[java-identity-provider] branch main updated: Re-home module under impl package and control module ID separately.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 8 15:31:32 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=8048228483cc291bdbfba09ae1f54c678b44c37e
The following commit(s) were added to refs/heads/main by this push:
new 804822848 Re-home module under impl package and control module ID separately.
804822848 is described below
commit 8048228483cc291bdbfba09ae1f54c678b44c37e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 8 11:31:24 2020 -0400
Re-home module under impl package and control module ID separately.
---
.../shibboleth/idp/module/PropertyDrivenIdPModule.java | 16 +++++++++++++---
.../idp/module/authn/{ => impl}/IPAddress.java | 2 +-
.../idp/module/authn/{ => impl}/package-info.java | 2 +-
.../services/net.shibboleth.idp.module.IdPModule | 2 +-
.../shibboleth/idp/module/authn/impl/module.properties | 10 ++++++++++
.../net/shibboleth/idp/module/authn/module.properties | 8 --------
6 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java b/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java
index 23195730a..87c9c2416 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java
@@ -47,6 +47,9 @@ public class PropertyDrivenIdPModule extends AbstractIdPModule {
/** Default name of module properties resource. */
@Nonnull @NotEmpty public static final String DEFAULT_RESOURCE = "module.properties";
+ /** Suffix of property for module ID. */
+ @Nonnull @NotEmpty public static final String MODULE_ID_PROPERTY = ".id";
+
/** Suffix of property for module name. */
@Nonnull @NotEmpty public static final String MODULE_NAME_PROPERTY = ".name";
@@ -76,7 +79,10 @@ public class PropertyDrivenIdPModule extends AbstractIdPModule {
/** Properties describing module. */
@Nonnull private final Properties moduleProperties;
-
+
+ /** Module ID. */
+ @Nonnull @NotEmpty private String moduleId;
+
/** Module name. */
@Nonnull @NotEmpty private String moduleName;
@@ -128,6 +134,10 @@ public class PropertyDrivenIdPModule extends AbstractIdPModule {
// Checkstyle: CyclomaticComplexity OFF
protected void load() throws ModuleException {
try {
+ moduleId = Constraint.isNotNull(
+ StringSupport.trimOrNull(moduleProperties.getProperty(getClass().getName() + MODULE_ID_PROPERTY)),
+ "Module ID missing from properties");
+
moduleName = Constraint.isNotNull(
StringSupport.trimOrNull(moduleProperties.getProperty(getId() + MODULE_NAME_PROPERTY)),
"Module name missing from properties");
@@ -176,8 +186,8 @@ public class PropertyDrivenIdPModule extends AbstractIdPModule {
// Checkstyle: CyclomaticComplexity ON
/** {@inheritDoc} */
- public String getId() {
- return getClass().getName();
+ @Nonnull @NotEmpty public String getId() {
+ return moduleId;
}
/** {@inheritDoc} */
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/impl/IPAddress.java
similarity index 96%
rename from idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/IPAddress.java
rename to idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/IPAddress.java
index cf5a653ee..6a30c9fa2 100644
--- 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/impl/IPAddress.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.module.authn;
+package net.shibboleth.idp.module.authn.impl;
import java.io.IOException;
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/impl/package-info.java
similarity index 95%
rename from idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/package-info.java
rename to idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/package-info.java
index b0ff9c665..e0d2d0cad 100644
--- 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/impl/package-info.java
@@ -19,4 +19,4 @@
* Authentication modules.
*/
-package net.shibboleth.idp.module.authn;
\ No newline at end of file
+package net.shibboleth.idp.module.authn.impl;
\ 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 bfd4ce7a3..c4fefba10 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 +1 @@
-net.shibboleth.idp.module.authn.IPAddress
+net.shibboleth.idp.module.authn.impl.IPAddress
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
new file mode 100644
index 000000000..29f2be0d1
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
@@ -0,0 +1,10 @@
+# Properties defining authn modules
+
+net.shibboleth.idp.module.authn.impl.IPAddress.id = idp.authn.IPAddress
+
+idp.authn.IPAddress.name = IPAddress Authentication
+idp.authn.IPAddress.desc = Authentication flow that maps IP Address ranges to subjects.
+idp.authn.IPAddress.url = https://wiki.shibboleth.net/confluence/display/IDP4/IPAddressAuthnConfiguration
+
+idp.authn.IPAddress.1.src = /net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
+idp.authn.IPAddress.1.dest = conf/authn/ipaddress-authn-config.xml
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
deleted file mode 100644
index e4407576d..000000000
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/module.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list