From fcbffa71d030e48a10e29e35d973e40d0418fda0 Mon Sep 17 00:00:00 2001 From: Yazhong Liu Date: Sun, 22 Jun 2014 23:34:47 +0800 Subject: [PATCH] tls: using %StringSplit to split `cert.subjectaltname` Signed-off-by: Fedor Indutny --- lib/tls.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/tls.js b/lib/tls.js index 197e968e08..9345632353 100644 --- a/lib/tls.js +++ b/lib/tls.js @@ -122,12 +122,15 @@ exports.checkServerIdentity = function checkServerIdentity(host, cert) { // Walk through altnames and generate lists of those names if (cert.subjectaltname) { cert.subjectaltname.split(/, /g).forEach(function(altname) { - if (/^DNS:/.test(altname)) { - dnsNames.push(altname.slice(4)); - } else if (/^IP Address:/.test(altname)) { - ips.push(altname.slice(11)); - } else if (/^URI:/.test(altname)) { - var uri = url.parse(altname.slice(4)); + var option = altname.match(/^(DNS|IP Address|URI):(.*)$/); + if (!option) + return; + if (option[1] === 'DNS') { + dnsNames.push(option[2]); + } else if (option[1] === 'IP Address') { + ips.push(option[2]); + } else if (option[1] === 'URI') { + var uri = url.parse(option[2]); if (uri) uriNames.push(uri.hostname); } });