Skip to content

XRAY-156301 Move redirect boundary validation to jfrog-client-go #818

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.

Sign up for GitHub

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

Open
Phavya-jfrog wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

XRAY-156301 Move redirect boundary validation to jfrog-client-go #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97fbd81
XRAY-156301 - Implement http HEAD GET security for pip and poetry
Phavya-jfrog Jul 27, 2026
7d5af3e
XRAY-156301 - Move redirect boundary validation to jfrog-client-go
Phavya-jfrog Jul 30, 2026
44ab04e
Merge branch 'dev' into feature/XRAY-156301-http
Phavya-jfrog Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions commands/curation/curationaudit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

"github.com/jfrog/jfrog-client-go/artifactory"
"github.com/jfrog/jfrog-client-go/auth"
"github.com/jfrog/jfrog-client-go/http/redirect"
clientutils "github.com/jfrog/jfrog-client-go/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
"github.com/jfrog/jfrog-client-go/utils/io/httputils"
Expand Down Expand Up @@ -847,9 +848,9 @@ func (ca *CurationAuditCommand) getRtManagerAndAuth(tech techutils.Technology) (
return
}

// pipenvBoundedRedirectManager must use zero retries: HttpClient.Send retries
// boundedRedirectManager must use zero retries: HttpClient.Send retries
// on CheckRedirect errors, desyncing SendWithBoundedRedirects's hop counter.
func pipenvBoundedRedirectManager(serverDetails *config.ServerDetails) (artifactory.ArtifactoryServicesManager, error) {
func boundedRedirectManager(serverDetails *config.ServerDetails) (artifactory.ArtifactoryServicesManager, error) {
return rtUtils.CreateServiceManager(serverDetails, 0, 0, false)
}

Expand Down Expand Up @@ -1007,8 +1008,8 @@ func (ca *CurationAuditCommand) auditTree(tech techutils.Technology, results map
if err != nil {
return err
}
if tech == techutils.Pipenv {
rtManager, err = pipenvBoundedRedirectManager(serverDetails)
if tech == techutils.Pip || tech == techutils.Poetry || tech == techutils.Pipenv {
rtManager, err = boundedRedirectManager(serverDetails)
if err != nil {
return err
}
Expand Down Expand Up @@ -1743,8 +1744,8 @@ func (nc *treeAnalyzer) fetchNodeStatus(node xrayUtils.GraphNode, p *sync.Map) e
requestDetails := nc.httpClientDetails.Clone()
var resp *http.Response
var err error
if nc.tech == techutils.Pipenv {
resp, _, err = nc.sendPipenvRequest(http.MethodHead, packageUrl, requestDetails)
if nc.tech == techutils.Pip || nc.tech == techutils.Poetry || nc.tech == techutils.Pipenv {
resp, _, err = nc.sendBoundedRequest(http.MethodHead, packageUrl, requestDetails)
} else {
resp, _, err = nc.rtManager.Client().SendHead(packageUrl, requestDetails)
}
Expand Down Expand Up @@ -1804,14 +1805,14 @@ func (nc *treeAnalyzer) fetchNodeStatus(node xrayUtils.GraphNode, p *sync.Map) e
return nil
}

func (nc *treeAnalyzer) sendPipenvRequest(method, requestURL string, details *httputils.HttpClientDetails) (*http.Response, []byte, error) {
func (nc *treeAnalyzer) sendBoundedRequest(method, requestURL string, details *httputils.HttpClientDetails) (*http.Response, []byte, error) {
repositoryURL := fmt.Sprintf("%s/api/pypi/%s/", strings.TrimSuffix(nc.url, "/"), nc.repo)
boundary, err := utils.NewEndpointBoundary(repositoryURL)
boundary, err := redirect.NewEndpointBoundary(repositoryURL)
if err != nil {
return nil, nil, err
}
return utils.SendWithBoundedRedirects(nc.rtManager.Client(), method, requestURL, details,
boundary, utils.MaxAuthenticatedRedirects)
return redirect.SendWithBoundedRedirects(nc.rtManager.Client(), method, requestURL, details,
boundary, redirect.MaxAuthenticatedRedirects)
}

// runCvsFallback is called when pip or poetry resolution failed because CVS
Expand All @@ -1824,8 +1825,8 @@ func (ca *CurationAuditCommand) runCvsFallback(cvsErr *python.CvsBlockedError, t
if err != nil {
return fmt.Errorf("curation-blocked resolution fallback: failed to get Artifactory manager (%w); %s error: %w", err, tech, cvsErr)
}
if tech == techutils.Pipenv {
rtManager, err = pipenvBoundedRedirectManager(serverDetails)
if tech == techutils.Pip || tech == techutils.Poetry || tech == techutils.Pipenv {
rtManager, err = boundedRedirectManager(serverDetails)
if err != nil {
return fmt.Errorf("curation-blocked resolution fallback: failed to create bounded HTTP manager: %w", err)
}
Expand Down Expand Up @@ -1873,8 +1874,8 @@ func (nc *treeAnalyzer) lookupPypiAllVersions(name string) ([]string, error) {
var resp *http.Response
var body []byte
var err error
if nc.tech == techutils.Pipenv {
resp, body, err = nc.sendPipenvRequest(http.MethodGet, metadataURL, requestDetails)
if nc.tech == techutils.Pip || nc.tech == techutils.Poetry || nc.tech == techutils.Pipenv {
resp, body, err = nc.sendBoundedRequest(http.MethodGet, metadataURL, requestDetails)
} else {
resp, body, _, err = nc.rtManager.Client().SendGet(metadataURL, true, requestDetails)
}
Expand Down Expand Up @@ -1913,8 +1914,8 @@ func (nc *treeAnalyzer) lookupPypiNormalDownloadURL(name, ver string) (string, e
var resp *http.Response
var body []byte
var err error
if nc.tech == techutils.Pipenv {
resp, body, err = nc.sendPipenvRequest(http.MethodGet, metadataURL, requestDetails)
if nc.tech == techutils.Pip || nc.tech == techutils.Poetry || nc.tech == techutils.Pipenv {
resp, body, err = nc.sendBoundedRequest(http.MethodGet, metadataURL, requestDetails)
} else {
resp, body, _, err = nc.rtManager.Client().SendGet(metadataURL, true, requestDetails)
}
Expand Down Expand Up @@ -2014,8 +2015,8 @@ func (nc *treeAnalyzer) fetchCvsBlockedStatus(pins []python.PinnedRequirement) [
headDetails := nc.httpClientDetails.Clone()
var headResp *http.Response
var headErr error
if nc.tech == techutils.Pipenv {
headResp, _, headErr = nc.sendPipenvRequest(http.MethodHead, dlURL, headDetails)
if nc.tech == techutils.Pip || nc.tech == techutils.Poetry || nc.tech == techutils.Pipenv {
headResp, _, headErr = nc.sendBoundedRequest(http.MethodHead, dlURL, headDetails)
} else {
headResp, _, headErr = nc.rtManager.Client().SendHead(dlURL, headDetails)
}
Expand Down Expand Up @@ -2114,8 +2115,8 @@ func (nc *treeAnalyzer) getBlockedPackageDetails(packageUrl string, name string,
var getResp *http.Response
var respBody []byte
var err error
if nc.tech == techutils.Pipenv {
getResp, respBody, err = nc.sendPipenvRequest(http.MethodGet, packageUrl, requestDetails)
if nc.tech == techutils.Pip || nc.tech == techutils.Poetry || nc.tech == techutils.Pipenv {
getResp, respBody, err = nc.sendBoundedRequest(http.MethodGet, packageUrl, requestDetails)
} else {
getResp, respBody, _, err = nc.rtManager.Client().SendGet(packageUrl, true, requestDetails)
}
Expand Down
Loading
Loading