-
Notifications
You must be signed in to change notification settings - Fork 12
Add proxy support for pypi package managers #150
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6fc2c61
initial pypi registry implementation
Sahilb315 979b8f1
support proxy mode for pypi package managers
Sahilb315 f6b020b
support proxy mode for pypi package managers - 2
Sahilb315 6e098be
rm default mode as proxy for pip3
Sahilb315 87a1b67
update goproxy version & fix pypi proxy failing on 304
Sahilb315 0f6eeeb
add PIP_RETRIES=0 env
Sahilb315 9354731
update pmg e2e & add proxy mode e2e for pypi
Sahilb315 ff0fe98
rm safedep-test-pkg for pypi proxy e2e
Sahilb315 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package interceptors | ||
|
|
||
| import ( | ||
| packagev1 "buf.build/gen/go/safedep/api/protocolbuffers/go/safedep/messages/package/v1" | ||
| "github.com/safedep/dry/log" | ||
| "github.com/safedep/pmg/analyzer" | ||
| "github.com/safedep/pmg/proxy" | ||
| ) | ||
|
|
||
| var pypiRegistryDomains = registryConfigMap{ | ||
| "files.pythonhosted.org": { | ||
| Host: "files.pythonhosted.org", | ||
| SupportedForAnalysis: true, | ||
| Parser: pypiFilesParser{}, | ||
| }, | ||
| "pypi.org": { | ||
| Host: "pypi.org", | ||
| SupportedForAnalysis: true, | ||
| Parser: pypiOrgParser{}, | ||
| }, | ||
| // Test PyPI instance | ||
| "test.pypi.org": { | ||
| Host: "test.pypi.org", | ||
| SupportedForAnalysis: false, // Skip analysis for test PyPI | ||
| Parser: pypiOrgParser{}, | ||
| }, | ||
| "test-files.pythonhosted.org": { | ||
| Host: "test-files.pythonhosted.org", | ||
| SupportedForAnalysis: false, // Skip analysis for test PyPI files | ||
| Parser: pypiFilesParser{}, | ||
| }, | ||
| } | ||
|
|
||
| // PypiRegistryInterceptor intercepts PyPI registry requests and analyzes packages for malware | ||
| // It embeds baseRegistryInterceptor to reuse ecosystem agnostic functionality | ||
| type PypiRegistryInterceptor struct { | ||
| baseRegistryInterceptor | ||
| } | ||
|
|
||
| var _ proxy.Interceptor = (*PypiRegistryInterceptor)(nil) | ||
|
|
||
| // NewPypiRegistryInterceptor creates a new PyPI registry interceptor | ||
| func NewPypiRegistryInterceptor( | ||
| analyzer analyzer.PackageVersionAnalyzer, | ||
| cache AnalysisCache, | ||
| statsCollector *AnalysisStatsCollector, | ||
| confirmationChan chan *ConfirmationRequest, | ||
| ) *PypiRegistryInterceptor { | ||
| return &PypiRegistryInterceptor{ | ||
| baseRegistryInterceptor: baseRegistryInterceptor{ | ||
| analyzer: analyzer, | ||
| cache: cache, | ||
| statsCollector: statsCollector, | ||
| confirmationChan: confirmationChan, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // Name returns the interceptor name for logging | ||
| func (i *PypiRegistryInterceptor) Name() string { | ||
| return "pypi-registry-interceptor" | ||
| } | ||
|
|
||
| // ShouldIntercept determines if this interceptor should handle the given request | ||
| func (i *PypiRegistryInterceptor) ShouldIntercept(ctx *proxy.RequestContext) bool { | ||
| return pypiRegistryDomains.ContainsHostname(ctx.Hostname) | ||
| } | ||
|
|
||
| // HandleRequest processes the request and returns response action | ||
| // We take a fail-open approach here, allowing requests that we can't parse the package information from the URL. | ||
| func (i *PypiRegistryInterceptor) HandleRequest(ctx *proxy.RequestContext) (*proxy.InterceptorResponse, error) { | ||
| log.Debugf("[%s] Handling PyPI registry request: %s", ctx.RequestID, ctx.URL.Path) | ||
|
|
||
| // Get registry configuration | ||
| config := pypiRegistryDomains.GetConfigForHostname(ctx.Hostname) | ||
| if config == nil { | ||
| // Shouldn't happen if ShouldIntercept is working correctly | ||
| log.Warnf("[%s] No registry config found for hostname: %s", ctx.RequestID, ctx.Hostname) | ||
| return &proxy.InterceptorResponse{Action: proxy.ActionAllow}, nil | ||
| } | ||
|
|
||
| // Skip analysis for registries that are not supported for analysis | ||
| if !config.SupportedForAnalysis { | ||
| log.Debugf("[%s] Skipping analysis for %s registry (not supported for analysis): %s", | ||
| ctx.RequestID, config.Host, ctx.URL.String()) | ||
| return &proxy.InterceptorResponse{Action: proxy.ActionAllow}, nil | ||
| } | ||
|
|
||
| // Parse URL using registry-specific strategy | ||
| pkgInfo, err := config.Parser.ParseURL(ctx.URL.Path) | ||
| if err != nil { | ||
| log.Warnf("[%s] Failed to parse PyPI registry URL %s for %s: %v", | ||
| ctx.RequestID, ctx.URL.Path, config.Host, err) | ||
| return &proxy.InterceptorResponse{Action: proxy.ActionAllow}, nil | ||
| } | ||
|
|
||
| // Only analyze actual file downloads (sdist or wheel) | ||
| // Metadata requests (Simple API or JSON API) are allowed through | ||
| if !pkgInfo.IsFileDownload() { | ||
| log.Debugf("[%s] Skipping analysis for metadata request: %s", ctx.RequestID, pkgInfo.GetName()) | ||
| return &proxy.InterceptorResponse{Action: proxy.ActionAllow}, nil | ||
| } | ||
|
|
||
| // Ensure we have both name and version for analysis | ||
| if pkgInfo.GetName() == "" || pkgInfo.GetVersion() == "" { | ||
| log.Warnf("[%s] Incomplete package info from URL %s: name=%s, version=%s", | ||
| ctx.RequestID, ctx.URL.Path, pkgInfo.GetName(), pkgInfo.GetVersion()) | ||
| return &proxy.InterceptorResponse{Action: proxy.ActionAllow}, nil | ||
| } | ||
|
|
||
| // Get file type for logging if available | ||
| fileType := "" | ||
| if pypiInfo, ok := pkgInfo.(*pypiPackageInfo); ok { | ||
| fileType = pypiInfo.FileType() | ||
| } | ||
| log.Debugf("[%s] Analyzing PyPI package: %s@%s (type: %s)", | ||
| ctx.RequestID, pkgInfo.GetName(), pkgInfo.GetVersion(), fileType) | ||
|
|
||
| result, err := i.analyzePackage( | ||
| ctx, | ||
| packagev1.Ecosystem_ECOSYSTEM_PYPI, | ||
| pkgInfo.GetName(), | ||
| pkgInfo.GetVersion(), | ||
| ) | ||
| if err != nil { | ||
| log.Errorf("[%s] Failed to analyze package %s@%s: %v", ctx.RequestID, pkgInfo.GetName(), pkgInfo.GetVersion(), err) | ||
| return &proxy.InterceptorResponse{Action: proxy.ActionAllow}, nil | ||
| } | ||
|
|
||
| return i.handleAnalysisResult(ctx, packagev1.Ecosystem_ECOSYSTEM_PYPI, pkgInfo.GetName(), pkgInfo.GetVersion(), result) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.