Author: orudyy
Date: Tue Apr 12 08:31:22 2016
New Revision: 1738731
URL: http://svn.apache.org/viewvc?rev=1738731&view=rev
Log:
QPID-7174: Add ability to convert certificates represented as Base64 encoded
string into X509 Certificates
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java?rev=1738731&r1=1738730&r2=1738731&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
Tue Apr 12 08:31:22 2016
@@ -22,7 +22,6 @@ package org.apache.qpid.server.model;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
@@ -30,7 +29,6 @@ import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.net.URI;
-import java.nio.charset.StandardCharsets;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
@@ -206,7 +204,8 @@ abstract class AttributeValueConverter<T
else if(value instanceof String)
{
String strValue = AbstractConfiguredObject.interpolate(object,
(String) value);
- return convert(strValue.getBytes(StandardCharsets.UTF_8),
object);
+ byte[] certificateBytes = BINARY_CONVERTER.convert(strValue,
object);
+ return convert(certificateBytes, object);
}
else if(value == null)
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java?rev=1738731&r1=1738730&r2=1738731&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
Tue Apr 12 08:31:22 2016
@@ -28,6 +28,9 @@ import static java.util.Collections.unmo
import static
org.apache.qpid.server.model.AttributeValueConverter.getConverter;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.text.ParseException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -192,4 +195,32 @@ public class AttributeValueConverterTest
}
}
+ private static String BASE_64_ENCODED_CERTIFICATE =
"MIIC4TCCAkqgAwIBAgIFAKI1xCswDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UE"
+ +
"BhMCQ0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBg"
+ +
"NVBAMTCE15Um9vdENBMB4XDTE1MDMyMDAxMjEwNVoXDTIwMDMyMDAxMjEw"
+ +
"NVowYTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3"
+ +
"JvbnRvMQ0wCwYDVQQKEwRhY21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMM"
+ +
"DWFwcDJAYWNtZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAo"
+ +
"IBAQCviLTH6Vl6gP3M6gmmm0sVlCcBFfo2czDTsr93D1cIQpnyY1r3znBd"
+ +
"FT3cbXE2LtHeLpnlXc+dTo9/aoUuBCzRIpi4CeaGgD3ggIl9Ws5hUgfxJC"
+ +
"WBg7nhzMUlBC2C+VgIUHWHqGPuaQ7VzXOEC7xF0mihMZ4bwvU6wxGK2uUo"
+ +
"ruXE/iti/+jtzxjq0PO7ZgJ7GUI2ZDqGMad5OnLur8jz+yKsVdetXlXsOy"
+ +
"HmHi/47pRuA115pYiIaZKu1+vs6IBl4HnEUgw5JwIww6oyTDVvXc1kCw0Q"
+ +
"CtUZMcNSH2XGhh/zGM/M2Bt2lgEEW0xWTwQcT1J7wnngfbIYbzoupEkRAg"
+ +
"MBAAGjQTA/MB0GA1UdDgQWBBRI+VUMRkfNYp/xngM9y720hvxmXTAJBgNV"
+ +
"HRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4"
+ +
"GBAJnedohhbqoY7O6oAm+hPScBCng/fl0erVjexL9W8l8g5NvIGgioUfjU"
+ +
"DvGOnwB5LOoTnZUCRaLFhQFcGFMIjdHpg0qt/QkEFX/0m+849RK6muHT1C"
+ +
"NlcXtCFXwPTJ+9h+1auTP+Yp/6ii9SU3W1dzYawy2p9IhkMZEpJaHCLnaC";
+
+ public void testBase64EncodedCertificateConverter() throws ParseException
+ {
+ ConfiguredObject object = _objectFactory.create(TestCar.class,
_attributes);
+ AttributeValueConverter<Certificate> certificateConverter =
getConverter(Certificate.class, Certificate.class);
+ Certificate certificate =
certificateConverter.convert(BASE_64_ENCODED_CERTIFICATE, object);
+ assertTrue("Unexpected certificate", certificate instanceof
X509Certificate);
+ X509Certificate x509Certificate = (X509Certificate)certificate;
+ assertEquals("[email protected],OU=art,O=acme,L=Toronto,ST=ON,C=CA",
x509Certificate.getSubjectX500Principal().getName());
+ assertEquals("CN=MyRootCA,O=ACME,ST=Ontario,C=CA",
x509Certificate.getIssuerX500Principal().getName());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
