Merge branch 'master' into SHIBUI-855

Jenkinsfile

@@ -36,7 +36,7 @@ pipeline {
       steps {
         sh '''
         docker stop shibui || true && docker rm shibui || true
-        docker run -d --restart always --name shibui -p 8080:8080 -v /etc/shibui/application.properties:/application.properties unicon/shibui:latest
+        docker run -d --restart always --name shibui -p 8080:8080 -v /etc/shibui/application.properties:/application.properties -m 3GB --memory-swap=3GB unicon/shibui:latest
         '''
       }
     }

backend/build.gradle

@@ -77,6 +77,9 @@ dependencies {
     // TODO: figure out what this should really be
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
 
+    //Spring Configuration Annotation Processor - makes IntelliJ happy about @ConfigurationProperties
+    compileOnly "org.springframework.boot:spring-boot-configuration-processor"
+
     // lucene deps
     ['core', 'analyzers-common', 'queryparser'].each {
         compile "org.apache.lucene:lucene-${it}:${project.'lucene.version'}"
@@ -218,4 +221,4 @@ docker {
     noCache true
     files tasks.bootWar.outputs
     buildArgs(['JAR_FILE': 'shibui.war'])
-}
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java

@@ -29,6 +29,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
@@ -42,6 +43,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 @Configuration
+@EnableConfigurationProperties(CustomAttributesConfiguration.class)
 public class CoreShibUiConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(CoreShibUiConfiguration.class);
 
@@ -170,6 +172,11 @@ public LuceneUtility luceneUtility(DirectoryService directoryService) {
         return new LuceneUtility(directoryService);
     }
 
+    @Bean
+    public CustomAttributesConfiguration customAttributesConfiguration() {
+        return new CustomAttributesConfiguration();
+    }
+
     @Bean
     public Module stringTrimModule() {
         return new StringTrimModule();

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomAttributesConfiguration.java

@@ -0,0 +1,26 @@
+package edu.internet2.tier.shibboleth.admin.ui.configuration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Bill Smith (wsmith@unicon.net)
+ */
+@Configuration
+@ConfigurationProperties(prefix="custom")
+public class CustomAttributesConfiguration {
+
+    private List<? extends Map<String, String>> attributes = new ArrayList<>();
+
+    public List<? extends Map<String, String>> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(List<? extends Map<String, String>> attributes) {
+        this.attributes = attributes;
+    }
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ConfigurationController.java

@@ -0,0 +1,24 @@
+package edu.internet2.tier.shibboleth.admin.ui.controller;
+
+import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomAttributesConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author Bill Smith (wsmith@unicon.net)
+ */
+@Controller
+@RequestMapping(value = "/api")
+public class ConfigurationController {
+
+    @Autowired
+    CustomAttributesConfiguration customAttributesConfiguration;
+
+    @GetMapping(value = "/customAttributes")
+    public ResponseEntity<?> getCustomAttributes() {
+        return ResponseEntity.ok(customAttributesConfiguration.getAttributes());
+    }
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java

@@ -47,14 +47,11 @@ public static List<String> getAttributeReleaseListFromAttributeList(List<Attribu
                 .filter(attribute -> attribute.getName().equals(MDDCConstants.RELEASE_ATTRIBUTES))
                 .collect(Collectors.toList());
 
-        if (releaseAttributes.size() != 1) {
-            // TODO: What do we do if there is more than one?
-        }
-        if (releaseAttributes.size() == 0) {
-            return new ArrayList<>();
-        } else {
-            return getStringListOfAttributeValues(releaseAttributes.get(0).getAttributeValues());
+        List<String> attributeValues = new ArrayList<>();
+        for (Attribute attribute : releaseAttributes) {
+            attributeValues.addAll(getStringListOfAttributeValues(attribute.getAttributeValues()));
         }
+        return attributeValues;
     }
 
     public static boolean getBooleanValueOfAttribute(Attribute attribute) {

backend/src/main/resources/application.yml

@@ -0,0 +1,28 @@
+custom:
+  attributes:
+  # Default attributes
+    - name: eduPersonPrincipalName
+      displayName: label.attribute-eduPersonPrincipalName
+    - name: uid
+      displayName: label.attribute-uid
+    - name: mail
+      displayName: label.attribute-mail
+    - name: surname
+      displayName: label.attribute-surname
+    - name: givenName
+      displayName: label.attribute-givenName
+    - name: eduPersonAffiliation
+      displayName: label.attribute-eduPersonAffiliation
+    - name: eduPersonScopedAffiliation
+      displayName: label.attribute-eduPersonScopedAffiliation
+    - name: eduPersonPrimaryAffiliation
+      displayName: label.attribute-eduPersonPrimaryAffiliation
+    - name: eduPersonEntitlement
+      displayName: label.attribute-eduPersonEntitlement
+    - name: eduPersonAssurance
+      displayName: label.attribute-eduPersonAssurance
+    - name: eduPersonUniqueId
+      displayName: label.attribute-eduPersonUniqueId
+    - name: employeeNumber
+      displayName: label.attribute-employeeNumber
+  # Custom attributes

backend/src/main/resources/i18n/messages_en.properties

@@ -8,7 +8,7 @@ action.clear=Clear
 action.delete=Delete
 action.remove=Remove
 action.save=Save
-action.toggle=Toggle { label }
+action.toggle=Toggle
 action.add-contact=Add Contact
 action.add-contacts=Add Contacts
 action.use-mine=Use My Changes
@@ -31,6 +31,12 @@ action.choose-file=Choose File
 action.search-by=Search By
 action.preview=Preview
 action.select-metadata-filter-type=Select a metadata filter type
+action.add-authentication-method=Add Authentication Method
+action.move-up=Move Up
+action.move-down=Move Down
+action.edit=Edit
+action.add-filter=Add Filter
+action.manage-filters=Manage Filters
 
 value.enabled=Enabled
 value.disabled=Disabled
@@ -39,6 +45,9 @@ value.file=File
 value.memory=Memory
 value.true=True
 value.false=False
+value.regex=Regex
+value.script=Script
+value.entity-id=Entity ID
 
 value.file-backed-http-metadata-provider=FileBackedHttpMetadataProvider
 value.entity-attributes-filter=EntityAttributes Filter
@@ -139,7 +148,7 @@ label.contact-name=Contact Name
 label.select-contact-type=Select Contact Type
 label.contact-email-address=Contact Email Address
 label.sign-the-assertion=Sign the Assertion
-label.dont-sign-the-response=Don''t Sign the Response
+label.dont-sign-the-response=Don\u0027t Sign the Response
 label.turn-off-encryption-of-response=Turn Off Encryption of Response
 label.use-sha1-signing-algorithm=Use SHA1 Signing Algorithm
 label.nameid-format-to-send=NameID Format to Send
@@ -201,10 +210,11 @@ label.service-enabled=Service Enabled
 label.filter-name=Filter Name
 label.filter-enabled=Filter Enabled
 label.filter-target=FilterTarget
+label.filter-type=Filter Type
 label.value=Value
 label.binding-type=Binding Type
 label.sign-assertion=Sign Assertions
-label.dont-sign-response=Don''t Sign Response
+label.dont-sign-response=Don\u0027t Sign Response
 label.turn-off-encryption=Turn off encryption
 label.use-sha=Use Sha
 label.ignore-authentication-method=Ignore Authentication Method
@@ -223,13 +233,12 @@ label.binding=Binding
 label.location-url=Location URL
 label.make-default=Make Default
 label.metadata-provider-name-dashboard-display-only=Metadata Provider Name (Dashboard Display Only)
+label.default-authentication-methods=Default Authentication Method(s)
 
 label.filter-name=Filter Name (Dashboard Display Only)
 label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only)
 label.filter-enable=Enable this Filter?
 label.search-criteria=Search Criteria
-label.regex=Regex
-label.script=Script
 label.metadata-filter=Metadata Filter
 label.metadata-filter-type=Metadata Filter Type
 
@@ -270,10 +279,12 @@ label.metadata-url=Metadata URL
 label.xml-id=ID
 label.enable-service=Enable this service?
 label.metadata-provider-type=Metadata Provider Type
-label.metadata-provider-name=Metadata Provider Name (Dashboard Display Only)
+label.metadata-provider-name=Metadata Provider Name
 label.select-metadata-type=Select a metadata provider type
+label.metadata-provider-status=Metadata Provider Status
 label.enable-provider-upon-saving=Enable Metadata Provider upon saving?
 
+label.enable-filter=Enable Filter?
 label.required-valid-until=Required Valid Until Filter
 label.max-validity-interval=Max Validity Interval
 label.signature-validation-filter=Signature Validation Filter
@@ -284,7 +295,38 @@ label.retained-roles=Retained Roles
 label.remove-roleless-entity-descriptors=Remove Roleless Entity Descriptors?
 label.remove-empty-entities-descriptors=Remove Empty Entities Descriptors?
 
+label.select-metadata-provider-type=Select Metadata Provider Type
+label.filter-list=Filter List
+label.common-attributes=Common Attributes
+label.reloading-attributes=Reloading Attributes
+label.metadata-filter-plugins=Metadata Filter Plugins
+label.advanced-settings=Advanced Settings
+label.edit-metadata-provider=Edit Metadata Provider
+
+label.metadata-ui=User Interface / MDUI Information
+label.descriptor-info=SP SSO Descriptor Information
+label.key-info=Security Information
+label.assertion=Assertion Consumer Service
+label.relying-party=Relying Party Overrides
+label.org-info=Organization Information
+
+label.attribute-eduPersonPrincipalName=eduPersonPrincipalName (EPPN)
+label.attribute-uid=uid
+label.attribute-mail=mail
+label.attribute-surname=surname
+label.attribute-givenName=givenName
+label.attribute-eduPersonAffiliation=eduPersonAffiliation
+label.attribute-eduPersonScopedAffiliation=eduPersonScopedAffiliation
+label.attribute-eduPersonPrimaryAffiliation=eduPersonPrimaryAffiliation
+label.attribute-eduPersonEntitlement=eduPersonEntitlement
+label.attribute-eduPersonAssurance=eduPersonAssurance
+label.attribute-eduPersonUniqueId=eduPersonUniqueId
+label.attribute-employeeNumber=employeeNumber
+
 message.must-be-unique=Must be unique.
+message.name-must-be-unique=Name must be unique.
+message.uri-valid-format=URI must be valid format.
+message.id-unique=ID must be unique.
 
 message.conflict=Conflict
 message.data-version-contention=Data Version Contention
@@ -302,14 +344,14 @@ message.delete-filter-body=You are deleting a metadata filter. This cannot be un
 message.unsaved-dialog-title=Save your information?
 message.unsaved-editor=You have not saved your changes. If you exit this screen, your changes will be lost.
 message.editor-invalid=All forms must be valid before changes can be saved!
-message.unsaved-source-1=You have not completed the wizard! Do you wish to save this information? You can finish the wizard later by clicking the ''Edit''
+message.unsaved-source-1=You have not completed the wizard! Do you wish to save this information? You can finish the wizard later by clicking the \u0027Edit\u0027
 message.unsaved-source-2=icon on the dashboard.
 message.service-resolver-name-required=Service Resolver Name is required
 message.entity-id-required=Entity ID is required
 message.entity-id-must-be-unique=Entity ID must be unique
 message.file-upload-alert=Note: You can only import a file with a single entityID (EntityDescriptor element) in it. Anything more in that file will result in an error.
 message.add-new-md-resolver=Add a new metadata source
-message.wizard-status=Step { index } of {{ length }}
+message.wizard-status=Step { index } of { length }
 message.entity-id-min-unique=You must add at least one entity id target and they must each be unique.
 message.required-for-scripts=Required for Scripts
 message.required-for-regex=Required for Regex
@@ -338,20 +380,20 @@ tooltip.logout-endpoints-binding-type=Logout Endpoints Binding Type
 tooltip.mdui-display-name=Typically, the IdP Display Name field will be presented on IdP discovery service interfaces.
 tooltip.mdui-information-url=The IdP Information URL is a link to a comprehensive information page about the IdP. This page should expand on the content of the IdP Description field.
 tooltip.mdui-description=The IdP Description is a brief description of the IdP service. On a well-designed discovery interface, the IdP Description will be presented to the user in addition to the IdP Display Name, and so the IdP Description helps disambiguate duplicate or similar IdP Display Names.
-tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to the IdP''s Privacy Statement. The content of the Privacy Statement should be targeted at end users.
+tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to the IdP\u0027s Privacy Statement. The content of the Privacy Statement should be targeted at end users.
 tooltip.mdui-logo-url=The IdP Logo URL in metadata points to an image file on a remote server. A discovery service, for example, may rely on a visual cue (i.e., a logo) instead of or in addition to the IdP Display Name.
 tooltip.mdui-logo-width=The logo should have a minimum width of 100 pixels
 tooltip.mdui-logo-height=The logo should have a minimum height of 75 pixels and a maximum height of 150 pixels (or the application will scale it proportionally)
 tooltip.organization-name=Organization Name
 tooltip.organization-display-name=Organization Display Name
 tooltip.organization-url=Organization Url
 tooltip.contact-name=Contact Name
+tooltip.contact-type=Contact Type
 tooltip.contact-email=Contact Email
 tooltip.sign-assertion=Sign Assertion
-tooltip.dont-sign-response=Don''t Sign Response
+tooltip.dont-sign-response=Don\u0027t Sign Response
 tooltip.turn-off-encryption=Turn Off Encryption of Response
 tooltip.usa-sha-algorithm=Use SHA1 Signing Algorithm
-tooltip.nameid-format=Add NameID Format
 tooltip.authentication-methods-to-use=Authentication Methods to Use
 tooltip.ignore-auth-method=Ignore any SP-Requested Authentication Method
 tooltip.omit-not-before-condition=Omit Not Before Condition
@@ -360,8 +402,8 @@ tooltip.instruction=Information icon - press spacebar to read additional informa
 tooltip.attribute-release-table=Attribute release table - select the attributes you want to release (default unchecked)
 tooltip.metadata-filter-name=Metadata Filter Name
 tooltip.metadata-filter-type=Metadata Filter Type
-tooltip.connection-request-timeout=The maximum amount of time to wait for a connection to be returned from the HTTP client''s connection pool manager. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
-tooltip.connection-timout=The maximum amount of time to wait to establish a connection with the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
+tooltip.connection-request-timeout=The maximum amount of time to wait for a connection to be returned from the HTTP client\u0027s connection pool manager. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
+tooltip.connection-timeout=The maximum amount of time to wait to establish a connection with the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
 tooltip.socket-timeout=The maximum amount of time to wait between two consecutive packets while reading from the socket connected to the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
 tooltip.disregard-tls-cert=If true, no TLS certificate checking will take place over an HTTPS connection. This attribute is incompatible with httpClientRef. (Be careful with this setting, it is typically only used during testing. See the HttpClientConfiguration topic for more information.)
 tooltip.proxy-host=The hostname of the HTTP proxy through which connections will be made. This attribute is incompatible with httpClientRef.
@@ -393,8 +435,12 @@ tooltip.retained-roles=Retained Roles
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors.
 
-tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata''s expiration.
-tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata''s expiration.
-tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata''s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
+tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
+tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
+tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
 tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
 tooltip.expiration-warning-threshold=For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.
+
+tooltip.filter-name=Filter Name
+tooltip.enable-filter=Enable Filter?
+tooltip.enable-service=Enable Service?