Update ResolvePackageNameVersionPin to handle invalid operators and update tests

pkg/apk/apk/repo.go

@@ -433,6 +433,9 @@ func (p *PkgResolver) constrain(constraints []string, dq map[*RepositoryPackage]
 		}
 
 		parsed := cachedResolvePackageNameVersionPin(constraint)
+		if parsed.Err != nil {
+			return fmt.Errorf("invalid version constraint for %q: %w", constraint, parsed.Err)
+		}
 		if parsed.dep == versionAny {
 			continue
 		}
@@ -638,6 +641,9 @@ func (p *PkgResolver) GetPackageWithDependencies(ctx context.Context, pkgName st
 // returns multiple in case you need to see all potential matches.
 func (p *PkgResolver) ResolvePackage(pkgName string, dq map[*RepositoryPackage]string) ([]*RepositoryPackage, error) {
 	constraint := cachedResolvePackageNameVersionPin(pkgName)
+	if constraint.Err != nil {
+		return nil, fmt.Errorf("invalid version constraint for %q: %w", pkgName, constraint.Err)
+	}
 	name, version, compare, pin := constraint.Name, constraint.Version, constraint.dep, constraint.pin
 	pkgsWithVersions, ok := p.nameMap[name]
 	if !ok {
@@ -664,6 +670,9 @@ func (p *PkgResolver) ResolvePackage(pkgName string, dq map[*RepositoryPackage]s
 // This is like ResolvePackage but we only care about the best match and not all matches.
 func (p *PkgResolver) resolvePackage(pkgName string, dq map[*RepositoryPackage]string) (*RepositoryPackage, error) {
 	constraint := cachedResolvePackageNameVersionPin(pkgName)
+	if constraint.Err != nil {
+		return nil, fmt.Errorf("invalid version constraint for %q: %w", pkgName, constraint.Err)
+	}
 	name, version, compare, pin := constraint.Name, constraint.Version, constraint.dep, constraint.pin
 
 	pkgsWithVersions, ok := p.nameMap[name]

pkg/apk/apk/version.go

@@ -324,6 +324,7 @@ const (
 	versionGreaterEqual
 	versionLessEqual
 	versionTilde
+	versionInvalid
 )
 
 func (v versionDependency) satisfies(actualVersion, requiredVersion Version) bool {
@@ -349,11 +350,13 @@ func (v versionDependency) satisfies(actualVersion, requiredVersion Version) boo
 	}
 }
 
+// ParsedConstraint represents a parsed version constraint, including any error.
 type ParsedConstraint struct {
 	Name    string
 	Version string
 	dep     versionDependency
 	pin     string
+	Err     error
 }
 
 func (p ParsedConstraint) SatisfiedBy(v Version) (bool, error) {
@@ -406,7 +409,11 @@ func ResolvePackageNameVersionPin(pkgName string) ParsedConstraint {
 
 	matcher := parts[0][3]
 	if matcher != "" {
-		// we have an equal
+		if strings.Contains(matcher, "!") {
+			p.dep = versionInvalid
+			p.Err = fmt.Errorf("unsupported or invalid version operator: %q", matcher)
+			return p
+		}
 		switch matcher {
 		case "=":
 			p.dep = versionEqual
@@ -423,7 +430,8 @@ func ResolvePackageNameVersionPin(pkgName string) ParsedConstraint {
 		case "=~":
 			p.dep = versionTilde
 		default:
-			p.dep = versionAny
+			p.dep = versionInvalid
+			p.Err = fmt.Errorf("unsupported or invalid version operator: %q", matcher)
 		}
 	}
 	return p

pkg/apk/apk/version_test.go

@@ -957,6 +957,37 @@ func TestResolverPackageNameVersionPin(t *testing.T) {
 			require.Equal(t, tt.version, constraint.Version)
 			require.Equal(t, tt.dep, constraint.dep)
 			require.Equal(t, tt.pin, constraint.pin)
+			require.Nil(t, constraint.Err)
 		})
 	}
+
+	invalids := []struct {
+		input     string
+		dep       versionDependency
+		shouldErr bool
+	}{
+		{"name>~1.2.3", versionInvalid, true},
+		{"name>>~1.2.3", versionInvalid, true},
+		{"name~<>~1.2.3", versionInvalid, true},
+		{"foo!1.2.3", versionAny, false}, // '!' at start is negation, not an operator
+	}
+	for _, tc := range invalids {
+		t.Run("invalid_operator_"+tc.input, func(t *testing.T) {
+			constraint := ResolvePackageNameVersionPin(tc.input)
+			require.Equal(t, tc.dep, constraint.dep)
+			if tc.shouldErr {
+				require.NotNil(t, constraint.Err)
+			} else {
+				require.Nil(t, constraint.Err)
+			}
+		})
+	}
+}
+
+func TestInvalidOperatorRaisesErrorInResolver(t *testing.T) {
+	pr := NewPkgResolver(context.Background(), []NamedIndex{})
+	_, err := pr.ResolvePackage("foo>~1.2.3", map[*RepositoryPackage]string{})
+	require.Error(t, err)
+	_, err = pr.resolvePackage("foo>>~1.2.3", map[*RepositoryPackage]string{})
+	require.Error(t, err)
 }