Author: sebb
Date: Fri Jun 25 16:35:27 2010
New Revision: 958030
URL: http://svn.apache.org/viewvc?rev=958030&view=rev
Log:
Tab police
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=958030&r1=958029&r2=958030&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
Fri Jun 25 16:35:27 2010
@@ -56,271 +56,271 @@ import org.bouncycastle.x509.extension.X
public class SMIMEAssertion {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
- public SMIMEAssertion() {
- super();
- }
-
- public static AssertionResult getResult(SMIMEAssertionTestElement
testElement, SampleResult response, String name) {
- checkForBouncycastle();
- AssertionResult res = new AssertionResult(name);
-
- try {
- MimeMessage msg = getMessageFromResponse(response, 0);
- SMIMESignedParser s = null;
- if (msg.isMimeType("multipart/signed")) {
- MimeMultipart multipart = (MimeMultipart)
msg.getContent();
- s = new SMIMESignedParser(multipart);
- } else if (msg.isMimeType("application/pkcs7-mime")
- ||
msg.isMimeType("application/x-pkcs7-mime")) {
- s = new SMIMESignedParser(msg);
- }
-
- if (null != s) {
-
- if (testElement.isNotSigned()) {
- res.setFailure(true);
- res.setFailureMessage("Mime message is
signed");
- } else if (testElement.isVerifySignature() ||
!testElement.isSignerNoCheck()) {
- res = verifySignature(testElement, s,
name);
- }
-
- } else {
- if (!testElement.isNotSigned()) {
- res.setFailure(true);
- res.setFailureMessage("Mime message is
not signed");
- }
- }
-
- } catch (MessagingException e) {
- String msg = "Cannot parse mime msg: " + e.getMessage();
- log.warn(msg, e);
- res.setFailure(true);
- res.setFailureMessage(msg);
- } catch (CMSException e) {
- res.setFailure(true);
- res.setFailureMessage("Error reading the signature: "
- + e.getMessage());
- } catch (SMIMEException e) {
- res.setFailure(true);
- res
- .setFailureMessage("Cannot extract
signed body part from signature: "
- + e.getMessage());
- } catch (IOException e) { // should never happen
- log.error("Cannot read mime message content: " +
e.getMessage(), e);
- res.setError(true);
- res.setFailureMessage(e.getMessage());
- }
-
- return res;
- }
-
- private static AssertionResult
verifySignature(SMIMEAssertionTestElement testElement, SMIMESignedParser s,
String name)
- throws CMSException {
- AssertionResult res = new AssertionResult(name);
-
- try {
- CertStore certs =
s.getCertificatesAndCRLs("Collection", "BC");
- SignerInformationStore signers = s.getSignerInfos();
- Iterator signerIt = signers.getSigners().iterator();
-
- if (signerIt.hasNext()) {
-
- SignerInformation signer = (SignerInformation)
signerIt.next();
- Iterator certIt =
certs.getCertificates(signer.getSID())
- .iterator();
-
- if (certIt.hasNext()) {
- // the signer certificate
- X509Certificate cert =
(X509Certificate) certIt.next();
-
- if (testElement.isVerifySignature()) {
-
- if
(!signer.verify(cert.getPublicKey(), "BC")) {
- res.setFailure(true);
-
res.setFailureMessage("Signature is invalid");
- }
- }
-
- if
(testElement.isSignerCheckConstraints()) {
- StringBuffer failureMessage =
new StringBuffer();
-
- String serial =
testElement.getSignerSerial();
- if (serial.trim().length() > 0)
{
- BigInteger serialNbr =
readSerialNumber(serial);
- if
(!serialNbr.equals(cert.getSerialNumber())) {
-
res.setFailure(true);
- failureMessage
-
.append("Serial number ")
-
.append(serialNbr)
-
.append(
-
" does not match serial from signer certificate: ")
-
.append(cert.getSerialNumber()).append(
-
"\n");
- }
- }
-
- String email =
testElement.getSignerEmail();
- if (email.trim().length() > 0) {
- List emailfromCert =
getEmailFromCert(cert);
- if
(!emailfromCert.contains(email)) {
-
res.setFailure(true);
- failureMessage
-
.append("Email address \"")
-
.append(email)
-
.append(
-
"\" not present in signer certificate\n");
- }
-
- }
-
- String subject =
testElement.getSignerDn();
- if (subject.length() > 0) {
- X500Principal principal
= new X500Principal(subject);
- if
(!principal.equals(cert
-
.getSubjectX500Principal())) {
-
res.setFailure(true);
- failureMessage
-
.append(
-
"Distinguished name of signer certificate does not match \"")
-
.append(subject).append("\"\n");
- }
- }
-
- String issuer =
testElement.getIssuerDn();
- if (issuer.length() > 0) {
- X500Principal principal
= new X500Principal(issuer);
- if (!principal
-
.equals(cert.getIssuerX500Principal())) {
-
res.setFailure(true);
- failureMessage
-
.append(
-
"Issuer distinguished name of signer certificate does not match
\"")
-
.append(subject).append("\"\n");
- }
- }
-
- if (failureMessage.length() >
0) {
-
res.setFailureMessage(failureMessage.toString());
- }
- }
-
- if (testElement.isSignerCheckByFile()) {
- CertificateFactory cf =
CertificateFactory
-
.getInstance("X.509");
- X509Certificate certFromFile =
(X509Certificate) cf
-
.generateCertificate(new FileInputStream(
-
testElement.getSignerCertFile()));
-
- if (!certFromFile.equals(cert))
{
- res.setFailure(true);
- res
-
.setFailureMessage("Signer certificate does not match certificate "
-
+ testElement.getSignerCertFile());
- }
- }
-
- } else {
- res.setFailure(true);
- res
- .setFailureMessage("No
signer certificate found in signature");
- }
-
- }
-
- // TODO support multiple signers
- if (signerIt.hasNext()) {
- log
- .warn("SMIME message contains
multiple signers! Checking multiple signers is not supported.");
- }
-
- } catch (GeneralSecurityException e) {
- log.error(e.getMessage(), e);
- res.setError(true);
- res.setFailureMessage(e.getMessage());
- } catch (FileNotFoundException e) {
- res.setFailure(true);
- res.setFailureMessage("certificate file not found: "
- + e.getMessage());
- }
-
- return res;
- }
-
- /**
- * extracts a MIME message from the SampleResult
- */
- private static MimeMessage getMessageFromResponse(SampleResult response,
- int messageNumber) throws MessagingException {
- SampleResult subResults[] = response.getSubResults();
-
- byte[] data = subResults[messageNumber].getResponseData();
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage msg = new MimeMessage(session, new
ByteArrayInputStream(
- data));
-
- log.debug("msg.getSize() = " + msg.getSize());
- return msg;
- }
-
- /**
- * Convert the value of <code>serialString</code> into a BigInteger.
Strings
- * starting with 0x or 0X are parsed as hex numbers, otherwise as
decimal
- * number.
- *
- * @param serialString
- * the String representation of the serial Number
- * @return
- */
- private static BigInteger readSerialNumber(String serialString) {
- if (serialString.startsWith("0x") ||
serialString.startsWith("0X")) {
- return new BigInteger(serialString.substring(2), 16);
- }
- return new BigInteger(serialString);
- }
-
- /**
- * Extract email addresses from a certificate
- *
- * @param cert
- * @return a List of all email addresses found
- * @throws CertificateException
- */
- private static List getEmailFromCert(X509Certificate cert)
- throws CertificateException {
- List<String> res = new ArrayList<String>();
-
- X509Principal subject =
PrincipalUtil.getSubjectX509Principal(cert);
- Iterator addressIt =
subject.getValues(X509Principal.EmailAddress)
- .iterator();
- while (addressIt.hasNext()) {
- String address = (String) addressIt.next();
- res.add(address);
- }
-
- Iterator subjectAltNamesIt = X509ExtensionUtil
- .getSubjectAlternativeNames(cert).iterator();
- while (subjectAltNamesIt.hasNext()) {
- List altName = (List) subjectAltNamesIt.next();
- int type = ((Integer) altName.get(0)).intValue();
- if (type == GeneralName.rfc822Name) {
- String address = (String) altName.get(1);
- res.add(address);
- }
- }
-
- return res;
- }
-
- /**
- * Check if the Bouncycastle jce provider is installed and dynamically
load
- * it, if needed;
- *
- */
- private static void checkForBouncycastle() {
- if (null == Security.getProvider("BC")) {
- Security.addProvider(new BouncyCastleProvider());
- }
- }
+ public SMIMEAssertion() {
+ super();
+ }
+
+ public static AssertionResult getResult(SMIMEAssertionTestElement
testElement, SampleResult response, String name) {
+ checkForBouncycastle();
+ AssertionResult res = new AssertionResult(name);
+
+ try {
+ MimeMessage msg = getMessageFromResponse(response, 0);
+ SMIMESignedParser s = null;
+ if (msg.isMimeType("multipart/signed")) {
+ MimeMultipart multipart = (MimeMultipart) msg.getContent();
+ s = new SMIMESignedParser(multipart);
+ } else if (msg.isMimeType("application/pkcs7-mime")
+ || msg.isMimeType("application/x-pkcs7-mime")) {
+ s = new SMIMESignedParser(msg);
+ }
+
+ if (null != s) {
+
+ if (testElement.isNotSigned()) {
+ res.setFailure(true);
+ res.setFailureMessage("Mime message is signed");
+ } else if (testElement.isVerifySignature() ||
!testElement.isSignerNoCheck()) {
+ res = verifySignature(testElement, s, name);
+ }
+
+ } else {
+ if (!testElement.isNotSigned()) {
+ res.setFailure(true);
+ res.setFailureMessage("Mime message is not signed");
+ }
+ }
+
+ } catch (MessagingException e) {
+ String msg = "Cannot parse mime msg: " + e.getMessage();
+ log.warn(msg, e);
+ res.setFailure(true);
+ res.setFailureMessage(msg);
+ } catch (CMSException e) {
+ res.setFailure(true);
+ res.setFailureMessage("Error reading the signature: "
+ + e.getMessage());
+ } catch (SMIMEException e) {
+ res.setFailure(true);
+ res
+ .setFailureMessage("Cannot extract signed body part from
signature: "
+ + e.getMessage());
+ } catch (IOException e) { // should never happen
+ log.error("Cannot read mime message content: " + e.getMessage(),
e);
+ res.setError(true);
+ res.setFailureMessage(e.getMessage());
+ }
+
+ return res;
+ }
+
+ private static AssertionResult verifySignature(SMIMEAssertionTestElement
testElement, SMIMESignedParser s, String name)
+ throws CMSException {
+ AssertionResult res = new AssertionResult(name);
+
+ try {
+ CertStore certs = s.getCertificatesAndCRLs("Collection", "BC");
+ SignerInformationStore signers = s.getSignerInfos();
+ Iterator signerIt = signers.getSigners().iterator();
+
+ if (signerIt.hasNext()) {
+
+ SignerInformation signer = (SignerInformation) signerIt.next();
+ Iterator certIt = certs.getCertificates(signer.getSID())
+ .iterator();
+
+ if (certIt.hasNext()) {
+ // the signer certificate
+ X509Certificate cert = (X509Certificate) certIt.next();
+
+ if (testElement.isVerifySignature()) {
+
+ if (!signer.verify(cert.getPublicKey(), "BC")) {
+ res.setFailure(true);
+ res.setFailureMessage("Signature is invalid");
+ }
+ }
+
+ if (testElement.isSignerCheckConstraints()) {
+ StringBuffer failureMessage = new StringBuffer();
+
+ String serial = testElement.getSignerSerial();
+ if (serial.trim().length() > 0) {
+ BigInteger serialNbr = readSerialNumber(serial);
+ if (!serialNbr.equals(cert.getSerialNumber())) {
+ res.setFailure(true);
+ failureMessage
+ .append("Serial number ")
+ .append(serialNbr)
+ .append(
+ " does not match serial from
signer certificate: ")
+ .append(cert.getSerialNumber()).append(
+ "\n");
+ }
+ }
+
+ String email = testElement.getSignerEmail();
+ if (email.trim().length() > 0) {
+ List emailfromCert = getEmailFromCert(cert);
+ if (!emailfromCert.contains(email)) {
+ res.setFailure(true);
+ failureMessage
+ .append("Email address \"")
+ .append(email)
+ .append(
+ "\" not present in signer
certificate\n");
+ }
+
+ }
+
+ String subject = testElement.getSignerDn();
+ if (subject.length() > 0) {
+ X500Principal principal = new
X500Principal(subject);
+ if (!principal.equals(cert
+ .getSubjectX500Principal())) {
+ res.setFailure(true);
+ failureMessage
+ .append(
+ "Distinguished name of signer
certificate does not match \"")
+ .append(subject).append("\"\n");
+ }
+ }
+
+ String issuer = testElement.getIssuerDn();
+ if (issuer.length() > 0) {
+ X500Principal principal = new
X500Principal(issuer);
+ if (!principal
+ .equals(cert.getIssuerX500Principal())) {
+ res.setFailure(true);
+ failureMessage
+ .append(
+ "Issuer distinguished name of
signer certificate does not match \"")
+ .append(subject).append("\"\n");
+ }
+ }
+
+ if (failureMessage.length() > 0) {
+ res.setFailureMessage(failureMessage.toString());
+ }
+ }
+
+ if (testElement.isSignerCheckByFile()) {
+ CertificateFactory cf = CertificateFactory
+ .getInstance("X.509");
+ X509Certificate certFromFile = (X509Certificate) cf
+ .generateCertificate(new FileInputStream(
+ testElement.getSignerCertFile()));
+
+ if (!certFromFile.equals(cert)) {
+ res.setFailure(true);
+ res
+ .setFailureMessage("Signer certificate
does not match certificate "
+ + testElement.getSignerCertFile());
+ }
+ }
+
+ } else {
+ res.setFailure(true);
+ res
+ .setFailureMessage("No signer certificate found in
signature");
+ }
+
+ }
+
+ // TODO support multiple signers
+ if (signerIt.hasNext()) {
+ log
+ .warn("SMIME message contains multiple signers!
Checking multiple signers is not supported.");
+ }
+
+ } catch (GeneralSecurityException e) {
+ log.error(e.getMessage(), e);
+ res.setError(true);
+ res.setFailureMessage(e.getMessage());
+ } catch (FileNotFoundException e) {
+ res.setFailure(true);
+ res.setFailureMessage("certificate file not found: "
+ + e.getMessage());
+ }
+
+ return res;
+ }
+
+ /**
+ * extracts a MIME message from the SampleResult
+ */
+ private static MimeMessage getMessageFromResponse(SampleResult response,
+ int messageNumber) throws MessagingException {
+ SampleResult subResults[] = response.getSubResults();
+
+ byte[] data = subResults[messageNumber].getResponseData();
+ Session session = Session.getDefaultInstance(new Properties());
+ MimeMessage msg = new MimeMessage(session, new ByteArrayInputStream(
+ data));
+
+ log.debug("msg.getSize() = " + msg.getSize());
+ return msg;
+ }
+
+ /**
+ * Convert the value of <code>serialString</code> into a BigInteger.
Strings
+ * starting with 0x or 0X are parsed as hex numbers, otherwise as decimal
+ * number.
+ *
+ * @param serialString
+ * the String representation of the serial Number
+ * @return
+ */
+ private static BigInteger readSerialNumber(String serialString) {
+ if (serialString.startsWith("0x") || serialString.startsWith("0X")) {
+ return new BigInteger(serialString.substring(2), 16);
+ }
+ return new BigInteger(serialString);
+ }
+
+ /**
+ * Extract email addresses from a certificate
+ *
+ * @param cert
+ * @return a List of all email addresses found
+ * @throws CertificateException
+ */
+ private static List getEmailFromCert(X509Certificate cert)
+ throws CertificateException {
+ List<String> res = new ArrayList<String>();
+
+ X509Principal subject = PrincipalUtil.getSubjectX509Principal(cert);
+ Iterator addressIt = subject.getValues(X509Principal.EmailAddress)
+ .iterator();
+ while (addressIt.hasNext()) {
+ String address = (String) addressIt.next();
+ res.add(address);
+ }
+
+ Iterator subjectAltNamesIt = X509ExtensionUtil
+ .getSubjectAlternativeNames(cert).iterator();
+ while (subjectAltNamesIt.hasNext()) {
+ List altName = (List) subjectAltNamesIt.next();
+ int type = ((Integer) altName.get(0)).intValue();
+ if (type == GeneralName.rfc822Name) {
+ String address = (String) altName.get(1);
+ res.add(address);
+ }
+ }
+
+ return res;
+ }
+
+ /**
+ * Check if the Bouncycastle jce provider is installed and dynamically load
+ * it, if needed;
+ *
+ */
+ private static void checkForBouncycastle() {
+ if (null == Security.getProvider("BC")) {
+ Security.addProvider(new BouncyCastleProvider());
+ }
+ }
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java?rev=958030&r1=958029&r2=958030&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
Fri Jun 25 16:35:27 2010
@@ -27,36 +27,36 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.util.JMeterUtils;
public class SMIMEAssertionTestElement extends AbstractTestElement implements
- Serializable, Assertion {
+ Serializable, Assertion {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private static final String VERIFY_SIGNATURE_KEY =
"SMIMEAssertionTestElement.verifySignature";
+ private static final String VERIFY_SIGNATURE_KEY =
"SMIMEAssertionTestElement.verifySignature";
- private static final String NOT_SIGNED_KEY =
"SMIMEAssertionTestElement.notSigned";
+ private static final String NOT_SIGNED_KEY =
"SMIMEAssertionTestElement.notSigned";
- private static final String SIGNER_NO_CHECK_KEY =
"SMIMEAssertionTestElement.signerNoCheck";
+ private static final String SIGNER_NO_CHECK_KEY =
"SMIMEAssertionTestElement.signerNoCheck";
- private static final String SIGNER_CHECK_BY_FILE_KEY =
"SMIMEAssertionTestElement.signerCheckByFile";
+ private static final String SIGNER_CHECK_BY_FILE_KEY =
"SMIMEAssertionTestElement.signerCheckByFile";
- private static final String SIGNER_CERT_FILE_KEY =
"SMIMEAssertionTestElement.signerCertFile";
+ private static final String SIGNER_CERT_FILE_KEY =
"SMIMEAssertionTestElement.signerCertFile";
- private static final String SINGER_CHECK_CONSTRAINTS_KEY =
"SMIMEAssertionTestElement.signerCheckConstraints";
+ private static final String SINGER_CHECK_CONSTRAINTS_KEY =
"SMIMEAssertionTestElement.signerCheckConstraints";
- private static final String SIGNER_SERIAL_KEY =
"SMIMEAssertionTestElement.signerSerial";
+ private static final String SIGNER_SERIAL_KEY =
"SMIMEAssertionTestElement.signerSerial";
- private static final String SIGNER_EMAIL_KEY =
"SMIMEAssertionTestElement.signerEmail";
+ private static final String SIGNER_EMAIL_KEY =
"SMIMEAssertionTestElement.signerEmail";
- private static final String SIGNER_DN_KEY =
"SMIMEAssertionTestElement.signerDn";
+ private static final String SIGNER_DN_KEY =
"SMIMEAssertionTestElement.signerDn";
- private static final String ISSUER_DN_KEY =
"SMIMEAssertionTestElement.issuerDn";
+ private static final String ISSUER_DN_KEY =
"SMIMEAssertionTestElement.issuerDn";
- public SMIMEAssertionTestElement() {
- super();
- }
+ public SMIMEAssertionTestElement() {
+ super();
+ }
- public AssertionResult getResult(SampleResult response) {
- try {
+ public AssertionResult getResult(SampleResult response) {
+ try {
return SMIMEAssertion.getResult(this, response, getName());
} catch (NoClassDefFoundError e) {
AssertionResult assertionResult = new AssertionResult(getName());
@@ -65,88 +65,88 @@ public class SMIMEAssertionTestElement e
.getResString("bouncy_castle_unavailable_message"));
return assertionResult;
}
- }
+ }
- public boolean isVerifySignature() {
- return getPropertyAsBoolean(VERIFY_SIGNATURE_KEY);
- }
-
- public void setVerifySignature(boolean verifySignature) {
- setProperty(new BooleanProperty(VERIFY_SIGNATURE_KEY,
verifySignature));
- }
-
- public String getIssuerDn() {
- return getPropertyAsString(ISSUER_DN_KEY);
- }
-
- public void setIssuerDn(String issuertDn) {
- setProperty(new StringProperty(ISSUER_DN_KEY, issuertDn));
- }
-
- public boolean isSignerCheckByFile() {
- return getPropertyAsBoolean(SIGNER_CHECK_BY_FILE_KEY);
- }
-
- public void setSignerCheckByFile(boolean signerCheckByFile) {
- setProperty(new BooleanProperty(SIGNER_CHECK_BY_FILE_KEY,
- signerCheckByFile));
- }
-
- public boolean isSignerCheckConstraints() {
- return getPropertyAsBoolean(SINGER_CHECK_CONSTRAINTS_KEY);
- }
-
- public void setSignerCheckConstraints(boolean signerCheckConstraints) {
- setProperty(new BooleanProperty(SINGER_CHECK_CONSTRAINTS_KEY,
- signerCheckConstraints));
- }
-
- public boolean isSignerNoCheck() {
- return getPropertyAsBoolean(SIGNER_NO_CHECK_KEY);
- }
-
- public void setSignerNoCheck(boolean signerNoCheck) {
- setProperty(new BooleanProperty(SIGNER_NO_CHECK_KEY,
signerNoCheck));
- }
-
- public String getSignerCertFile() {
- return getPropertyAsString(SIGNER_CERT_FILE_KEY);
- }
-
- public void setSignerCertFile(String signerCertFile) {
- setProperty(new StringProperty(SIGNER_CERT_FILE_KEY,
signerCertFile));
- }
-
- public String getSignerDn() {
- return getPropertyAsString(SIGNER_DN_KEY);
- }
-
- public void setSignerDn(String signerDn) {
- setProperty(new StringProperty(SIGNER_DN_KEY, signerDn));
- }
-
- public String getSignerSerial() {
- return getPropertyAsString(SIGNER_SERIAL_KEY);
- }
-
- public void setSignerSerial(String signerSerial) {
- setProperty(new StringProperty(SIGNER_SERIAL_KEY,
signerSerial));
- }
-
- public String getSignerEmail() {
- return getPropertyAsString(SIGNER_EMAIL_KEY);
- }
-
- public void setSignerEmail(String signerEmail) {
- setProperty(new StringProperty(SIGNER_EMAIL_KEY, signerEmail));
- }
-
- public boolean isNotSigned() {
- return getPropertyAsBoolean(NOT_SIGNED_KEY);
- }
-
- public void setNotSigned(boolean notSigned) {
- setProperty(new BooleanProperty(NOT_SIGNED_KEY, notSigned));
- }
+ public boolean isVerifySignature() {
+ return getPropertyAsBoolean(VERIFY_SIGNATURE_KEY);
+ }
+
+ public void setVerifySignature(boolean verifySignature) {
+ setProperty(new BooleanProperty(VERIFY_SIGNATURE_KEY,
verifySignature));
+ }
+
+ public String getIssuerDn() {
+ return getPropertyAsString(ISSUER_DN_KEY);
+ }
+
+ public void setIssuerDn(String issuertDn) {
+ setProperty(new StringProperty(ISSUER_DN_KEY, issuertDn));
+ }
+
+ public boolean isSignerCheckByFile() {
+ return getPropertyAsBoolean(SIGNER_CHECK_BY_FILE_KEY);
+ }
+
+ public void setSignerCheckByFile(boolean signerCheckByFile) {
+ setProperty(new BooleanProperty(SIGNER_CHECK_BY_FILE_KEY,
+ signerCheckByFile));
+ }
+
+ public boolean isSignerCheckConstraints() {
+ return getPropertyAsBoolean(SINGER_CHECK_CONSTRAINTS_KEY);
+ }
+
+ public void setSignerCheckConstraints(boolean signerCheckConstraints) {
+ setProperty(new BooleanProperty(SINGER_CHECK_CONSTRAINTS_KEY,
+ signerCheckConstraints));
+ }
+
+ public boolean isSignerNoCheck() {
+ return getPropertyAsBoolean(SIGNER_NO_CHECK_KEY);
+ }
+
+ public void setSignerNoCheck(boolean signerNoCheck) {
+ setProperty(new BooleanProperty(SIGNER_NO_CHECK_KEY, signerNoCheck));
+ }
+
+ public String getSignerCertFile() {
+ return getPropertyAsString(SIGNER_CERT_FILE_KEY);
+ }
+
+ public void setSignerCertFile(String signerCertFile) {
+ setProperty(new StringProperty(SIGNER_CERT_FILE_KEY, signerCertFile));
+ }
+
+ public String getSignerDn() {
+ return getPropertyAsString(SIGNER_DN_KEY);
+ }
+
+ public void setSignerDn(String signerDn) {
+ setProperty(new StringProperty(SIGNER_DN_KEY, signerDn));
+ }
+
+ public String getSignerSerial() {
+ return getPropertyAsString(SIGNER_SERIAL_KEY);
+ }
+
+ public void setSignerSerial(String signerSerial) {
+ setProperty(new StringProperty(SIGNER_SERIAL_KEY, signerSerial));
+ }
+
+ public String getSignerEmail() {
+ return getPropertyAsString(SIGNER_EMAIL_KEY);
+ }
+
+ public void setSignerEmail(String signerEmail) {
+ setProperty(new StringProperty(SIGNER_EMAIL_KEY, signerEmail));
+ }
+
+ public boolean isNotSigned() {
+ return getPropertyAsBoolean(NOT_SIGNED_KEY);
+ }
+
+ public void setNotSigned(boolean notSigned) {
+ setProperty(new BooleanProperty(NOT_SIGNED_KEY, notSigned));
+ }
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java?rev=958030&r1=958029&r2=958030&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
Fri Jun 25 16:35:27 2010
@@ -16,10 +16,9 @@
*
*/
- package org.apache.jmeter.assertions.gui;
+package org.apache.jmeter.assertions.gui;
- import java.awt.BorderLayout;
-import java.awt.Component;
+import java.awt.BorderLayout;
import javax.swing.BorderFactory;
import javax.swing.Box;
@@ -39,194 +38,194 @@ import org.apache.jorphan.gui.layout.Ver
public class SMIMEAssertionGui extends AbstractAssertionGui {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private JCheckBox verifySignature = new JCheckBox();
+ private JCheckBox verifySignature = new JCheckBox();
- private JCheckBox notSigned = new JCheckBox();
+ private JCheckBox notSigned = new JCheckBox();
- private JRadioButton signerNoCheck = new JRadioButton();
+ private JRadioButton signerNoCheck = new JRadioButton();
- private JRadioButton signerCheckConstraints = new JRadioButton();
+ private JRadioButton signerCheckConstraints = new JRadioButton();
- private JRadioButton signerCheckByFile = new JRadioButton();
+ private JRadioButton signerCheckByFile = new JRadioButton();
- private JTextField signerDnField = new JTextField();
+ private JTextField signerDnField = new JTextField();
- private JTextField signerSerialNumberField = new JTextField();
+ private JTextField signerSerialNumberField = new JTextField();
- private JTextField signerEmailField = new JTextField();
+ private JTextField signerEmailField = new JTextField();
- private JTextField issuerDnField = new JTextField();
+ private JTextField issuerDnField = new JTextField();
- private JTextField signerCertFile = new JTextField();
+ private JTextField signerCertFile = new JTextField();
- public SMIMEAssertionGui() {
- init();
- }
+ public SMIMEAssertionGui() {
+ init();
+ }
- public String getLabelResource() {
- return "smime_assertion_title";
- }
+ public String getLabelResource() {
+ return "smime_assertion_title";
+ }
- private void init() {
- setLayout(new BorderLayout());
- setBorder(makeBorder());
+ private void init() {
+ setLayout(new BorderLayout());
+ setBorder(makeBorder());
- Box box = Box.createVerticalBox();
- box.add(makeTitlePanel());
- box.add(createSignaturePanel());
- box.add(createSignerPanel());
- add(box, BorderLayout.NORTH);
- }
+ Box box = Box.createVerticalBox();
+ box.add(makeTitlePanel());
+ box.add(createSignaturePanel());
+ box.add(createSignerPanel());
+ add(box, BorderLayout.NORTH);
+ }
- private JPanel createSignaturePanel() {
- JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
- .getResString("smime_assertion_signature")));
+ private JPanel createSignaturePanel() {
+ JPanel panel = new JPanel();
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
+ .getResString("smime_assertion_signature")));
- verifySignature = new JCheckBox(JMeterUtils
- .getResString("smime_assertion_verify_signature"));
+ verifySignature = new JCheckBox(JMeterUtils
+ .getResString("smime_assertion_verify_signature"));
- notSigned = new JCheckBox(JMeterUtils
- .getResString("smime_assertion_not_signed"));
- notSigned.addChangeListener(new ChangeListener() {
- public void stateChanged(ChangeEvent e) {
-
verifySignature.setEnabled(!notSigned.isSelected());
- }
- });
-
- panel.add(verifySignature);
- panel.add(notSigned);
-
- return panel;
- }
-
- private JPanel createSignerPanel() {
- JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
- .getResString("smime_assertion_signer")));
-
- panel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
-
- signerNoCheck = new JRadioButton(JMeterUtils
- .getResString("smime_assertion_signer_no_check"));
- signerCheckConstraints = new JRadioButton(JMeterUtils
- .getResString("smime_assertion_signer_constraints"));
- signerCheckByFile = new JRadioButton(JMeterUtils
- .getResString("smime_assertion_signer_by_file"));
-
- signerCertFile = new JTextField(25);
-
- ButtonGroup buttonGroup = new ButtonGroup();
- buttonGroup.add(signerNoCheck);
- buttonGroup.add(signerCheckConstraints);
- buttonGroup.add(signerCheckByFile);
-
- panel.add(signerNoCheck);
-
- panel.add(signerCheckConstraints);
- signerCheckConstraints.addChangeListener(new ChangeListener() {
- public void stateChanged(ChangeEvent e) {
-
signerDnField.setEnabled(signerCheckConstraints.isSelected());
-
signerSerialNumberField.setEnabled(signerCheckConstraints
- .isSelected());
- signerEmailField
-
.setEnabled(signerCheckConstraints.isSelected());
-
issuerDnField.setEnabled(signerCheckConstraints.isSelected());
- }
- });
- Box box = Box.createHorizontalBox();
- box.add(new JLabel(JMeterUtils
- .getResString("smime_assertion_signer_dn")));
- box.add(Box.createHorizontalStrut(5));
- signerDnField = new JTextField(25);
- box.add(signerDnField);
- panel.add(box);
-
- box = Box.createHorizontalBox();
- box.add(new JLabel(JMeterUtils
- .getResString("smime_assertion_signer_email")));
- box.add(Box.createHorizontalStrut(5));
- signerEmailField = new JTextField(25);
- box.add(signerEmailField);
- panel.add(box);
-
- box = Box.createHorizontalBox();
- box.add(new JLabel(JMeterUtils
- .getResString("smime_assertion_issuer_dn")));
- box.add(Box.createHorizontalStrut(5));
- issuerDnField = new JTextField(25);
- box.add(issuerDnField);
- panel.add(box);
-
- box = Box.createHorizontalBox();
- box.add(new JLabel(JMeterUtils
- .getResString("smime_assertion_signer_serial")));
- box.add(Box.createHorizontalStrut(5));
- signerSerialNumberField = new JTextField(25);
- box.add(signerSerialNumberField);
- panel.add(box);
-
- // panel.add(signerCheckByFile);
- signerCheckByFile.addChangeListener(new ChangeListener() {
- public void stateChanged(ChangeEvent e) {
-
signerCertFile.setEnabled(signerCheckByFile.isSelected());
- }
- });
- box = Box.createHorizontalBox();
- box.add(signerCheckByFile);
- box.add(Box.createHorizontalStrut(5));
- box.add(signerCertFile);
- panel.add(box);
-
- return panel;
- }
-
- public void configure(TestElement el) {
- super.configure(el);
- SMIMEAssertionTestElement smimeAssertion =
(SMIMEAssertionTestElement) el;
- verifySignature.setSelected(smimeAssertion.isVerifySignature());
- notSigned.setSelected(smimeAssertion.isNotSigned());
-
- if (smimeAssertion.isSignerNoCheck())
- signerNoCheck.setSelected(true);
- if (smimeAssertion.isSignerCheckConstraints())
- signerCheckConstraints.setSelected(true);
- if (smimeAssertion.isSignerCheckByFile())
- signerCheckByFile.setSelected(true);
-
- issuerDnField.setText(smimeAssertion.getIssuerDn());
- signerDnField.setText(smimeAssertion.getSignerDn());
-
signerSerialNumberField.setText(smimeAssertion.getSignerSerial());
- signerEmailField.setText(smimeAssertion.getSignerEmail());
-
- signerCertFile.setText(smimeAssertion.getSignerCertFile());
- }
-
- public void modifyTestElement(TestElement el) {
- configureTestElement(el);
- SMIMEAssertionTestElement smimeAssertion =
(SMIMEAssertionTestElement) el;
- smimeAssertion.setVerifySignature(verifySignature.isSelected());
- smimeAssertion.setNotSigned(notSigned.isSelected());
-
- smimeAssertion.setIssuerDn(issuerDnField.getText());
- smimeAssertion.setSignerDn(signerDnField.getText());
-
smimeAssertion.setSignerSerial(signerSerialNumberField.getText());
- smimeAssertion.setSignerEmail(signerEmailField.getText());
-
- smimeAssertion.setSignerCertFile(signerCertFile.getText());
-
- smimeAssertion.setSignerNoCheck(signerNoCheck.isSelected());
- smimeAssertion.setSignerCheckConstraints(signerCheckConstraints
- .isSelected());
-
smimeAssertion.setSignerCheckByFile(signerCheckByFile.isSelected());
- }
-
- public TestElement createTestElement() {
- SMIMEAssertionTestElement smimeAssertion = new
SMIMEAssertionTestElement();
- modifyTestElement(smimeAssertion);
- return smimeAssertion;
- }
+ notSigned = new JCheckBox(JMeterUtils
+ .getResString("smime_assertion_not_signed"));
+ notSigned.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ verifySignature.setEnabled(!notSigned.isSelected());
+ }
+ });
+
+ panel.add(verifySignature);
+ panel.add(notSigned);
+
+ return panel;
+ }
+
+ private JPanel createSignerPanel() {
+ JPanel panel = new JPanel();
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
+ .getResString("smime_assertion_signer")));
+
+ panel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+
+ signerNoCheck = new JRadioButton(JMeterUtils
+ .getResString("smime_assertion_signer_no_check"));
+ signerCheckConstraints = new JRadioButton(JMeterUtils
+ .getResString("smime_assertion_signer_constraints"));
+ signerCheckByFile = new JRadioButton(JMeterUtils
+ .getResString("smime_assertion_signer_by_file"));
+
+ signerCertFile = new JTextField(25);
+
+ ButtonGroup buttonGroup = new ButtonGroup();
+ buttonGroup.add(signerNoCheck);
+ buttonGroup.add(signerCheckConstraints);
+ buttonGroup.add(signerCheckByFile);
+
+ panel.add(signerNoCheck);
+
+ panel.add(signerCheckConstraints);
+ signerCheckConstraints.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ signerDnField.setEnabled(signerCheckConstraints.isSelected());
+ signerSerialNumberField.setEnabled(signerCheckConstraints
+ .isSelected());
+ signerEmailField
+ .setEnabled(signerCheckConstraints.isSelected());
+ issuerDnField.setEnabled(signerCheckConstraints.isSelected());
+ }
+ });
+ Box box = Box.createHorizontalBox();
+ box.add(new JLabel(JMeterUtils
+ .getResString("smime_assertion_signer_dn")));
+ box.add(Box.createHorizontalStrut(5));
+ signerDnField = new JTextField(25);
+ box.add(signerDnField);
+ panel.add(box);
+
+ box = Box.createHorizontalBox();
+ box.add(new JLabel(JMeterUtils
+ .getResString("smime_assertion_signer_email")));
+ box.add(Box.createHorizontalStrut(5));
+ signerEmailField = new JTextField(25);
+ box.add(signerEmailField);
+ panel.add(box);
+
+ box = Box.createHorizontalBox();
+ box.add(new JLabel(JMeterUtils
+ .getResString("smime_assertion_issuer_dn")));
+ box.add(Box.createHorizontalStrut(5));
+ issuerDnField = new JTextField(25);
+ box.add(issuerDnField);
+ panel.add(box);
+
+ box = Box.createHorizontalBox();
+ box.add(new JLabel(JMeterUtils
+ .getResString("smime_assertion_signer_serial")));
+ box.add(Box.createHorizontalStrut(5));
+ signerSerialNumberField = new JTextField(25);
+ box.add(signerSerialNumberField);
+ panel.add(box);
+
+ // panel.add(signerCheckByFile);
+ signerCheckByFile.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ signerCertFile.setEnabled(signerCheckByFile.isSelected());
+ }
+ });
+ box = Box.createHorizontalBox();
+ box.add(signerCheckByFile);
+ box.add(Box.createHorizontalStrut(5));
+ box.add(signerCertFile);
+ panel.add(box);
+
+ return panel;
+ }
+
+ public void configure(TestElement el) {
+ super.configure(el);
+ SMIMEAssertionTestElement smimeAssertion = (SMIMEAssertionTestElement)
el;
+ verifySignature.setSelected(smimeAssertion.isVerifySignature());
+ notSigned.setSelected(smimeAssertion.isNotSigned());
+
+ if (smimeAssertion.isSignerNoCheck())
+ signerNoCheck.setSelected(true);
+ if (smimeAssertion.isSignerCheckConstraints())
+ signerCheckConstraints.setSelected(true);
+ if (smimeAssertion.isSignerCheckByFile())
+ signerCheckByFile.setSelected(true);
+
+ issuerDnField.setText(smimeAssertion.getIssuerDn());
+ signerDnField.setText(smimeAssertion.getSignerDn());
+ signerSerialNumberField.setText(smimeAssertion.getSignerSerial());
+ signerEmailField.setText(smimeAssertion.getSignerEmail());
+
+ signerCertFile.setText(smimeAssertion.getSignerCertFile());
+ }
+
+ public void modifyTestElement(TestElement el) {
+ configureTestElement(el);
+ SMIMEAssertionTestElement smimeAssertion = (SMIMEAssertionTestElement)
el;
+ smimeAssertion.setVerifySignature(verifySignature.isSelected());
+ smimeAssertion.setNotSigned(notSigned.isSelected());
+
+ smimeAssertion.setIssuerDn(issuerDnField.getText());
+ smimeAssertion.setSignerDn(signerDnField.getText());
+ smimeAssertion.setSignerSerial(signerSerialNumberField.getText());
+ smimeAssertion.setSignerEmail(signerEmailField.getText());
+
+ smimeAssertion.setSignerCertFile(signerCertFile.getText());
+
+ smimeAssertion.setSignerNoCheck(signerNoCheck.isSelected());
+ smimeAssertion.setSignerCheckConstraints(signerCheckConstraints
+ .isSelected());
+ smimeAssertion.setSignerCheckByFile(signerCheckByFile.isSelected());
+ }
+
+ public TestElement createTestElement() {
+ SMIMEAssertionTestElement smimeAssertion = new
SMIMEAssertionTestElement();
+ modifyTestElement(smimeAssertion);
+ return smimeAssertion;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
