This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c598ecf38e4d796ffb35288de39827a609d035be Author: Alexey Markevich <[email protected]> AuthorDate: Thu Feb 27 20:57:05 2020 +0300 cxf-rt-rs-security-oauth: use MessageDigestUtils --- .../oauth/provider/MD5SequenceGenerator.java | 20 ++------------------ .../security/oauth/MemoryOAuthDataProvider.java | 4 +--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java index 0896988..5e5a192 100644 --- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java +++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java @@ -18,10 +18,8 @@ */ package org.apache.cxf.rs.security.oauth.provider; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - import net.oauth.OAuthException; +import org.apache.cxf.rt.security.crypto.MessageDigestUtils; /** * The utility MD5 sequence generator which can be used for generating @@ -33,20 +31,6 @@ public class MD5SequenceGenerator { if (input == null) { throw new OAuthException("You have to pass input to Token Generator"); } - - try { - MessageDigest algorithm = MessageDigest.getInstance("MD5"); - algorithm.reset(); - algorithm.update(input); - byte[] messageDigest = algorithm.digest(); - StringBuilder hexString = new StringBuilder(); - for (int i = 0; i < messageDigest.length; i++) { - hexString.append(Integer.toHexString(0xFF & messageDigest[i])); - } - - return hexString.toString(); - } catch (NoSuchAlgorithmException e) { - throw new OAuthException(e); - } + return MessageDigestUtils.generate(input, MessageDigestUtils.ALGO_MD5); } } diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java index 8bd17c3..2e57342 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java @@ -155,13 +155,11 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider { } protected String generateToken() throws OAuthServiceException { - String token; try { - token = tokenGenerator.generate(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8)); + return tokenGenerator.generate(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8)); } catch (Exception e) { throw new OAuthServiceException("Unable to create token ", e.getCause()); } - return token; } public void setClientAuthInfo(Map<String, Client> clientAuthInfo) {
