[java-idp-plugin-totp] branch main updated: Relocate packages under authn.
Scott Cantor
cantor.2 at osu.edu
Tue Oct 6 18:17:54 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-plugin-totp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=af23587e1077a25ef0280f2cc1cdceae89f23f51
The following commit(s) were added to refs/heads/main by this push:
new af23587 Relocate packages under authn.
af23587 is described below
commit af23587e1077a25ef0280f2cc1cdceae89f23f51
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 6 14:17:51 2020 -0400
Relocate packages under authn.
---
totp-dist/src/main/assembly/plugin-assembly-tgz.xml | 2 +-
totp-dist/src/main/assembly/plugin-assembly-zip.xml | 2 +-
.../shibboleth/idp/plugin/{ => authn}/totp/TOTPModule.java | 2 +-
.../shibboleth/idp/plugin/{ => authn}/totp/TOTPPlugin.java | 2 +-
.../idp/plugin/{ => authn}/totp/context/TOTPContext.java | 2 +-
.../idp/plugin/{ => authn}/totp/context/package-info.java | 2 +-
.../idp/plugin/{ => authn}/totp/impl/AbstractSeedSource.java | 4 ++--
.../{ => authn}/totp/impl/AbstractTOTPExtractionAction.java | 4 ++--
.../{ => authn}/totp/impl/AttributeResolverSeedSource.java | 4 ++--
.../{ => authn}/totp/impl/ExtractTOTPFromFormRequest.java | 2 +-
.../plugin/{ => authn}/totp/impl/ExtractTOTPFromHeader.java | 2 +-
.../{ => authn}/totp/impl/GoogleTOTPAuthenticator.java | 2 +-
.../idp/plugin/{ => authn}/totp/impl/StaticSeedSource.java | 4 ++--
.../idp/plugin/{ => authn}/totp/impl/TOTPAuthenticator.java | 2 +-
.../{ => authn}/totp/impl/TOTPAuthenticatorArguments.java | 2 +-
.../plugin/{ => authn}/totp/impl/TOTPAuthenticatorCLI.java | 4 ++--
.../{ => authn}/totp/impl/TOTPCredentialValidator.java | 4 ++--
.../idp/plugin/{ => authn}/totp/impl/package-info.java | 2 +-
.../shibboleth/idp/plugin/{ => authn}/totp/package-info.java | 2 +-
.../net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml | 12 ++++++------
totp-impl/src/main/resources/META-INF/plugins/plugin.props | 8 ++++----
.../META-INF/services/net.shibboleth.idp.module.IdPModule | 2 +-
.../META-INF/services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../shibboleth/idp/plugin/{ => authn}/totp/bin/totpauth.bat | 0
.../shibboleth/idp/plugin/{ => authn}/totp/bin/totpauth.sh | 0
.../idp/plugin/{ => authn}/totp/messages.properties | 0
.../shibboleth/idp/plugin/{ => authn}/totp/module.properties | 10 +++++-----
.../shibboleth/idp/plugin/{ => authn}/totp/plugin.properties | 2 +-
.../idp/plugin/{ => authn}/totp/views/totp-error.vm | 0
.../net/shibboleth/idp/plugin/{ => authn}/totp/views/totp.vm | 0
.../totp/impl/AttributeResolverSeedSourceTest.java | 4 ++--
.../totp/impl/ExtractTOTPFromFormRequestTest.java | 4 ++--
.../{ => authn}/totp/impl/ExtractTOTPFromHeaderTest.java | 4 ++--
.../{ => authn}/totp/impl/GoogleTOTPAuthenticatorTest.java | 4 ++--
34 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/totp-dist/src/main/assembly/plugin-assembly-tgz.xml b/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
index 7de2b87..3d9015d 100644
--- a/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
+++ b/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -29,7 +29,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../totp-impl/target/classes/net/shibboleth/idp/plugin/totp</directory>
+ <directory>../totp-impl/target/classes/net/shibboleth/idp/plugin/authn/totp</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/totp-dist/src/main/assembly/plugin-assembly-zip.xml b/totp-dist/src/main/assembly/plugin-assembly-zip.xml
index 17cc0d5..1eec9c7 100644
--- a/totp-dist/src/main/assembly/plugin-assembly-zip.xml
+++ b/totp-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -29,7 +29,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../totp-impl/target/classes/net/shibboleth/idp/plugin/totp</directory>
+ <directory>../totp-impl/target/classes/net/shibboleth/idp/plugin/authn/totp</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/TOTPModule.java
similarity index 96%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/TOTPModule.java
index 2aafd32..43619c3 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/TOTPModule.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp;
+package net.shibboleth.idp.plugin.authn.totp;
import java.io.IOException;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPPlugin.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/TOTPPlugin.java
similarity index 97%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPPlugin.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/TOTPPlugin.java
index a1c23f8..aa78699 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPPlugin.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/TOTPPlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp;
+package net.shibboleth.idp.plugin.authn.totp;
import java.io.IOException;
import java.util.Collections;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/context/TOTPContext.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/context/TOTPContext.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/context/TOTPContext.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/context/TOTPContext.java
index 6205e16..a783d30 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/context/TOTPContext.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/context/TOTPContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.context;
+package net.shibboleth.idp.plugin.authn.totp.context;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/context/package-info.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/context/package-info.java
similarity index 94%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/context/package-info.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/context/package-info.java
index 11e523f..e61a9cc 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/context/package-info.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/context/package-info.java
@@ -17,4 +17,4 @@
/** TOTP login flow context classes. */
-package net.shibboleth.idp.plugin.totp.context;
+package net.shibboleth.idp.plugin.authn.totp.context;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AbstractSeedSource.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AbstractSeedSource.java
similarity index 96%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AbstractSeedSource.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AbstractSeedSource.java
index 24aaff2..ba273c8 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AbstractSeedSource.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AbstractSeedSource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -26,7 +26,7 @@ import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AbstractTOTPExtractionAction.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AbstractTOTPExtractionAction.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AbstractTOTPExtractionAction.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AbstractTOTPExtractionAction.java
index e6a6121..ab1c4dd 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AbstractTOTPExtractionAction.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AbstractTOTPExtractionAction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.util.function.Function;
@@ -27,7 +27,7 @@ import net.shibboleth.idp.authn.AbstractAuthenticationAction;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.idp.session.context.navigate.CanonicalUsernameLookupStrategy;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AttributeResolverSeedSource.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AttributeResolverSeedSource.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AttributeResolverSeedSource.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AttributeResolverSeedSource.java
index 74a76ba..8a43d2d 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/AttributeResolverSeedSource.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/AttributeResolverSeedSource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.util.Collection;
import java.util.Collections;
@@ -31,7 +31,7 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromFormRequest.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromFormRequest.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromFormRequest.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromFormRequest.java
index 068db9a..70a166e 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromFormRequest.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromFormRequest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromHeader.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromHeader.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromHeader.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromHeader.java
index e99235e..f1fb03e 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromHeader.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromHeader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/GoogleTOTPAuthenticator.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/GoogleTOTPAuthenticator.java
similarity index 99%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/GoogleTOTPAuthenticator.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/GoogleTOTPAuthenticator.java
index 9558174..af321a3 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/GoogleTOTPAuthenticator.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/GoogleTOTPAuthenticator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.security.GeneralSecurityException;
import java.util.Collection;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/StaticSeedSource.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/StaticSeedSource.java
similarity index 97%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/StaticSeedSource.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/StaticSeedSource.java
index ea84da3..6fb1f6a 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/StaticSeedSource.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/StaticSeedSource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.util.Collection;
import java.util.Map;
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.codec.Base32Support;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticator.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticator.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticator.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticator.java
index 2668145..5db56b4 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticator.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.security.GeneralSecurityException;
import java.util.Collection;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticatorArguments.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticatorArguments.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticatorArguments.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticatorArguments.java
index c4f05d0..17af2cb 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticatorArguments.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticatorArguments.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.io.PrintStream;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticatorCLI.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticatorCLI.java
similarity index 96%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticatorCLI.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticatorCLI.java
index 6e80e0d..deed7c8 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPAuthenticatorCLI.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPAuthenticatorCLI.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -27,7 +27,7 @@ import com.google.common.net.UrlEscapers;
import net.shibboleth.ext.spring.cli.AbstractCommandLine;
import net.shibboleth.idp.Version;
-import net.shibboleth.idp.plugin.totp.impl.TOTPAuthenticator.TOTPCredential;
+import net.shibboleth.idp.plugin.authn.totp.impl.TOTPAuthenticator.TOTPCredential;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.codec.Base32Support;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPCredentialValidator.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPCredentialValidator.java
similarity index 98%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPCredentialValidator.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPCredentialValidator.java
index dca4873..78200d0 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/TOTPCredentialValidator.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/TOTPCredentialValidator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -37,7 +37,7 @@ import net.shibboleth.idp.authn.CredentialValidator;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.authn.principal.TOTPPrincipal;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/package-info.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/package-info.java
similarity index 94%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/package-info.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/package-info.java
index 5eb71c3..32df027 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/impl/package-info.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/impl/package-info.java
@@ -17,4 +17,4 @@
/** TOTP login flow implementation classes. */
-package net.shibboleth.idp.plugin.totp.impl;
\ No newline at end of file
+package net.shibboleth.idp.plugin.authn.totp.impl;
\ No newline at end of file
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/package-info.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/package-info.java
similarity index 95%
rename from totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/package-info.java
rename to totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/package-info.java
index 6856442..1e1ee1a 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/package-info.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/authn/totp/package-info.java
@@ -19,4 +19,4 @@
* Top level TOTP classes.
*/
-package net.shibboleth.idp.plugin.totp;
\ No newline at end of file
+package net.shibboleth.idp.plugin.authn.totp;
\ No newline at end of file
diff --git a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
index 309bce4..6729bbf 100644
--- a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
+++ b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
@@ -24,16 +24,16 @@
<bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
p:cacheSeconds="%{idp.message.cacheSeconds:300}"
- p:basenames="classpath:/net/shibboleth/idp/plugin/totp/messages"
+ p:basenames="classpath:/net/shibboleth/idp/plugin/authn/totp/messages"
p:defaultEncoding="UTF-8" />
<bean id="ExtractTOTPFromHeader"
- class="net.shibboleth.idp.plugin.totp.impl.ExtractTOTPFromHeader" scope="prototype"
+ class="net.shibboleth.idp.plugin.authn.totp.impl.ExtractTOTPFromHeader" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest"
p:headerName="#{'%{idp.authn.TOTP.headerName:X-Shibboleth-TOTP}'.trim()}" />
<bean id="ExtractTOTPFromFormRequest"
- class="net.shibboleth.idp.plugin.totp.impl.ExtractTOTPFromFormRequest" scope="prototype"
+ class="net.shibboleth.idp.plugin.authn.totp.impl.ExtractTOTPFromFormRequest" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest"
p:fieldName="#{'%{idp.authn.TOTP.fieldName:tokencode}'.trim()}" />
@@ -54,15 +54,15 @@
<!-- These are singletons acting as default "back-ends". -->
- <bean id="DefaultTOTPValidator" class="net.shibboleth.idp.plugin.totp.impl.TOTPCredentialValidator" lazy-init="true"
+ <bean id="DefaultTOTPValidator" class="net.shibboleth.idp.plugin.authn.totp.impl.TOTPCredentialValidator" lazy-init="true"
p:seedSource="#{getObject('shibboleth.authn.TOTP.SeedSource') ?: getObject('DefaultSeedSource')}"
p:authenticator="#{getObject('shibboleth.authn.TOTP.Authenticator') ?: getObject('DefaultAuthenticator')}" />
- <bean id="DefaultSeedSource" class="net.shibboleth.idp.plugin.totp.impl.AttributeResolverSeedSource" lazy-init="true"
+ <bean id="DefaultSeedSource" class="net.shibboleth.idp.plugin.authn.totp.impl.AttributeResolverSeedSource" lazy-init="true"
p:attributeResolver-ref="shibboleth.AttributeResolverService"
p:sourceAttribute="#{'%{idp.authn.TOTP.tokenSeedAttribute:tokenSeeds}'.trim()}" />
<!-- Parent bean for use of alternative seed source. -->
- <bean id="shibboleth.authn.TOTP.StaticSeedSource" class="net.shibboleth.idp.plugin.totp.impl.StaticSeedSource" abstract="true" />
+ <bean id="shibboleth.authn.TOTP.StaticSeedSource" class="net.shibboleth.idp.plugin.authn.totp.impl.StaticSeedSource" abstract="true" />
</beans>
diff --git a/totp-impl/src/main/resources/META-INF/plugins/plugin.props b/totp-impl/src/main/resources/META-INF/plugins/plugin.props
index b59b649..560db62 100644
--- a/totp-impl/src/main/resources/META-INF/plugins/plugin.props
+++ b/totp-impl/src/main/resources/META-INF/plugins/plugin.props
@@ -1,4 +1,4 @@
-net.shibboleth.idp.plugin.totp.versions=0.0.1
-net.shibboleth.idp.plugin.totp.idpVersionMax.0.0.1=5.0.0
-net.shibboleth.idp.plugin.totp.idpVersionMin.0.0.1=4.1.0
-net.shibboleth.idp.plugin.totp.supportLevel.0.0.1 = Current
+net.shibboleth.idp.plugin.authn.totp.versions=0.0.1
+net.shibboleth.idp.plugin.authn.totp.idpVersionMax.0.0.1=5.0.0
+net.shibboleth.idp.plugin.authn.totp.idpVersionMin.0.0.1=4.1.0
+net.shibboleth.idp.plugin.authn.totp.supportLevel.0.0.1 = Current
diff --git a/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 2ac01fd..b6a96d6 100644
--- a/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1 @@
-net.shibboleth.idp.plugin.totp.TOTPModule
+net.shibboleth.idp.plugin.authn.totp.TOTPModule
diff --git a/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
index 480559e..d797a14 100644
--- a/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ b/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -1 +1 @@
-net.shibboleth.idp.plugin.totp.TOTPPlugin
+net.shibboleth.idp.plugin.authn.totp.TOTPPlugin
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/bin/totpauth.bat b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/bin/totpauth.bat
similarity index 100%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/bin/totpauth.bat
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/bin/totpauth.bat
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/bin/totpauth.sh b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/bin/totpauth.sh
similarity index 100%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/bin/totpauth.sh
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/bin/totpauth.sh
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/messages.properties b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/messages.properties
similarity index 100%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/messages.properties
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/messages.properties
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/module.properties
similarity index 53%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/module.properties
index e28d8c5..815e0df 100644
--- a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties
+++ b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/module.properties
@@ -1,18 +1,18 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.totp.TOTPModule = idp.authn.TOTP
+net.shibboleth.idp.plugin.authn.totp.TOTPModule = idp.authn.TOTP
idp.authn.TOTP.name = TOTP Authentication
idp.authn.TOTP.desc = Login flow for TOTP tokens
idp.authn.TOTP.url = /TOTPConfiguration
-idp.authn.TOTP.1.src = /net/shibboleth/idp/plugin/totp/bin/totpauth.bat
+idp.authn.TOTP.1.src = /net/shibboleth/idp/plugin/authn/totp/bin/totpauth.bat
idp.authn.TOTP.1.dest = bin/totpauth.bat
idp.authn.TOTP.1.replace = true
-idp.authn.TOTP.2.src = /net/shibboleth/idp/plugin/totp/bin/totpauth.sh
+idp.authn.TOTP.2.src = /net/shibboleth/idp/plugin/authn/totp/bin/totpauth.sh
idp.authn.TOTP.2.dest = bin/totpauth.sh
idp.authn.TOTP.2.replace = true
-idp.authn.TOTP.3.src = /net/shibboleth/idp/plugin/totp/views/totp.vm
+idp.authn.TOTP.3.src = /net/shibboleth/idp/plugin/authn/totp/views/totp.vm
idp.authn.TOTP.3.dest = views/totp.vm
-idp.authn.TOTP.4.src = /net/shibboleth/idp/plugin/totp/views/totp-error.vm
+idp.authn.TOTP.4.src = /net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm
idp.authn.TOTP.4.dest = views/totp-error.vm
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/plugin.properties b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties
similarity index 62%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/plugin.properties
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties
index 9fc2223..97e6e32 100644
--- a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/plugin.properties
+++ b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties
@@ -1,6 +1,6 @@
# Properties defining this plugin
-plugin.id = net.shibboleth.idp.plugin.totp
+plugin.id = net.shibboleth.idp.plugin.authn.totp
# Only used when package manifest is not available
plugin.version = 1.0.0
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/views/totp-error.vm b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm
similarity index 100%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/views/totp-error.vm
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/views/totp.vm b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp.vm
similarity index 100%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/views/totp.vm
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp.vm
diff --git a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/AttributeResolverSeedSourceTest.java b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/AttributeResolverSeedSourceTest.java
similarity index 98%
rename from totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/AttributeResolverSeedSourceTest.java
rename to totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/AttributeResolverSeedSourceTest.java
index b5d473e..1a5ebec 100644
--- a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/AttributeResolverSeedSourceTest.java
+++ b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/AttributeResolverSeedSourceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import static org.testng.Assert.*;
@@ -38,7 +38,7 @@ import net.shibboleth.idp.attribute.resolver.DataConnector;
import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
import net.shibboleth.idp.attribute.resolver.testing.MockAttributeDefinition;
import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.codec.Base32Support;
import net.shibboleth.utilities.java.support.codec.EncodingException;
diff --git a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromFormRequestTest.java b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromFormRequestTest.java
similarity index 97%
rename from totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromFormRequestTest.java
rename to totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromFormRequestTest.java
index bd52990..cef2b1f 100644
--- a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromFormRequestTest.java
+++ b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromFormRequestTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -27,7 +27,7 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
diff --git a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromHeaderTest.java b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromHeaderTest.java
similarity index 97%
rename from totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromHeaderTest.java
rename to totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromHeaderTest.java
index 5bc3e5d..2cf988e 100644
--- a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/ExtractTOTPFromHeaderTest.java
+++ b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/ExtractTOTPFromHeaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -27,7 +27,7 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
diff --git a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/GoogleTOTPAuthenticatorTest.java b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/GoogleTOTPAuthenticatorTest.java
similarity index 98%
rename from totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/GoogleTOTPAuthenticatorTest.java
rename to totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/GoogleTOTPAuthenticatorTest.java
index db782e4..aa35e6e 100644
--- a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/impl/GoogleTOTPAuthenticatorTest.java
+++ b/totp-impl/src/test/java/net/shibboleth/idp/plugin/authn/totp/impl/GoogleTOTPAuthenticatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.totp.impl;
+package net.shibboleth.idp.plugin.authn.totp.impl;
import java.util.Collection;
import java.util.Collections;
@@ -31,7 +31,7 @@ import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
import net.shibboleth.idp.authn.impl.ValidateCredentials;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.authn.principal.TOTPPrincipal;
-import net.shibboleth.idp.plugin.totp.context.TOTPContext;
+import net.shibboleth.idp.plugin.authn.totp.context.TOTPContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.codec.Base32Support;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list