openid 1.0.0 → 1.0.4

package/README.md

@@ -135,7 +135,4 @@ requests go through a proxy server, by using the following environment variables
 
 ## License
 
-OpenID for Node.js is licensed under the MIT license. See LICENSE for further details. 
-The libary includes bigint functionality released by Tom Wu under the BSD license, 
-and Base64 functions released by Nick Galbreath under the MIT license. Please see 
-`lib/bigint.js` and `lib/base64.js` for the details of the licenses for these functions.
+OpenID for Node.js is licensed under the MIT license. See LICENSE for further details.

package/openid.js

@@ -26,7 +26,7 @@
  * vim: set sw=2 ts=2 et tw=80 : 
  */
 
-var convert = require('./lib/convert'),
+var Buffer = require('buffer').Buffer,
     crypto = require('crypto'),
     request = require('request'),
     querystring = require('querystring'),
@@ -40,6 +40,10 @@ var AX_MAX_VALUES_COUNT = 1000;
 
 var openid = exports;
 
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
 openid.RelyingParty = function(returnUrl, realm, stateless, strict, extensions)
 {
   this.returnUrl = returnUrl;
@@ -60,20 +64,70 @@ openid.RelyingParty.prototype.verifyAssertion = function(requestOrUrl, callback)
   openid.verifyAssertion(requestOrUrl, callback, this.stateless, this.extensions, this.strict);
 }
 
+
+
+var _btwoc = function(i)
+{
+  if(i.charCodeAt(0) > 127)
+  {
+    return String.fromCharCode(0) + i;
+  }
+  return i;
+}
+
+var _unbtwoc = function(i)
+{
+  if(i[0] === String.fromCharCode(0))
+  {
+    return i.substr(1);
+  }
+
+  return i;
+}
+
 var _isDef = function(e)
 {
   var undefined;
   return e !== undefined;
 }
 
-var _toBase64 = function(binary)
+// Find the most up-to-date and usable way to create buffers
+var _buffer = null;
+if (typeof(Buffer.from) === 'function') {
+  // Some older Node versions throw an exception when 
+  // buffers with binary encoding are created using the
+  // from function, so if that happens we have to resort
+  // to constructor based creation.
+  try {
+    Buffer.from('openid', 'binary');
+    _buffer = Buffer.from;
+  }
+  catch(_) {
+  }
+}
+if (_buffer === null) {
+  // Either the Node version is too old to have a Buffer.from,
+  // or the Buffer.from call failed with binary encoding.
+  // Either way, use the (deprecated from node v6) constructor.
+  _buffer = function(str, enc) { return new Buffer(str, enc); };
+} 
+
+var _base64encode = function(str) {
+  return _buffer(str, 'binary').toString('base64');
+};
+
+var _base64decode = function(str) {
+  return _buffer(str, 'base64').toString('binary');
+};
+
+var _bigIntToBase64 = function(binary)
 {
-  return convert.base64.encode(convert.btwoc(binary));
+  return _base64encode(_btwoc(binary));  
 }
 
-var _fromBase64 = function(str)
+var _bigIntFromBase64 = function(str)
 {
-  return convert.unbtwoc(convert.base64.decode(str));
+  return _unbtwoc(_base64decode(str));
 }
 
 var _xor = function(a, b)
@@ -149,7 +203,7 @@ var _buildUrl = function(theUrl, params)
     {
       for(var key in params)
       {
-        if(params.hasOwnProperty(key))
+        if(hasOwnProperty(params, key))
         {
           theUrl.query[key] = params[key];
         }
@@ -165,7 +219,7 @@ var _get = function (getUrl, params, callback, redirects) {
     url: getUrl,
     maxRedirects: redirects || 5,
     qs: params,
-    headers: { 'Accept' : 'application/xrds+xml,text/html,text/plain,*/*' }
+    headers: { 'Accept' : 'application/xrds+xml,text/html,text/plain,*/*;q=0.9' }
   };
   request.get(options, function (error, response, body) {
     if (error) {
@@ -570,9 +624,9 @@ openid.associate = function(provider, callback, strict, algorithm)
   if(algorithm.indexOf('no-encryption') === -1)
   {
     dh = _createDiffieHellmanKeyExchange(algorithm);
-    params['openid.dh_modulus'] = _toBase64(dh.getPrime('binary'));
-    params['openid.dh_gen'] = _toBase64(dh.getGenerator('binary'));
-    params['openid.dh_consumer_public'] = _toBase64(dh.getPublicKey('binary'));
+    params['openid.dh_modulus'] = _bigIntToBase64(dh.getPrime('binary'));
+    params['openid.dh_gen'] = _bigIntToBase64(dh.getGenerator('binary'));
+    params['openid.dh_consumer_public'] = _bigIntToBase64(dh.getPublicKey('binary'));
   }
 
   _post(provider.endpoint, params, function(data, headers, statusCode)
@@ -648,13 +702,13 @@ openid.associate = function(provider, callback, strict, algorithm)
       }
       else
       {
-        var serverPublic = _fromBase64(data.dh_server_public);
-        var sharedSecret = convert.btwoc(dh.computeSecret(serverPublic, 'binary', 'binary'));
+        var serverPublic = _bigIntFromBase64(data.dh_server_public);
+        var sharedSecret = _btwoc(dh.computeSecret(serverPublic, 'binary', 'binary'));
         var hash = crypto.createHash(hashAlgorithm);
-        hash.update(sharedSecret);
+        hash.update(_buffer(sharedSecret, 'binary'));
         sharedSecret = hash.digest('binary');
-        var encMacKey = convert.base64.decode(data.enc_mac_key);
-        secret = convert.base64.encode(_xor(encMacKey, sharedSecret));
+        var encMacKey = _base64decode(data.enc_mac_key);
+        secret = _base64encode(_xor(encMacKey, sharedSecret));
       }
 
       if (!_isDef(data.assoc_handle)) {
@@ -809,7 +863,7 @@ var _requestAuthentication = function(provider, assoc_handle, returnUrl, realm,
 
   for (var i in extensions)
   {
-    if(!extensions.hasOwnProperty(i))
+    if(!hasOwnProperty(extensions, i))
     {
       continue;
     }
@@ -817,7 +871,7 @@ var _requestAuthentication = function(provider, assoc_handle, returnUrl, realm,
     var extension = extensions[i];
     for (var key in extension.requestParams)
     {
-      if (!extension.requestParams.hasOwnProperty(key)) { continue; }
+      if (!hasOwnProperty(extension.requestParams, key)) { continue; }
       params[key] = extension.requestParams[key];
     }
   }
@@ -1054,7 +1108,7 @@ var _verifyAssertionAgainstProviders = function(providers, params, stateless, ex
       {
         for(var ext in extensions)
         {
-          if (!extensions.hasOwnProperty(ext))
+          if (!hasOwnProperty(extensions, ext))
           { 
             continue; 
           }
@@ -1122,7 +1176,7 @@ var _checkSignatureUsingAssociation = function(params, callback)
       message += param + ':' + value + '\n';
     }
 
-    var hmac = crypto.createHmac(association.type, convert.base64.decode(association.secret));
+    var hmac = crypto.createHmac(association.type, _buffer(association.secret, 'base64'));
     hmac.update(message, 'utf8');
     var ourSignature = hmac.digest('base64');
 
@@ -1145,7 +1199,7 @@ var _checkSignatureUsingProvider = function(params, provider, callback)
   };
   for(var key in params)
   {
-    if(params.hasOwnProperty(key) && key != 'openid.mode')
+    if(hasOwnProperty(params, key) && key != 'openid.mode')
     {
       requestParams[key] = params[key];
     }
@@ -1302,7 +1356,7 @@ openid.AttributeExchange = function AttributeExchange(options)
   var optional = [];
   for (var ns in options)
   {
-    if (!options.hasOwnProperty(ns)) { continue; }
+    if (!hasOwnProperty(options, ns)) { continue; }
     if (options[ns] == 'required')
     {
       required.push(ns);
@@ -1344,7 +1398,7 @@ openid.AttributeExchange.prototype.fillResult = function(params, result)
   var values = {};
   for (var k in params)
   {
-    if (!params.hasOwnProperty(k)) { continue; }
+    if (!hasOwnProperty(params, k)) { continue; }
     var matches = k.match(regex);
     if (!matches)
     {
@@ -1488,7 +1542,7 @@ openid.PAPE.prototype.fillResult = function(params, result)
   var paramString = 'openid.' + extension + '.';
   var thisParam;
   for (var p in params) {
-    if (params.hasOwnProperty(p)) {
+    if (hasOwnProperty(params, p)) {
       if (p.substr(0, paramString.length) === paramString) {
         thisParam = p.substr(paramString.length);
         if (thisParam === 'auth_policies') {