eric/onix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ref: remove url transform config

Browse Source
This commit is contained in:
ameersohel45
2025-12-12 12:14:11 +05:30
parent 94943e63e6
commit 5739573da0
2 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/plugin/implementation/schemav2validator/cmd/plugin.go
View File

@@ -41,34 +41,32 @@ func (vp schemav2ValidatorProvider) New(ctx context.Context, config map[string]s
} }
} }
// NEW: Parse enableReferencedSchemas // NEW: Parse extendedSchema_enabled
if enableStr, ok := config["enableReferencedSchemas"]; ok { if enableStr, ok := config["extendedSchema_enabled"]; ok {
cfg.EnableReferencedSchemas = enableStr == "true" cfg.EnableReferencedSchemas = enableStr == "true"
} }
// NEW: Parse referencedSchemaConfig (if enabled) // NEW: Parse Extended Schema config (if enabled)
if cfg.EnableReferencedSchemas { if cfg.EnableReferencedSchemas {
if v, ok := config["referencedSchemaConfig.cacheTTL"]; ok { if v, ok := config["extendedSchema_cacheTTL"]; ok {
if ttl, err := strconv.Atoi(v); err == nil && ttl > 0 { if ttl, err := strconv.Atoi(v); err == nil && ttl > 0 {
cfg.ReferencedSchemaConfig.CacheTTL = ttl cfg.ReferencedSchemaConfig.CacheTTL = ttl
} }
} }
if v, ok := config["referencedSchemaConfig.maxCacheSize"]; ok { if v, ok := config["extendedSchema_maxCacheSize"]; ok {
if size, err := strconv.Atoi(v); err == nil && size > 0 { if size, err := strconv.Atoi(v); err == nil && size > 0 {
cfg.ReferencedSchemaConfig.MaxCacheSize = size cfg.ReferencedSchemaConfig.MaxCacheSize = size
} }
} }
if v, ok := config["referencedSchemaConfig.downloadTimeout"]; ok { if v, ok := config["extendedSchema_downloadTimeout"]; ok {
if timeout, err := strconv.Atoi(v); err == nil && timeout > 0 { if timeout, err := strconv.Atoi(v); err == nil && timeout > 0 {
cfg.ReferencedSchemaConfig.DownloadTimeout = timeout cfg.ReferencedSchemaConfig.DownloadTimeout = timeout
} }
} }
if v, ok := config["referencedSchemaConfig.allowedDomains"]; ok && v != "" { if v, ok := config["extendedSchema_allowedDomains"]; ok && v != "" {
cfg.ReferencedSchemaConfig.AllowedDomains = strings.Split(v, ",") cfg.ReferencedSchemaConfig.AllowedDomains = strings.Split(v, ",")
} }
if v, ok := config["referencedSchemaConfig.urlTransform"]; ok && v != "" {
cfg.ReferencedSchemaConfig.URLTransform = v
}
} }
return schemav2validator.New(ctx, cfg) return schemav2validator.New(ctx, cfg)

44
pkg/plugin/implementation/schemav2validator/schemav2validator.go
View File

@@ -56,7 +56,6 @@ type ReferencedSchemaConfig struct {
MaxCacheSize int // default 100 MaxCacheSize int // default 100
DownloadTimeout int // seconds, default 30 DownloadTimeout int // seconds, default 30
AllowedDomains []string // whitelist (empty = all allowed) AllowedDomains []string // whitelist (empty = all allowed)
URLTransform string // e.g. "context.jsonld->attributes.yaml"
} }
// referencedObject represents ANY object with @context in the request. // referencedObject represents ANY object with @context in the request.
@@ -169,17 +168,17 @@ func (v *schemav2Validator) Validate(ctx context.Context, reqURL *url.URL, data
return v.formatValidationError(err) return v.formatValidationError(err)
} }
log.Debugf(ctx, "LEVEL 1 validation passed for action: %s", action) log.Debugf(ctx, "Core schema validation passed for action: %s", action)
// NEW: LEVEL 2 - Referenced schema validation (if enabled) // NEW: Extended Schema validation (if enabled)
if v.config.EnableReferencedSchemas && v.schemaCache != nil { if v.config.EnableReferencedSchemas && v.schemaCache != nil {
log.Debugf(ctx, "Starting LEVEL 2 validation for action: %s", action) log.Debugf(ctx, "Starting Extended Schema validation for action: %s", action)
if err := v.validateReferencedSchemas(ctx, jsonData); err != nil { if err := v.validateReferencedSchemas(ctx, jsonData); err != nil {
// Level 2 failure - return error (same behavior as Level 1) // Extended Schema failure - return error (same behavior as core schema)
log.Debugf(ctx, "LEVEL 2 validation failed for action %s: %v", action, err) log.Debugf(ctx, "Extended Schema validation failed for action %s: %v", action, err)
return v.formatValidationError(err) return v.formatValidationError(err)
} }
log.Debugf(ctx, "LEVEL 2 validation passed for action: %s", action) log.Debugf(ctx, "Extended Schema validation passed for action: %s", action)
} }
return nil return nil
@@ -416,22 +415,18 @@ func (v *schemav2Validator) validateReferencedSchemas(ctx context.Context, body
objects := findReferencedObjects(message, "message") objects := findReferencedObjects(message, "message")
if len(objects) == 0 { if len(objects) == 0 {
log.Debugf(ctx, "No objects with @context found in message, skipping LEVEL 2 validation") log.Debugf(ctx, "No objects with @context found in message, skipping Extended Schema validation")
return nil return nil
} }
log.Debugf(ctx, "Found %d objects with @context for LEVEL 2 validation", len(objects)) log.Debugf(ctx, "Found %d objects with @context for Extended Schema validation", len(objects))
// Get config with defaults // Get config with defaults
urlTransform := "context.jsonld->attributes.yaml"
ttl := 86400 * time.Second // 24 hours default ttl := 86400 * time.Second // 24 hours default
timeout := 30 * time.Second timeout := 30 * time.Second
var allowedDomains []string var allowedDomains []string
refConfig := v.config.ReferencedSchemaConfig refConfig := v.config.ReferencedSchemaConfig
if refConfig.URLTransform != "" {
urlTransform = refConfig.URLTransform
}
if refConfig.CacheTTL > 0 { if refConfig.CacheTTL > 0 {
ttl = time.Duration(refConfig.CacheTTL) * time.Second ttl = time.Duration(refConfig.CacheTTL) * time.Second
} }
@@ -440,8 +435,8 @@ func (v *schemav2Validator) validateReferencedSchemas(ctx context.Context, body
} }
allowedDomains = refConfig.AllowedDomains allowedDomains = refConfig.AllowedDomains
log.Debugf(ctx, "LEVEL 2 config: urlTransform=%s, ttl=%v, timeout=%v, allowedDomains=%v", log.Debugf(ctx, "Extended Schema config: ttl=%v, timeout=%v, allowedDomains=%v",
urlTransform, ttl, timeout, allowedDomains) ttl, timeout, allowedDomains)
// Validate each object and collect errors // Validate each object and collect errors
var errors []string var errors []string
@@ -449,7 +444,7 @@ func (v *schemav2Validator) validateReferencedSchemas(ctx context.Context, body
log.Debugf(ctx, "Validating object at path: %s, @context: %s, @type: %s", log.Debugf(ctx, "Validating object at path: %s, @context: %s, @type: %s",
obj.Path, obj.Context, obj.Type) obj.Path, obj.Context, obj.Type)
if err := v.schemaCache.validateReferencedObject(ctx, obj, urlTransform, ttl, timeout, allowedDomains); err != nil { if err := v.schemaCache.validateReferencedObject(ctx, obj, ttl, timeout, allowedDomains); err != nil {
errors = append(errors, err.Error()) errors = append(errors, err.Error())
} }
} }
@@ -699,15 +694,13 @@ func findReferencedObjects(data interface{}, path string) []referencedObject {
} }
// transformContextToSchemaURL transforms @context URL to schema URL. // transformContextToSchemaURL transforms @context URL to schema URL.
func transformContextToSchemaURL(contextURL, transform string) string { func transformContextToSchemaURL(contextURL string) string {
parts := strings.Split(transform, "->") // Hardcoded transformation: context.jsonld -> attributes.yaml
if len(parts) != 2 { return strings.Replace(contextURL, "context.jsonld", "attributes.yaml", 1)
// Default transformation
return strings.Replace(contextURL, "context.jsonld", "attributes.yaml", 1)
}
return strings.Replace(contextURL, strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1]), 1)
} }
// findSchemaByType finds a schema in the document by @type value. // findSchemaByType finds a schema in the document by @type value.
func findSchemaByType(doc *openapi3.T, typeName string) (*openapi3.SchemaRef, error) { func findSchemaByType(doc *openapi3.T, typeName string) (*openapi3.SchemaRef, error) {
if doc.Components == nil || doc.Components.Schemas == nil { if doc.Components == nil || doc.Components.Schemas == nil {
@@ -751,7 +744,6 @@ func isAllowedDomain(schemaURL string, allowedDomains []string) bool {
func (c *schemaCache) validateReferencedObject( func (c *schemaCache) validateReferencedObject(
ctx context.Context, ctx context.Context,
obj referencedObject, obj referencedObject,
urlTransform string,
ttl, timeout time.Duration, ttl, timeout time.Duration,
allowedDomains []string, allowedDomains []string,
) error { ) error {
@@ -762,7 +754,7 @@ func (c *schemaCache) validateReferencedObject(
} }
// Transform @context to schema path (URL or file) // Transform @context to schema path (URL or file)
schemaPath := transformContextToSchemaURL(obj.Context, urlTransform) schemaPath := transformContextToSchemaURL(obj.Context)
log.Debugf(ctx, "Transformed %s -> %s", obj.Context, schemaPath) log.Debugf(ctx, "Transformed %s -> %s", obj.Context, schemaPath)
// Load schema with timeout (supports URL or local file) // Load schema with timeout (supports URL or local file)
@@ -778,7 +770,7 @@ func (c *schemaCache) validateReferencedObject(
return fmt.Errorf("at %s: %w", obj.Path, err) return fmt.Errorf("at %s: %w", obj.Path, err)
} }
// Validate object against schema (same options as Level 1) // Validate object against schema (same options as core schema)
opts := []openapi3.SchemaValidationOption{ opts := []openapi3.SchemaValidationOption{
openapi3.VisitAsRequest(), openapi3.VisitAsRequest(),
openapi3.EnableFormatValidation(), openapi3.EnableFormatValidation(),