feat: add limits for missing categories

Author: bietkul

model/permission/defaults.go

@@ -38,22 +38,36 @@ var (
 	}
 
 	defaultLimits = Limits{
-		IPLimit:       7200,
-		DocsLimit:     10,
-		SearchLimit:   10,
-		IndicesLimit:  10,
-		CatLimit:      10,
-		ClustersLimit: 10,
-		MiscLimit:     10,
+		IPLimit:          7200,
+		DocsLimit:        10,
+		SearchLimit:      10,
+		IndicesLimit:     10,
+		CatLimit:         10,
+		ClustersLimit:    10,
+		MiscLimit:        10,
+		UserLimit:        10,
+		PermissionLimit:  10,
+		AnalyticsLimit:   10,
+		RulesLimit:       10,
+		TemplatesLimit:   10,
+		SuggestionsLimit: 10,
+		StreamsLimit:     10,
 	}
 
 	defaultAdminLimits = Limits{
-		IPLimit:       7200,
-		DocsLimit:     30,
-		SearchLimit:   30,
-		IndicesLimit:  30,
-		CatLimit:      30,
-		ClustersLimit: 30,
-		MiscLimit:     30,
+		IPLimit:          7200,
+		DocsLimit:        30,
+		SearchLimit:      30,
+		IndicesLimit:     30,
+		CatLimit:         30,
+		ClustersLimit:    30,
+		MiscLimit:        30,
+		UserLimit:        30,
+		PermissionLimit:  30,
+		AnalyticsLimit:   30,
+		RulesLimit:       30,
+		TemplatesLimit:   30,
+		SuggestionsLimit: 30,
+		StreamsLimit:     30,
 	}
 )

model/permission/permission.go

@@ -50,13 +50,20 @@ type Permission struct {
 
 // Limits defines the rate limits for each category.
 type Limits struct {
-	IPLimit       int64 `json:"ip_limit"`
-	DocsLimit     int64 `json:"docs_limit"`
-	SearchLimit   int64 `json:"search_limit"`
-	IndicesLimit  int64 `json:"indices_limit"`
-	CatLimit      int64 `json:"cat_limit"`
-	ClustersLimit int64 `json:"clusters_limit"`
-	MiscLimit     int64 `json:"misc_limit"`
+	IPLimit          int64 `json:"ip_limit"`
+	DocsLimit        int64 `json:"docs_limit"`
+	SearchLimit      int64 `json:"search_limit"`
+	IndicesLimit     int64 `json:"indices_limit"`
+	CatLimit         int64 `json:"cat_limit"`
+	ClustersLimit    int64 `json:"clusters_limit"`
+	MiscLimit        int64 `json:"misc_limit"`
+	UserLimit        int64 `json:"user_limit"`
+	PermissionLimit  int64 `json:"permission_limit"`
+	AnalyticsLimit   int64 `json:"analytics_limit"`
+	RulesLimit       int64 `json:"rules_limit"`
+	TemplatesLimit   int64 `json:"templates_limit"`
+	SuggestionsLimit int64 `json:"suggestions_limit"`
+	StreamsLimit     int64 `json:"streams_limit"`
 }
 
 // Options is a function type used to define a permission's properties.
@@ -421,6 +428,20 @@ func (p *Permission) GetLimitFor(c category.Category) (int64, error) {
 		return p.Limits.ClustersLimit, nil
 	case category.Misc:
 		return p.Limits.MiscLimit, nil
+	case category.User:
+		return p.Limits.UserLimit, nil
+	case category.Permission:
+		return p.Limits.PermissionLimit, nil
+	case category.Analytics:
+		return p.Limits.AnalyticsLimit, nil
+	case category.Rules:
+		return p.Limits.RulesLimit, nil
+	case category.Templates:
+		return p.Limits.TemplatesLimit, nil
+	case category.Suggestions:
+		return p.Limits.SuggestionsLimit, nil
+	case category.Streams:
+		return p.Limits.StreamsLimit, nil
 	default:
 		return -1, fmt.Errorf(`we do not rate limit "%s" category`, c)
 	}
@@ -509,6 +530,28 @@ func (p *Permission) GetPatch(rolePatched bool) (map[string]interface{}, error)
 		if p.Limits.MiscLimit != 0 {
 			limits["misc_limit"] = p.Limits.MiscLimit
 		}
+		if p.Limits.UserLimit != 0 {
+			limits["user_limit"] = p.Limits.UserLimit
+		}
+		if p.Limits.PermissionLimit != 0 {
+			limits["permission_limit"] = p.Limits.PermissionLimit
+		}
+		if p.Limits.AnalyticsLimit != 0 {
+			limits["analytics_limit"] = p.Limits.AnalyticsLimit
+		}
+		if p.Limits.RulesLimit != 0 {
+			limits["rules_limit"] = p.Limits.RulesLimit
+		}
+		if p.Limits.TemplatesLimit != 0 {
+			limits["templates_limit"] = p.Limits.TemplatesLimit
+		}
+		if p.Limits.SuggestionsLimit != 0 {
+			limits["suggestions_limit"] = p.Limits.SuggestionsLimit
+		}
+		if p.Limits.StreamsLimit != 0 {
+			limits["streams_limit"] = p.Limits.StreamsLimit
+		}
+
 		patch["limits"] = limits
 	}
 	if p.Description != "" {

plugins/auth/dao_test.go

@@ -76,7 +76,7 @@ var getPermissionTest = []struct {
 		&ServerSetup{
 			Method:   "GET",
 			Path:     "/test/_doc/perm1",
-			Body:    "",
+			Body:     "",
 			Response: `{"_index":"perm1","_type":"doc","_id":"user1","_version":1,"found":true,"_source":{"first_name":"John","last_name":"Smith","age":25}}`,
 		},
 		[]byte(`{"_index":"perm1","_type":"doc","_id":"user1","_version":1,"found":true,"_source":{"first_name":"John","last_name":"Smith","age":25}}`),
@@ -189,13 +189,20 @@ func TestPutUser(t *testing.T) {
 }
 
 var defaultLimits = &permission.Limits{
-	IPLimit:       7200,
-	DocsLimit:     30,
-	SearchLimit:   30,
-	IndicesLimit:  30,
-	CatLimit:      30,
-	ClustersLimit: 30,
-	MiscLimit:     30,
+	IPLimit:          7200,
+	DocsLimit:        30,
+	SearchLimit:      30,
+	IndicesLimit:     30,
+	CatLimit:         30,
+	ClustersLimit:    30,
+	MiscLimit:        30,
+	UserLimit:        30,
+	PermissionLimit:  30,
+	AnalyticsLimit:   30,
+	RulesLimit:       30,
+	TemplatesLimit:   30,
+	SuggestionsLimit: 30,
+	StreamsLimit:     30,
 }
 
 var perm = permission.Permission{

plugins/permissions/dao_test.go

@@ -232,13 +232,20 @@ func TestPatchPermission(t *testing.T) {
 }
 
 var defaultLimits = &permission.Limits{
-	IPLimit:       7200,
-	DocsLimit:     30,
-	SearchLimit:   30,
-	IndicesLimit:  30,
-	CatLimit:      30,
-	ClustersLimit: 30,
-	MiscLimit:     30,
+	IPLimit:          7200,
+	DocsLimit:        30,
+	SearchLimit:      30,
+	IndicesLimit:     30,
+	CatLimit:         30,
+	ClustersLimit:    30,
+	MiscLimit:        30,
+	UserLimit:        30,
+	PermissionLimit:  30,
+	AnalyticsLimit:   30,
+	RulesLimit:       30,
+	TemplatesLimit:   30,
+	SuggestionsLimit: 30,
+	StreamsLimit:     30,
 }
 
 var p = permission.Permission{