Merge pull request #241 from rundeck/issue/180

Fix #180 prevent invalid project name
rundeck · Jun 25, 2019 · edf0312 · edf0312
2 parents 2e321ae + 7112d8a
commit edf0312
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java
@@ -28,6 +28,9 @@
 
 import java.io.IOException;
 import java.util.function.Function;
+import java.util.regex.Pattern;
+
+import static org.rundeck.client.tool.options.ProjectRequiredNameOptions.PROJECT_NAME_PATTERN;
 
 /**
  * Base type for commands in Rd
@@ -168,7 +171,18 @@ public String projectOrEnv(final ProjectNameOptions options) throws InputError {
             return options.getProject();
         }
         try {
-            return getAppConfig().require("RD_PROJECT", "or specify as `-p/--project value` : Project name.");
+            String
+                    rd_project =
+                    getAppConfig().require("RD_PROJECT", "or specify as `-p/--project value` : Project name.");
+            Pattern pat = Pattern.compile(PROJECT_NAME_PATTERN);
+            if (!pat.matcher(rd_project).matches()) {
+                throw new InputError(String.format(
+                        "Cannot match (%s) to pattern: /%s/ : RD_PROJECT",
+                        rd_project,
+                        PROJECT_NAME_PATTERN
+                ));
+            }
+            return rd_project;
         } catch (ConfigSource.ConfigSourceError configSourceError) {
             throw new InputError(configSourceError.getMessage());
         }

diff --git a/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java
@@ -24,6 +24,8 @@
  * @since 4/10/17
  */
 public interface ProjectRequiredNameOptions {
-    @Option(shortName = "p", longName = "project", description = "Project name")
+    static final String PROJECT_NAME_PATTERN = "^[-_a-zA-Z0-9+][-\\._a-zA-Z0-9+]*$";
+
+    @Option(shortName = "p", longName = "project", description = "Project name", pattern = PROJECT_NAME_PATTERN)
     String getProject();
 }