extend test; persistent storage

Author: shults

gateway/api.go

@@ -1089,6 +1089,16 @@ func (gw *Gateway) newPolicyPathRoot() (*osutil.Root, error) {
 	return osutil.NewRoot(policyPath)
 }
 
+func (gw *Gateway) removePersistentPolicyById(id string) error {
+	root, err := gw.newPolicyPathRoot()
+
+	if err != nil {
+		return err
+	}
+
+	return root.Remove(id + ".json")
+}
+
 func (gw *Gateway) handleAddOrUpdatePolicy(polID string, r *http.Request) (interface{}, int) {
 	if gw.GetConfig().Policies.PolicySource == "service" {
 		log.Error("Rejected new policy due to PolicySource = service")

gateway/api_test.go

@@ -85,6 +85,7 @@ func TestPolicyAPI(t *testing.T) {
 	ts := StartTest(func(cnf *config.Config) {
 		cnf.Policies.PolicyPath = "."
 		cnf.Policies.PolicySource = "file"
+		cnf.DisableCustomIdValidation = true
 	})
 
 	defer ts.Close()
@@ -176,17 +177,27 @@ func TestPolicyAPI(t *testing.T) {
 		})
 	})
 
-	t.Run("fails if ID contains invalid characters", func(t *testing.T) {
+	t.Run("GET does not fail if exitent policy has broken ID", func(t *testing.T) {
 		invalidURLID := "invalid@id"
 
+		ts.CreatePolicy(func(p *user.Policy) {
+			p.ID = "invalid@id"
+		})
+
 		_, err := ts.Run(t, test.TestCase{
 			Path:      "/tyk/policies/" + invalidURLID,
 			Method:    http.MethodGet,
 			AdminAuth: true,
-			Code:      http.StatusBadRequest,
-			BodyMatch: errMsgInvalidPolicyID,
+			Code:      http.StatusOK,
 		})
+
 		assert.NoError(t, err)
+	})
+
+	t.Run("fails create/update if ID contains invalid characters", func(t *testing.T) {
+		ts.setTestScopeConfig(t, func(cnf *config.Config) {
+			cnf.DisableCustomIdValidation = false
+		})
 
 		invalidBodyPol := user.Policy{
 			ID:           "invalid/id",
@@ -196,7 +207,7 @@ func TestPolicyAPI(t *testing.T) {
 			AccessRights: make(map[string]user.AccessDefinition),
 		}
 
-		_, err = ts.Run(t, test.TestCase{
+		_, err := ts.Run(t, test.TestCase{
 			Path:      "/tyk/policies",
 			Method:    http.MethodPost,
 			AdminAuth: true,
@@ -218,6 +229,42 @@ func TestPolicyAPI(t *testing.T) {
 		})
 		assert.NoError(t, err)
 	})
+
+	t.Run("does not fail on create/update if ID contains invalid characters and when DisableCustomIdValidation=true", func(t *testing.T) {
+		ts.setTestScopeConfig(t, func(cnf *config.Config) {
+			cnf.DisableCustomIdValidation = true
+		})
+
+		t.Cleanup(func() {
+			_ = ts.Gw.removePersistentPolicyById("invalid@id") //nolint:errcheck
+		})
+
+		invalidBodyPol := user.Policy{
+			ID:           "invalid@id",
+			Rate:         100,
+			Per:          1,
+			OrgID:        "54de205930c55e15bd000001",
+			AccessRights: make(map[string]user.AccessDefinition),
+		}
+
+		_, err := ts.Run(t, test.TestCase{
+			Path:      "/tyk/policies",
+			Method:    http.MethodPost,
+			AdminAuth: true,
+			Data:      serializePolicy(t, invalidBodyPol),
+			Code:      http.StatusOK,
+		})
+		assert.NoError(t, err)
+
+		_, err = ts.Run(t, test.TestCase{
+			Path:      "/tyk/policies/invalid@id",
+			Method:    http.MethodPut,
+			AdminAuth: true,
+			Data:      serializePolicy(t, invalidBodyPol),
+			Code:      http.StatusOK,
+		})
+		assert.NoError(t, err)
+	})
 }
 
 func serializePolicy(t *testing.T, pol user.Policy) string {

gateway/server.go

@@ -1609,13 +1609,17 @@ func (gw *Gateway) initSystem() error {
 	// free resources.
 	go cleanIdleMemConnProviders(gw.ctx)
 
-	gw.validator = validator.New(
-		validator.WithDisabledPolicyIdValidation(gwConfig.DisableCustomIdValidation),
-	)
+	gw.initMembers(gwConfig)
 
 	return nil
 }
 
+func (gw *Gateway) initMembers(cfg config.Config) {
+	gw.validator = validator.New(
+		validator.WithDisabledPolicyIdValidation(cfg.DisableCustomIdValidation),
+	)
+}
+
 // SignatureVerifier returns a verifier to use for validating signatures.
 // It is configured with the PublicKeyPath value in gateway config.
 func (gw *Gateway) SignatureVerifier() (goverify.Verifier, error) {

gateway/testutil.go

@@ -1127,8 +1127,10 @@ func (s *Test) setTestScopeConfig(t *testing.T, apply func(cnf *config.Config))
 	newCnf := reflect.Clone(cnf)
 	apply(&newCnf)
 	s.Gw.SetConfig(newCnf)
+	s.Gw.initMembers(newCnf)
 	t.Cleanup(func() {
 		s.Gw.SetConfig(cnf)
+		s.Gw.initMembers(cnf)
 	})
 }