Fix regex in constraint format check

KostasTsiounis · Jan 20, 2025 · 16753cc · 16753cc
1 parent dac2870
commit 16753cc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java b/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java
@@ -1493,7 +1493,7 @@ private void setConstraints(String providerName, String providerInfo, boolean pr
             final String typeRE = "\\w+";
             final String algoRE = "[A-Za-z0-9./_-]+";
             final String attrRE = "[A-Za-z0-9=*|.:]+";
-            final String consRE = "\\{(" + typeRE + "),(" + algoRE + "),(" + attrRE + ")(,\\s+\".+?\")*\\}";
+            final String consRE = "\\{(" + typeRE + "),(" + algoRE + "),(" + attrRE + ")(,\".+?\")?\\}";
             p = Pattern.compile(
                 "\\["
                 + "([+-]?)"             // option to append or remove
@@ -1805,6 +1805,7 @@ private static void checkProviderFormat(String providerInfo, boolean update) {
                 + "(\\["                                // constraints [optional]
                     + "\\s*"
                     + "([+-])?"                         // action [optional]
+                    + "\\s*"
                     + "\\{.+?\\}"                        // constraint definition
                 + "\\])?"
                 + "\\s*"