[java-identity-provider] branch main updated: IDP-2002 - Migrate all unmanaged config files into core module
Scott Cantor
cantor.2 at osu.edu
Mon May 8 20:09:22 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=df0542fd238df2f36983fc4d35e8b90243ae179c
The following commit(s) were added to refs/heads/main by this push:
new df0542fd2 IDP-2002 - Migrate all unmanaged config files into core module
df0542fd2 is described below
commit df0542fd238df2f36983fc4d35e8b90243ae179c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 8 16:09:18 2023 -0400
IDP-2002 - Migrate all unmanaged config files into core module
https://shibboleth.atlassian.net/browse/IDP-2002
Created UserPrefs and Core modules for now.
Moved some initial views into Core module.
Added idp.Core to installer's list to auto-enable.
---
.../idp/module/admin/impl/package-info.java | 4 +++-
.../idp/module/authn/impl/package-info.java | 4 +++-
.../impl/package-info.java => core/impl/Core.java} | 23 +++++++++++++++++--
.../package-info.java => core/impl/UserPrefs.java} | 23 +++++++++++++++++--
.../module/{admin => core}/impl/package-info.java | 6 +++--
.../idp/module/intercept/impl/package-info.java | 4 +++-
.../idp/module/profile/impl/package-info.java | 4 +++-
.../services/net.shibboleth.idp.module.IdPModule | 3 +++
.../idp/module/core/impl/module.properties | 26 ++++++++++++++++++++++
.../idp/module}/flows/user/prefs/prefs-flow.xml | 0
.../views/client-storage/client-storage-read.vm | 0
.../views/client-storage/client-storage-write.vm | 0
.../net/shibboleth/idp/module}/views/user-prefs.js | 0
.../net/shibboleth/idp/module}/views/user-prefs.vm | 0
.../idp/installer/InstallerProperties.java | 2 +-
15 files changed, 88 insertions(+), 11 deletions(-)
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
index b2973b09b..d8e4e32cd 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
@@ -18,5 +18,7 @@
/**
* Administrative modules.
*/
+ at NonnullElements
+package net.shibboleth.idp.module.admin.impl;
-package net.shibboleth.idp.module.admin.impl;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/package-info.java
index e0d2d0cad..3f736d30d 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/authn/impl/package-info.java
@@ -18,5 +18,7 @@
/**
* Authentication modules.
*/
+ at NonnullElements
+package net.shibboleth.idp.module.authn.impl;
-package net.shibboleth.idp.module.authn.impl;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/Core.java
similarity index 62%
copy from idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
copy to idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/Core.java
index b2973b09b..9b367a9ec 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/Core.java
@@ -15,8 +15,27 @@
* limitations under the License.
*/
+package net.shibboleth.idp.module.core.impl;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.module.IdPModule;
+import net.shibboleth.idp.module.ModuleException;
+import net.shibboleth.idp.module.impl.CoreIdPModule;
+
/**
- * Administrative modules.
+ * {@link IdPModule} implementation.
*/
+public final class Core extends CoreIdPModule {
+
+ /**
+ * Constructor.
+ *
+ * @throws ModuleException on error
+ * @throws IOException on error
+ */
+ public Core() throws IOException, ModuleException {
+ super(Core.class);
+ }
-package net.shibboleth.idp.module.admin.impl;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/UserPrefs.java
similarity index 61%
copy from idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
copy to idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/UserPrefs.java
index b2973b09b..ceee3b812 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/UserPrefs.java
@@ -15,8 +15,27 @@
* limitations under the License.
*/
+package net.shibboleth.idp.module.core.impl;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.module.IdPModule;
+import net.shibboleth.idp.module.ModuleException;
+import net.shibboleth.idp.module.impl.CoreIdPModule;
+
/**
- * Administrative modules.
+ * {@link IdPModule} implementation.
*/
+public final class UserPrefs extends CoreIdPModule {
+
+ /**
+ * Constructor.
+ *
+ * @throws ModuleException on error
+ * @throws IOException on error
+ */
+ public UserPrefs() throws IOException, ModuleException {
+ super(UserPrefs.class);
+ }
-package net.shibboleth.idp.module.admin.impl;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/package-info.java
similarity index 85%
copy from idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
copy to idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/package-info.java
index b2973b09b..7a5e8654b 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/core/impl/package-info.java
@@ -16,7 +16,9 @@
*/
/**
- * Administrative modules.
+ * General modules.
*/
+ at NonnullElements
+package net.shibboleth.idp.module.core.impl;
-package net.shibboleth.idp.module.admin.impl;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/intercept/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/intercept/impl/package-info.java
index 7bb4446b6..668adc8b6 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/intercept/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/intercept/impl/package-info.java
@@ -18,5 +18,7 @@
/**
* Interceptor modules.
*/
+ at NonnullElements
+package net.shibboleth.idp.module.intercept.impl;
-package net.shibboleth.idp.module.intercept.impl;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/profile/impl/package-info.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/profile/impl/package-info.java
index 759fe133b..d57460654 100644
--- a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/profile/impl/package-info.java
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/profile/impl/package-info.java
@@ -18,5 +18,7 @@
/**
* Profile modules.
*/
+ at NonnullElements
+package net.shibboleth.idp.module.profile.impl;
-package net.shibboleth.idp.module.profile.impl;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
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 e4c052728..68cd53d74 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,3 +1,6 @@
+net.shibboleth.idp.module.core.impl.Core
+net.shibboleth.idp.module.core.impl.UserPrefs
+
net.shibboleth.idp.module.authn.impl.Duo
net.shibboleth.idp.module.authn.impl.IPAddress
net.shibboleth.idp.module.authn.impl.MFA
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties
new file mode 100644
index 000000000..178e87ab8
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties
@@ -0,0 +1,26 @@
+# Properties defining profile modules
+
+# Class to Module ID mappings
+net.shibboleth.idp.module.core.impl.Core = idp.Core
+net.shibboleth.idp.module.core.impl.UserPrefs = idp.UserPrefs
+
+
+idp.Core.name = Core IdP Functions
+idp.Core.desc = Module that provides built-in IdP functionality
+idp.Core.url = /
+
+idp.Core.1.src = /net/shibboleth/idp/module/views/client-storage/client-storage-read.vm
+idp.Core.1.dest = views/client-storage/client-storage-read.vm
+idp.Core.1.src = /net/shibboleth/idp/module/views/client-storage/client-storage-write.vm
+idp.Core.1.dest = views/client-storage/client-storage-write.vm
+
+
+idp.UserPrefs.name = User Preferences Flow
+idp.UserPrefs.desc = Flow that renders a view allowing manipulation of preference cookies
+idp.UserPrefs.url = /
+idp.UserPrefs.1.src = /net/shibboleth/idp/module/flows/user/prefs/prefs-flow.xml
+idp.UserPrefs.1.dest = flows/user/prefs/prefs-flow.xml
+idp.UserPrefs.2.src = /net/shibboleth/idp/module/views/user-prefs.vm
+idp.UserPrefs.2.dest = views/user-prefs.vm
+idp.UserPrefs.3.src = /net/shibboleth/idp/module/views/user-prefs.js
+idp.UserPrefs.3.dest = views/user-prefs.js
diff --git a/idp-conf/src/main/resources/flows/user/prefs/prefs-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/user/prefs/prefs-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/flows/user/prefs/prefs-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/user/prefs/prefs-flow.xml
diff --git a/idp-conf/src/main/resources/views/client-storage/client-storage-read.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/client-storage/client-storage-read.vm
similarity index 100%
rename from idp-conf/src/main/resources/views/client-storage/client-storage-read.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/client-storage/client-storage-read.vm
diff --git a/idp-conf/src/main/resources/views/client-storage/client-storage-write.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/client-storage/client-storage-write.vm
similarity index 100%
rename from idp-conf/src/main/resources/views/client-storage/client-storage-write.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/client-storage/client-storage-write.vm
diff --git a/idp-conf/src/main/resources/views/user-prefs.js b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/user-prefs.js
similarity index 100%
rename from idp-conf/src/main/resources/views/user-prefs.js
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/user-prefs.js
diff --git a/idp-conf/src/main/resources/views/user-prefs.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/user-prefs.vm
similarity index 100%
rename from idp-conf/src/main/resources/views/user-prefs.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/user-prefs.vm
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java
index 71c476714..4e8935891 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java
@@ -33,7 +33,7 @@ import net.shibboleth.shared.component.InitializableComponent;
public interface InstallerProperties extends InitializableComponent {
/** Those modules enabled by default. */
- @Nonnull public static final Set<String> DEFAULT_MODULES = CollectionSupport.setOf("idp.authn.Password", "idp.admin.Hello");
+ @Nonnull public static final Set<String> DEFAULT_MODULES = CollectionSupport.setOf("idp.Core", "idp.authn.Password", "idp.admin.Hello");
/** Get where we are installing/updating/building the war.
* @return the target directory
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list