PHON-6: Split normal SSL and X509 servers

Author: bjori

scripts/presets/standalone-ssl.json

@@ -1,9 +1,6 @@
 {
     "name": "mongod", 
     "id" : "STANDALONE-SSL",
-    "auth_key": "secret",
-    "login": "root", 
-    "password": "toor", 
     "procParams": {
         "dbpath": "/tmp/standalone-ssl/",
         "ipv6": true, 

scripts/presets/standalone-x509.json

@@ -0,0 +1,23 @@
+{
+    "name": "mongod", 
+    "id" : "STANDALONE-X509",
+    "auth_key": "secret",
+    "login": "root", 
+    "password": "toor", 
+    "procParams": {
+        "dbpath": "/tmp/standalone-x509/",
+        "ipv6": true, 
+        "logappend": true, 
+        "logpath": "/tmp/standalone-x509/m.log", 
+        "journal": true,
+        "port": 2300,
+        "setParameter": {"enableTestCommands": 1}
+    }, 
+    "sslParams": {
+        "sslCAFile": "/phongo/scripts/ssl/ca.pem", 
+        "sslOnNormalPorts": true, 
+        "sslPEMKeyFile": "/phongo/scripts/ssl/server.pem", 
+        "sslWeakCertificateValidation": true
+    }
+}
+

scripts/start-servers.php

@@ -20,3 +20,6 @@
 $auth = $orch->start("standalone-auth.json");
 printf("Standalone Auth server running on: %s\n", $auth);
 
+$x509 = $orch->start("standalone-x509.json");
+printf("Standalone X509 Auth server running on: %s\n", $x509);
+

tests/utils/basic.inc

@@ -17,6 +17,9 @@ if (!$orch->ping()) {
 $consts = array(
     "MONGODB_URI"         => $orch->getURI("standalone.json"),
     "MONGODB_CLEANUP_URI" => $orch->getURI("standalone.json"),
+    "MONGODB_STANDALONE_URI"      => $orch->getURI("standalone.json"),
+    "MONGODB_STANDALONE_AUTH_URI" => $orch->getURI("standalone-auth.json"),
+    "MONGODB_STANDALONE_SSL_URI"  => $orch->getURI("standalone-ssl.json"),
     "DATABASE_NAME"       => "phongo",
     "COLLECTION_NAME"     => makeCollectionNameFromFilename($_SERVER["SCRIPT_FILENAME"]),
     "DEBUG_DIR"           => sys_get_temp_dir() . "/PHONGO-TESTS/",