From 82d99d68cd5cfe0f666eede43dbbfa8c18a018de Mon Sep 17 00:00:00 2001
From: Abdul Mohammed <abdul.mohammed@alfresco.com>
Date: Fri, 1 May 2020 17:58:35 +0100
Subject: [PATCH] Use IllegalArgumentException for invalid characters found in
 authority and person name (#980)

---
 .../alfresco/repo/security/authority/AuthorityDAOImpl.java    | 2 +-
 .../org/alfresco/repo/security/person/PersonServiceImpl.java  | 2 +-
 .../repo/security/authority/AuthorityServiceTest.java         | 4 ++--
 .../java/org/alfresco/repo/security/person/PersonTest.java    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
index 3352a2aab1..686929878e 100644
--- a/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
+++ b/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
@@ -1670,7 +1670,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
             {
                 if (authorityName.indexOf(illegalCharacter) != -1)
                 {
-                    throw new AuthorityException("Group name contains characters that are not permitted: "+authorityName.charAt(authorityName.indexOf(illegalCharacter)));
+                    throw new IllegalArgumentException("Group name contains characters that are not permitted: "+authorityName.charAt(authorityName.indexOf(illegalCharacter)));
                 }
             }
         }
diff --git a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
index e21b355d58..dc48843dec 100644
--- a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
+++ b/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
@@ -1797,7 +1797,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
                 {
                     if (userName.indexOf(illegalCharacter) != -1)
                     {
-                        throw new PersonException("Person name contains characters that are not permitted: "+userName.charAt(userName.indexOf(illegalCharacter)));
+                        throw new IllegalArgumentException("Person name contains characters that are not permitted: "+userName.charAt(userName.indexOf(illegalCharacter)));
                     }
                 }
             }
diff --git a/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
index b68aa717a9..009d4297c6 100644
--- a/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
+++ b/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
@@ -261,9 +261,9 @@ public class AuthorityServiceTest extends TestCase
             try 
             {
                 authorityService.createAuthority(AuthorityType.GROUP, groupName);
-                fail("AuthorityException not caught for illegalCharacter: " +groupName.charAt(groupName.indexOf(illegalCharacter)));
+                fail("IllegalArgumentException not caught for illegalCharacter: " +groupName.charAt(groupName.indexOf(illegalCharacter)));
             } 
-            catch (AuthorityException ignored)
+            catch (IllegalArgumentException ignored)
             {
                 // Expected
             }
diff --git a/src/test/java/org/alfresco/repo/security/person/PersonTest.java b/src/test/java/org/alfresco/repo/security/person/PersonTest.java
index 230ab02df8..9c8deb0543 100644
--- a/src/test/java/org/alfresco/repo/security/person/PersonTest.java
+++ b/src/test/java/org/alfresco/repo/security/person/PersonTest.java
@@ -467,9 +467,9 @@ public class PersonTest extends TestCase
             try
             {
                 personService.createPerson(createDefaultProperties(personName, "Some", "User", "some.user@example.com", "alfresco", rootNodeRef));
-                fail("PersonException not caught for illegalCharacter: " +personName.charAt(personName.indexOf(illegalCharacter)));
+                fail("IllegalArgumentException not caught for illegalCharacter: " +personName.charAt(personName.indexOf(illegalCharacter)));
             }
-            catch (PersonException ignored)
+            catch (IllegalArgumentException ignored)
             {
                 // Expected
             }