From b8a66f6bcd4d3870bdba73af837954a4d6d8a636 Mon Sep 17 00:00:00 2001 From: Daniel Jeffery Date: Thu, 15 Aug 2024 09:36:50 -0700 Subject: [PATCH] fix: restrict condition name to 50 characters --- pkg/go/validation/validation-rules.go | 2 +- .../main/java/dev/openfga/language/validation/Validator.java | 2 +- pkg/js/validator/validate-rules.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/go/validation/validation-rules.go b/pkg/go/validation/validation-rules.go index 7e27d557..c92e586a 100644 --- a/pkg/go/validation/validation-rules.go +++ b/pkg/go/validation/validation-rules.go @@ -10,7 +10,7 @@ type Rule string const ( RuleType Rule = "[^:#@\\*\\s]{1,254}" RuleRelation Rule = "[^:#@\\*\\s]{1,50}" - RuleCondition Rule = "[^\\*\\s]{2,256}" + RuleCondition Rule = "[^\\*\\s]{1,50}" RuleID Rule = "[^#:\\*\\s]+" RuleObject Rule = "[^\\s]{2,256}" ) diff --git a/pkg/java/src/main/java/dev/openfga/language/validation/Validator.java b/pkg/java/src/main/java/dev/openfga/language/validation/Validator.java index 8a3d298c..e4afc0c8 100644 --- a/pkg/java/src/main/java/dev/openfga/language/validation/Validator.java +++ b/pkg/java/src/main/java/dev/openfga/language/validation/Validator.java @@ -5,7 +5,7 @@ public class Validator { public class Rules { public static final String TYPE = "[^:#@\\*\\s]{1,254}"; public static final String RELATION = "[^:#@\\*\\s]{1,50}"; - public static final String CONDITION = "[^\\*\\s]{2,256}"; + public static final String CONDITION = "[^\\*\\s]{1,50}"; public static final String ID = "[^#:\\*\\s]+"; public static final String OBJECT = "[^\\s]{2,256}"; } diff --git a/pkg/js/validator/validate-rules.ts b/pkg/js/validator/validate-rules.ts index cc6da53c..5f84ad45 100644 --- a/pkg/js/validator/validate-rules.ts +++ b/pkg/js/validator/validate-rules.ts @@ -1,7 +1,7 @@ export const Rules = { type: "[^:#@\\*\\s]{1,254}", relation: "[^:#@\\*\\s]{1,50}", - condition: "[^\\*\\s]{2,256}", + condition: "[^\\*\\s]{1,50}", id: "[^#:\\*\\s]+", object: "[^\\s]{2,256}", };