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/12/04 13:46:12 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes d2a2a2494 -> 90789cc21
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/90789cc2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90789cc2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90789cc2
Branch: refs/heads/3.0.x-fixes
Commit: 90789cc21ac50388c0670e66fd61f9aa161e8da0
Parents: 8e39d46
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 12:46:00 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 12:46:00 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/90789cc2/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 16b12ad..9091f53 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -735,6 +735,7 @@ M 9edf90a691627ac9ccbda2ec887f8bb4c7f9d1a2
M 9f18da888e37f203b1aa9a3240ed7b6aab3a4ef9
M 9fc3be7e5afe6d2a06a4be37fada1ac14f9c4f86
M a088c793efd923a52f68044b02221f8b47569ef9
+M a1a16ca1719aef85aa038e6538d451808852bc97
M a2c4be5e99472fc23b1740fc594e5d4c64961ca4
M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7
M a400eaa95b977c292162e69434b98ebbf578febd
[2/2] cxf git commit: Some trivial fixes
Posted by co...@apache.org.
Some trivial fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e39d464
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e39d464
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e39d464
Branch: refs/heads/3.0.x-fixes
Commit: 8e39d46404adf69d694fa8faceb045436146c706
Parents: d2a2a24
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 12:38:49 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 12:46:00 2015 +0000
----------------------------------------------------------------------
.../cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +-
.../security/oauth2/services/AuthorizationCodeGrantService.java | 4 ++--
.../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e39d464/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
index c11cbc2..1a397c5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
@@ -108,7 +108,7 @@ public class OAuthRequestFilter extends AbstractAccessTokenValidator
}
}
- if (permissions.size() > 0 && matchingPermissions.isEmpty()
+ if (!permissions.isEmpty() && matchingPermissions.isEmpty()
|| allPermissionsMatch && (matchingPermissions.size() != permissions.size())
|| !requiredScopes.isEmpty() && requiredScopes.size() != matchingPermissions.size()) {
String message = "Client has no valid permissions";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e39d464/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
index ab56e06..8e7c966 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
@@ -52,7 +52,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
*/
@Path("/authorize")
public class AuthorizationCodeGrantService extends RedirectionBasedGrantService {
- private static final Integer RECOMMENDED_CODE_EXPIRY_TIME_MINS = 10;
+ private static final long RECOMMENDED_CODE_EXPIRY_TIME_SECS = 10L * 60L;
private boolean canSupportPublicClients;
private boolean canSupportEmptyRedirectForPrivateClients;
private OOBResponseDeliverer oobDeliverer;
@@ -113,7 +113,7 @@ public class AuthorizationCodeGrantService extends RedirectionBasedGrantService
} catch (OAuthServiceException ex) {
return createErrorResponse(params, redirectUri, OAuthConstants.ACCESS_DENIED);
}
- if (grant.getExpiresIn() / 60 > RECOMMENDED_CODE_EXPIRY_TIME_MINS) {
+ if (grant.getExpiresIn() > RECOMMENDED_CODE_EXPIRY_TIME_SECS) {
LOG.warning("Code expiry time exceeds 10 minutes");
}
String grantCode = processCodeGrant(client, grant.getCode(), grant.getSubject());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e39d464/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 d4c5dcd..59d1da7 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
@@ -165,12 +165,12 @@ public final class OAuthUtils {
}
public static long getIssuedAt() {
- return System.currentTimeMillis() / 1000;
+ return System.currentTimeMillis() / 1000L;
}
public static boolean isExpired(Long issuedAt, Long lifetime) {
return lifetime != 0L
- && issuedAt + lifetime < System.currentTimeMillis() / 1000;
+ && issuedAt + lifetime < System.currentTimeMillis() / 1000L;
}
public static boolean validateAudience(String audience, List<String> audiences) {