[java-identity-provider] branch main updated: IDP-1642 - Migrate configuration into jars where feasible
Scott Cantor
cantor.2 at osu.edu
Thu Sep 3 22:46:30 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=f8432934f7dbf1d5587128bfb66b4f90ecf92363
The following commit(s) were added to refs/heads/main by this push:
new f8432934f IDP-1642 - Migrate configuration into jars where feasible
f8432934f is described below
commit f8432934f7dbf1d5587128bfb66b4f90ecf92363
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 3 18:46:21 2020 -0400
IDP-1642 - Migrate configuration into jars where feasible
https://issues.shibboleth.net/jira/browse/IDP-1642
First module prototype to bury IPAddress authn config.
---
.../net/shibboleth/idp/module/authn/IPAddress.java | 40 ++++++++++++++++++++++
.../shibboleth/idp/module/authn/package-info.java | 22 ++++++++++++
.../services/net.shibboleth.idp.module.IdPModule | 1 +
.../shibboleth/idp/module/authn/module.properties | 8 +++++
.../module}/conf/authn/ipaddress-authn-config.xml | 3 +-
5 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/IPAddress.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/IPAddress.java
new file mode 100644
index 000000000..ed54564b3
--- /dev/null
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/IPAddress.java
@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.module.ModuleException;
+import net.shibboleth.idp.module.PropertyDrivenIdPModule;
+
+/**
+ * {@IdPModule} implementation.
+ */
+public final class IPAddress extends PropertyDrivenIdPModule {
+
+ /**
+ * Constructor.
+ *
+ * @throws ModuleException
+ * @throws IOException
+ */
+ public IPAddress() throws IOException, ModuleException {
+ super(IPAddress.class);
+ }
+
+}
\ No newline at end of file
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/package-info.java
new file mode 100644
index 000000000..b0ff9c665
--- /dev/null
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Authentication modules.
+ */
+
+package net.shibboleth.idp.module.authn;
\ 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
new file mode 100644
index 000000000..bfd4ce7a3
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -0,0 +1 @@
+net.shibboleth.idp.module.authn.IPAddress
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/module.properties
new file mode 100644
index 000000000..e4407576d
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/module.properties
@@ -0,0 +1,8 @@
+# Properties defining authn modules
+
+net.shibboleth.idp.module.authn.IPAddress.name = IPAddress Authentication
+net.shibboleth.idp.module.authn.IPAddress.desc = Authentication flow that maps IP Address ranges to subjects.
+net.shibboleth.idp.module.authn.IPAddress.url = https://wiki.shibboleth.net/confluence/display/IDP4/IPAddressAuthnConfiguration
+
+net.shibboleth.idp.module.authn.IPAddress.1.src = /net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
+net.shibboleth.idp.module.authn.IPAddress.1.dest = conf/authn/ipaddress-authn-config.xml
diff --git a/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
similarity index 99%
rename from idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
index a3ee096f3..d499c7a3c 100644
--- a/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
@@ -21,8 +21,7 @@
The ranges provided MUST be CIDR network expressions. To specify a single address,
add "/32" or "/128" for IPv4 or IPv6 respectively.
-->
-
-
+
<util:map id="shibboleth.authn.IPAddress.Mappings">
<!--
<entry key="jdoe">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list