Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1489#discussion_r60433227
--- Diff: api/src/org/apache/cloudstack/acl/Rule.java ---
@@ -0,0 +1,65 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.acl;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.google.common.base.Strings;
+
+import java.util.regex.Pattern;
+
+public final class Rule {
+ private final String rule;
+ private final static Pattern ALLOWED_PATTERN =
Pattern.compile("^[a-zA-Z0-9*]+$");
+
+ public Rule(final String rule) {
+ validate(rule);
+ this.rule = rule;
+ }
+
+ public boolean matches(final String commandName) {
+ if (Strings.isNullOrEmpty(commandName)) {
+ return false;
+ }
+ if (isWildcard()) {
+ if (commandName.matches(rule.replace("*", "\\w*"))) {
+ return true;
+ }
+ } else {
+ if (commandName.equalsIgnoreCase(rule)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isWildcard() {
+ return rule.contains("*");
+ }
+
+ @Override
+ public String toString() {
+ return rule;
+ }
+
+ private static boolean validate(final String rule) throws
InvalidParameterValueException {
+ if (Strings.isNullOrEmpty(rule) ||
!ALLOWED_PATTERN.matcher(rule).matches()) {
+ throw new InvalidParameterValueException("Invalid rule
provided. Only API names and wildcards are allowed.");
--- End diff --
Add the rule value into the error message for debugging.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
