[java-identity-provider] branch main updated: IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
Scott Cantor
cantor.2 at osu.edu
Mon May 8 17:41:23 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d1ec287739487391d2afe2784e2f6257f4de97da
The following commit(s) were added to refs/heads/main by this push:
new d1ec28773 IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
d1ec28773 is described below
commit d1ec287739487391d2afe2784e2f6257f4de97da
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 8 13:41:20 2023 -0400
IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
https://shibboleth.atlassian.net/browse/IDP-2100
Eliminated External module.
Added NoCredentials/InvalidCredentials mappings to ReselectFlow.
---
.../shibboleth/idp/module/authn/impl/External.java | 41 ----------------------
.../services/net.shibboleth.idp.module.IdPModule | 1 -
.../idp/flows/authn/external-authn-flow.xml | 2 ++
.../idp/module/authn/impl/module.properties | 7 ----
.../module/conf/authn/external-authn-config.xml | 41 ----------------------
5 files changed, 2 insertions(+), 90 deletions(-)
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/External.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/External.java
deleted file mode 100644
index 7ec4761d4..000000000
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/External.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.module.authn.impl;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.IdPModule;
-import net.shibboleth.idp.module.ModuleException;
-import net.shibboleth.idp.module.impl.CoreIdPModule;
-
-/**
- * {@link IdPModule} implementation.
- */
-public final class External extends CoreIdPModule {
-
- /**
- * Constructor.
- *
- * @throws ModuleException on error
- * @throws IOException on error
- */
- public External() throws IOException, ModuleException {
- super(External.class);
- }
-
-}
\ No newline at end of file
diff --git a/idp-conf-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/idp-conf-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index b8776838c..6732df8e7 100644
--- a/idp-conf-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/idp-conf-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1,5 +1,4 @@
net.shibboleth.idp.module.authn.impl.Duo
-net.shibboleth.idp.module.authn.impl.External
net.shibboleth.idp.module.authn.impl.Function
net.shibboleth.idp.module.authn.impl.IPAddress
net.shibboleth.idp.module.authn.impl.MFA
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-flow.xml
index af53c0128..9c8346fb8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-flow.xml
@@ -29,6 +29,8 @@
<evaluate expression="'proceed'" />
<transition on="proceed" to="CallSubjectCanonicalization" />
+ <transition on="NoCredentials" to="ReselectFlow" />
+ <transition on="InvalidCredentials" to="ReselectFlow" />
</action-state>
<!-- This runs a c14n step on the result of the authentication. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
index 5ed014afe..94d9a2612 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
@@ -2,7 +2,6 @@
# Class to Module ID mappings
net.shibboleth.idp.module.authn.impl.Duo = idp.authn.Duo
-net.shibboleth.idp.module.authn.impl.External = idp.authn.External
net.shibboleth.idp.module.authn.impl.Function = idp.authn.Function
net.shibboleth.idp.module.authn.impl.IPAddress = idp.authn.IPAddress
net.shibboleth.idp.module.authn.impl.MFA = idp.authn.MFA
@@ -22,12 +21,6 @@ idp.authn.Duo.2.dest = conf/authn/duo.properties
idp.authn.Duo.3.src = /net/shibboleth/idp/module/views/duo.vm
idp.authn.Duo.3.dest = views/duo.vm
-idp.authn.External.name = External Authentication
-idp.authn.External.desc = Login flow that delegates authentication to a servlet/JSP.
-idp.authn.External.url = /ExternalAuthnConfiguration
-idp.authn.External.1.src = /net/shibboleth/idp/module/conf/authn/external-authn-config.xml
-idp.authn.External.1.dest = conf/authn/external-authn-config.xml
-
idp.authn.Function.name = Function Authentication
idp.authn.Function.desc = Login flow that produces a result from a function.
idp.authn.Function.url = /FunctionAuthnConfiguration
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml
deleted file mode 100644
index ceb92663d..000000000
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <!-- Most settings are controlled with authn.properties -->
-
- <!--
- The idp.authn.External.externalAuthnPath property controls the default location to use.
- For advanced cases, define a bean called "shibboleth.authn.External.externalAuthnPathStrategy"
- of type Function<ProfileRequestContext,String> that returns the path to use.
- -->
-
- <!--
- Define entries here to map error messages returned by external modules and classify them as particular
- kinds of errors for use in your templates and as events in flows.
-
- Keys are events to signal, values are error codes.
-
- If you want to "fall-through" to other login flows, include a mapping to "ReselectFlow".
- -->
- <!--
- <util:map id="shibboleth.authn.External.ClassifiedMessageMap">
- <entry key="ReselectFlow">
- <list>
- <value>UnknownUsername</value>
- </list>
- </entry>
- </util:map>
- -->
-
-</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list