coheigea closed pull request #312: CVE-2017-3156 backport
URL: https://github.com/apache/cxf/pull/312
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessTokenValidator.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessTokenValidator.java
index 2ef5ce550ea..ef9f88d6b95 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessTokenValidator.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessTokenValidator.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.rs.security.oauth2.tokens.mac;
-import java.util.Arrays;
+import java.security.MessageDigest;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -92,7 +92,7 @@ private MacAccessToken
validateSchemeData(MacAuthorizationScheme macAuthInfo,
macAccessToken.getMacKey(), hmacAlgo, normalizedString);
byte[] clientMacData = Base64Utility.decode(clientMacString);
- boolean validMac = Arrays.equals(serverMacData, clientMacData);
+ boolean validMac = MessageDigest.isEqual(serverMacData,
clientMacData);
if (!validMac) {
AuthorizationUtils.throwAuthorizationFailure(Collections
.singleton(OAuthConstants.MAC_AUTHORIZATION_SCHEME));
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
