SHIBUI-1478

TIER · Sep 11, 2019 · 91d6abb · 91d6abb
1 parent e4fdcc3
commit 91d6abb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy
@@ -7,6 +7,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocati
 import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocationLookup.entityAttributesFiltersSchema
 import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocationLookup.filesystemMetadataProviderSchema
 import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocationLookup.localDynamicMetadataProviderSchema
+import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocationLookup.nameIdFormatFilterSchema
 
 /**
  * Currently uses mjson library.
@@ -56,6 +57,9 @@ class LowLevelJsonSchemaValidator {
             case 'EntityAttributes':
                 schemaUri = entityAttributesFiltersSchema(schemaRegistry).uri
                 break
+            case 'NameIDFormat':
+                schemaUri = nameIdFormatFilterSchema(schemaRegistry).uri
+                break
             default:
                 break
         }

diff --git a/...leth/admin/ui/controller/MetadataFiltersControllerSchemaValidationIntegrationTests.groovy b/...leth/admin/ui/controller/MetadataFiltersControllerSchemaValidationIntegrationTests.groovy
@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import org.springframework.beans.factory.annotation.Autowired
@@ -35,7 +36,7 @@ class MetadataFiltersControllerSchemaValidationIntegrationTests extends Specific
 
     def 'POST for EntityAttributesFilter with invalid payload according to schema validation'() {
         given:
-        def resolver = metadataResolverRepository.save(new FileBackedHttpMetadataResolver(name: 'fbmr', backingFile: '/tmp/metadata.xml'))
+        def resolver = metadataResolverRepository.save(new DynamicHttpMetadataResolver(name: 'dmr'))
         def postedJsonBody = """            
             {                    
                     "name" : "EntityAttributes",    
@@ -68,6 +69,29 @@ class MetadataFiltersControllerSchemaValidationIntegrationTests extends Specific
 
     }
 
+    def 'POST for NameIdFormatFilter with invalid payload according to schema validation'() {
+        given:
+        def resolver = metadataResolverRepository.save(new FileBackedHttpMetadataResolver(name: 'fbmr', backingFile: '/tmp/metadata.xml'))
+        def postedJsonBody = """
+            {              
+              "name" : null,              
+              "filterEnabled" : "not-a-boolean",
+              "removeExistingFormats" : false,
+              "formats" : [ "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" ],
+              "nameIdFormatFilterTarget" : {                
+                "nameIdFormatFilterTargetType" : "ENTITY",
+                "value" : [ "https://sp1.example.org" ]                
+              },              
+              "@type" : "NameIDFormat"              
+            }"""
+
+        when:
+        def result = HTTP_POST(postedJsonBody, resolver.resourceId)
+
+        then:
+        checkJsonValidationIsPerformed(result)
+    }
+
     private static HttpEntity<String> createRequestHttpEntityFor(String jsonBody) {
         new HttpEntity<String>(jsonBody, ['Content-Type': 'application/json'] as HttpHeaders)
     }