Fix regex backtracking

kdebisschop · Jul 23, 2024 · e547ce2 · e547ce2
1 parent 5e71bfb
commit e547ce2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/bioraft/rundeck/nexus/BranchOrVersion.java b/src/main/java/com/bioraft/rundeck/nexus/BranchOrVersion.java
@@ -96,7 +96,7 @@ public BranchOrVersion(String path) {
 	 * Anything else is considered to be a branch.
 	 */
 	public boolean isVersion() {
-		return versionOrBranch.matches(".*\\d+[.]\\d+.*");
+		return versionOrBranch.matches("^(v|rc)?\\d+[.]\\d+.*");
 	}
 
 	/**
@@ -133,7 +133,7 @@ private String component(String path) {
 	 * string-valued.
 	 */
 	private String tag(String path) {
-		return path.replaceAll(".*/", "");
+		return path.replaceAll("/?[^/]*/", "");
 	}
 
 }