From 3549af120e1054214628360fe6d4a72adc041112 Mon Sep 17 00:00:00 2001 From: Bernhard Minks Date: Wed, 12 Feb 2025 14:59:26 +0100 Subject: [PATCH] Allow '.' in usernames --- src/main/java/hudson/scm/SubversionSCM.java | 4 ++-- src/test/java/hudson/scm/SubversionSCMTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java index 65079927..28f1b638 100755 --- a/src/main/java/hudson/scm/SubversionSCM.java +++ b/src/main/java/hudson/scm/SubversionSCM.java @@ -2502,9 +2502,9 @@ public FormValidation doCheckIncludedRegions(@QueryParameter String value) throw /** * Regular expression for matching one username. Matches 'windows' names ('DOMAIN\user') and - * 'normal' names ('user'). Where user (and DOMAIN) has one or more characters in 'a-zA-Z0-9_-') + * 'normal' names ('user'). Where user (and DOMAIN) has one or more characters in 'a-zA-Z0-9_.-') */ - private static final Pattern USERNAME_PATTERN = Pattern.compile("([a-zA-Z0-9_-]+\\\\)?+([a-zA-Z0-9_-]+)"); + private static final Pattern USERNAME_PATTERN = Pattern.compile("([a-zA-Z0-9_.-]+\\\\)?+([a-zA-Z0-9_.-]+)"); /** * Validates the excludeUsers field diff --git a/src/test/java/hudson/scm/SubversionSCMTest.java b/src/test/java/hudson/scm/SubversionSCMTest.java index a5a40d3d..443b0245 100644 --- a/src/test/java/hudson/scm/SubversionSCMTest.java +++ b/src/test/java/hudson/scm/SubversionSCMTest.java @@ -805,7 +805,8 @@ void doCheckExcludedUsers() throws Exception { "User-Name", "Do-Main\\User-Name", "", // this one is ignored - "DOmain12\\User34"}; + "DOmain12\\User34", + "DOMAIN.user" }; for (String validUsername : validUsernames) { assertEquals( @@ -817,8 +818,7 @@ void doCheckExcludedUsers() throws Exception { String[] invalidUsernames = new String[]{ "\\user", "DOMAIN\\", - "DOMAIN@user", - "DOMAIN.user"}; + "DOMAIN@user"}; for (String invalidUsername : invalidUsernames) { assertEquals(