[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 14:12:43 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=6a67895c0ba6393151963a8fbda1e300efb4853e
The following commit(s) were added to refs/heads/main by this push:
new 6a67895c0 IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
6a67895c0 is described below
commit 6a67895c0ba6393151963a8fbda1e300efb4853e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 8 10:12:40 2023 -0400
IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
https://shibboleth.atlassian.net/browse/IDP-2100
Remove module and XML config for RemoteUserInternal.
---
.../idp/module/authn/impl/RemoteUserInternal.java | 41 ----------------------
.../services/net.shibboleth.idp.module.IdPModule | 1 -
.../authn/remoteuser-internal-authn-beans.xml | 4 +--
.../idp/module/authn/impl/module.properties | 7 ----
.../authn/remoteuser-internal-authn-config.xml | 24 -------------
5 files changed, 2 insertions(+), 75 deletions(-)
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/RemoteUserInternal.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/RemoteUserInternal.java
deleted file mode 100644
index 021c8cc36..000000000
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/RemoteUserInternal.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 RemoteUserInternal extends CoreIdPModule {
-
- /**
- * Constructor.
- *
- * @throws ModuleException on error
- * @throws IOException on error
- */
- public RemoteUserInternal() throws IOException, ModuleException {
- super(RemoteUserInternal.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 eab251f99..b8776838c 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
@@ -4,7 +4,6 @@ net.shibboleth.idp.module.authn.impl.Function
net.shibboleth.idp.module.authn.impl.IPAddress
net.shibboleth.idp.module.authn.impl.MFA
net.shibboleth.idp.module.authn.impl.Password
-net.shibboleth.idp.module.authn.impl.RemoteUserInternal
net.shibboleth.idp.module.authn.impl.SPNEGO
net.shibboleth.idp.module.authn.impl.X509
net.shibboleth.idp.module.authn.impl.Demo
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
index 827c515d3..64799269c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
@@ -47,7 +47,7 @@
p:lowercase="#{getObject('shibboleth.authn.RemoteUser.Lowercase') ?: %{idp.authn.RemoteUserInternal.lowercase:false}}"
p:uppercase="#{getObject('shibboleth.authn.RemoteUser.Uppercase') ?: %{idp.authn.RemoteUserInternal.uppercase:false}}"
p:trim="#{getObject('shibboleth.authn.RemoteUser.Trim') ?: %{idp.authn.RemoteUserInternal.trim:true}}"
- p:transforms="#{getObject('shibboleth.authn.RemoteUser.Transforms')}" />
+ p:transforms="#{getObject('shibboleth.authn.RemoteUserInternal.Transforms') ?: getObject('shibboleth.authn.RemoteUser.Transforms')}" />
<bean id="PropertyDrivenAllowList" parent="shibboleth.CommaDelimStringArray"
c:_0="#{'%{idp.authn.RemoteUserInternal.allowedUsernames:}'.trim()}" />
@@ -60,7 +60,7 @@
p:allowedUsernames="#{getObject('shibboleth.authn.RemoteUser.allowedUsernames') ?: (getObject('shibboleth.authn.RemoteUser.whitelistedUsernames') ?: getObject('PropertyDrivenAllowList'))}"
p:deniedUsernames="#{getObject('shibboleth.authn.RemoteUser.deniedUsernames') ?: (getObject('shibboleth.authn.RemoteUser.blacklistedUsernames') ?: getObject('PropertyDrivenDenyList'))}"
p:addDefaultPrincipals="#{getObject('shibboleth.authn.RemoteUser.addDefaultPrincipals') ?: %{idp.authn.RemoteUserInternal.addDefaultPrincipals:true}}"
- p:classifiedMessages="#{getObject('shibboleth.authn.RemoteUser.ClassifiedMessageMap')}"
+ p:classifiedMessages="#{getObject('shibboleth.authn.RemoteUserInternal.ClassifiedMessageMap') ?: getObject('shibboleth.authn.RemoteUser.ClassifiedMessageMap')}"
p:resultCachingPredicate="#{getObject('shibboleth.authn.RemoteUser.resultCachingPredicate')}"
p:populateAuditContextAction="#{%{idp.authn.RemoteUserInternal.audit.enabled:%{idp.authn.audit.enabled:false}} ? getObject('shibboleth.authn.RemoteUserInternal.PopulateAuditContext') : null}"
p:writeAuditLogAction="#{%{idp.authn.RemoteUserInternal.audit.enabled:%{idp.authn.audit.enabled:false}} ? getObject('WriteAuthnAuditLog') : null}" />
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 d4baacbc3..a58c46327 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
@@ -7,7 +7,6 @@ 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
net.shibboleth.idp.module.authn.impl.Password = idp.authn.Password
-net.shibboleth.idp.module.authn.impl.RemoteUserInternal = idp.authn.RemoteUserInternal
net.shibboleth.idp.module.authn.impl.SPNEGO = idp.authn.SPNEGO
net.shibboleth.idp.module.authn.impl.X509 = idp.authn.X509
net.shibboleth.idp.module.authn.impl.Demo = idp.authn.Demo
@@ -64,12 +63,6 @@ idp.authn.Demo.1.dest = credentials/demo.htpasswd
idp.authn.Demo.postenable = To use the demo account, adjust the shibboleth.authn.Password.Validators \
bean in conf/authn/password-authn-config.xml
-idp.authn.RemoteUserInternal.name = RemoteUserInternal Authentication
-idp.authn.RemoteUserInternal.desc = Login flow for container-based authentication with no redirects.
-idp.authn.RemoteUserInternal.url = /RemoteUserInternalAuthnConfiguration
-idp.authn.RemoteUserInternal.1.src = /net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml
-idp.authn.RemoteUserInternal.1.dest = conf/authn/remoteuser-internal-authn-config.xml
-
idp.authn.SPNEGO.name = SPNEGO Authentication
idp.authn.SPNEGO.desc = Login flow for SPNEGO authentication.
idp.authn.SPNEGO.url = /SPNEGOAuthnConfiguration
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml
deleted file mode 100644
index ab96d2aff..000000000
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml
+++ /dev/null
@@ -1,24 +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 -->
-
- <!-- Apply any regular expression replacement pairs before validation. -->
- <util:list id="shibboleth.authn.RemoteUser.Transforms">
- <!--
- <bean parent="shibboleth.Pair" p:first="^(.+)@example\.org$" p:second="$1" />
- -->
- </util:list>
-
-</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list