Skip to content

Escape pkg names in URLs #62

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

Merged
NamelessOne91 merged 1 commit into from
Apr 10, 2025
Merged

Escape pkg names in URLs #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 19 additions & 6 deletions get/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,14 @@ func (r *Syncer) storeRepo(checksumMap map[string]XMLChecksum) (err error) {
downloadCount := len(packagesToDownload)
log.Printf("Downloading %v packages...\n", downloadCount)
for i, pack := range packagesToDownload {
description := fmt.Sprintf("(%v/%v) %v", i+1, downloadCount, path.Base(pack.Location.Href))
err = r.downloadStoreApply(pack.Location.Href, pack.Checksum.Checksum, description, hashMap[pack.Checksum.Type], util.Nop)
// we need to escape package names because some CDN, proxies (...) are not perfectly RFC 3986 compliant
// in such cases characters like '+' (which are common in c++ pkgs) will assume a different meaning
name := path.Base(pack.Location.Href)
escapedName := url.QueryEscape(name)
relativeURL := strings.TrimSuffix(pack.Location.Href, name) + escapedName

description := fmt.Sprintf("(%v/%v) %v", i+1, downloadCount, name)
err = r.downloadStoreApply(relativeURL, pack.Checksum.Checksum, description, hashMap[pack.Checksum.Type], util.Nop)
if err != nil {
return err
}
Expand All @@ -207,13 +213,20 @@ func (r *Syncer) storeRepo(checksumMap map[string]XMLChecksum) (err error) {
func (r *Syncer) downloadStoreApply(relativePath string, checksum string, description string, hash crypto.Hash, f util.ReaderConsumer) error {
log.Printf("Downloading %v...", description)

url := r.URL
url.Path = path.Join(r.URL.Path, relativePath)
body, err := ReadURL(url.String())
repoURL := r.URL
repoURL.Path = path.Join(repoURL.Path, relativePath)
finalURL := fmt.Sprintf("%s://%s%s", repoURL.Scheme, repoURL.Host, repoURL.Path)

body, err := ReadURL(finalURL)
if err != nil {
return err
}
// unescape to preserve original pkg name
storagePath, err := url.QueryUnescape(relativePath)
if err != nil {
return err
}
return util.Compose(r.storage.StoringMapper(relativePath, checksum, hash), f)(body)
return util.Compose(r.storage.StoringMapper(storagePath, checksum, hash), f)(body)
}

// processMetadata stores the repo metadata and returns a list of package file
Expand Down