mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
fix proxy stuck on blocking malicious package (#153)
* fix proxy stuck on blocking malicious package * update pmg e2e
This commit is contained in:
@@ -164,7 +164,7 @@ jobs:
|
||||
echo "Testing pip manifest installation via proxy mode..."
|
||||
pmg pip freeze > requirements.txt
|
||||
pmg pip uninstall -y requests numpy
|
||||
pmg pip install -r requirements.txt
|
||||
pmg pip install -r <(grep -v '^PMG:' requirements.txt)
|
||||
python -c "import requests, numpy; print('pip manifest ok:', requests.__version__, numpy.__version__)"
|
||||
deactivate
|
||||
|
||||
@@ -183,7 +183,7 @@ jobs:
|
||||
echo "Testing pip3 manifest installation via proxy mode..."
|
||||
pmg pip3 freeze > requirements3.txt
|
||||
pmg pip3 uninstall -y requests numpy
|
||||
pmg pip3 install -r requirements3.txt
|
||||
pmg pip3 install -r <(grep -v '^PMG:' requirements3.txt)
|
||||
python -c "import requests, numpy; print('pip3 manifest ok:', requests.__version__, numpy.__version__)"
|
||||
deactivate
|
||||
|
||||
@@ -205,7 +205,7 @@ jobs:
|
||||
|
||||
echo "Testing uv pip install from requirements via proxy mode..."
|
||||
pmg uv pip freeze > requirements.txt
|
||||
pmg uv pip install -r requirements.txt
|
||||
pmg uv pip install -r <(grep -v '^PMG:' requirements.txt)
|
||||
pmg uv pip show requests >/dev/null
|
||||
pmg uv pip show numpy >/dev/null
|
||||
cd ..
|
||||
|
||||
+18
-1
@@ -283,8 +283,25 @@ func (ps *proxyServer) registerHandlers() {
|
||||
}
|
||||
|
||||
log.Debugf("[%s] Blocked by %s: %s", reqCtx.RequestID, interceptor.Name(), req.URL.String())
|
||||
r := goproxy.NewResponse(req, goproxy.ContentTypeText, statusCode, message)
|
||||
|
||||
return req, goproxy.NewResponse(req, goproxy.ContentTypeText, statusCode, message)
|
||||
// goproxy v1.8.x writes the response via (*http.Response).Write for MITM traffic.
|
||||
// Ensure the protocol version is valid (defaults to HTTP/0.0 otherwise).
|
||||
// Ref: https://github.com/elazarl/goproxy/issues/745
|
||||
if req.ProtoMajor > 0 {
|
||||
r.Proto = req.Proto
|
||||
r.ProtoMajor = req.ProtoMajor
|
||||
r.ProtoMinor = req.ProtoMinor
|
||||
} else {
|
||||
r.Proto = "HTTP/1.1"
|
||||
r.ProtoMajor = 1
|
||||
r.ProtoMinor = 1
|
||||
}
|
||||
r.Close = true
|
||||
r.Header.Set("Connection", "close")
|
||||
r.Header.Set("Proxy-Connection", "close")
|
||||
|
||||
return req, r
|
||||
|
||||
case ActionModifyRequest:
|
||||
if resp.ModifiedHeaders != nil {
|
||||
|
||||
Reference in New Issue
Block a user