Implement predefined field constraints

internal/cmd/protovalidate-conformance-go/main.go

@@ -58,6 +58,25 @@ func TestConformance(req *harness.TestConformanceRequest) (*harness.TestConforma
 		err = fmt.Errorf("failed to parse file descriptors: %w", err)
 		return nil, err
 	}
+	// Register all dynamic FDS files and their extensions.
+	files.RangeFiles(func(file protoreflect.FileDescriptor) bool {
+		if _, err := protoregistry.GlobalFiles.FindFileByPath(file.Path()); err == nil {
+			// Already registered
+			return true
+		}
+		err = protoregistry.GlobalFiles.RegisterFile(file)
+		if err != nil {
+			err = fmt.Errorf("failed to register file descriptor %q: %w", file.FullName(), err)
+		}
+		exts := file.Extensions()
+		for i := 0; i < exts.Len(); i++ {
+			protoregistry.GlobalTypes.RegisterExtension(dynamicpb.NewExtensionType(exts.Get(i)))
+		}
+		return err == nil
+	})
+	if err != nil {
+		return nil, err
+	}
 	val, err := protovalidate.New()
 	if err != nil {
 		err = fmt.Errorf("failed to initialize validator: %w", err)

internal/constraints/cache.go

@@ -15,14 +15,18 @@
 package constraints
 
 import (
+	"fmt"
+
 	"buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate"
-	"buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate/priv"
+	"buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate/shared"
 	"github.com/bufbuild/protovalidate-go/celext"
 	"github.com/bufbuild/protovalidate-go/internal/errors"
 	"github.com/bufbuild/protovalidate-go/internal/expression"
 	"github.com/google/cel-go/cel"
+	"github.com/google/cel-go/common/types"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
 // Cache is a build-through cache to computed standard constraints.
@@ -57,8 +61,19 @@
 	}
 
 	var asts expression.ASTSet
-	constraints.Range(func(desc protoreflect.FieldDescriptor, _ protoreflect.Value) bool {
-		precomputedASTs, compileErr := c.loadOrCompileStandardConstraint(env, desc)
+	constraints.Range(func(desc protoreflect.FieldDescriptor, rule protoreflect.Value) bool {
+		fieldEnv, compileErr := env.Extend(
+			cel.Constant(
+				"rule",
+				celext.ProtoFieldToCELType(desc, true, forItems),
+				types.DefaultTypeAdapter.NativeToValue(rule.Interface()),
+			),
+		)
+		if err != nil {
+			err = compileErr
+			return false
+		}
+		precomputedASTs, compileErr := c.loadOrCompileStandardConstraint(fieldEnv, desc)
 		if compileErr != nil {
 			err = compileErr
 			return false
@@ -102,6 +117,11 @@
 		return nil, true, nil
 	}
 	rules = constraints.Get(setOneof).Message()
+	// Reparse unrecognized fields so that we get dynamic extensions.
+	err = reparseUnrecognized(rules)
+	if err != nil {
+		return nil, false, fmt.Errorf("error reparsing message: %v", err)
+	}
 	return rules, false, nil
 }
 
@@ -137,7 +157,7 @@
 	if cachedConstraint, ok := c.cache[constraintFieldDesc]; ok {
 		return cachedConstraint, nil
 	}
-	exprs, _ := proto.GetExtension(constraintFieldDesc.Options(), priv.E_Field).(*priv.FieldConstraints)
+	exprs, _ := proto.GetExtension(constraintFieldDesc.Options(), shared.E_Field).(*shared.FieldConstraints)
 	set, err = expression.CompileASTs(exprs.GetCel(), env)
 	if err != nil {
 		return set, errors.NewCompilationErrorf(
@@ -170,3 +190,18 @@
 		return expected, ok
 	}
 }
+
+func reparseUnrecognized(reflectMessage protoreflect.Message) error {
+	unknown := reflectMessage.GetUnknown()
+	if len(unknown) > 0 {
+		reflectMessage.SetUnknown(nil)
+		options := proto.UnmarshalOptions{
+			Resolver: protoregistry.GlobalTypes,
+			Merge:    true,
+		}
+		if err := options.Unmarshal(unknown, reflectMessage.Interface()); err != nil {
+			return err
+		}
+	}
+	return nil
+}