Merge branch 'improve-tls-configuration'

Closes pump-io#1061
larjona · Sep 12, 2016 · bde7b76 · bde7b76
2 parents b78603a + 2a10c7a
commit bde7b76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/app.js b/lib/app.js
@@ -29,6 +29,7 @@ var urlparse = require("url").parse,
     validator = require("validator"),
     DialbackClient = require("dialback-client"),
     helmet = require("helmet"),
+    sslConfig = require("ssl-config")("intermediate"),
     api = require("../routes/api"),
     web = require("../routes/web"),
     shared = require("../routes/shared"),
@@ -206,7 +207,10 @@ var makeApp = function(configBase, callback) {
         if (useHTTPS) {
             log.debug("Setting up HTTPS server.");
             app = express.createServer({key: fs.readFileSync(config.key),
-                                        cert: fs.readFileSync(config.cert)});
+                                        cert: fs.readFileSync(config.cert),
+                                        ciphers: sslConfig.ciphers,
+                                        honorCipherOrder: true,
+                                        secureOptions: sslConfig.minimumTLSVersion});
 
             if (useBounce) {
                 log.debug("Setting up micro-HTTP server to bounce to HTTPS.");

diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
     "send": "^0.13.2",
     "showdown": "^1.4.1",
     "sockjs": "0.3.x",
+    "ssl-config": "0.0.9",
     "step": "0.0.x",
     "ua-parser-js": "^0.7.10",
     "underscore": "1.8.x",