You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/08/14 15:17:39 UTC
[cxf] 02/02: Cleanup from the last commit
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Aug 14 16:16:00 2018 +0100
Cleanup from the last commit
---
.../saml/sso/AbstractRequestAssertionConsumerHandler.java | 1 -
.../apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java | 10 ----------
.../rs/security/saml/sso/AbstractServiceProviderFilter.java | 11 +++++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
index c06b1bd..4a1e27e 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
@@ -428,7 +428,6 @@ public abstract class AbstractRequestAssertionConsumerHandler extends AbstractSS
this.checkClientAddress = checkClientAddress;
}
- @Override
protected boolean isStateExpired(long stateCreatedAt, long expiresAt) {
Instant currentTime = Instant.now();
return expiresAt > 0 && currentTime.isAfter(Instant.ofEpochMilli(stateCreatedAt + expiresAt));
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
index b717bcb..b699652 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
@@ -139,16 +139,6 @@ public class AbstractSSOSpHandler {
return contextCookie;
}
- protected boolean isStateExpired(long stateCreatedAt, long expiresAt) {
- Instant currentTime = Instant.now();
- Instant expires = Instant.ofEpochMilli(stateCreatedAt + getStateTimeToLive());
- if (currentTime.isAfter(expires)) {
- return true;
- }
-
- return expiresAt > 0 && currentTime.isAfter(Instant.ofEpochMilli(expiresAt));
- }
-
public void setStateProvider(SPStateManager stateProvider) {
this.stateProvider = stateProvider;
}
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index 283a1bc..9e21236 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -24,6 +24,7 @@ import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
+import java.time.Instant;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
@@ -213,6 +214,16 @@ public abstract class AbstractServiceProviderFilter extends AbstractSSOSpHandler
return responseState;
}
+ protected boolean isStateExpired(long stateCreatedAt, long expiresAt) {
+ Instant currentTime = Instant.now();
+ Instant expires = Instant.ofEpochMilli(stateCreatedAt + getStateTimeToLive());
+ if (currentTime.isAfter(expires)) {
+ return true;
+ }
+
+ return expiresAt > 0 && currentTime.isAfter(Instant.ofEpochMilli(expiresAt));
+ }
+
protected SamlRequestInfo createSamlRequestInfo(Message m) throws Exception {
Document doc = DOMUtils.createDocument();
doc.appendChild(doc.createElement("root"));