MB-46881: Fix bug where we allow unknown limits.

Change-Id: I1ccc58f60bc2fb181511f638082e35d225880664
Reviewed-on: http://review.couchbase.org/c/ns_server/+/160752
Tested-by: Abhijeeth Nuthan <[email protected]>
Well-Formed: Build Bot <[email protected]>
Reviewed-by: Artem Stemkovski <[email protected]>

Author: anuthan

src/menelaus_web_rbac.erl

@@ -996,37 +996,34 @@ put_user_validators(Domain) ->
         end ++
         [validator:unsupported(_)].
 
-ns_server_user_limit_validators() ->
+service_user_limit_validators(clusterManager) ->
     [validator:integer(num_concurrent_requests, 1, infinity, _),
      validator:integer(ingress_mib_per_min, 1, infinity, _),
-     validator:integer(egress_mib_per_min, 1, infinity, _)].
-
-fts_user_limit_validators() ->
+     validator:integer(egress_mib_per_min, 1, infinity, _),
+     validator:unsupported(_)];
+service_user_limit_validators(fts) ->
     [validator:integer(num_concurrent_requests, 1, infinity, _),
      validator:integer(ingress_mib_per_min, 1, infinity, _),
-     validator:integer(egress_mib_per_min, 1, infinity, _)].
-
-query_user_limit_validators() ->
+     validator:integer(egress_mib_per_min, 1, infinity, _),
+     validator:unsupported(_)];
+service_user_limit_validators(query) ->
     [validator:integer(num_concurrent_requests, 1, infinity, _),
      validator:integer(num_queries_per_min, 1, infinity, _),
      validator:integer(ingress_mib_per_min, 1, infinity, _),
-     validator:integer(egress_mib_per_min, 1, infinity, _)].
-
-kv_user_limit_validators() ->
+     validator:integer(egress_mib_per_min, 1, infinity, _),
+     validator:unsupported(_)];
+service_user_limit_validators(kv) ->
     [validator:integer(num_connections, 1, infinity, _),
      validator:integer(num_ops_per_min, 1, infinity, _),
      validator:integer(ingress_mib_per_min, 1, infinity, _),
-     validator:integer(egress_mib_per_min, 1, infinity, _)].
+     validator:integer(egress_mib_per_min, 1, infinity, _),
+     validator:unsupported(_)].
 
 validate_limits(State) ->
-    Validators =
-        [validator:decoded_json(clusterManager,
-                                ns_server_user_limit_validators(),
-                                _),
-         validator:decoded_json(query, query_user_limit_validators(), _),
-         validator:decoded_json(kv, kv_user_limit_validators(), _),
-         validator:decoded_json(fts, fts_user_limit_validators(), _),
-         validator:unsupported(_)],
+    Validators = [validator:decoded_json(
+                    Service, service_user_limit_validators(Service), _) ||
+                  Service <- [clusterManager, fts, query, kv]] ++
+                 [validator:unsupported(_)],
     validator:json(limits, Validators, State).
 
 bad_roles_error(BadRoles) ->