adapt changes from APPNG-2329

appNG · Apr 3, 2020 · 41cba82 · 41cba82
1 parent bb53bf1
commit 41cba82
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/test/resources/xml/SubjectsTest-testCreate-action.xml b/src/test/resources/xml/SubjectsTest-testCreate-action.xml
@@ -15,12 +15,12 @@
 					<notNull>
 						<message ref="subject.name" class="ERROR" code="{validation.notNull}">Field must not be empty</message>
 					</notNull>
-					<size min="0" max="64">
-						<message ref="subject.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
+					<size min="0" max="255">
+						<message ref="subject.name" class="ERROR" code="{validation.string.max}">Enter at most 255 characters</message>
 					</size>
-					<pattern regexp="^([a-zA-Z0-9_\.-])+(@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]){2,})?$">
-						<message ref="subject.name" class="ERROR" code="{validation.username}">The name must either be a valid e-mail address, or consist
-							of letters, digits, dots, underscores and hyphens</message>
+					<pattern regexp="^((((CN|cn)=[^,]+),?)*(((OU|ou)=[^,]+),?)*(((DC|dc)=[^,]+),?)*)|(([a-zA-Z0-9_\.-])+(@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]){2,})?)$">
+						<message ref="subject.name" class="ERROR" code="{validation.usernameGroup}">The name must either be a valid e-mail address, or consist 
+							of letters, digits, dots, underscores and hyphens or a valid LDAP group reference</message>
 					</pattern>
 				</validation>
 			</field>

diff --git a/src/test/resources/xml/SubjectsTest-testCreateNameExists.xml b/src/test/resources/xml/SubjectsTest-testCreateNameExists.xml
@@ -15,12 +15,12 @@
 					<notNull>
 						<message ref="subject.name" class="ERROR" code="{validation.notNull}">Field must not be empty</message>
 					</notNull>
-					<size min="0" max="64">
-						<message ref="subject.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
+					<size min="0" max="255">
+						<message ref="subject.name" class="ERROR" code="{validation.string.max}">Enter at most 255 characters</message>
 					</size>
-					<pattern regexp="^([a-zA-Z0-9_\.-])+(@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]){2,})?$">
-						<message ref="subject.name" class="ERROR" code="{validation.username}">The name must either be a valid e-mail address, or consist
-							of letters, digits, dots, underscores and hyphens</message>
+					<pattern regexp="^((((CN|cn)=[^,]+),?)*(((OU|ou)=[^,]+),?)*(((DC|dc)=[^,]+),?)*)|(([a-zA-Z0-9_\.-])+(@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]){2,})?)$">
+						<message ref="subject.name" class="ERROR" code="{validation.usernameGroup}">The name must either be a valid e-mail address, or consist 
+						of letters, digits, dots, underscores and hyphens or a valid LDAP group reference</message>
 					</pattern>
 				</validation>
 				<messages ref="name">

diff --git a/src/test/resources/xml/SubjectsTest-testCreateValidationFail.xml b/src/test/resources/xml/SubjectsTest-testCreateValidationFail.xml
@@ -15,12 +15,12 @@
 					<notNull>
 						<message ref="subject.name" class="ERROR" code="{validation.notNull}">Field must not be empty</message>
 					</notNull>
-					<size min="0" max="64">
-						<message ref="subject.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
+					<size min="0" max="255">
+						<message ref="subject.name" class="ERROR" code="{validation.string.max}">Enter at most 255 characters</message>
 					</size>
-					<pattern regexp="^([a-zA-Z0-9_\.-])+(@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]){2,})?$">
-						<message ref="subject.name" class="ERROR" code="{validation.username}">The name must either be a valid e-mail address, or consist
-							of letters, digits, dots, underscores and hyphens</message>
+					<pattern regexp="^((((CN|cn)=[^,]+),?)*(((OU|ou)=[^,]+),?)*(((DC|dc)=[^,]+),?)*)|(([a-zA-Z0-9_\.-])+(@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]){2,})?)$">
+						<message ref="subject.name" class="ERROR" code="{validation.usernameGroup}">The name must either be a valid e-mail address, or consist 
+							of letters, digits, dots, underscores and hyphens or a valid LDAP group reference</message>
 					</pattern>
 				</validation>
 				<messages ref="subject.name">