[java-identity-provider] branch main updated: Initial set of admin modules.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 16 20:49:53 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=505b17e506bc29889cb15abd160f8efe0c6ffa6d
The following commit(s) were added to refs/heads/main by this push:
new 505b17e50 Initial set of admin modules.
505b17e50 is described below
commit 505b17e506bc29889cb15abd160f8efe0c6ffa6d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 16 16:49:44 2020 -0400
Initial set of admin modules.
---
.../shibboleth/idp/module/admin/impl/Hello.java | 41 ++++++++++++++++++++++
.../idp/module/admin/impl/UnlockKeys.java | 41 ++++++++++++++++++++++
.../idp/module/admin/impl/package-info.java | 22 ++++++++++++
.../services/net.shibboleth.idp.module.IdPModule | 3 ++
.../idp/module/admin/impl/module.properties | 19 ++++++++++
.../idp/module/conf/admin/unlock-keys.xml | 37 +++++++++++++++++++
.../shibboleth/idp/module}/views/admin/hello.vm | 0
.../idp/module}/views/admin/unlock-keys.vm | 0
8 files changed, 163 insertions(+)
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/Hello.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/Hello.java
new file mode 100644
index 000000000..2f8edd348
--- /dev/null
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/Hello.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.admin.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 Hello extends PropertyDrivenIdPModule {
+
+ /**
+ * Constructor.
+ *
+ * @throws ModuleException on error
+ * @throws IOException on error
+ */
+ public Hello() throws IOException, ModuleException {
+ super(Hello.class);
+ }
+
+}
\ No newline at end of file
diff --git a/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/UnlockKeys.java b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/UnlockKeys.java
new file mode 100644
index 000000000..14d4f4abc
--- /dev/null
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/UnlockKeys.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.admin.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 UnlockKeys extends PropertyDrivenIdPModule {
+
+ /**
+ * Constructor.
+ *
+ * @throws ModuleException on error
+ * @throws IOException on error
+ */
+ public UnlockKeys() throws IOException, ModuleException {
+ super(UnlockKeys.class);
+ }
+
+}
\ 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/admin/impl/package-info.java
new file mode 100644
index 000000000..b2973b09b
--- /dev/null
+++ b/idp-conf-impl/src/main/java/net/shibboleth/idp/module/admin/impl/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.
+ */
+
+/**
+ * Administrative modules.
+ */
+
+package net.shibboleth.idp.module.admin.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 b718cd620..548fae3ae 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,3 +8,6 @@ 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.admin.impl.Hello
+net.shibboleth.idp.module.admin.impl.UnlockKeys
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/admin/impl/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/admin/impl/module.properties
new file mode 100644
index 000000000..f67975c3a
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/admin/impl/module.properties
@@ -0,0 +1,19 @@
+# Properties defining admin modules
+
+# Class to Module ID mappings
+net.shibboleth.idp.module.admin.impl.Hello = idp.admin.Hello
+net.shibboleth.idp.module.admin.impl.UnlockKeys = idp.admin.UnlockKeys
+
+idp.admin.Hello.name = Hello World
+idp.admin.Hello.desc = Administrative flow for debugging/initial deployment
+idp.admin.Hello.url = https://wiki.shibboleth.net/confluence/display/IDP4/HelloWorldConfiguration
+idp.admin.Hello.1.src = /net/shibboleth/idp/module/views/admin/hello.vm
+idp.admin.Hello.1.dest = views/admin/hello.vm
+
+idp.admin.UnlockKeys.name = Attended Restart
+idp.admin.UnlockKeys.desc = Administrative flow for attended restart
+idp.admin.UnlockKeys.url = https://wiki.shibboleth.net/confluence/display/IDP4/AttendedRestartConfiguration
+idp.admin.UnlockKeys.1.src = /net/shibboleth/idp/module/conf/admin/unlock-keys.xml
+idp.admin.UnlockKeys.1.dest = conf/admin/unlock-keys.xml
+idp.admin.UnlockKeys.2.src = /net/shibboleth/idp/module/views/admin/unlock-keys.vm
+idp.admin.UnlockKeys.2.dest = views/admin/unlock-keys.vm
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
new file mode 100644
index 000000000..ae08af1cf
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
@@ -0,0 +1,37 @@
+<?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">
+
+ <!-- Attended restart unlock beans. -->
+
+ <!-- Enumerate the system key strategy beans to unlock, typically just one. -->
+
+ <util:list id="shibboleth.unlock-keys.KeyStrategies">
+ <ref bean="shibboleth.DataSealerKeyStrategy" />
+ </util:list>
+
+ <!-- Enumerate credential bean refs and private key resources. -->
+
+ <util:list id="shibboleth.unlock-keys.Credentials">
+ <ref bean="shibboleth.DefaultSigningCredential" />
+ </util:list>
+
+ <util:list id="shibboleth.unlock-keys.PrivateKeys">
+ <bean class="org.springframework.core.io.FileSystemResource"
+ c:_0="%{idp.signing.key}"/>
+ </util:list>
+
+ <bean id="shibboleth.DefaultSigningCredential"
+ class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
+ p:certificateResource="%{idp.signing.cert}"
+ p:entityId="%{idp.entityID}" />
+
+</beans>
\ No newline at end of file
diff --git a/idp-conf/src/main/resources/views/admin/hello.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/admin/hello.vm
similarity index 100%
rename from idp-conf/src/main/resources/views/admin/hello.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/admin/hello.vm
diff --git a/idp-conf/src/main/resources/views/admin/unlock-keys.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/admin/unlock-keys.vm
similarity index 100%
rename from idp-conf/src/main/resources/views/admin/unlock-keys.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/admin/unlock-keys.vm
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list