diff --git a/modules/protocols/protocols.js b/modules/protocols/protocols.js index 7338533bf..e3ab4edc3 100644 --- a/modules/protocols/protocols.js +++ b/modules/protocols/protocols.js @@ -11,7 +11,7 @@ module.exports = function (phantomas) { phantomas.setMetric("mainDomainHttpProtocol"); // @desc HTTP protocol used by the main domain [string] phantomas.setMetric("oldHttpProtocol"); // @desc number of domains using HTTP/1.0 or 1.1 phantomas.setMetric("mainDomainTlsProtocol"); // @desc TLS protocol used by the main domain [string] - phantomas.setMetric("oldTlsProtocol"); // @desc number of domains using TLS 1.1 or 1.2 + phantomas.setMetric("oldTlsProtocol"); // @desc number of domains using TLS 1.2 // spy all requests phantomas.on("recv", (entry) => { diff --git a/test/integration-spec.yaml b/test/integration-spec.yaml index 9a814f686..170991fef 100644 --- a/test/integration-spec.yaml +++ b/test/integration-spec.yaml @@ -825,28 +825,28 @@ # protocols # http/1.1 (legacy one) -- url: "http://127.0.0.1:8888" - label: "localhost with http/1.1" - # options: - # ignore-ssl-errors: true +- url: "https://127.0.0.1:8889" + label: "localhost with http/1.1 and TLS 1.2" + options: + ignore-ssl-errors: true metrics: mainDomainHttpProtocol: "http/1.1" oldHttpProtocol: 1 - # mainDomainTlsProtocol: "TLS 1.1" - # oldTlsProtocol: 1 + mainDomainTlsProtocol: "TLS 1.2" + oldTlsProtocol: 1 offenders: oldHttpProtocol: - { - domain: "http://127.0.0.1", + domain: "https://127.0.0.1", httpVersion: "http/1.1", requests: 1, } - # oldTlsProtocol: - # - { - # domain: "https://127.0.0.1", - # tlsVersion: "TLS 1.1", - # beforeDomReady: true, - # } + oldTlsProtocol: + - { + domain: "https://127.0.0.1", + tlsVersion: "TLS 1.2", + beforeDomReady: true, + } # http/2 - url: "https://127.0.0.1:9000" diff --git a/test/nginx-static.conf b/test/nginx-static.conf index 479152bbc..6b4aa0761 100644 --- a/test/nginx-static.conf +++ b/test/nginx-static.conf @@ -60,8 +60,7 @@ server { ssl_certificate /etc/nginx/localhost.crt; ssl_certificate_key /etc/nginx/localhost.key; - ssl_ciphers HIGH:!aNULL:!MD5; - ssl_protocols TLSv1.1; + ssl_protocols TLSv1.2; root /static;