Skip to content

Commit fd89c06

Browse files
KN4CK3Rlunny
andauthored
Allow local package identifiers for PyPI packages (#21690)
Fixes #21683 Co-authored-by: Lunny Xiao <[email protected]>
1 parent a0367c2 commit fd89c06

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Diff for: routers/api/packages/pypi/pypi.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ import (
2525
var normalizer = strings.NewReplacer(".", "-", "_", "-")
2626
var nameMatcher = regexp.MustCompile(`\A[a-zA-Z0-9\.\-_]+\z`)
2727

28-
// https://www.python.org/dev/peps/pep-0440/#appendix-b-parsing-version-strings-with-regular-expressions
29-
var versionMatcher = regexp.MustCompile(`^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$`)
28+
// https://peps.python.org/pep-0440/#appendix-b-parsing-version-strings-with-regular-expressions
29+
var versionMatcher = regexp.MustCompile(`\Av?` +
30+
`(?:[0-9]+!)?` + // epoch
31+
`[0-9]+(?:\.[0-9]+)*` + // release segment
32+
`(?:[-_\.]?(?:a|b|c|rc|alpha|beta|pre|preview)[-_\.]?[0-9]*)?` + // pre-release
33+
`(?:-[0-9]+|[-_\.]?(?:post|rev|r)[-_\.]?[0-9]*)?` + // post release
34+
`(?:[-_\.]?dev[-_\.]?[0-9]*)?` + // dev release
35+
`(?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)?` + // local version
36+
`\z`)
3037

3138
func apiError(ctx *context.Context, status int, obj interface{}) {
3239
helper.LogAndProcessError(ctx, status, obj, func(message string) {

Diff for: tests/integration/api_packages_pypi_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestPackagePyPI(t *testing.T) {
2929
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
3030

3131
packageName := "test-package"
32-
packageVersion := "1.0.1"
32+
packageVersion := "1.0.1+r1234"
3333
packageAuthor := "KN4CK3R"
3434
packageDescription := "Test Description"
3535

@@ -164,7 +164,7 @@ func TestPackagePyPI(t *testing.T) {
164164
nodes := htmlDoc.doc.Find("a").Nodes
165165
assert.Len(t, nodes, 2)
166166

167-
hrefMatcher := regexp.MustCompile(fmt.Sprintf(`%s/files/%s/%s/test\..+#sha256-%s`, root, packageName, packageVersion, hashSHA256))
167+
hrefMatcher := regexp.MustCompile(fmt.Sprintf(`%s/files/%s/%s/test\..+#sha256-%s`, root, regexp.QuoteMeta(packageName), regexp.QuoteMeta(packageVersion), hashSHA256))
168168

169169
for _, a := range nodes {
170170
for _, att := range a.Attr {

0 commit comments

Comments
 (0)