[java-identity-provider] branch main updated: Revise handling of demo account feature.

[Scott Cantor]

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=f8aab48b50d7580182053c30b7d3d9a3eea87fbf

The following commit(s) were added to refs/heads/main by this push:
       new  f8aab48b5 Revise handling of demo account feature.
f8aab48b5 is described below

commit f8aab48b50d7580182053c30b7d3d9a3eea87fbf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jan 27 08:26:11 2021 -0500

    Revise handling of demo account feature.
---
 .../net/shibboleth/idp/module/authn/impl/Demo.java | 41 ++++++++++++++++++++++
 .../services/net.shibboleth.idp.module.IdPModule   |  1 +
 .../idp/module/authn/impl/module.properties        |  9 +++--
 .../module/conf/authn/password-authn-config.xml    |  4 +--
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/Demo.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/Demo.java
new file mode 100644
index 000000000..56cf41bd7
--- /dev/null
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/Demo.java
@@ -0,0 +1,41 @@
+/*
+ * 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 Demo extends CoreIdPModule {
+
+    /**
+     * Constructor.
+     *  
+     * @throws ModuleException on error
+     * @throws IOException on error
+     */
+    public Demo() throws IOException, ModuleException {
+        super(Demo.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 571260db4..512c6350c 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
@@ -8,6 +8,7 @@ net.shibboleth.idp.module.authn.impl.RemoteUser
 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
 
 net.shibboleth.idp.module.admin.impl.Hello
 net.shibboleth.idp.module.admin.impl.UnlockKeys
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 b146dac6c..02ecce6d0 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
@@ -11,6 +11,7 @@ net.shibboleth.idp.module.authn.impl.RemoteUser = idp.authn.RemoteUser
 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
 
 idp.authn.Duo.name = Duo Authentication
 idp.authn.Duo.desc = Login flow for Duo Security's second-factor authentication service.
@@ -56,9 +57,11 @@ idp.authn.Password.2.src = /net/shibboleth/idp/module/views/login.vm
 idp.authn.Password.2.dest = views/login.vm
 idp.authn.Password.3.src = /net/shibboleth/idp/module/views/login-error.vm
 idp.authn.Password.3.dest = views/login-error.vm
-idp.authn.Password.4.src = /net/shibboleth/idp/module/credentials/demo.htpasswd
-idp.authn.Password.4.dest = credentials/demo.htpasswd
-idp.authn.Password.4.optional = true
+
+idp.authn.Demo.name = Demo Authentication
+idp.authn.Demo.desc = Demo htpasswd file for use with password-based authentication
+idp.authn.Demo.1.src = /net/shibboleth/idp/module/credentials/demo.htpasswd
+idp.authn.Demo.1.dest = credentials/demo.htpasswd
 
 idp.authn.RemoteUser.name = RemoteUser Authentication
 idp.authn.RemoteUser.desc = Login flow for container-based authentication with a dedicated protected path.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
index 0bc28953c..cde94fb43 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
@@ -20,10 +20,10 @@
     want to remove it after initial install and testing.
     -->
     <util:list id="shibboleth.authn.Password.Validators">
-        <bean parent="shibboleth.HTPasswdValidator" p:resource="%{idp.home}/credentials/demo.htpasswd" />
-        <!-- <ref bean="shibboleth.LDAPValidator" /> -->
+        <ref bean="shibboleth.LDAPValidator" />
         <!-- <ref bean="shibboleth.KerberosValidator" /> -->
         <!-- <ref bean="shibboleth.JAASValidator" /> -->
+        <!-- <bean parent="shibboleth.HTPasswdValidator" p:resource="%{idp.home}/credentials/demo.htpasswd" /> -->
     </util:list>
 
     <!-- Apply any regular expression replacement pairs to username before validation. -->

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