jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1708212 - /jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
Date Mon, 12 Oct 2015 19:58:56 GMT
Author: fschumacher
Date: Mon Oct 12 19:58:56 2015
New Revision: 1708212

URL: http://svn.apache.org/viewvc?rev=1708212&view=rev
Log:
Add a keywordMap parameter when using the constructor of X500Principal.

This is necessary for DNs which have emailAddress components, which
where not parsed correctly by the jdk.

For better debug logs both compared components will be logged now, when
comparing the issuerDN/certDN with given ones for the assertion.

Bugzilla Id: 58303

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=1708212&r1=1708211&r2=1708212&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java Mon Oct 12
19:58:56 2015
@@ -33,8 +33,10 @@ import java.security.cert.CertificateFac
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Vector;
 
@@ -70,6 +72,12 @@ class SMIMEAssertion {
 
     // Use the name of the test element, otherwise cannot enable/disable debug from the GUI
     private static final Logger log = LoggingManager.getLoggerForShortName(SMIMEAssertionTestElement.class.getName());
+    
+    private static Map<String, String> keywordMap = new HashMap<>();
+    static {
+        keywordMap.put("E", "1.2.840.113549.1.9.1");
+        keywordMap.put("EMAILADDRESS", "1.2.840.113549.1.9.1");
+    }
 
     SMIMEAssertion() {
         super();
@@ -203,13 +211,13 @@ class SMIMEAssertion {
                         if (subject.length() > 0) {
                             final X500Principal certPrincipal = cert.getSubjectX500Principal();
                             log.debug(certPrincipal.getName(X500Principal.CANONICAL));
-                            X500Principal principal = new X500Principal(subject);
+                            X500Principal principal = new X500Principal(subject, keywordMap);
                             log.debug(principal.getName(X500Principal.CANONICAL));
                             if (!principal.equals(certPrincipal)) {
                                 res.setFailure(true);
                                 failureMessage
                                         .append("Distinguished name of signer certificate
does not match \"")
-                                        .append(subject).append("\"\n");
+                                        .append(principal).append("\" != \"").append(certPrincipal).append("\"\n");
                             }
                         }
 
@@ -217,13 +225,13 @@ class SMIMEAssertion {
                         if (issuer.length() > 0) {
                             final X500Principal issuerX500Principal = cert.getIssuerX500Principal();
                             log.debug(issuerX500Principal.getName(X500Principal.CANONICAL));
-                            X500Principal principal = new X500Principal(issuer);
+                            X500Principal principal = new X500Principal(issuer, keywordMap);
                             log.debug(principal.getName(X500Principal.CANONICAL));
                             if (!principal.equals(issuerX500Principal)) {
                                 res.setFailure(true);
                                 failureMessage
                                         .append("Issuer distinguished name of signer certificate
does not match \"")
-                                        .append(subject).append("\"\n");
+                                        .append(principal).append("\" != \"").append(issuerX500Principal).append("\"\n");
                             }
                         }
 



Mime
View raw message