From 06a1969271a916f4b75a2aaca28b271202cc6fc5 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Tue, 1 Aug 2023 17:35:17 +0530 Subject: [PATCH] fix: cud validation (#761) --- CHANGELOG.md | 4 ++++ build.gradle | 2 +- src/main/java/io/supertokens/webserver/Utils.java | 2 +- .../test/multitenant/api/TestPermissionChecks.java | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caafebcfb..a9eb24ce9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [unreleased] +## [6.0.8] - 2023-08-01 + +- Fixes CUD validation starting with number. + ## [6.0.7] - 2023-07-28 - Fixes session removing for user with useridmapping when disassociating from tenant. diff --git a/build.gradle b/build.gradle index f771204cd..49e9735c9 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ compileTestJava { options.encoding = "UTF-8" } // } //} -version = "6.0.7" +version = "6.0.8" repositories { diff --git a/src/main/java/io/supertokens/webserver/Utils.java b/src/main/java/io/supertokens/webserver/Utils.java index 5e78aa0c4..e59672246 100644 --- a/src/main/java/io/supertokens/webserver/Utils.java +++ b/src/main/java/io/supertokens/webserver/Utils.java @@ -47,7 +47,7 @@ public static String normalizeAndValidateConnectionUriDomain(String connectionUr throw new ServletException(new WebserverAPI.BadRequestException("connectionUriDomain should not be an empty String")); } - String hostnameRegex = "^[a-z][a-z0-9-]+(\\.[a-z][a-z0-9-]+)*(:[0-9]+)?$"; + String hostnameRegex = "^[a-z0-9-]+(\\.[a-z0-9-]+)*(:[0-9]+)?$"; String ipRegex = "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(:[0-9]+)?$"; if (!connectionUriDomain.matches(hostnameRegex) && !connectionUriDomain.matches(ipRegex)) { diff --git a/src/test/java/io/supertokens/test/multitenant/api/TestPermissionChecks.java b/src/test/java/io/supertokens/test/multitenant/api/TestPermissionChecks.java index 261dc8e7f..e2f9e4a32 100644 --- a/src/test/java/io/supertokens/test/multitenant/api/TestPermissionChecks.java +++ b/src/test/java/io/supertokens/test/multitenant/api/TestPermissionChecks.java @@ -487,6 +487,7 @@ public void testConnectionUriDomainValidationUtil() throws Exception { "sub-domain.example.com", "sub-domain.example.com:3567", "hello.co.uk", + "58hello.abc.com" }; String[] invalidDomains = new String[]{ "http://localhost",