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 2015/11/25 17:08:45 UTC
[1/2] cxf git commit: Fixed a bug with the expiry of refresh tokens
with the EhCache provider
Repository: cxf
Updated Branches:
refs/heads/master c686b1a36 -> fe39afe42
Fixed a bug with the expiry of refresh tokens with the EhCache provider
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb2429bc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb2429bc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb2429bc
Branch: refs/heads/master
Commit: fb2429bc877b27828dd6fbdea5220b46296a27c2
Parents: b4640ac
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 25 16:07:45 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 25 16:07:45 2015 +0000
----------------------------------------------------------------------
.../cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java | 2 +-
.../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb2429bc/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 8eba936..d40d668 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -32,7 +32,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
public abstract class AbstractOAuthDataProvider implements OAuthDataProvider {
private long accessTokenLifetime = 3600L;
- private long refreshTokenLifetime = -1;
+ private long refreshTokenLifetime; // refresh tokens are eternal by default
protected AbstractOAuthDataProvider() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb2429bc/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 74270a3..7722d7a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -183,7 +183,7 @@ public final class OAuthUtils {
}
public static boolean isExpired(Long issuedAt, Long lifetime) {
- return lifetime != -1
+ return lifetime != 0L
&& issuedAt + lifetime < System.currentTimeMillis() / 1000;
}
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by co...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe39afe4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe39afe4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe39afe4
Branch: refs/heads/master
Commit: fe39afe42bc46a6815f386d0ca67034aa944e5dd
Parents: fb2429b c686b1a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 25 16:08:30 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 25 16:08:30 2015 +0000
----------------------------------------------------------------------
.../rs/security/jose/common/JoseConstants.java | 6 +
.../cxf/rs/security/jose/jwe/JweUtils.java | 26 +++-
.../jose/jwk/DefaultJwkReaderWriter.java | 49 -------
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 13 +-
.../rs/security/jose/jwk/JwkReaderWriter.java | 27 +++-
.../cxf/rs/security/jose/jwk/JwkUtils.java | 127 ++++++++-----------
.../cxf/rs/security/jose/jws/JwsUtils.java | 13 +-
.../rs/security/oidc/idp/OidcKeysService.java | 46 +++++++
.../oidc/rp/AbstractTokenValidator.java | 2 +
9 files changed, 179 insertions(+), 130 deletions(-)
----------------------------------------------------------------------