diff --git a/index.js b/index.js index d7efeab9..ff6c6d3e 100644 --- a/index.js +++ b/index.js @@ -538,16 +538,22 @@ function getcookie(req, name, secrets) { raw = cookies[name]; if (raw) { - if (raw.substr(0, 2) === 's:') { - val = unsigncookie(raw.slice(2), secrets); + val = unsigncookie(raw, secrets); - if (val === false) { - debug('cookie signature invalid'); - val = undefined; - } - } else { - debug('cookie unsigned') + if (val === false) { + debug('cookie signature invalid'); + val = undefined; } + // if (raw.substr(0, 2) === 's:') { + // val = unsigncookie(raw.slice(2), secrets); + + // if (val === false) { + // debug('cookie signature invalid'); + // val = undefined; + // } + // } else { + // debug('cookie unsigned') + // } } } @@ -565,20 +571,31 @@ function getcookie(req, name, secrets) { raw = req.cookies[name]; if (raw) { - if (raw.substr(0, 2) === 's:') { - val = unsigncookie(raw.slice(2), secrets); + val = unsigncookie(raw, secrets); - if (val) { - deprecate('cookie should be available in req.headers.cookie'); - } + if (val) { + deprecate('cookie should be available in req.headers.cookie'); + } - if (val === false) { - debug('cookie signature invalid'); - val = undefined; - } - } else { - debug('cookie unsigned') + if (val === false) { + debug('cookie signature invalid'); + val = undefined; } + + // if (raw.substr(0, 2) === 's:') { + // val = unsigncookie(raw.slice(2), secrets); + + // if (val) { + // deprecate('cookie should be available in req.headers.cookie'); + // } + + // if (val === false) { + // debug('cookie signature invalid'); + // val = undefined; + // } + // } else { + // debug('cookie unsigned') + // } } } @@ -653,7 +670,7 @@ function issecure(req, trustProxy) { */ function setcookie(res, name, val, secret, options) { - var signed = 's:' + signature.sign(val, secret); + var signed = signature.sign(val, secret); var data = cookie.serialize(name, signed, options); debug('set-cookie %s', data);