SHIBUI-2380

adding in support for OIDC specific relying overrides
TIER · Oct 6, 2022 · 8e5ab06 · 8e5ab06
1 parent a7f7b84
commit 8e5ab06
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
@@ -53,8 +53,8 @@ class MetadataSourcesUiDefinitionController {
             def parsedJson = jacksonObjectMapper.readValue(url, Map)
             jsonSchemaBuilderService.hideServiceEnabledFromNonAdmins(parsedJson)
             jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['items'])
-            jsonSchemaBuilderService.addRelyingPartyOverridesToJson(parsedJson['properties']['relyingPartyOverrides'])
-            jsonSchemaBuilderService.addRelyingPartyOverridesCollectionDefinitionsToJson(parsedJson["definitions"])
+            jsonSchemaBuilderService.addRelyingPartyOverridesToJson(parsedJson['properties']['relyingPartyOverrides'], protocol.toLowerCase())
+            jsonSchemaBuilderService.addRelyingPartyOverridesCollectionDefinitionsToJson(parsedJson["definitions"], protocol.toLowerCase())
             return ResponseEntity.ok(parsedJson)
         }
         catch (IOException e) {

diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -42,8 +42,15 @@ class JsonSchemaBuilderService {
     }
 
     void addRelyingPartyOverridesToJson(Object json) {
+        addRelyingPartyOverridesToJson(json, "saml")
+    }
+
+    void addRelyingPartyOverridesToJson(Object json, String protocol) {
         def properties = [:]
-        customPropertiesConfiguration.getOverrides().each {
+        customPropertiesConfiguration.getOverrides().stream().filter {
+            it -> it.protocol.contains(protocol)
+        }.each {
+            if (it.protocol)
             def property
             if (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list') {
                 property = [$ref: '#/definitions/' + it['name']]
@@ -61,8 +68,12 @@ class JsonSchemaBuilderService {
     }
 
     void addRelyingPartyOverridesCollectionDefinitionsToJson(Object json) {
+        addRelyingPartyOverridesCollectionDefinitionsToJson(json, "saml")
+    }
+
+    void addRelyingPartyOverridesCollectionDefinitionsToJson(Object json, String protocol) {
         customPropertiesConfiguration.getOverrides().stream().filter {
-            it -> it['displayType'] && (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list')
+            it -> it.protocol.contains(protocol) && it['displayType'] && (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list')
         }.each {
             def definition = [title      : it['displayName'],
                               description: it['helpText'],

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -65,7 +65,9 @@ public class CustomEntityAttributeDefinition implements IRelyingPartyOverridePro
     @Id
     @Column(name = "resource_id", nullable = false)
     String resourceId = UUID.randomUUID().toString();
-
+
+    String protocol = "saml";
+
     @Override
     public Set<String> getDefaultValues() {
         return customAttrListDefinitions;

diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/domain/IRelyingPartyOverrideProperty.java b/...ain/java/edu/internet2/tier/shibboleth/admin/ui/domain/IRelyingPartyOverrideProperty.java
@@ -32,7 +32,9 @@ public interface IRelyingPartyOverrideProperty {
     public String getPersistType();
 
     public String getPersistValue();
-
+
+    public String getProtocol();
+
     /**
      * When the override actually is used in the UI, the "type" list is fairly limited, so each implementing class
      * should adjust the real value so the UI gets a value it expects. For actual file configured overrides, this 
@@ -61,4 +63,6 @@ public interface IRelyingPartyOverrideProperty {
     public void setPersistType(String persistType);
 
     public void setPersistValue(String persistValue);
-}
+
+    public void setProtocol(String protocol);
+}
diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java
@@ -27,6 +27,7 @@ public class RelyingPartyOverrideProperty implements IRelyingPartyOverrideProper
     private String name;
     private String persistType;
     private String persistValue;
+    private String protocol = "saml";
 
     @Override
     public Boolean getFromConfigFile() {
@@ -43,7 +44,11 @@ public CustomAttributeType getAttributeType() {
             return CustomAttributeType.valueOf(displayType.toUpperCase());
         }
     }
-
+
+    public String getProtocol() {
+        return protocol == null ? "saml" : protocol;
+    }
+
     public String getTypeForUI() {
         return getDisplayType();
     }