You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2018/09/18 14:15:46 UTC
[3/3] qpid-broker-j git commit: QPID-8241 : Remove use of
javax.xml.bind.DatatypeConverter
QPID-8241 : Remove use of javax.xml.bind.DatatypeConverter
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/c8c82033
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c8c82033
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c8c82033
Branch: refs/heads/master
Commit: c8c82033021fb8b0ebfea5bd6367832780a3a8c4
Parents: b770054
Author: Robert Godfrey <rg...@apache.org>
Authored: Tue Sep 18 16:14:55 2018 +0200
Committer: Robert Godfrey <rg...@apache.org>
Committed: Tue Sep 18 16:14:55 2018 +0200
----------------------------------------------------------------------
.../berkeleydb/BDBAMQP10V0UpgradeTest.java | 4 +-
.../server/model/AttributeValueConverter.java | 45 +-
.../AutoGeneratedSelfSignedKeyStoreImpl.java | 8 +-
.../security/SiteSpecificTrustStoreImpl.java | 4 +-
.../security/auth/database/HashedUser.java | 5 +-
.../AbstractScramAuthenticationManager.java | 12 +-
.../manager/AuthenticationResultCacher.java | 4 +-
.../auth/manager/MD5AuthenticationProvider.java | 5 +-
.../OAuth2AuthenticationProviderImpl.java | 5 +-
...oudFoundryOAuth2IdentityResolverService.java | 5 +-
.../auth/sasl/scram/ScramSaslServer.java | 6 +-
.../encryption/AESKeyFileEncrypter.java | 4 +-
.../apache/qpid/server/util/DataUrlUtils.java | 4 +-
.../org/apache/qpid/server/util/StringUtil.java | 16 +-
.../org/apache/qpid/server/util/Strings.java | 6 +-
.../model/AttributeValueConverterTest.java | 2 +-
.../singleton/AbstractConfiguredObjectTest.java | 2 +-
.../server/security/NonJavaKeyStoreTest.java | 6 +-
...e64MD5PasswordFilePrincipalDatabaseTest.java | 4 +-
.../auth/manager/oauth2/OAuth2MockEndpoint.java | 4 +-
.../sasl/crammd5/CramMd5NegotiatorTest.java | 7 +-
.../auth/sasl/scram/ScramNegotiatorTest.java | 8 +-
.../transport/TCPandSSLTransportTest.java | 4 +-
.../network/security/ssl/SSLUtilTest.java | 754 +++++++++----------
.../servlet/ServletConnectionPrincipal.java | 4 +-
.../ConfiguredObjectExpressionFactory.java | 54 +-
.../plugin/servlet/rest/SaslServlet.java | 6 +-
.../plugin/GunzipOutputStreamTest.java | 7 +-
.../query/ConfiguredObjectQueryTest.java | 15 +-
.../client/MessageVerifier.java | 7 +-
.../apache/qpid/tests/protocol/SaslUtils.java | 15 +-
.../apache/qpid/tests/http/HttpTestHelper.java | 4 +-
.../tests/http/authentication/SaslTest.java | 17 +-
.../jms_1_1/extensions/tls/TlsTest.java | 8 +-
.../apache/qpid/tools/RestStressTestClient.java | 8 +-
35 files changed, 580 insertions(+), 489 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
index 2d8fd16..c8c5e9a 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
@@ -42,7 +42,6 @@ import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Queue;
import javax.jms.Session;
-import javax.xml.bind.DatatypeConverter;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -50,6 +49,7 @@ import org.junit.Test;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.server.util.StringUtil;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode;
import org.apache.qpid.systests.JmsTestBase;
import org.apache.qpid.tests.utils.ConfigItem;
@@ -117,7 +117,7 @@ public class BDBAMQP10V0UpgradeTest extends UpgradeTestBase
{
MessageDigest digest = MessageDigest.getInstance("SHA-256");
byte[] hash = digest.digest(content);
- return DatatypeConverter.printHexBinary(hash);
+ return StringUtil.toHex(hash);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
index a335fd1..b0f50ab 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
@@ -36,6 +36,16 @@ import java.security.Principal;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.time.chrono.IsoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -50,8 +60,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
-import javax.xml.bind.DatatypeConverter;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Defaults;
@@ -70,6 +78,22 @@ abstract class AttributeValueConverter<T>
}
};
+ private static final DateTimeFormatter ISO_DATE_TIME_FORMAT = new DateTimeFormatterBuilder()
+ .parseCaseInsensitive()
+ .append(DateTimeFormatter.ISO_LOCAL_DATE)
+ .optionalStart()
+ .appendLiteral('T')
+ .append(DateTimeFormatter.ISO_LOCAL_TIME)
+ .optionalStart()
+ .appendOffsetId()
+ .optionalStart()
+ .appendLiteral('[')
+ .parseCaseSensitive()
+ .appendZoneRegionId()
+ .appendLiteral(']')
+ .toFormatter()
+ .withChronology(IsoChronology.INSTANCE);
+
static final AttributeValueConverter<Object> OBJECT_CONVERTER = new AttributeValueConverter<Object>()
{
@Override
@@ -538,9 +562,10 @@ abstract class AttributeValueConverter<T>
{
try
{
- return DatatypeConverter.parseDateTime(interpolated).getTime();
+ return ISO_DATE_TIME_FORMAT.parse(interpolated)
+ .query(this::convertToDate);
}
- catch (IllegalArgumentException e1)
+ catch (DateTimeParseException e1)
{
throw new IllegalArgumentException("Cannot convert string '" + interpolated + "' to a Date."
+ " It is neither a ISO-8601 date or date time nor a string"
@@ -557,6 +582,18 @@ abstract class AttributeValueConverter<T>
throw new IllegalArgumentException("Cannot convert type " + value.getClass() + " to a Date");
}
}
+
+ private Date convertToDate(TemporalAccessor t)
+ {
+ if(!t.isSupported(ChronoField.INSTANT_SECONDS))
+ {
+ t = LocalDateTime.of(LocalDate.from(t), LocalTime.MIN).atOffset(ZoneOffset.UTC);
+ }
+ return new Date((t.getLong(ChronoField.INSTANT_SECONDS) * 1000L)
+ + t.getLong(ChronoField.MILLI_OF_SECOND));
+
+
+ }
};
public static final AttributeValueConverter<Principal> PRINCIPAL_CONVERTER = new AttributeValueConverter<Principal>()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
index 244d802..f596a8d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
@@ -43,6 +43,7 @@ import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
@@ -52,7 +53,6 @@ import java.util.Set;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
-import javax.xml.bind.DatatypeConverter;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -143,7 +143,7 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
{
try
{
- return DatatypeConverter.printBase64Binary(_certificate.getEncoded());
+ return Base64.getEncoder().encodeToString(_certificate.getEncoded());
}
catch (CertificateEncodingException e)
{
@@ -154,7 +154,7 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
@Override
public String getEncodedPrivateKey()
{
- return DatatypeConverter.printBase64Binary(_privateKey.getEncoded());
+ return Base64.getEncoder().encodeToString(_privateKey.getEncoded());
}
@Override
@@ -447,7 +447,7 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
{
_disposition = "attachment; filename=\"" + name + ".pem\"";
StringBuilder certStringBuffer = new StringBuilder("-----BEGIN CERTIFICATE-----\n");
- String cert = DatatypeConverter.printBase64Binary(certificate.getEncoded());
+ String cert = Base64.getEncoder().encodeToString(certificate.getEncoded());
int offset = 0;
while(cert.length()-offset > 64)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
index 09029de..983a2a1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
@@ -32,6 +32,7 @@ import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
@@ -43,7 +44,6 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import javax.xml.bind.DatatypeConverter;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
@@ -136,7 +136,7 @@ public class SiteSpecificTrustStoreImpl
{
try
{
- return DatatypeConverter.printBase64Binary(_x509Certificate.getEncoded());
+ return Base64.getEncoder().encodeToString(_x509Certificate.getEncoded());
}
catch (CertificateEncodingException e)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index 7db98db..b1ccf29 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
@@ -24,8 +24,7 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -179,7 +178,7 @@ public class HashedUser implements PasswordPrincipal
{
byteArray[index++] = (byte) c;
}
- _encodedPassword = DatatypeConverter.printBase64Binary(byteArray).getBytes(StandardCharsets.UTF_8);
+ _encodedPassword = Base64.getEncoder().encodeToString(byteArray).getBytes(StandardCharsets.UTF_8);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
index 4c619ca..e8bb81e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
@@ -26,6 +26,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -33,7 +34,6 @@ import java.util.Map;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import javax.security.sasl.SaslException;
-import javax.xml.bind.DatatypeConverter;
import com.google.common.util.concurrent.ListenableFuture;
@@ -171,8 +171,8 @@ public abstract class AbstractScramAuthenticationManager<X extends AbstractScram
String password = passwordFields[PasswordField.SALT.ordinal()] + ","
+ "," // remove previously insecure salted password field
- + DatatypeConverter.printBase64Binary(storedKey) + ","
- + DatatypeConverter.printBase64Binary(serverKey) + ","
+ + Base64.getEncoder().encodeToString(storedKey) + ","
+ + Base64.getEncoder().encodeToString(serverKey) + ","
+ oldDefaultIterationCount;
upgradeUserPassword(user, password);
}
@@ -272,10 +272,10 @@ public abstract class AbstractScramAuthenticationManager<X extends AbstractScram
byte[] storedKey = MessageDigest.getInstance(getDigestName()).digest(clientKey);
byte[] serverKey = computeHmac(saltedPassword, "Server Key");
- return DatatypeConverter.printBase64Binary(salt) + ","
+ return Base64.getEncoder().encodeToString(salt) + ","
+ "," // leave insecure salted password field blank
- + DatatypeConverter.printBase64Binary(storedKey) + ","
- + DatatypeConverter.printBase64Binary(serverKey) + ","
+ + Base64.getEncoder().encodeToString(storedKey) + ","
+ + Base64.getEncoder().encodeToString(serverKey) + ","
+ iterationCount;
}
catch (NoSuchAlgorithmException e)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
index b034916..b18147d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
@@ -32,7 +32,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import javax.security.auth.Subject;
-import javax.xml.bind.DatatypeConverter;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
@@ -42,6 +41,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.SocketConnectionPrincipal;
+import org.apache.qpid.server.util.StringUtil;
public class AuthenticationResultCacher
{
@@ -147,7 +147,7 @@ public class AuthenticationResultCacher
credentialDigest = md.digest(credentialDigest);
}
- return DatatypeConverter.printHexBinary(credentialDigest);
+ return StringUtil.toHex(credentialDigest);
}
catch (NoSuchAlgorithmException e)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationProvider.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationProvider.java
index 189a78f..cf3e18f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationProvider.java
@@ -24,12 +24,11 @@ import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.DatatypeConverter;
-
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
@@ -75,7 +74,7 @@ public class MD5AuthenticationProvider
}
md.update(data);
- return DatatypeConverter.printBase64Binary(md.digest());
+ return Base64.getEncoder().encodeToString(md.digest());
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java
index 43ce269..6854bd5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java
@@ -32,6 +32,7 @@ import java.net.URL;
import java.net.URLEncoder;
import java.security.GeneralSecurityException;
import java.security.Principal;
+import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -39,8 +40,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.DatatypeConverter;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
@@ -276,7 +275,7 @@ public class OAuth2AuthenticationProviderImpl
String clientSecret = getClientSecret() == null ? "" : getClientSecret();
if (getTokenEndpointNeedsAuth())
{
- String encoded = DatatypeConverter.printBase64Binary((getClientId() + ":" + clientSecret).getBytes(UTF_8));
+ String encoded = Base64.getEncoder().encodeToString((getClientId() + ":" + clientSecret).getBytes(UTF_8));
connection.setRequestProperty("Authorization", "Basic " + encoded);
}
else
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/cloudfoundry/CloudFoundryOAuth2IdentityResolverService.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/cloudfoundry/CloudFoundryOAuth2IdentityResolverService.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/cloudfoundry/CloudFoundryOAuth2IdentityResolverService.java
index b9510b5..ae9e724 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/cloudfoundry/CloudFoundryOAuth2IdentityResolverService.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/cloudfoundry/CloudFoundryOAuth2IdentityResolverService.java
@@ -30,11 +30,10 @@ import java.net.URI;
import java.net.URL;
import java.security.GeneralSecurityException;
import java.security.Principal;
+import java.util.Base64;
import java.util.Collections;
import java.util.Map;
-import javax.xml.bind.DatatypeConverter;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
@@ -108,7 +107,7 @@ public class CloudFoundryOAuth2IdentityResolverService implements OAuth2Identity
connection.setRequestProperty("Accept-Charset", UTF_8.name());
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=" + UTF_8.name());
connection.setRequestProperty("Accept", "application/json");
- String encoded = DatatypeConverter.printBase64Binary((clientId + ":" + clientSecret).getBytes(UTF_8));
+ String encoded = Base64.getEncoder().encodeToString((clientId + ":" + clientSecret).getBytes(UTF_8));
connection.setRequestProperty("Authorization", "Basic " + encoded);
final Map<String,String> requestParameters = Collections.singletonMap("token", accessToken);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java
index 9169ee8..8dddfbc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java
@@ -26,13 +26,13 @@ import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
+import java.util.Base64;
import java.util.UUID;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-import javax.xml.bind.DatatypeConverter;
import org.apache.qpid.server.util.Strings;
@@ -128,7 +128,7 @@ class ScramSaslServer implements SaslServer
_nonce = parts[3].substring(2) + UUID.randomUUID().toString();
_saltAndPassword = _authManager.getSaltAndPasswordKeys(_username);
- _serverFirstMessage = "r="+_nonce+",s="+ DatatypeConverter.printBase64Binary(_saltAndPassword.getSalt())+",i=" + _saltAndPassword.getIterationCount();
+ _serverFirstMessage = "r=" + _nonce + ",s=" + Base64.getEncoder().encodeToString(_saltAndPassword.getSalt()) + ",i=" + _saltAndPassword.getIterationCount();
return _serverFirstMessage.getBytes(ASCII);
}
@@ -202,7 +202,7 @@ class ScramSaslServer implements SaslServer
}
byte[] serverKey = _saltAndPassword.getServerKey();
- String finalResponse = "v=" + DatatypeConverter.printBase64Binary(computeHmac(serverKey, authMessage));
+ String finalResponse = "v=" + Base64.getEncoder().encodeToString(computeHmac(serverKey, authMessage));
return finalResponse.getBytes(ASCII);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java b/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java
index 73a4f74..ed90d4f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java
@@ -28,13 +28,13 @@ import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
+import java.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
-import javax.xml.bind.DatatypeConverter;
import org.apache.qpid.server.util.Strings;
@@ -74,7 +74,7 @@ class AESKeyFileEncrypter implements ConfigurationSecretEncrypter
byte[] output = new byte[AES_INITIALIZATION_VECTOR_LENGTH + encryptedBytes.length];
System.arraycopy(ivbytes, 0, output, 0, AES_INITIALIZATION_VECTOR_LENGTH);
System.arraycopy(encryptedBytes, 0, output, AES_INITIALIZATION_VECTOR_LENGTH, encryptedBytes.length);
- return DatatypeConverter.printBase64Binary(output);
+ return Base64.getEncoder().encodeToString(output);
}
catch (IOException | InvalidAlgorithmParameterException | InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException e)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java b/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java
index 08880c9..199e4da 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java
@@ -19,14 +19,14 @@
package org.apache.qpid.server.util;
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
public class DataUrlUtils
{
public static String getDataUrlForBytes(final byte[] bytes)
{
StringBuilder inlineURL = new StringBuilder("data:;base64,");
- inlineURL.append(DatatypeConverter.printBase64Binary(bytes));
+ inlineURL.append(Base64.getEncoder().encodeToString(bytes));
return inlineURL.toString();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java b/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
index b986370..8f785d1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/util/StringUtil.java
@@ -25,15 +25,13 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Random;
-import javax.xml.bind.DatatypeConverter;
-
-
public class StringUtil
{
private static final String NUMBERS = "0123456789";
private static final String LETTERS = "abcdefghijklmnopqrstuvwxwy";
private static final String OTHERS = "_-";
private static final char[] CHARACTERS = (NUMBERS + LETTERS + LETTERS.toUpperCase() + OTHERS).toCharArray();
+ private static final char[] HEX = "0123456789ABCDEF".toCharArray();
private Random _random = new Random();
@@ -42,6 +40,16 @@ public class StringUtil
return String.valueOf(path).toLowerCase().startsWith("data:") ? "data:..." : path;
}
+ public static String toHex(byte[] bin)
+ {
+ StringBuilder result = new StringBuilder(2 * bin.length);
+ for (byte b : bin) {
+ result.append(HEX[(b >> 4) & 0xF]);
+ result.append(HEX[(b & 0xF)]);
+ }
+ return result.toString();
+ }
+
public String randomAlphaNumericString(int maxLength)
{
char[] result = new char[maxLength];
@@ -80,7 +88,7 @@ public class StringUtil
try
{
byte[] digest = MessageDigest.getInstance("MD5").digest(managerName.getBytes(StandardCharsets.UTF_8));
- builder.append(DatatypeConverter.printHexBinary(digest).toLowerCase());
+ builder.append(toHex(digest).toLowerCase());
}
catch (NoSuchAlgorithmException e)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java b/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
index 5a0953a..0e468fb 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
@@ -24,8 +24,8 @@ import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
-import java.util.Formatter;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -36,8 +36,6 @@ import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.xml.bind.DatatypeConverter;
-
/**
* Strings
@@ -139,7 +137,7 @@ public final class Strings
throw new IllegalArgumentException("Cannot convert string '"+ base64String+ "'to a byte[] - it does not appear to be base64 data");
}
- return DatatypeConverter.parseBase64Binary(base64String);
+ return Base64.getDecoder().decode(base64String);
}
public static interface Resolver
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
index 89057a1..341cc4b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
@@ -131,7 +131,7 @@ public class AttributeValueConverterTest extends UnitTestBase
new Date(1000),
converter.convert(iso8601DateTime, object));
- final String iso8601Date = "1970-01-02Z";
+ final String iso8601Date = "1970-01-02";
assertEquals("Cannot convert date expressed as ISO8601 date",
new Date(TimeUnit.MILLISECONDS.convert(1, TimeUnit.DAYS)),
converter.convert(iso8601Date, object));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
index 246329f..0ebfed9 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
@@ -301,7 +301,7 @@ public class AbstractConfiguredObjectTest extends UnitTestBase
public void testDateAttributeFromIso8601()
{
final String objectName = "myName";
- String date = "1970-01-01Z";
+ String date = "1970-01-01";
Map<String, Object> attributes = new HashMap<>();
attributes.put(TestSingleton.NAME, objectName);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
index e88bcc6..583ba8b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
@@ -41,6 +41,7 @@ import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -49,7 +50,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.KeyManager;
-import javax.xml.bind.DatatypeConverter;
import org.junit.After;
import org.junit.Before;
@@ -130,7 +130,7 @@ public class NonJavaKeyStoreTest extends UnitTestBase
if (pem)
{
kos.write("-----BEGIN PRIVATE KEY-----\n".getBytes());
- String base64encoded = DatatypeConverter.printBase64Binary(pvt.getEncoded());
+ String base64encoded = Base64.getEncoder().encodeToString(pvt.getEncoded());
while(base64encoded.length() > 76)
{
kos.write(base64encoded.substring(0,76).getBytes());
@@ -156,7 +156,7 @@ public class NonJavaKeyStoreTest extends UnitTestBase
if (pem)
{
cos.write("-----BEGIN CERTIFICATE-----\n".getBytes());
- String base64encoded = DatatypeConverter.printBase64Binary(pub.getEncoded());
+ String base64encoded = Base64.getEncoder().encodeToString(pub.getEncoded());
while(base64encoded.length() > 76)
{
cos.write(base64encoded.substring(0,76).getBytes());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index 6e9925c..d741cbc 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
@@ -34,12 +34,12 @@ import java.io.FileReader;
import java.io.IOException;
import java.security.Principal;
import java.util.Arrays;
+import java.util.Base64;
import java.util.List;
import java.util.regex.Pattern;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
-import javax.xml.bind.DatatypeConverter;
import org.junit.After;
import org.junit.Before;
@@ -59,7 +59,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
static
{
- byte[] decoded = DatatypeConverter.parseBase64Binary(PASSWORD_B64MD5HASHED);
+ byte[] decoded = Base64.getDecoder().decode(PASSWORD_B64MD5HASHED);
PASSWORD_MD5_CHARS = new char[decoded.length];
for(int i = 0; i < decoded.length; i++)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpoint.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpoint.java
index 61fdb56..6e80105 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpoint.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpoint.java
@@ -21,12 +21,12 @@
package org.apache.qpid.server.security.auth.manager.oauth2;
import java.io.IOException;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.DatatypeConverter;
class OAuth2MockEndpoint
{
@@ -44,7 +44,7 @@ class OAuth2MockEndpoint
response.setContentType("application/json");
if (_needsAuth)
{
- String expected = "Basic " + DatatypeConverter.printBase64Binary((OAuth2AuthenticationProviderImplTest.TEST_CLIENT_ID + ":" + OAuth2AuthenticationProviderImplTest.TEST_CLIENT_SECRET).getBytes(
+ String expected = "Basic " + Base64.getEncoder().encodeToString((OAuth2AuthenticationProviderImplTest.TEST_CLIENT_ID + ":" + OAuth2AuthenticationProviderImplTest.TEST_CLIENT_SECRET).getBytes(
OAuth2AuthenticationProviderImplTest.UTF8));
doAssertEquals("Authorization required",
expected,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
index 5bd686a..11e8e2b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
@@ -31,8 +31,7 @@ import static org.mockito.Mockito.when;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
import org.junit.After;
import org.junit.Before;
@@ -309,8 +308,8 @@ public class CramMd5NegotiatorTest extends UnitTestBase
byte[] data = new String(VALID_USERPASSWORD).getBytes(StandardCharsets.UTF_8);
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(data);
- char[] password = DatatypeConverter.printBase64Binary(md.digest()).toCharArray();
+ char[] password = Base64.getEncoder().encodeToString(md.digest()).toCharArray();
when(_passwordSource.getPassword(eq(VALID_USERNAME))).thenReturn(password);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
index 48e6440..788c6e4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.when;
import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -40,7 +41,6 @@ import java.util.UUID;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import javax.security.sasl.SaslException;
-import javax.xml.bind.DatatypeConverter;
import org.junit.After;
import org.junit.Before;
@@ -369,7 +369,7 @@ public class ScramNegotiatorTest extends UnitTestBase
byte[] saltedPassword = generateSaltedPassword(passwordBytes, hmacName, _iterationCount, salt);
String clientFinalMessageWithoutProof =
- "c=" + DatatypeConverter.printBase64Binary(GS2_HEADER.getBytes(ASCII))
+ "c=" + Base64.getEncoder().encodeToString(GS2_HEADER.getBytes(ASCII))
+ ",r=" + nonce;
String authMessage = _clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
@@ -384,7 +384,7 @@ public class ScramNegotiatorTest extends UnitTestBase
byte[] serverKey = computeHmac(saltedPassword, "Server Key", hmacName);
_serverSignature = computeHmac(serverKey, authMessage, hmacName);
String finalMessageWithProof = clientFinalMessageWithoutProof
- + ",p=" + DatatypeConverter.printBase64Binary(clientProof);
+ + ",p=" + Base64.getEncoder().encodeToString(clientProof);
return finalMessageWithProof.getBytes();
}
@@ -460,4 +460,4 @@ public class ScramNegotiatorTest extends UnitTestBase
Collections.<String, String>emptyMap());
return configuredObject;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java b/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
index 53d81f5..5c61df4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
@@ -35,6 +35,7 @@ import java.net.InetAddress;
import java.net.SocketAddress;
import java.security.KeyStore;
import java.util.Arrays;
+import java.util.Base64;
import java.util.HashSet;
import java.util.List;
@@ -43,7 +44,6 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManagerFactory;
-import javax.xml.bind.DatatypeConverter;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -143,7 +143,7 @@ public class TCPandSSLTransportTest extends UnitTestBase
private void checkSSLExcluded(String clientProtocol, final Transport... transports) throws Exception
{
KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(keystoreString)), "password".toCharArray());
+ keyStore.load(new ByteArrayInputStream(Base64.getDecoder().decode(keystoreString)), "password".toCharArray());
final SSLContext sslContext = SSLContext.getInstance("TLS");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org