From 3e28ce6f61264d0aa66c23d3fabdc66796d91637 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 20 Oct 2016 11:04:43 -0400 Subject: [PATCH 1/2] The ursa module no longer compiles with Node 6.x. Replace the ursa dependency with forsake in a hope that it is compatible. --- operations.js | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/operations.js b/operations.js index dd454ae..d794161 100644 --- a/operations.js +++ b/operations.js @@ -4,7 +4,7 @@ var url = require('url'); var crypto = require('crypto'); var exec = require('child_process').exec; var _ = require("lodash"); -var key = require('ursa').coercePrivateKey; +var forsake = require('forsake'); exports.operations = function(config){ return { @@ -25,8 +25,6 @@ exports.operations = function(config){ return header.join(":"); }).join("\n"); - var signature = key(config.key_contents).privateEncrypt(request_headers, 'utf8', 'base64'); - var auth_headers = { "Accept": "application/json", "X-Ops-Timestamp": timestamp, @@ -36,8 +34,10 @@ exports.operations = function(config){ "X-Ops-Sign": "version=1.0" }; + var sig = forsake.sign(request_headers, config.key_contents).toString('base64'); + var auth_header_count = 0; - _.each(signature.match(/.{1,60}/g), function(signature_section){ + _.each(sig.match(/.{1,60}/g), function(signature_section){ var name = ["X-Ops-Authorization", ++auth_header_count].join("-"); auth_headers[name] = signature_section; }); diff --git a/package.json b/package.json index b0228d5..065f004 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chef-api", - "version": "0.6.0", + "version": "0.6.1", "description": "A simple chef server api wrapper", "author": "Norman Joyner ", "license": "GPLv2", @@ -13,7 +13,7 @@ "dependencies": { "lodash": "^2.2.1", "request": "^2.61.0", - "ursa": "^0.9.1" + "forsake": "^0.1.4" }, "engines": { "node": "*" From 79ca32eeb4c771530f61d29cb6b02c5599729d8c Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 20 Oct 2016 13:07:31 -0400 Subject: [PATCH 2/2] Remove ursa from shrinkwrap --- npm-shrinkwrap.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 91da22d..dd05a66 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -379,23 +379,6 @@ } } } - }, - "ursa": { - "version": "0.9.1", - "from": "http://registry.npmjs.org/ursa/-/ursa-0.9.1.tgz", - "resolved": "http://registry.npmjs.org/ursa/-/ursa-0.9.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.1.0", - "from": "http://registry.npmjs.org/nan/-/nan-2.1.0.tgz", - "resolved": "http://registry.npmjs.org/nan/-/nan-2.1.0.tgz" - } - } } } }