Skip to content

Commit ade09e6

Browse files
authored
adding / as a valid character (#3854)
* adding / as a valid character Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * fixing unit test Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> --------- Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>
1 parent f6a25f5 commit ade09e6

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

common/src/main/java/org/opensearch/ml/common/utils/StringUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ public class StringUtils {
6464
+ "\n }\n";
6565

6666
// Regex allows letters, digits, spaces, hyphens, underscores, and dots.
67-
private static final Pattern SAFE_INPUT_PATTERN = Pattern.compile("^[\\p{L}\\p{N}\\s.,!?():@\\-_'\"]*$");
67+
private static final Pattern SAFE_INPUT_PATTERN = Pattern.compile("^[\\p{L}\\p{N}\\s.,!?():@\\-_/'\"]*$");
6868

69-
public static final String SAFE_INPUT_DESCRIPTION =
70-
"can only contain letters, numbers, whitespace, and basic punctuation (.,!?():@-_'\")";
69+
public static final String SAFE_INPUT_DESCRIPTION = "can only contain letters, numbers, spaces, and basic punctuation (.,!?():@-_'/\")";
7170

7271
public static final Gson gson;
7372

common/src/test/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorRequestTests.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,15 +258,12 @@ public void validateWithEmptyAndInvalidModelConnectorNameAndDescription() {
258258
String exceptionMessage = invalidException.getMessage();
259259
assertTrue(
260260
"Error message should contain name validation failure",
261-
exceptionMessage
262-
.contains("Model connector name can only contain letters, numbers, whitespace, and basic punctuation (.,!?():@-_'\");")
261+
exceptionMessage.contains("Model connector name " + SAFE_INPUT_DESCRIPTION + ";")
263262
);
263+
264264
assertTrue(
265265
"Error message should contain description validation failure",
266-
exceptionMessage
267-
.contains(
268-
"Model connector description can only contain letters, numbers, whitespace, and basic punctuation (.,!?():@-_'\");"
269-
)
266+
exceptionMessage.contains("Model connector description " + SAFE_INPUT_DESCRIPTION + ";")
270267
);
271268
}
272269

common/src/test/java/org/opensearch/ml/common/utils/StringUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ public void testIsSafeText_AdvancedInvalidInputs() {
810810
// Testing specifically excluded characters
811811
assertFalse(StringUtils.isSafeText("Hello<World")); // less than
812812
assertFalse(StringUtils.isSafeText("Hello>World")); // greater than
813-
assertFalse(StringUtils.isSafeText("Hello/World")); // forward slash
813+
assertTrue(StringUtils.isSafeText("Hello/World")); // forward slash
814814
assertFalse(StringUtils.isSafeText("Hello\\World")); // backslash
815815
assertFalse(StringUtils.isSafeText("Hello&World")); // ampersand
816816
assertFalse(StringUtils.isSafeText("Hello+World")); // plus

0 commit comments

Comments
 (0)