Merge branch 'master' of github.com:jdigweed/sonar into jdigweed-master

1 files changed, 48 insertions, 1 deletions

diff --git a/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java b/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java
index b207e98441e..c2ac054a808 100644
--- a/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java
@@ -124,7 +124,8 @@ public class ConnectorsTest {
       @Override
       public boolean matches(Object o) {
         Connector c = (Connector) o;
-        return c.getScheme().equals("https") && c.getPort() == 9443;
+        return c.getScheme().equals("https") && c.getPort() == 9443
+        		&& c.getProperty("clientAuth").equals("false");
       }
     }));
   }
@@ -256,6 +257,52 @@ public class ConnectorsTest {
     verify(tomcat.getServer(), never()).setShutdown(anyString());
   }
 
+  @Test
+  public void enable_client_auth() throws Exception {
+	  
+    Properties p = new Properties();
+
+    p.setProperty("sonar.web.port", "-1");
+    p.setProperty("sonar.web.https.port", "9443");
+    p.setProperty("sonar.web.https.clientAuth", "want");
+    
+    Props props = new Props(p);
+
+    Connectors.configure(tomcat, props);
+
+    verify(tomcat).setConnector(argThat(new ArgumentMatcher<Connector>() {
+        @Override
+        public boolean matches(Object o) {
+          Connector c = (Connector) o;
+          return c.getScheme().equals("https") && c.getProperty("clientAuth").equals("want");
+        }
+      }));
+  }
+
+  @Test
+  public void require_client_auth() throws Exception {
+	  
+    Properties p = new Properties();
+
+    p.setProperty("sonar.web.port", "-1");
+    p.setProperty("sonar.web.https.port", "9443");
+    p.setProperty("sonar.web.https.clientAuth", "true");
+    
+    Props props = new Props(p);
+
+    Connectors.configure(tomcat, props);
+
+    verify(tomcat).setConnector(argThat(new ArgumentMatcher<Connector>() {
+        @Override
+        public boolean matches(Object o) {
+          Connector c = (Connector) o;
+          return c.getScheme().equals("https") && c.getProperty("clientAuth").equals("true");
+        }
+      }));
+  }
+ 
+  
+
   private static class PropertiesMatcher extends ArgumentMatcher<Connector> {
     private final Map<String, Object> expected;