Skip to content

Commit d59c6fc

Browse files
blen-destablen-desta
authored
Disabled email name id verification (#198)
1 parent 120b724 commit d59c6fc

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

‎ctk/common/src/main/kotlin/org/codice/compliance/verification/core/SamlDefinedIdentifiersVerifier.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ http://www.gnu.org/licenses/lgpl.html
66
*/
77
package org.codice.compliance.verification.core
88

9+
import org.codice.compliance.Common.Companion.idpMetadataObject
910
import org.codice.compliance.SAMLComplianceException
1011
import org.codice.compliance.SAMLCore_8_2_2_a
1112
import org.codice.compliance.SAMLCore_8_2_3_a
@@ -26,7 +27,6 @@ import org.codice.compliance.utils.PERSISTENT_ID
2627
import org.codice.compliance.utils.SP_NAME_QUALIFIER
2728
import org.codice.compliance.utils.TRANSIENT_ID
2829
import org.codice.compliance.utils.TestCommon.Companion.currentSPIssuer
29-
import org.codice.compliance.Common.Companion.idpMetadataObject
3030
import org.w3c.dom.DOMException
3131
import org.w3c.dom.Node
3232
import java.net.URI
@@ -64,7 +64,9 @@ internal class SamlDefinedIdentifiersVerifier(val node: Node) {
6464
/** 8 SAML-Defined Identifiers */
6565
fun verify() {
6666
verifyAttributeNameFormatIdentifiers()
67-
verifyEmailAddressIdentifier()
67+
// Disabled email verification since it's not a requirement.
68+
// Should be re-enabled once the CTK supports categorization of tests.
69+
// verifyEmailAddressIdentifier()
6870
verifyPersistentIdentifiers()
6971
verifyTransientIdentifiers()
7072
verifyEntityIdentifiers()
@@ -161,7 +163,7 @@ internal class SamlDefinedIdentifiersVerifier(val node: Node) {
161163
SAMLCore_8_3_7_c,
162164
message = "The Persistent ID's NameQualifier " +
163165
"[$nameQualifier] is not equal to " +
164-
"${idpMetadataObject.entityId}",
166+
idpMetadataObject.entityId,
165167
node = it)
166168
}
167169

‎ctk/common/src/test/kotlin/org/codice/compilance/verification/core/SamlDefinedIdentifiersVerifierSpec.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
131131
}
132132

133133
/* 8.3.2 Email Address */
134-
"valid Email name identifier" {
134+
"valid Email name identifier".config(enabled = false) {
135135
createResponse(
136136
identifierValue = "[email protected]",
137137
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
138138
SamlDefinedIdentifiersVerifier(it).verify()
139139
}
140140
}
141141

142-
"invalid Email name identifier (multiple '@'s)" {
142+
"invalid Email name identifier (multiple '@'s)".config(enabled = false) {
143143
createResponse(
144144
identifierValue = "example@[email protected]",
145145
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -149,7 +149,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
149149
}
150150
}
151151

152-
"invalid Email name identifier (no '@')" {
152+
"invalid Email name identifier (no '@')".config(enabled = false) {
153153
createResponse(
154154
identifierValue = "example-email.domain.com",
155155
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -159,7 +159,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
159159
}
160160
}
161161

162-
"invalid Email name identifier (no '.com')" {
162+
"invalid Email name identifier (no '.com')".config(enabled = false) {
163163
createResponse(
164164
identifierValue = "example-email@domain",
165165
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -169,7 +169,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
169169
}
170170
}
171171

172-
"invalid Email name identifier (end with '.')" {
172+
"invalid Email name identifier (end with '.')".config(enabled = false) {
173173
createResponse(
174174
identifierValue = "example-email@domain.",
175175
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -179,7 +179,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
179179
}
180180
}
181181

182-
"invalid Email name identifier (single word)" {
182+
"invalid Email name identifier (single word)".config(enabled = false) {
183183
createResponse(
184184
identifierValue = "exampleemaildomaincom",
185185
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -189,7 +189,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
189189
}
190190
}
191191

192-
"invalid Email name identifier (whitespace)" {
192+
"invalid Email name identifier (whitespace)".config(enabled = false) {
193193
createResponse(
194194
identifierValue = "example [email protected]",
195195
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -199,7 +199,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
199199
}
200200
}
201201

202-
"invalid Email name identifier (invalid characters)" {
202+
"invalid Email name identifier (invalid characters)".config(enabled = false) {
203203
createResponse(
204204
identifierValue = "example:[email protected]",
205205
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -209,7 +209,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
209209
}
210210
}
211211

212-
"invalid Email name identifier (comment)" {
212+
"invalid Email name identifier (comment)".config(enabled = false) {
213213
createResponse(
214214
identifierValue = "[email protected](comment)",
215215
identifierFormat = NAME_ID_FORMAT_EMAIL).let {
@@ -219,7 +219,7 @@ class SamlDefinedIdentifiersVerifierSpec : StringSpec() {
219219
}
220220
}
221221

222-
"invalid Email name identifier (surrounded by '<' and '>')" {
222+
"invalid Email name identifier (surrounded by '<' and '>')".config(enabled = false) {
223223
createResponse(
224224
identifierValue = "&lt;[email protected]&gt;",
225225
identifierFormat = NAME_ID_FORMAT_EMAIL).let {

‎ctk/idp/src/main/kotlin/org/codice/compliance/web/sso/PostSSOTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class PostSSOTest : StringSpec() {
109109
}
110110
}
111111

112-
"POST AuthnRequest With Email NameIDPolicy Format Test" {
112+
"POST AuthnRequest With Email NameIDPolicy Format Test".config(enabled = false) {
113113
val authnRequest = createDefaultAuthnRequest(HTTP_POST).apply {
114114
nameIDPolicy = NameIDPolicyBuilder().buildObject().apply {
115115
format = SAML2Constants.NAMEID_FORMAT_EMAIL_ADDRESS

‎ctk/idp/src/main/kotlin/org/codice/compliance/web/sso/RedirectSSOTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class RedirectSSOTest : StringSpec() {
149149
}
150150
}
151151

152-
"Redirect AuthnRequest With Email NameID Format Test" {
152+
"Redirect AuthnRequest With Email NameID Format Test".config(enabled = false) {
153153
val authnRequest = createDefaultAuthnRequest(HTTP_REDIRECT).apply {
154154
nameIDPolicy = NameIDPolicyBuilder().buildObject().apply {
155155
format = SAML2Constants.NAMEID_FORMAT_EMAIL_ADDRESS

0 commit comments

Comments
 (0)