From fad835037adc1bd313bb56b694426fca4eb67346 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 10 Oct 2014 16:30:54 +0200
Subject: [PATCH] interactive mode

---
 .../duenndns/ssl/MemorizingTrustManager.java  | 73 +++++++++++++++++--
 1 file changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/de/duenndns/ssl/MemorizingTrustManager.java b/src/de/duenndns/ssl/MemorizingTrustManager.java
index 90e6ed4..9032ba2 100644
--- a/src/de/duenndns/ssl/MemorizingTrustManager.java
+++ b/src/de/duenndns/ssl/MemorizingTrustManager.java
@@ -291,6 +291,13 @@ public HostnameVerifier wrapHostnameVerifier(final HostnameVerifier defaultVerif
 		return new MemorizingHostnameVerifier(defaultVerifier);
 	}
 	
+	public HostnameVerifier wrapHostnameVerifierNonInteractive(final HostnameVerifier defaultVerifier) {
+		if (defaultVerifier == null)
+			throw new IllegalArgumentException("The default verifier may not be null");
+		
+		return new NonInteractiveMemorizingHostnameVerifier(defaultVerifier);
+	}
+	
 	X509TrustManager getTrustManager(KeyStore ks) {
 		try {
 			TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
@@ -382,7 +389,7 @@ private boolean isExpiredException(Throwable e) {
 		return false;
 	}
 
-	public void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer)
+	public void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer, boolean interactive)
 		throws CertificateException
 	{
 		LOGGER.log(Level.FINE, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
@@ -412,8 +419,12 @@ public void checkCertTrusted(X509Certificate[] chain, String authType, boolean i
 				else
 					defaultTrustManager.checkClientTrusted(chain, authType);
 			} catch (CertificateException e) {
-				LOGGER.log(Level.FINER, "checkCertTrusted: defaultTrustManager failed", e);
-				interactCert(chain, authType, e);
+				e.printStackTrace();
+				if (interactive) {
+					interactCert(chain, authType, e);
+				} else {
+					throw e;
+				}
 			}
 		}
 	}
@@ -421,13 +432,13 @@ public void checkCertTrusted(X509Certificate[] chain, String authType, boolean i
 	public void checkClientTrusted(X509Certificate[] chain, String authType)
 		throws CertificateException
 	{
-		checkCertTrusted(chain, authType, false);
+		checkCertTrusted(chain, authType, false,true);
 	}
 
 	public void checkServerTrusted(X509Certificate[] chain, String authType)
 		throws CertificateException
 	{
-		checkCertTrusted(chain, authType, true);
+		checkCertTrusted(chain, authType, true,true);
 	}
 
 	public X509Certificate[] getAcceptedIssuers()
@@ -650,8 +661,7 @@ public MemorizingHostnameVerifier(HostnameVerifier wrapped) {
 			defaultVerifier = wrapped;
 		}
 
-		@Override
-		public boolean verify(String hostname, SSLSession session) {
+		protected boolean verify(String hostname, SSLSession session, boolean interactive) {
 			LOGGER.log(Level.FINE, "hostname verifier for " + hostname + ", trying default verifier first");
 			// if the default verifier accepts the hostname, we are done
 			if (defaultVerifier.verify(hostname, session)) {
@@ -667,12 +677,59 @@ public boolean verify(String hostname, SSLSession session) {
 					return true;
 				} else {
 					LOGGER.log(Level.FINE, "server " + hostname + " provided wrong certificate, asking user.");
-					return interactHostname(cert, hostname);
+					if (interactive) {
+						return interactHostname(cert, hostname);
+					} else {
+						return false;
+					}
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
 				return false;
 			}
 		}
+		
+		@Override
+		public boolean verify(String hostname, SSLSession session) {
+			return verify(hostname, session, true);
+		}
+	}
+	
+	class NonInteractiveMemorizingHostnameVerifier extends MemorizingHostnameVerifier {
+
+		public NonInteractiveMemorizingHostnameVerifier(HostnameVerifier wrapped) {
+			super(wrapped);
+		}
+		@Override
+		public boolean verify(String hostname, SSLSession session) {
+			return verify(hostname, session, true);
+		}
+		
+		
+	}
+	
+	public X509TrustManager getNonInteractive() {
+		return new NonInteractiveMemorizingTrustManager();
+	}
+	
+	private class NonInteractiveMemorizingTrustManager implements X509TrustManager {
+
+		@Override
+		public void checkClientTrusted(X509Certificate[] chain, String authType)
+				throws CertificateException {
+			MemorizingTrustManager.this.checkCertTrusted(chain, authType, false, false);
+		}
+
+		@Override
+		public void checkServerTrusted(X509Certificate[] chain, String authType)
+				throws CertificateException {
+			MemorizingTrustManager.this.checkCertTrusted(chain, authType, true, false);
+		}
+
+		@Override
+		public X509Certificate[] getAcceptedIssuers() {
+			return MemorizingTrustManager.this.getAcceptedIssuers();
+		}
+		
 	}
 }