wiztools#50 wiztools#48 Now in the UI we have the option of ignoring …

…all certificate errors (instead of just self-signed certificate).
mematrix · May 5, 2016 · 4a3ca8b · 4a3ca8b
1 parent 8cf3aea
commit 4a3ca8b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/restclient-lib/src/main/java/org/wiztools/restclient/HTTPClientRequestExecuter.java b/restclient-lib/src/main/java/org/wiztools/restclient/HTTPClientRequestExecuter.java
@@ -390,7 +390,7 @@ else if(part instanceof ReqEntityFilePart) {
                         null:
                         sslReq.getKeyStore().getKeyStore();
 
-                final TrustStrategy trustStrategy = sslReq.isTrustSelfSignedCert()
+                final TrustStrategy trustStrategy = sslReq.isTrustAllCerts()
                         ? new TrustAllTrustStrategy(): null;
 
                 SSLContext ctx = new SSLContextBuilder()

diff --git a/restclient-lib/src/main/java/org/wiztools/restclient/bean/SSLReq.java b/restclient-lib/src/main/java/org/wiztools/restclient/bean/SSLReq.java
@@ -9,7 +9,7 @@
 public interface SSLReq extends Serializable {
 
     SSLHostnameVerifier getHostNameVerifier();
-    boolean isTrustSelfSignedCert();
+    boolean isTrustAllCerts();
 
     SSLKeyStore getKeyStore();
 

diff --git a/restclient-lib/src/main/java/org/wiztools/restclient/bean/SSLReqBean.java b/restclient-lib/src/main/java/org/wiztools/restclient/bean/SSLReqBean.java
@@ -14,14 +14,14 @@ public class SSLReqBean implements SSLReq {
     // Default to strict!
     private SSLHostnameVerifier hostNameVerifier = SSLHostnameVerifier.STRICT;
 
-    private boolean trustSelfSignedCert = false;
+    private boolean trustAllCerts = false;
 
     public void setHostNameVerifier(SSLHostnameVerifier sslHostNameVerifier) {
         this.hostNameVerifier = sslHostNameVerifier;
     }
 
-    public void setTrustSelfSignedCert(boolean sslTrustSelfSignedCert) {
-        this.trustSelfSignedCert = sslTrustSelfSignedCert;
+    public void setTrustAllCerts(boolean sslTrustSelfSignedCert) {
+        this.trustAllCerts = sslTrustSelfSignedCert;
     }
 
     public void setKeyStore(SSLKeyStore sslKeyStore) {
@@ -48,8 +48,8 @@ public SSLKeyStore getTrustStore() {
     }
 
     @Override
-    public boolean isTrustSelfSignedCert() {
-        return trustSelfSignedCert;
+    public boolean isTrustAllCerts() {
+        return trustAllCerts;
     }
 
     @Override
@@ -58,7 +58,7 @@ public int hashCode() {
         hash = 29 * hash + Objects.hashCode(this.trustStore);
         hash = 29 * hash + Objects.hashCode(this.keyStore);
         hash = 29 * hash + Objects.hashCode(this.hostNameVerifier);
-        hash = 29 * hash + (this.trustSelfSignedCert ? 1 : 0);
+        hash = 29 * hash + (this.trustAllCerts ? 1 : 0);
         return hash;
     }
 
@@ -80,7 +80,7 @@ public boolean equals(Object obj) {
         if (this.hostNameVerifier != other.hostNameVerifier) {
             return false;
         }
-        if (this.trustSelfSignedCert != other.trustSelfSignedCert) {
+        if (this.trustAllCerts != other.trustAllCerts) {
             return false;
         }
         return true;
@@ -90,7 +90,7 @@ public boolean equals(Object obj) {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("@SSL[");
-        sb.append("trustSelfSignedCert=").append(trustSelfSignedCert).append(", ");
+        sb.append("trustSelfSignedCert=").append(trustAllCerts).append(", ");
         sb.append("hostNameVerifier=").append(hostNameVerifier).append(", ");
         sb.append("trustStore=").append(trustStore).append(", ");
         sb.append("keyStore=").append(keyStore).append(", ");

diff --git a/restclient-lib/src/main/java/org/wiztools/restclient/persistence/XmlSslUtil.java b/restclient-lib/src/main/java/org/wiztools/restclient/persistence/XmlSslUtil.java
@@ -22,8 +22,8 @@ private XmlSslUtil() {}
     static Element getSslReq(SSLReq req) {
         Element eSsl = new Element("ssl");
 
-        if(req.isTrustSelfSignedCert()) {
-            Element e = new Element("trust-self-signed-cert");
+        if(req.isTrustAllCerts()) {
+            Element e = new Element("ignore-cert-errs");
             eSsl.appendChild(e);
         }
 
@@ -62,8 +62,9 @@ static SSLReq getSslReq(Element eSsl) {
             Element e = eChildren.get(i);
             final String name = e.getLocalName();
             if(null != name) switch (name) {
-                case "trust-self-signed-cert":
-                    out.setTrustSelfSignedCert(true);
+                case "trust-self-signed-cert": // backward-compatibility...
+                case "ignore-cert-errs":
+                    out.setTrustAllCerts(true);
                     break;
                 case "hostname-verifier":
                     out.setHostNameVerifier(SSLHostnameVerifier.valueOf(e.getValue()));

diff --git a/restclient-lib/src/test/java/org/wiztools/restclient/SslTest.java b/restclient-lib/src/test/java/org/wiztools/restclient/SslTest.java
@@ -48,7 +48,7 @@ public void testSsl()  throws Exception {
         expResult.setHttpVersion(HTTPVersion.HTTP_1_1);
         expResult.setFollowRedirect(true);
         SSLReqBean ssl = new SSLReqBean();
-        ssl.setTrustSelfSignedCert(true);
+        ssl.setTrustAllCerts(true);
         ssl.setHostNameVerifier(SSLHostnameVerifier.ALLOW_ALL);
         expResult.setSslReq(ssl);
 

diff --git a/restclient-ui/src/main/java/org/wiztools/restclient/ui/reqssl/ReqSSLPanelImpl.java b/restclient-ui/src/main/java/org/wiztools/restclient/ui/reqssl/ReqSSLPanelImpl.java
@@ -23,7 +23,7 @@ public class ReqSSLPanelImpl extends JPanel implements ReqSSLPanel {
 
     // SSL - general
     private final JCheckBox jcb_disable_hostname_verifier = new JCheckBox("Disable hostname verification? ");
-    private final JCheckBox jcb_ssl_trust_self_signed_cert = new JCheckBox("Trust self-signed certificate? ");
+    private final JCheckBox jcb_ssl_trust_self_signed_cert = new JCheckBox("Ignore cert errors (self-signed, expired, etc.)? ");
 
     // SSL - trust store
     @Inject private KeyStorePanel jp_truststore;
@@ -41,7 +41,7 @@ public SSLReq getSslReq() {
         SSLReqBean out = new SSLReqBean();
 
         out.setHostNameVerifier(getSelectedHostnameVerifier());
-        out.setTrustSelfSignedCert(jcb_ssl_trust_self_signed_cert.isSelected());
+        out.setTrustAllCerts(jcb_ssl_trust_self_signed_cert.isSelected());
 
         SSLKeyStore trustStore = jp_truststore.getKeyStore();    
         out.setTrustStore(trustStore);
@@ -63,7 +63,7 @@ public void setSslReq(SSLReq sslReq) {
                 jcb_disable_hostname_verifier.setSelected(false);
                 break;
         }
-        jcb_ssl_trust_self_signed_cert.setSelected(sslReq.isTrustSelfSignedCert());
+        jcb_ssl_trust_self_signed_cert.setSelected(sslReq.isTrustAllCerts());
 
         // truststore / keystore tab:
         jp_truststore.setKeyStore(sslReq.getTrustStore());