[java-idp-plugin-webauthn] branch main updated: Fixup small module and plugin issues preventing it from loading
Phil Smart
philip.smart at jisc.ac.uk
Fri Oct 20 13:48:19 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-webauthn.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-webauthn.git;a=commit;h=9f3fb67eaf4c814904533b847cfaf49913a62626
The following commit(s) were added to refs/heads/main by this push:
new 9f3fb67 Fixup small module and plugin issues preventing it from loading
9f3fb67 is described below
commit 9f3fb67eaf4c814904533b847cfaf49913a62626
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Oct 20 14:48:13 2023 +0100
Fixup small module and plugin issues preventing it from loading
---
.../idp/plugin/authn/webauthn/WebAuthnModule.java | 39 ++++++++++++++++++++++
.../authn/webauthn/{impl => }/WebAuthnPlugin.java | 17 +++++++++-
.../plugin/authn/webauthn/impl/WebAuthnModule.java | 24 -------------
.../services/net.shibboleth.idp.module.IdPModule | 2 +-
.../services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../idp/plugin/authn/webauthn/module.properties | 2 +-
6 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnModule.java b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnModule.java
new file mode 100644
index 0000000..0f23b74
--- /dev/null
+++ b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnModule.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed 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.plugin.authn.webauthn;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.module.IdPModule;
+import net.shibboleth.idp.module.impl.PluginIdPModule;
+import net.shibboleth.profile.module.ModuleException;
+
+/**
+ * {@link IdPModule IdP Module} implementation for the WebAuthn login flow.
+ */
+public class WebAuthnModule extends PluginIdPModule{
+
+ /**
+ * Constructor.
+ *
+ * @throws ModuleException on error
+ * @throws IOException on error
+ */
+ public WebAuthnModule() throws IOException, ModuleException {
+ super(WebAuthnModule.class);
+ }
+
+}
diff --git a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/WebAuthnPlugin.java b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnPlugin.java
similarity index 71%
rename from webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/WebAuthnPlugin.java
rename to webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnPlugin.java
index 89670eb..8945bdd 100644
--- a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/WebAuthnPlugin.java
+++ b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnPlugin.java
@@ -1,4 +1,19 @@
-package net.shibboleth.idp.plugin.authn.webauthn.impl;
+/*
+ * Licensed 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.plugin.authn.webauthn;
import java.io.IOException;
import java.util.Collections;
diff --git a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/WebAuthnModule.java b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/WebAuthnModule.java
deleted file mode 100644
index ecdd8b2..0000000
--- a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/WebAuthnModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package net.shibboleth.idp.plugin.authn.webauthn.impl;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.IdPModule;
-import net.shibboleth.idp.module.PropertyDrivenIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/**
- * {@link IdPModule IdP Module} implementation for the WebAuthn login flow.
- */
-public class WebAuthnModule extends PropertyDrivenIdPModule{
-
- /**
- * Constructor.
- *
- * @throws ModuleException on error
- * @throws IOException on error
- */
- public WebAuthnModule() throws IOException, ModuleException {
- super(WebAuthnModule.class);
- }
-
-}
diff --git a/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 9a63d84..485c6fc 100644
--- a/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1 @@
-net.shibboleth.idp.plugin.authn.webauthn.impl.WebAuthnModule
+net.shibboleth.idp.plugin.authn.webauthn.WebAuthnModule
diff --git a/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
index a74c1ce..f8337b1 100644
--- a/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ b/webauthn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -1,2 +1,2 @@
-net.shibboleth.idp.plugin.authn.webauthn.impl.WebAuthnPlugin
+net.shibboleth.idp.plugin.authn.webauthn.WebAuthnPlugin
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties
index 6ca0327..0b8a9b8 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties
@@ -1,7 +1,7 @@
# Example Properties defining a module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.authn.webauthn.impl.WebAuthnModule = idp.authn.WebAuthn
+net.shibboleth.idp.plugin.authn.webauthn.WebAuthnModule = idp.authn.WebAuthn
# Module Owner
idp.authn.WebAuthn.plugin = net.shibboleth.idp.plugin.authn.webauthn
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list