cxf git commit: Fixing a typo in the eureka-registry/README
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 6b77e0261 -> 417b13b07
Fixing a typo in the eureka-registry/README
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/417b13b0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/417b13b0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/417b13b0
Branch: refs/heads/3.1.x-fixes
Commit: 417b13b074fc5b3ad36947f539144182173a2213
Parents: 6b77e02
Author: Sergey Beryozkin
Authored: Mon Aug 21 16:04:43 2017 +0100
Committer: Sergey Beryozkin
Committed: Mon Aug 21 16:08:46 2017 +0100
--
.../release/samples/jax_rs/spring_boot_scan/eureka-registry/README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/417b13b0/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
--
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
index 1f6c62d..13d9fd6 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
+++
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
@@ -31,7 +31,7 @@ $ mvn dockerfile:push
Run the container:
--
-docker run -p 8080:8080 -t
${username}/apachecxf:spring-boot-sample-rs-scan-eureka
+docker run -p 8761:8761 -t
${username}/apachecxf:spring-boot-sample-rs-scan-eureka
--
= Testing the registry =
cxf git commit: Fixing a typo in the eureka-registry/README
Repository: cxf
Updated Branches:
refs/heads/master 332cd6e96 -> 6b99105c1
Fixing a typo in the eureka-registry/README
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6b99105c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6b99105c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6b99105c
Branch: refs/heads/master
Commit: 6b99105c11d6820bd9c4a3b0956ab51997b74279
Parents: 332cd6e
Author: Sergey Beryozkin
Authored: Mon Aug 21 16:04:43 2017 +0100
Committer: Sergey Beryozkin
Committed: Mon Aug 21 16:04:43 2017 +0100
--
.../release/samples/jax_rs/spring_boot_scan/eureka-registry/README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6b99105c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
--
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
index 1f6c62d..13d9fd6 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
+++
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/README
@@ -31,7 +31,7 @@ $ mvn dockerfile:push
Run the container:
--
-docker run -p 8080:8080 -t
${username}/apachecxf:spring-boot-sample-rs-scan-eureka
+docker run -p 8761:8761 -t
${username}/apachecxf:spring-boot-sample-rs-scan-eureka
--
= Testing the registry =
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 10d845b61 -> 20efc30eb
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/20efc30e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20efc30e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20efc30e
Branch: refs/heads/3.1.x-fixes
Commit: 20efc30eb21f5f32a1a3de1eb5ea41f8dd01776c
Parents: 10d845b
Author: Sergey Beryozkin
Authored: Fri Apr 28 17:13:59 2017 +0100
Committer: Sergey Beryozkin
Committed: Fri Apr 28 17:14:43 2017 +0100
--
.../java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/20efc30e/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
--
diff --git
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index 3952dd6..f5e8c8f 100644
---
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -45,7 +45,7 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
return null;
}
String[] locations = swaggerUiMavenGroupAndArtifact == null ?
DEFAULT_LOCATIONS
-: new String[]{"mvn:" + DEFAULT_COORDINATES + "/",
+: new String[]{"mvn:" + swaggerUiMavenGroupAndArtifact + "/",
"wrap:mvn:" + swaggerUiMavenGroupAndArtifact +
"/"};
for (Bundle b : bundle.getBundleContext().getBundles()) {
String location = b.getLocation();
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master dd3cb8eb8 -> a36af6323
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a36af632
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a36af632
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a36af632
Branch: refs/heads/master
Commit: a36af6323505211479c875fb9923cc6dcbc6ac95
Parents: dd3cb8e
Author: Sergey Beryozkin
Authored: Fri Apr 28 17:13:59 2017 +0100
Committer: Sergey Beryozkin
Committed: Fri Apr 28 17:13:59 2017 +0100
--
.../java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a36af632/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
--
diff --git
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index 32493a1..b522f1b 100644
---
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -45,7 +45,7 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
return null;
}
String[] locations = swaggerUiMavenGroupAndArtifact == null ?
DEFAULT_LOCATIONS
-: new String[]{"mvn:" + DEFAULT_COORDINATES + "/",
+: new String[]{"mvn:" + swaggerUiMavenGroupAndArtifact + "/",
"wrap:mvn:" + swaggerUiMavenGroupAndArtifact +
"/"};
for (Bundle b : bundle.getBundleContext().getBundles()) {
String location = b.getLocation();
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes f8eec3e29 -> 73dcc6d88
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/73dcc6d8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73dcc6d8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73dcc6d8
Branch: refs/heads/3.1.x-fixes
Commit: 73dcc6d8894757341151414dae981ce23b034945
Parents: f8eec3e
Author: Sergey Beryozkin
Authored: Thu Apr 20 16:57:45 2017 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 20 17:02:20 2017 +0100
--
.../cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +-
.../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/73dcc6d8/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 1a85f46..e432193 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
@@ -163,7 +163,7 @@ public class OAuthRequestFilter extends
AbstractAccessTokenValidator
if (certThumbprint != null) {
TLSSessionInfo tlsInfo = getTlsSessionInfo();
X509Certificate cert = tlsInfo == null ? null :
OAuthUtils.getRootTLSCertificate(tlsInfo);
-if (!OAuthUtils.compareCertificateThumbprints(cert,
certThumbprint)) {
+if (cert == null ||
!OAuthUtils.compareCertificateThumbprints(cert, certThumbprint)) {
throw ExceptionUtils.toForbiddenException(null, null);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/73dcc6d8/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 6913f31..ffe0180 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
@@ -92,8 +92,8 @@ public final class OAuthUtils {
public static boolean compareCertificateThumbprints(X509Certificate cert,
String encodedThumbprint) {
try {
byte[] thumbprint = createCertificateThumbprint(cert);
-byte[] currentThumbrint =
Base64UrlUtility.decode(encodedThumbprint);
-return MessageDigest.isEqual(thumbprint, currentThumbrint);
+byte[] currentThumbprint =
Base64UrlUtility.decode(encodedThumbprint);
+return MessageDigest.isEqual(thumbprint, currentThumbprint);
} catch (Exception ex) {
return false;
}
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master cbb8261fc -> 9a19f69aa
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9a19f69a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9a19f69a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9a19f69a
Branch: refs/heads/master
Commit: 9a19f69aab463eae96eaf0e5beba877da84d857d
Parents: cbb8261
Author: Sergey Beryozkin
Authored: Thu Apr 20 16:57:45 2017 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 20 16:57:45 2017 +0100
--
.../cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +-
.../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/9a19f69a/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 a485c1e..ec1e8fa 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
@@ -162,7 +162,7 @@ public class OAuthRequestFilter extends
AbstractAccessTokenValidator
if (certThumbprint != null) {
TLSSessionInfo tlsInfo = getTlsSessionInfo();
X509Certificate cert = tlsInfo == null ? null :
OAuthUtils.getRootTLSCertificate(tlsInfo);
-if (!OAuthUtils.compareCertificateThumbprints(cert,
certThumbprint)) {
+if (cert == null ||
!OAuthUtils.compareCertificateThumbprints(cert, certThumbprint)) {
throw ExceptionUtils.toForbiddenException(null, null);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9a19f69a/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 6e38944..06bf7de 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
@@ -92,8 +92,8 @@ public final class OAuthUtils {
public static boolean compareCertificateThumbprints(X509Certificate cert,
String encodedThumbprint) {
try {
byte[] thumbprint = createCertificateThumbprint(cert);
-byte[] currentThumbrint =
Base64UrlUtility.decode(encodedThumbprint);
-return MessageDigest.isEqual(thumbprint, currentThumbrint);
+byte[] currentThumbprint =
Base64UrlUtility.decode(encodedThumbprint);
+return MessageDigest.isEqual(thumbprint, currentThumbprint);
} catch (Exception ex) {
return false;
}
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 4764f8f39 -> 85dc3a1b6
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/85dc3a1b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/85dc3a1b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/85dc3a1b
Branch: refs/heads/3.1.x-fixes
Commit: 85dc3a1b6a51f2c550af11cb27de857af6b82d78
Parents: 4764f8f
Author: Sergey Beryozkin
Authored: Fri Apr 7 13:37:53 2017 +0100
Committer: Sergey Beryozkin
Committed: Fri Apr 7 13:55:14 2017 +0100
--
.../java/org/apache/cxf/rs/security/jose/common/JoseConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/85dc3a1b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
--
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index 9bc0eed..4cdfdab 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -177,7 +177,7 @@ public final class JoseConstants {
/**
* Include the X.509 certificate SHA-256 digest for signature in the
"x5t#S256" header.
*/
-public static final String RSSEC_SIGNATURE_INCLUDE_CERT_SHA256 =
"rs.security.signature.include.cert.sha1";
+public static final String RSSEC_SIGNATURE_INCLUDE_CERT_SHA256 =
"rs.security.signature.include.cert.sha256";
//
// JWE specific Configuration
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 0eef86f37 -> b9150876f
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b9150876
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b9150876
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b9150876
Branch: refs/heads/master
Commit: b9150876fe190b27891bc32ed27be0f9838ddc92
Parents: 0eef86f
Author: Sergey Beryozkin
Authored: Fri Apr 7 13:37:53 2017 +0100
Committer: Sergey Beryozkin
Committed: Fri Apr 7 13:37:53 2017 +0100
--
.../java/org/apache/cxf/rs/security/jose/common/JoseConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b9150876/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
--
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index bcf9d79..2a69486 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -177,7 +177,7 @@ public final class JoseConstants {
/**
* Include the X.509 certificate SHA-256 digest for signature in the
"x5t#S256" header.
*/
-public static final String RSSEC_SIGNATURE_INCLUDE_CERT_SHA256 =
"rs.security.signature.include.cert.sha1";
+public static final String RSSEC_SIGNATURE_INCLUDE_CERT_SHA256 =
"rs.security.signature.include.cert.sha256";
//
// JWE specific Configuration
[06/22] cxf git commit: Fixing a typo in the OAuth2 config service
Fixing a typo in the OAuth2 config service
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5eb67e15
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5eb67e15
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5eb67e15
Branch: refs/heads/master-jaxrs-2.1
Commit: 5eb67e15938ece67e7a0f518d05b1ff653690f0f
Parents: f7f017f
Author: Sergey Beryozkin
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin
Committed: Wed Sep 14 13:52:31 2016 +0100
--
.../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5eb67e15/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index cfd566b..97c7a53 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -46,6 +46,7 @@ public class AuthorizationMetadataService {
prepareConfigurationData(cfg, baseUri);
JsonMapObjectReaderWriter writer = new JsonMapObjectReaderWriter();
+writer.setFormat(true);
return writer.toJson(cfg);
}
@@ -71,7 +72,7 @@ public class AuthorizationMetadataService {
}
protected static String calculateEndpointAddress(String endpointAddress,
String baseUri, String defRelAddress) {
-endpointAddress = endpointAddress == null ? endpointAddress :
defRelAddress;
+endpointAddress = endpointAddress != null ? endpointAddress :
defRelAddress;
if (endpointAddress.startsWith("https")) {
return endpointAddress;
} else {
cxf git commit: Fixing a typo in the OAuth2 config service
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 2624d5dd7 -> 5072be969
Fixing a typo in the OAuth2 config service
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5072be96
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5072be96
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5072be96
Branch: refs/heads/3.1.x-fixes
Commit: 5072be96989b8617cb4fcf88ecad69fa324349c7
Parents: 2624d5d
Author: Sergey Beryozkin
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin
Committed: Wed Sep 14 13:53:15 2016 +0100
--
.../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5072be96/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index cfd566b..97c7a53 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -46,6 +46,7 @@ public class AuthorizationMetadataService {
prepareConfigurationData(cfg, baseUri);
JsonMapObjectReaderWriter writer = new JsonMapObjectReaderWriter();
+writer.setFormat(true);
return writer.toJson(cfg);
}
@@ -71,7 +72,7 @@ public class AuthorizationMetadataService {
}
protected static String calculateEndpointAddress(String endpointAddress,
String baseUri, String defRelAddress) {
-endpointAddress = endpointAddress == null ? endpointAddress :
defRelAddress;
+endpointAddress = endpointAddress != null ? endpointAddress :
defRelAddress;
if (endpointAddress.startsWith("https")) {
return endpointAddress;
} else {
cxf git commit: Fixing a typo in the OAuth2 config service
Repository: cxf
Updated Branches:
refs/heads/master f7f017f21 -> 5eb67e159
Fixing a typo in the OAuth2 config service
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5eb67e15
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5eb67e15
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5eb67e15
Branch: refs/heads/master
Commit: 5eb67e15938ece67e7a0f518d05b1ff653690f0f
Parents: f7f017f
Author: Sergey Beryozkin
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin
Committed: Wed Sep 14 13:52:31 2016 +0100
--
.../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5eb67e15/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index cfd566b..97c7a53 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -46,6 +46,7 @@ public class AuthorizationMetadataService {
prepareConfigurationData(cfg, baseUri);
JsonMapObjectReaderWriter writer = new JsonMapObjectReaderWriter();
+writer.setFormat(true);
return writer.toJson(cfg);
}
@@ -71,7 +72,7 @@ public class AuthorizationMetadataService {
}
protected static String calculateEndpointAddress(String endpointAddress,
String baseUri, String defRelAddress) {
-endpointAddress = endpointAddress == null ? endpointAddress :
defRelAddress;
+endpointAddress = endpointAddress != null ? endpointAddress :
defRelAddress;
if (endpointAddress.startsWith("https")) {
return endpointAddress;
} else {
[10/33] cxf git commit: Fixing a typo in the Karaf swagger2 feature
Fixing a typo in the Karaf swagger2 feature
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46040f88
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46040f88
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46040f88
Branch: refs/heads/master-jaxrs-2.1
Commit: 46040f88584faae17264cde80ecfaadd28b63fbf
Parents: b20f102
Author: Sergey Beryozkin
Authored: Wed Jul 6 15:21:28 2016 +0100
Committer: Sergey Beryozkin
Committed: Wed Jul 6 15:21:28 2016 +0100
--
osgi/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/46040f88/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 71db85a..196d823 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -230,7 +230,7 @@
cxf-jaxrs
-mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger2/${project.version}
+mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}
mvn:javax.validation/validation-api/${cxf.validation.api.version}
mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
cxf git commit: Fixing a typo in the Karaf swagger2 feature
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 310b23956 -> ce992f3b0
Fixing a typo in the Karaf swagger2 feature
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce992f3b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce992f3b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce992f3b
Branch: refs/heads/3.1.x-fixes
Commit: ce992f3b0cd85ca255950289461c6c48926c8efc
Parents: 310b239
Author: Sergey Beryozkin
Authored: Wed Jul 6 15:21:28 2016 +0100
Committer: Sergey Beryozkin
Committed: Wed Jul 6 15:22:43 2016 +0100
--
osgi/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce992f3b/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 71db85a..196d823 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -230,7 +230,7 @@
cxf-jaxrs
-mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger2/${project.version}
+mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}
mvn:javax.validation/validation-api/${cxf.validation.api.version}
mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
cxf git commit: Fixing a typo in the Karaf swagger2 feature
Repository: cxf
Updated Branches:
refs/heads/master b20f10205 -> 46040f885
Fixing a typo in the Karaf swagger2 feature
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46040f88
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46040f88
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46040f88
Branch: refs/heads/master
Commit: 46040f88584faae17264cde80ecfaadd28b63fbf
Parents: b20f102
Author: Sergey Beryozkin
Authored: Wed Jul 6 15:21:28 2016 +0100
Committer: Sergey Beryozkin
Committed: Wed Jul 6 15:21:28 2016 +0100
--
osgi/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/46040f88/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 71db85a..196d823 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -230,7 +230,7 @@
cxf-jaxrs
-mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger2/${project.version}
+mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}
mvn:javax.validation/validation-api/${cxf.validation.api.version}
mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
[2/2] cxf git commit: Fixing a typo
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aa7aef8d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aa7aef8d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aa7aef8d
Branch: refs/heads/3.1.x-fixes
Commit: aa7aef8dc771ecfd8cfa428a83d3f529accbd10a
Parents: 3f90fa6
Author: Sergey Beryozkin
Authored: Thu Apr 14 17:15:23 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 17:17:07 2016 +0100
--
.../cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aa7aef8d/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index ec0c020..8b23e22 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -74,7 +74,7 @@ public class JPAOAuthDataProviderTest extends Assert {
compareClients(c, c2);
c2.setClientSecret("567");
-provider.setClient(c);
+provider.setClient(c2);
Client c22 = provider.getClient(c.getClientId());
compareClients(c2, c22);
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 0caf56378 -> 5c9993600
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5c999360
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5c999360
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5c999360
Branch: refs/heads/master
Commit: 5c999360016e11d9173888936e08b185a89e009a
Parents: 0caf563
Author: Sergey Beryozkin
Authored: Thu Apr 14 17:15:23 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 17:15:23 2016 +0100
--
.../cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5c999360/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index ec0c020..8b23e22 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -74,7 +74,7 @@ public class JPAOAuthDataProviderTest extends Assert {
compareClients(c, c2);
c2.setClientSecret("567");
-provider.setClient(c);
+provider.setClient(c2);
Client c22 = provider.getClient(c.getClientId());
compareClients(c2, c22);
cxf git commit: Fixing a typo in one JPA code queries
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 4b15b8a49 -> d54b8750a
Fixing a typo in one JPA code queries
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d54b8750
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d54b8750
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d54b8750
Branch: refs/heads/3.1.x-fixes
Commit: d54b8750a256a4ea6baf6470928bd28cb8f7c9d4
Parents: 4b15b8a
Author: Sergey Beryozkin
Authored: Fri Apr 8 14:13:54 2016 +0100
Committer: Sergey Beryozkin
Committed: Fri Apr 8 14:14:52 2016 +0100
--
.../cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java | 2 +-
.../rs/security/oauth2/grants/code/JPACodeDataProviderTest.java | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d54b8750/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
index ba7a11a..d582fcf 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
@@ -82,7 +82,7 @@ public class JPACodeDataProvider extends JPAOAuthDataProvider
implements Authori
+ resourceOwnerSubject.getLogin() + "'",
ServerAuthorizationCodeGrant.class);
} else if (resourceOwnerSubject == null) {
return getEntityManager().createQuery(
-"SELECT code FROM " + CODE_TABLE_NAME + " code JOIN
code.cliednt c WHERE c.clientId = '"
+"SELECT code FROM " + CODE_TABLE_NAME + " code JOIN
code.client c WHERE c.clientId = '"
+ c.getClientId() + "'",
ServerAuthorizationCodeGrant.class);
} else {
return getEntityManager().createQuery(
http://git-wip-us.apache.org/repos/asf/cxf/blob/d54b8750/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 8bb74aa..3878fff 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -76,6 +76,11 @@ public class JPACodeDataProviderTest extends Assert {
assertEquals(1, grants.size());
assertEquals(grant.getCode(), grants.get(0).getCode());
+grants = provider.getCodeGrants(c, null);
+assertNotNull(grants);
+assertEquals(1, grants.size());
+assertEquals(grant.getCode(), grants.get(0).getCode());
+
ServerAuthorizationCodeGrant grant2 =
provider.removeCodeGrant(grant.getCode());
assertEquals(grant.getCode(), grant2.getCode());
}
cxf git commit: Fixing a typo in one JPA code queries
Repository: cxf
Updated Branches:
refs/heads/master c01c68ddd -> fd32df1be
Fixing a typo in one JPA code queries
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fd32df1b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fd32df1b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fd32df1b
Branch: refs/heads/master
Commit: fd32df1beebe2472c450389c1c204c801d760714
Parents: c01c68d
Author: Sergey Beryozkin
Authored: Fri Apr 8 14:13:54 2016 +0100
Committer: Sergey Beryozkin
Committed: Fri Apr 8 14:13:54 2016 +0100
--
.../cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java | 2 +-
.../rs/security/oauth2/grants/code/JPACodeDataProviderTest.java | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/fd32df1b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
index ba7a11a..d582fcf 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
@@ -82,7 +82,7 @@ public class JPACodeDataProvider extends JPAOAuthDataProvider
implements Authori
+ resourceOwnerSubject.getLogin() + "'",
ServerAuthorizationCodeGrant.class);
} else if (resourceOwnerSubject == null) {
return getEntityManager().createQuery(
-"SELECT code FROM " + CODE_TABLE_NAME + " code JOIN
code.cliednt c WHERE c.clientId = '"
+"SELECT code FROM " + CODE_TABLE_NAME + " code JOIN
code.client c WHERE c.clientId = '"
+ c.getClientId() + "'",
ServerAuthorizationCodeGrant.class);
} else {
return getEntityManager().createQuery(
http://git-wip-us.apache.org/repos/asf/cxf/blob/fd32df1b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 8bb74aa..3878fff 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -76,6 +76,11 @@ public class JPACodeDataProviderTest extends Assert {
assertEquals(1, grants.size());
assertEquals(grant.getCode(), grants.get(0).getCode());
+grants = provider.getCodeGrants(c, null);
+assertNotNull(grants);
+assertEquals(1, grants.size());
+assertEquals(grant.getCode(), grants.get(0).getCode());
+
ServerAuthorizationCodeGrant grant2 =
provider.removeCodeGrant(grant.getCode());
assertEquals(grant.getCode(), grant2.getCode());
}
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c3cca2d5d -> 084ad67a6
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/084ad67a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/084ad67a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/084ad67a
Branch: refs/heads/3.1.x-fixes
Commit: 084ad67a648c736e911fa0a419d6e5cca345c1b2
Parents: c3cca2d
Author: Sergey Beryozkin
Authored: Wed Feb 17 17:57:36 2016 +
Committer: Sergey Beryozkin
Committed: Wed Feb 17 17:58:40 2016 +
--
.../java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/084ad67a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index a8e086f..abf11ef 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -52,8 +52,8 @@ public final class OidcUtils {
public static final List ADDRESS_CLAIMS =
Arrays.asList(UserInfo.ADDRESS_CLAIM);
public static final List PHONE_CLAIMS =
Arrays.asList(UserInfo.PHONE_CLAIM);
public static final String CLAIMS_PARAM = "claims";
-public static final String CLAIM_NAMES_PROPERTY = "_claims_names";
-public static final String CLAIM_SOURCES_PROPERTY = "_claims_sources";
+public static final String CLAIM_NAMES_PROPERTY = "_claim_names";
+public static final String CLAIM_SOURCES_PROPERTY = "_claim_sources";
public static final String JWT_CLAIM_SOURCE_PROPERTY = "JWT";
public static final String ENDPOINT_CLAIM_SOURCE_PROPERTY = "endpoint";
public static final String TOKEN_CLAIM_SOURCE_PROPERTY = "access_token";
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 92e0d0d96 -> d51f4ec91
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d51f4ec9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d51f4ec9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d51f4ec9
Branch: refs/heads/master
Commit: d51f4ec91cd5e8e050854923be61536307cf257e
Parents: 92e0d0d
Author: Sergey Beryozkin
Authored: Wed Feb 17 17:57:36 2016 +
Committer: Sergey Beryozkin
Committed: Wed Feb 17 17:57:36 2016 +
--
.../java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d51f4ec9/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index a8e086f..abf11ef 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -52,8 +52,8 @@ public final class OidcUtils {
public static final List ADDRESS_CLAIMS =
Arrays.asList(UserInfo.ADDRESS_CLAIM);
public static final List PHONE_CLAIMS =
Arrays.asList(UserInfo.PHONE_CLAIM);
public static final String CLAIMS_PARAM = "claims";
-public static final String CLAIM_NAMES_PROPERTY = "_claims_names";
-public static final String CLAIM_SOURCES_PROPERTY = "_claims_sources";
+public static final String CLAIM_NAMES_PROPERTY = "_claim_names";
+public static final String CLAIM_SOURCES_PROPERTY = "_claim_sources";
public static final String JWT_CLAIM_SOURCE_PROPERTY = "JWT";
public static final String ENDPOINT_CLAIM_SOURCE_PROPERTY = "endpoint";
public static final String TOKEN_CLAIM_SOURCE_PROPERTY = "access_token";
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 14ed2e2c4 -> 6a0873647
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6a087364
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6a087364
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6a087364
Branch: refs/heads/3.1.x-fixes
Commit: 6a08736476f84c3bc40826d6debc6d4d96589cde
Parents: 14ed2e2
Author: Sergey Beryozkin
Authored: Fri Feb 5 14:32:25 2016 +
Committer: Sergey Beryozkin
Committed: Fri Feb 5 14:33:20 2016 +
--
.../org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a087364/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
index c13b89d..f8a72ab 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
@@ -115,7 +115,7 @@ public class OidcImplicitService extends
ImplicitGrantService {
OidcUserSubject sub = (OidcUserSubject)subject;
IdToken idToken = new IdToken(sub.getIdToken());
idToken.setNonce(state.getNonce());
-JoseJwtProducer processor = idTokenHandler == null ? new
JoseJwtProducer() : null;
+JoseJwtProducer processor = idTokenHandler == null ? new
JoseJwtProducer() : idTokenHandler;
return processor.processJwt(new JwtToken(idToken));
} else {
return null;
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 9ffc542d0 -> f5606894d
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f5606894
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f5606894
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f5606894
Branch: refs/heads/master
Commit: f5606894dec0ea43cda33da563b2ccb9d57fb7d1
Parents: 9ffc542
Author: Sergey Beryozkin
Authored: Fri Feb 5 14:32:25 2016 +
Committer: Sergey Beryozkin
Committed: Fri Feb 5 14:32:25 2016 +
--
.../org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f5606894/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
index c13b89d..f8a72ab 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
@@ -115,7 +115,7 @@ public class OidcImplicitService extends
ImplicitGrantService {
OidcUserSubject sub = (OidcUserSubject)subject;
IdToken idToken = new IdToken(sub.getIdToken());
idToken.setNonce(state.getNonce());
-JoseJwtProducer processor = idTokenHandler == null ? new
JoseJwtProducer() : null;
+JoseJwtProducer processor = idTokenHandler == null ? new
JoseJwtProducer() : idTokenHandler;
return processor.processJwt(new JwtToken(idToken));
} else {
return null;
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 75d475ba8 -> 7fa085a73
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7fa085a7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7fa085a7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7fa085a7
Branch: refs/heads/master
Commit: 7fa085a73381095df800effb301737febf4837fb
Parents: 75d475b
Author: Sergey Beryozkin
Authored: Tue Jan 26 14:11:39 2016 +
Committer: Sergey Beryozkin
Committed: Tue Jan 26 14:12:34 2016 +
--
.../cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7fa085a7/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 6ac6922..5b67ca2 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
@@ -199,7 +199,7 @@ public abstract class AbstractOAuthDataProvider implements
OAuthDataProvider, Cl
&& OAuthUtils.isExpired(token.getIssuedAt(),
token.getExpiresIn())) {
revokeToken(client, token.getTokenKey(),
OAuthConstants.ACCESS_TOKEN);
}
-return null;
+return token;
}
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c79bb840f -> ffef2eacf
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ffef2eac
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ffef2eac
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ffef2eac
Branch: refs/heads/3.1.x-fixes
Commit: ffef2eacfb97193bc62494305e9e789b4ddf5ef7
Parents: c79bb84
Author: Sergey Beryozkin
Authored: Tue Jan 26 14:11:39 2016 +
Committer: Sergey Beryozkin
Committed: Tue Jan 26 14:11:39 2016 +
--
.../cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffef2eac/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 d8c9a47..53ccc63 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
@@ -204,7 +204,7 @@ public abstract class AbstractOAuthDataProvider implements
OAuthDataProvider, Cl
&& OAuthUtils.isExpired(token.getIssuedAt(),
token.getExpiresIn())) {
revokeToken(client, token.getTokenKey(),
OAuthConstants.ACCESS_TOKEN);
}
-return null;
+return token;
}
[1/2] cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 5705d3db6 -> 3a8a24326
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3a8a2432
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3a8a2432
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3a8a2432
Branch: refs/heads/3.1.x-fixes
Commit: 3a8a24326d690c8e0b58631b9428e3b460918ab5
Parents: 4604ca1
Author: Sergey Beryozkin
Authored: Fri Jan 22 13:47:50 2016 +
Committer: Sergey Beryozkin
Committed: Fri Jan 22 14:01:33 2016 +
--
.../apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3a8a2432/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 5fb6108..e8478ad 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
@@ -106,7 +106,7 @@ public class OAuthRequestFilter extends
AbstractAccessTokenValidator
String validAudience = validateAudiences(accessTokenV.getAudiences());
// Check if token was issued by the supported issuer
-if (issuer != null && issuer.equals(accessTokenV.getTokenIssuer())) {
+if (issuer != null && !issuer.equals(accessTokenV.getTokenIssuer())) {
AuthorizationUtils.throwAuthorizationFailure(supportedSchemes,
realm);
}
// Find the scopes which match the current request
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 68aa19fad -> 322753ed9
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/322753ed
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/322753ed
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/322753ed
Branch: refs/heads/master
Commit: 322753ed99fe8227e4f07c0884a43f7391e56ddb
Parents: 68aa19f
Author: Sergey Beryozkin
Authored: Fri Jan 22 13:47:50 2016 +
Committer: Sergey Beryozkin
Committed: Fri Jan 22 13:47:50 2016 +
--
.../apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/322753ed/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 5fb6108..e8478ad 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
@@ -106,7 +106,7 @@ public class OAuthRequestFilter extends
AbstractAccessTokenValidator
String validAudience = validateAudiences(accessTokenV.getAudiences());
// Check if token was issued by the supported issuer
-if (issuer != null && issuer.equals(accessTokenV.getTokenIssuer())) {
+if (issuer != null && !issuer.equals(accessTokenV.getTokenIssuer())) {
AuthorizationUtils.throwAuthorizationFailure(supportedSchemes,
realm);
}
// Find the scopes which match the current request
cxf git commit: Fixing a typo in OAuthUtils
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 4612855a0 -> 6af098775
Fixing a typo in OAuthUtils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6af09877
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6af09877
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6af09877
Branch: refs/heads/3.1.x-fixes
Commit: 6af09877545cb1fe34fce0057b5b39cb264b5f7c
Parents: 4612855
Author: Sergey Beryozkin
Authored: Thu Jan 21 17:24:37 2016 +
Committer: Sergey Beryozkin
Committed: Thu Jan 21 17:25:41 2016 +
--
.../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6af09877/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 1857bf3..a7f9dc6 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
@@ -200,7 +200,7 @@ public final class OAuthUtils {
List allowedAudiences) {
return StringUtils.isEmpty(providedAudiences)
&& StringUtils.isEmpty(allowedAudiences)
- || allowedAudiences.contains(providedAudiences);
+ || allowedAudiences.containsAll(providedAudiences);
}
public static boolean checkRequestURI(String servletPath, String uri) {
cxf git commit: Fixing a typo in OAuthUtils
Repository: cxf
Updated Branches:
refs/heads/master 83451c004 -> c0d2c83b4
Fixing a typo in OAuthUtils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c0d2c83b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0d2c83b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0d2c83b
Branch: refs/heads/master
Commit: c0d2c83b469215c32138ff29aeee31b11046f0ad
Parents: 83451c0
Author: Sergey Beryozkin
Authored: Thu Jan 21 17:24:37 2016 +
Committer: Sergey Beryozkin
Committed: Thu Jan 21 17:24:37 2016 +
--
.../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c0d2c83b/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 1857bf3..a7f9dc6 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
@@ -200,7 +200,7 @@ public final class OAuthUtils {
List allowedAudiences) {
return StringUtils.isEmpty(providedAudiences)
&& StringUtils.isEmpty(allowedAudiences)
- || allowedAudiences.contains(providedAudiences);
+ || allowedAudiences.containsAll(providedAudiences);
}
public static boolean checkRequestURI(String servletPath, String uri) {
cxf git commit: Fixing a typo in OAuthJsonProvider
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 73cce96fa -> 4612855a0
Fixing a typo in OAuthJsonProvider
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4612855a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4612855a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4612855a
Branch: refs/heads/3.1.x-fixes
Commit: 4612855a0f44b5f3bf4513c241d4ea1622bf1819
Parents: 73cce96
Author: Sergey Beryozkin
Authored: Thu Jan 21 16:53:18 2016 +
Committer: Sergey Beryozkin
Committed: Thu Jan 21 16:54:37 2016 +
--
.../apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4612855a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
index d2a6766..42f039a 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
@@ -94,7 +94,7 @@ public class OAuthJSONProvider implements
MessageBodyWriter,
sb.append(",");
appendJsonPair(sb, OAuthConstants.SCOPE, obj.getScope());
}
-if (StringUtils.isEmpty(obj.getAud())) {
+if (!StringUtils.isEmpty(obj.getAud())) {
sb.append(",");
if (obj.getAud().size() == 1) {
appendJsonPair(sb, "aud", obj.getAud());
cxf git commit: Fixing a typo in OAuthJsonProvider
Repository: cxf
Updated Branches:
refs/heads/master 386805560 -> 83451c004
Fixing a typo in OAuthJsonProvider
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/83451c00
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83451c00
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83451c00
Branch: refs/heads/master
Commit: 83451c004cf5a6ac9a0f7c08f38fdad2261cb9b4
Parents: 3868055
Author: Sergey Beryozkin
Authored: Thu Jan 21 16:53:18 2016 +
Committer: Sergey Beryozkin
Committed: Thu Jan 21 16:53:18 2016 +
--
.../apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/83451c00/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
index d2a6766..42f039a 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
@@ -94,7 +94,7 @@ public class OAuthJSONProvider implements
MessageBodyWriter,
sb.append(",");
appendJsonPair(sb, OAuthConstants.SCOPE, obj.getScope());
}
-if (StringUtils.isEmpty(obj.getAud())) {
+if (!StringUtils.isEmpty(obj.getAud())) {
sb.append(",");
if (obj.getAud().size() == 1) {
appendJsonPair(sb, "aud", obj.getAud());
cxf git commit: Fixing a typo in the code grant handler
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 12206c314 -> 9f0d1b323
Fixing a typo in the code grant handler
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9f0d1b32
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9f0d1b32
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9f0d1b32
Branch: refs/heads/3.1.x-fixes
Commit: 9f0d1b3236b6b7fdb67c812360c03bda19700cc5
Parents: 12206c3
Author: Sergey Beryozkin
Authored: Tue Jan 19 11:40:19 2016 +
Committer: Sergey Beryozkin
Committed: Tue Jan 19 11:41:36 2016 +
--
.../oauth2/grants/code/AuthorizationCodeGrantHandler.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/9f0d1b32/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
index 72021f0..fb4bd5d 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
@@ -115,11 +115,11 @@ public class AuthorizationCodeGrantHandler extends
AbstractGrantHandler {
private boolean compareCodeVerifierWithChallenge(Client c, String
clientCodeVerifier,
String
clientCodeChallenge) {
-if (clientCodeChallenge == null && clientCodeChallenge == null
+if (clientCodeChallenge == null && clientCodeVerifier == null
&& (c.isConfidential() || !expectCodeVerifierForPublicClients)) {
return true;
-} else if (clientCodeChallenge != null && clientCodeChallenge == null
-|| clientCodeChallenge == null && clientCodeChallenge != null) {
+} else if (clientCodeChallenge != null && clientCodeVerifier == null
+|| clientCodeChallenge == null && clientCodeVerifier != null) {
return false;
} else {
String transformedCodeVerifier = codeVerifierTransformer == null
cxf git commit: Fixing a typo in the code grant handler
Repository: cxf
Updated Branches:
refs/heads/master a9bd49ff0 -> f11ec01ac
Fixing a typo in the code grant handler
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f11ec01a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f11ec01a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f11ec01a
Branch: refs/heads/master
Commit: f11ec01ac603a7b3919ed075afc9ac35edf48c8a
Parents: a9bd49f
Author: Sergey Beryozkin
Authored: Tue Jan 19 11:40:19 2016 +
Committer: Sergey Beryozkin
Committed: Tue Jan 19 11:40:19 2016 +
--
.../oauth2/grants/code/AuthorizationCodeGrantHandler.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f11ec01a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
index 6d7fc1a..7e5aab3 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
@@ -113,11 +113,11 @@ public class AuthorizationCodeGrantHandler extends
AbstractGrantHandler {
private boolean compareCodeVerifierWithChallenge(Client c, String
clientCodeVerifier,
String
clientCodeChallenge) {
-if (clientCodeChallenge == null && clientCodeChallenge == null
+if (clientCodeChallenge == null && clientCodeVerifier == null
&& (c.isConfidential() || !expectCodeVerifierForPublicClients)) {
return true;
-} else if (clientCodeChallenge != null && clientCodeChallenge == null
-|| clientCodeChallenge == null && clientCodeChallenge != null) {
+} else if (clientCodeChallenge != null && clientCodeVerifier == null
+|| clientCodeChallenge == null && clientCodeVerifier != null) {
return false;
} else {
String transformedCodeVerifier = codeVerifierTransformer == null
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 32c0aca5f -> 83e95f902
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/83e95f90
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83e95f90
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83e95f90
Branch: refs/heads/3.1.x-fixes
Commit: 83e95f9029afebf93a08fc3cee2904d84db36a14
Parents: 32c0aca
Author: Sergey Beryozkin
Authored: Tue Dec 8 14:14:25 2015 +
Committer: Sergey Beryozkin
Committed: Tue Dec 8 14:19:32 2015 +
--
.../java/org/apache/cxf/rs/security/oauth2/common/Client.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/83e95f90/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
index bc5c756..f85ad99 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
@@ -50,7 +50,7 @@ public class Client implements Serializable {
private Map properties = new HashMap();
private UserSubject subject;
private UserSubject resourceOwnerSubject;
-private boolean registeredAt;
+private long registeredAt;
public Client() {
@@ -339,11 +339,11 @@ public class Client implements Serializable {
this.clientIpAddress = clientIpAddress;
}
-public boolean isRegisteredAt() {
+public long getRegisteredAt() {
return registeredAt;
}
-public void setRegisteredAt(boolean registeredAt) {
+public void setRegisteredAt(long registeredAt) {
this.registeredAt = registeredAt;
}
}
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 5ca5bd90e -> 55cbd9f51
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55cbd9f5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55cbd9f5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55cbd9f5
Branch: refs/heads/master
Commit: 55cbd9f51a40c65365043c6f2d64941e50b6f4c8
Parents: 5ca5bd9
Author: Sergey Beryozkin
Authored: Tue Dec 8 14:14:25 2015 +
Committer: Sergey Beryozkin
Committed: Tue Dec 8 14:14:25 2015 +
--
.../java/org/apache/cxf/rs/security/oauth2/common/Client.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/55cbd9f5/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
index bc5c756..f85ad99 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
@@ -50,7 +50,7 @@ public class Client implements Serializable {
private Map properties = new HashMap();
private UserSubject subject;
private UserSubject resourceOwnerSubject;
-private boolean registeredAt;
+private long registeredAt;
public Client() {
@@ -339,11 +339,11 @@ public class Client implements Serializable {
this.clientIpAddress = clientIpAddress;
}
-public boolean isRegisteredAt() {
+public long getRegisteredAt() {
return registeredAt;
}
-public void setRegisteredAt(boolean registeredAt) {
+public void setRegisteredAt(long registeredAt) {
this.registeredAt = registeredAt;
}
}
cxf git commit: Fixing a typo in the abstract jose helper
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes fc8878539 -> 1591faf1b
Fixing a typo in the abstract jose helper
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1591faf1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1591faf1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1591faf1
Branch: refs/heads/3.0.x-fixes
Commit: 1591faf1b9877f9a27f1a51c99ee5130bcb1e248
Parents: fc88785
Author: Sergey Beryozkin
Authored: Thu Aug 6 22:59:55 2015 +0100
Committer: Sergey Beryozkin
Committed: Thu Aug 6 23:01:24 2015 +0100
--
.../rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1591faf1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
index ae27021..aa85a53 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
@@ -39,7 +39,7 @@ public abstract class AbstractOAuthJoseJwtProducer extends
AbstractJoseJwtProduc
private boolean encryptWithClientSecret;
private boolean signWithClientSecret;
-protected JwsSignatureProvider getInitializedSigProvider(Client c, boolean
required) {
+protected JwsSignatureProvider getInitializedSignatureProvider(Client c,
boolean required) {
if (signWithClientSecret) {
byte[] hmac = CryptoUtils.decodeSequence(c.getClientSecret());
return JwsUtils.getHmacSignatureProvider(hmac,
SignatureAlgorithm.HS256);
[1/2] cxf git commit: Fixing a typo in the abstract jose helper
Repository: cxf
Updated Branches:
refs/heads/master 77c9f1572 -> 1bbb368a2
Fixing a typo in the abstract jose helper
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2b5c8474
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b5c8474
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b5c8474
Branch: refs/heads/master
Commit: 2b5c8474be1dc98a816c23ab5dc79c918f0e5061
Parents: 11e710d
Author: Sergey Beryozkin
Authored: Thu Aug 6 22:59:55 2015 +0100
Committer: Sergey Beryozkin
Committed: Thu Aug 6 22:59:55 2015 +0100
--
.../rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2b5c8474/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
index ae27021..aa85a53 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtProducer.java
@@ -39,7 +39,7 @@ public abstract class AbstractOAuthJoseJwtProducer extends
AbstractJoseJwtProduc
private boolean encryptWithClientSecret;
private boolean signWithClientSecret;
-protected JwsSignatureProvider getInitializedSigProvider(Client c, boolean
required) {
+protected JwsSignatureProvider getInitializedSignatureProvider(Client c,
boolean required) {
if (signWithClientSecret) {
byte[] hmac = CryptoUtils.decodeSequence(c.getClientSecret());
return JwsUtils.getHmacSignatureProvider(hmac,
SignatureAlgorithm.HS256);
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 3dd409f04 -> 429afd6bb
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/429afd6b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/429afd6b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/429afd6b
Branch: refs/heads/3.0.x-fixes
Commit: 429afd6bb7ae6e0f6c4586abbdc6072480dd
Parents: 3dd409f
Author: Sergey Beryozkin
Authored: Wed Feb 4 12:11:06 2015 +
Committer: Sergey Beryozkin
Committed: Wed Feb 4 12:14:01 2015 +
--
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/429afd6b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 00a9a70..3422555 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1174,7 +1174,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (href.endsWith(".xsl")) {
List xslImports =
DOMUtils.getChildrenWithName(docEl, XLS_NS, "import");
handleExistingDocRefs(xslImports, "href", loc, href,
m, ui);
-List xslIncludes =
DOMUtils.getChildrenWithName(docEl, XLS_NS, "import");
+List xslIncludes =
DOMUtils.getChildrenWithName(docEl, XLS_NS, "include");
handleExistingDocRefs(xslIncludes, "href", loc, href,
m, ui);
} else {
if (fragmentIndex != -1) {
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 28379a02b -> 7f7034e7d
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f7034e7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f7034e7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f7034e7
Branch: refs/heads/master
Commit: 7f7034e7de9f424044a8858e6b6fbda519b8
Parents: 28379a0
Author: Sergey Beryozkin
Authored: Wed Feb 4 12:11:06 2015 +
Committer: Sergey Beryozkin
Committed: Wed Feb 4 12:11:06 2015 +
--
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f7034e7/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 00a9a70..3422555 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1174,7 +1174,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (href.endsWith(".xsl")) {
List xslImports =
DOMUtils.getChildrenWithName(docEl, XLS_NS, "import");
handleExistingDocRefs(xslImports, "href", loc, href,
m, ui);
-List xslIncludes =
DOMUtils.getChildrenWithName(docEl, XLS_NS, "import");
+List xslIncludes =
DOMUtils.getChildrenWithName(docEl, XLS_NS, "include");
handleExistingDocRefs(xslIncludes, "href", loc, href,
m, ui);
} else {
if (fragmentIndex != -1) {
cxf git commit: Fixing a typo in OIDC token validator
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes a7ced3dee -> da75a0f83
Fixing a typo in OIDC token validator
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/da75a0f8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/da75a0f8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/da75a0f8
Branch: refs/heads/3.0.x-fixes
Commit: da75a0f83e92dc46d0aa6fcb091cec5492ea48e4
Parents: a7ced3d
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:36:46 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:38:05 2014 +
--
.../org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/da75a0f8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index 1553258..89e7fa4 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -115,7 +115,7 @@ public abstract class AbstractTokenValidator {
return validateToken(jwtConsumer, jwt,
JwsUtils.getSignatureVerifier(key));
}
protected JwtToken validateToken(JwsJwtCompactConsumer consumer, JwtToken
jwt, JwsSignatureVerifier jws) {
-if (consumer.verifySignatureWith(jws)) {
+if (!consumer.verifySignatureWith(jws)) {
throw new SecurityException("Invalid Signature");
}
return jwt;
cxf git commit: Fixing a typo in OIDC token validator
Repository: cxf
Updated Branches:
refs/heads/master d333c275e -> 969cdb02e
Fixing a typo in OIDC token validator
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/969cdb02
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/969cdb02
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/969cdb02
Branch: refs/heads/master
Commit: 969cdb02ee1bffbf8e32c00caad9820f109230f4
Parents: d333c27
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:36:46 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:36:46 2014 +
--
.../org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/969cdb02/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index 1553258..89e7fa4 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -115,7 +115,7 @@ public abstract class AbstractTokenValidator {
return validateToken(jwtConsumer, jwt,
JwsUtils.getSignatureVerifier(key));
}
protected JwtToken validateToken(JwsJwtCompactConsumer consumer, JwtToken
jwt, JwsSignatureVerifier jws) {
-if (consumer.verifySignatureWith(jws)) {
+if (!consumer.verifySignatureWith(jws)) {
throw new SecurityException("Invalid Signature");
}
return jwt;
