[java-idp-plugin-duo] branch main updated: JPAR-171 - Parent POM dependencies should be managed only

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=6fdd3d6e1b1231671dbf600ec0bc86a1183a167a

The following commit(s) were added to refs/heads/main by this push:
       new  6fdd3d6   JPAR-171 - Parent POM dependencies should be managed only
6fdd3d6 is described below

commit 6fdd3d6e1b1231671dbf600ec0bc86a1183a167a
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Aug 19 14:18:34 2020 +0100

    JPAR-171 - Parent POM dependencies should be managed only
    
     - Add slf4j API to deps as is now managed in parent.
    
    https://issues.shibboleth.net/jira/browse/JPAR-171
---
 .../duo/impl/ValidateDuoTokenAuthenticationResult.java    |  8 +++++---
 pom.xml                                                   | 15 +++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
index a0c9bc3..0602ce0 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
@@ -157,12 +157,14 @@ public class ValidateDuoTokenAuthenticationResult extends AbstractValidationActi
     /** {@inheritDoc} */
     @Override protected Subject populateSubject(@Nonnull final Subject subject) {
         
-        //add the custom Duo principal
+        //Always add the custom Duo principal
         subject.getPrincipals().add(new DuoOIDCPrincipal(username));
-        //add any principals specified on the integration.
+        //Always add any principals specified on the integration
         subject.getPrincipals().addAll(duoContext.getIntegration().getSupportedPrincipals(Principal.class));
         
-        //add any further principals from a function hook that can inspect the Duo response
+        //add any further principals from a function hook that can inspect the Duo response.
+        //If the mapping strategy is set, the defaults are not copied over from the flow. Hence,
+        //these will be added only to those added above.
         if (getContextToPrincipalMappingStrategy() != null) {
             final Collection<Principal> mapped = getContextToPrincipalMappingStrategy().apply(prc);
             if (mapped != null) {
diff --git a/pom.xml b/pom.xml
index b70dd39..e038192 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
@@ -34,7 +34,7 @@
         <module>idp-duo-native-client-impl</module>
         <module>idp-duo-distribution</module>
     </modules>
-    
+
     <distributionManagement>
         <site>
             <id>site</id>
@@ -61,13 +61,16 @@
 
 
     <dependencies>
-        <!-- Project wide test Dependencies -->          
+        <!-- Project wide test Dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>7.1.0</version>
+            <artifactId>testng</artifactId>       
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${slf4j.groupId}</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -107,7 +110,7 @@
                 <groupId>net.shibboleth.idp.plugin</groupId>
                 <artifactId>idp-plugin-duo-native-client-impl</artifactId>
                 <version>${project.version}</version>
-            </dependency>     
+            </dependency>
             <!-- test bom dependencies -->
             <dependency>
                 <groupId>${idp.groupId}</groupId>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.