[java-plugin-shibd] branch main updated: Relocate state token manager classes.
Scott Cantor
cantor.2 at osu.edu
Tue Apr 15 12:49:37 UTC 2025
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-plugin-shibd.
View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd.git;a=commit;h=03110f6ca1aa489b0921a92379b7a5c7f52eb9ad
The following commit(s) were added to refs/heads/main by this push:
new 03110f6 Relocate state token manager classes.
03110f6 is described below
commit 03110f6ca1aa489b0921a92379b7a5c7f52eb9ad
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 15 08:49:32 2025 -0400
Relocate state token manager classes.
---
sp-server-api/src/main/java/net/shibboleth/sp/Application.java | 1 +
.../net/shibboleth/sp/{ => profile}/AbstractStateTokenManager.java | 2 +-
.../main/java/net/shibboleth/sp/{ => profile}/StateTokenManager.java | 5 ++++-
.../src/main/java/net/shibboleth/sp/impl/BasicApplication.java | 2 +-
.../main/java/net/shibboleth/sp/impl/CookieStateTokenManager.java | 4 ++--
.../java/net/shibboleth/sp/impl/PassthroughStateTokenManager.java | 2 +-
.../java/net/shibboleth/sp/impl/StorageServiceStateTokenManager.java | 4 ++--
.../net/shibboleth/sp/profile/impl/ProcessCorrelationCookie.java | 2 --
8 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/Application.java b/sp-server-api/src/main/java/net/shibboleth/sp/Application.java
index 53b1ce4..00c5e8c 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/Application.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/Application.java
@@ -31,6 +31,7 @@ import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.profile.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.sp.profile.StateTokenManager;
/**
* A collection of resources protected by the SP and treated as a unit for the purposes of
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/AbstractStateTokenManager.java b/sp-server-api/src/main/java/net/shibboleth/sp/profile/AbstractStateTokenManager.java
similarity index 98%
rename from sp-server-api/src/main/java/net/shibboleth/sp/AbstractStateTokenManager.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/profile/AbstractStateTokenManager.java
index 2905e47..2c7eba3 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/AbstractStateTokenManager.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/profile/AbstractStateTokenManager.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.sp;
+package net.shibboleth.sp.profile;
import java.time.Duration;
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/StateTokenManager.java b/sp-server-api/src/main/java/net/shibboleth/sp/profile/StateTokenManager.java
similarity index 95%
rename from sp-server-api/src/main/java/net/shibboleth/sp/StateTokenManager.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/profile/StateTokenManager.java
index e93b420..83ae7d3 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/StateTokenManager.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/profile/StateTokenManager.java
@@ -12,13 +12,16 @@
* limitations under the License.
*/
-package net.shibboleth.sp;
+package net.shibboleth.sp.profile;
import java.io.IOException;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.sp.Agent;
+import net.shibboleth.sp.Application;
+
/**
* Interface to a service that manages "state" tokens, used in most SSO protocols
* to manage stateful request/response correlation and to limit exposure of the
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
index bd82552..2039d17 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
@@ -47,7 +47,7 @@ import net.shibboleth.shared.logic.FunctionSupport;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.sp.Application;
-import net.shibboleth.sp.StateTokenManager;
+import net.shibboleth.sp.profile.StateTokenManager;
/**
* Basic implementation of an {@link Application}.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/CookieStateTokenManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/CookieStateTokenManager.java
index 0adae11..e281d61 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/CookieStateTokenManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/CookieStateTokenManager.java
@@ -37,10 +37,10 @@ import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
import net.shibboleth.shared.security.RandomIdentifierParameterSpec;
-import net.shibboleth.sp.AbstractStateTokenManager;
import net.shibboleth.sp.Agent;
import net.shibboleth.sp.Application;
-import net.shibboleth.sp.StateTokenManager;
+import net.shibboleth.sp.profile.AbstractStateTokenManager;
+import net.shibboleth.sp.profile.StateTokenManager;
/**
* {@link StateTokenManager} implemented using cookies.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/PassthroughStateTokenManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/PassthroughStateTokenManager.java
index 1ad88db..9649c8a 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/PassthroughStateTokenManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/PassthroughStateTokenManager.java
@@ -28,7 +28,7 @@ import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponen
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.sp.Agent;
import net.shibboleth.sp.Application;
-import net.shibboleth.sp.StateTokenManager;
+import net.shibboleth.sp.profile.StateTokenManager;
/**
* {@link StateTokenManager} implemented as a simple pass-through that doesn't mask the data.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/StorageServiceStateTokenManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/StorageServiceStateTokenManager.java
index df00cd0..ccd934b 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/StorageServiceStateTokenManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/StorageServiceStateTokenManager.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.codec.EncodingException;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.sp.AbstractStateTokenManager;
import net.shibboleth.sp.Agent;
import net.shibboleth.sp.Application;
-import net.shibboleth.sp.StateTokenManager;
+import net.shibboleth.sp.profile.AbstractStateTokenManager;
+import net.shibboleth.sp.profile.StateTokenManager;
/**
* {@link StateTokenManager} implemented with a {@link StorageService}.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/ProcessCorrelationCookie.java b/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/ProcessCorrelationCookie.java
index 9e4231c..2e9d745 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/ProcessCorrelationCookie.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/ProcessCorrelationCookie.java
@@ -36,9 +36,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.sp.context.AgentRequestContext;
import net.shibboleth.sp.context.TokenConsumerContext;
-import net.shibboleth.sp.ddf.DDF;
import net.shibboleth.sp.messaging.RemotedHttpServletRequestResponseContext;
-import net.shibboleth.sp.messaging.RemotedHttpServletResponse;
import net.shibboleth.sp.profile.AbstractApplicationAction;
/**
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list