[java-identity-provider] branch main updated: Eliminate superfluous module/config.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 16 13:57:59 UTC 2020
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=a6ca10196da3c727c1f9fc49e2585a252d2f50d0
The following commit(s) were added to refs/heads/main by this push:
new a6ca10196 Eliminate superfluous module/config.
a6ca10196 is described below
commit a6ca10196da3c727c1f9fc49e2585a252d2f50d0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 16 09:57:50 2020 -0400
Eliminate superfluous module/config.
---
.../idp/module/authn/impl/X509Internal.java | 41 ----------------------
.../services/net.shibboleth.idp.module.IdPModule | 1 -
.../idp/module/authn/impl/module.properties | 7 ----
.../conf/authn/x509-internal-authn-config.xml | 21 -----------
4 files changed, 70 deletions(-)
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/X509Internal.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/X509Internal.java
deleted file mode 100644
index d81950962..000000000
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/X509Internal.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.PropertyDrivenIdPModule;
-
-/**
- * {@link IdPModule} implementation.
- */
-public final class X509Internal extends PropertyDrivenIdPModule {
-
- /**
- * Constructor.
- *
- * @throws ModuleException on error
- * @throws IOException on error
- */
- public X509Internal() throws IOException, ModuleException {
- super(X509Internal.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 74c4bf885..b718cd620 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,4 +8,3 @@ 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.X509Internal
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 4604226a7..0f4a38c3f 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,7 +11,6 @@ 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.X509Internal = idp.authn.X509Internal
idp.authn.Duo.name = Duo Authentication
idp.authn.Duo.desc = Login flow for Duo Security's second-factor authentication service.
@@ -85,9 +84,3 @@ idp.authn.X509.1.dest = conf/authn/x509-authn-config.xml
idp.authn.X509.2.src = /net/shibboleth/idp/module/edit-webapp/x509-prompt.jsp
idp.authn.X509.2.dest = edit-webapp/x509-prompt.jsp
idp.authn.X509.postenable = Customize edit-webapp/x509-prompt.jsp and rebuild war to deploy.
-
-idp.authn.X509Internal.name = X509Internal Authentication
-idp.authn.X509Internal.desc = Login flow for X.509 authentication with no redirects.
-idp.authn.X509Internal.url = https://wiki.shibboleth.net/confluence/display/IDP4/X509InternalAuthnConfiguration
-idp.authn.X509Internal.1.src = /net/shibboleth/idp/module/conf/authn/x509-internal-authn-config.xml
-idp.authn.X509Internal.1.dest = conf/authn/x509-internal-authn-config.xml
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/x509-internal-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/x509-internal-authn-config.xml
deleted file mode 100644
index bad302930..000000000
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/x509-internal-authn-config.xml
+++ /dev/null
@@ -1,21 +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">
-
- <!--
- You can define a TrustEngine to apply to any candidate certificates by defining a bean named
- "shibboleth.authn.X509.TrustEngine". You could also define that in conf/global.xml if you need
- to share one between the internal and external versions of this flow.
- -->
-
-</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list