Skip to content

Commit

Permalink
fix make check (#90)
Browse files Browse the repository at this point in the history
- fixes node 0.10 usage which was broken by PR #83 and released in v1.3.0
- updates jsstyle and javascriptlint to latest versions on the joyent github org
- various style nits
  • Loading branch information
bahamas10 committed Nov 5, 2019
1 parent c8e8805 commit db839cd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
@@ -1,6 +1,6 @@
[submodule "deps/javascriptlint"]
path = deps/javascriptlint
url = git@github.com:davepacheco/javascriptlint
url = git@github.com:joyent/javascriptlint
[submodule "deps/jsstyle"]
path = deps/jsstyle
url = git@github.com:davepacheco/jsstyle
url = git@github.com:joyent/jsstyle
2 changes: 1 addition & 1 deletion deps/javascriptlint
2 changes: 1 addition & 1 deletion deps/jsstyle
6 changes: 4 additions & 2 deletions lib/parser.js
Expand Up @@ -119,10 +119,12 @@ module.exports = {

var headers = request.headers;
var authzHeaderName = options.authorizationHeaderName;
var authz = headers[authzHeaderName] || headers[utils.HEADER.AUTH] || headers[utils.HEADER.SIG];
var authz = headers[authzHeaderName] || headers[utils.HEADER.AUTH] ||
headers[utils.HEADER.SIG];

if (!authz) {
var errHeader = authzHeaderName ? authzHeaderName : utils.HEADER.AUTH + ' or ' + utils.HEADER.SIG;
var errHeader = authzHeaderName ? authzHeaderName :
utils.HEADER.AUTH + ' or ' + utils.HEADER.SIG;

throw new MissingHeaderError('no ' + errHeader + ' header ' +
'present in the request');
Expand Down
4 changes: 3 additions & 1 deletion lib/signer.js
Expand Up @@ -390,7 +390,9 @@ module.exports = {

var authzHeaderName = options.authorizationHeaderName || 'Authorization';

var FMT = authzHeaderName.toLowerCase() === utils.HEADER.SIG ? SIGNATURE_FMT : AUTHZ_FMT;
var FMT = authzHeaderName.toLowerCase() === utils.HEADER.SIG ?
SIGNATURE_FMT : AUTHZ_FMT;

request.setHeader(authzHeaderName, sprintf(FMT,
options.keyId,
options.algorithm,
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.js
Expand Up @@ -59,7 +59,7 @@ function validateAlgorithm(algorithm) {
///--- API

module.exports = {
HEADER,
HEADER: HEADER,

HASH_ALGOS: HASH_ALGOS,
PK_ALGOS: PK_ALGOS,
Expand Down

0 comments on commit db839cd

Please sign in to comment.