Update deps. Closes #248

Author: hueniverse

.gitignore

@@ -1,18 +1,9 @@
-.idea
-*.iml
-npm-debug.log
-dump.rdb
-node_modules
-results.tap
-results.xml
-config.json
-.DS_Store
-*/.DS_Store
-*/*/.DS_Store
-._*
-*/._*
-*/*/._*
+**/node_modules
+**/package-lock.json
+
 coverage.*
-.settings
-package-lock.json
 
+**/.DS_Store
+**/._*
+
+**/*.pem

.travis.yml

@@ -2,8 +2,8 @@ language: node_js
 
 node_js:
   - "8"
-  - "9"
+  - "10"
+  - "11"
   - "node"
 
 sudo: false
-

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2017, Eran Hammer and Project contributors
+Copyright (c) 2012-2018, Eran Hammer and Project contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-                                  *   *   *
-
-The complete list of contributors can be found at: https://github.com/hueniverse/hawk/graphs/contributors

dist/browser.js

@@ -4,6 +4,7 @@
 
 const Url = require('url');
 
+const B64 = require('b64');
 const Boom = require('boom');
 const Hoek = require('hoek');
 
@@ -290,7 +291,7 @@ exports.getBewit = function (uri, options) {
     // Construct bewit: id\exp\mac\ext
 
     const bewit = credentials.id + '\\' + exp + '\\' + mac + '\\' + ext;
-    return Hoek.base64urlEncode(bewit);
+    return B64.base64urlEncode(bewit);
 };
 
 

lib/client.js

@@ -5,10 +5,14 @@
 exports.sntp = require('sntp');
 
 exports.server = require('./server');
+
 exports.client = require('./client');
+
 exports.crypto = require('./crypto');
+
 exports.utils = require('./utils');
 
+
 exports.uri = {
     authenticate: exports.server.authenticateBewit,
     getBewit: exports.client.getBewit

lib/index.js

@@ -2,6 +2,7 @@
 
 // Load modules
 
+const B64 = require('b64');
 const Boom = require('boom');
 const Cryptiles = require('cryptiles');
 const Hoek = require('hoek');
@@ -365,7 +366,7 @@ exports.authenticateBewit = async function (req, credentialsFunc, options) {
     // Parse bewit
 
     try {
-        var bewitString = Hoek.base64urlDecode(resource[3]);
+        var bewitString = B64.base64urlDecode(resource[3]);
     }
     catch (err) {
         throw Boom.badRequest('Invalid bewit encoding');

lib/server.js

@@ -1,8 +1,7 @@
 {
   "name": "hawk",
   "description": "HTTP Hawk Authentication Scheme",
-  "version": "7.0.7",
-  "author": "Eran Hammer <[email protected]> (http://hueniverse.com)",
+  "version": "7.0.8",
   "repository": "git://github.com/hueniverse/hawk",
   "main": "lib/index.js",
   "browser": "dist/browser.js",
@@ -12,11 +11,9 @@
     "scheme",
     "hawk"
   ],
-  "engines": {
-    "node": ">=8.9.0"
-  },
   "dependencies": {
-    "hoek": "5.x.x",
+    "hoek": "6.x.x",
+    "b64": "4.x.x",
     "boom": "7.x.x",
     "cryptiles": "4.x.x",
     "sntp": "3.x.x"
@@ -26,7 +23,7 @@
     "babel-preset-env": "^1.6.1",
     "babel-preset-minify": "^0.3.0",
     "code": "5.x.x",
-    "lab": "15.x.x"
+    "lab": "17.x.x"
   },
   "scripts": {
     "build-client": "mkdir -p dist; babel lib/browser.js --out-file dist/browser.js",

package.json

@@ -4,10 +4,10 @@
 
 const Url = require('url');
 
+const B64 = require('b64');
 const Boom = require('boom');
 const Code = require('code');
 const Hawk = require('../lib');
-const Hoek = require('hoek');
 const Lab = require('lab');
 
 
@@ -149,7 +149,7 @@ describe('Uri', () => {
 
         const bewit = credentials.id + '\\' + exp + '\\' + mac + '\\' + ext;
 
-        req.url += '&bewit=' + Hoek.base64urlEncode(bewit);
+        req.url += '&bewit=' + B64.base64urlEncode(bewit);
 
         await expect(Hawk.uri.authenticate(req, credentialsFunc)).to.reject('Invalid method');
     });

test/uri.js

@@ -110,6 +110,7 @@ describe('Utils', () => {
             for (let i = 0; i < 5000; ++i) {
                 long += 'x';
             }
+
             long += '"';
 
             expect(() => Hawk.utils.parseAuthorizationHeader(long, ['a'])).to.throw('Header length too long');