Merge pull request #176 from glynnbird/reconfigure

better error checking in the reconfigure function

Author: glynnbird

cloudant.js

@@ -49,6 +49,13 @@ function Cloudant(options, callback) {
   } else {
     theurl = reconfigure({ url: options})
   }
+  if (theurl === null) {
+    if (callback) {
+      return callback('invalid url', null);
+    } else {
+      throw(new Error('invalid url'));
+    }
+  }
 
   // keep connections alive by default
   if (requestDefaults && !requestDefaults.agent) {

lib/reconfigure.js

@@ -15,9 +15,17 @@ module.exports = function(config) {
   var outUrl; 
   // if a full URL is passed in
   if (config.url) {
-    
     // parse the URL
-    var parsed = url.parse(config.url);
+    var parsed = null;
+    try {
+      var parsed = url.parse(config.url);
+    } catch(e) {
+      parsed = null;
+    };
+    if (!config.url || !parsed || !parsed.hostname || !parsed.protocol || !parsed.slashes) {
+      return null;
+    }
+    
 
     // enforce HTTPS for *cloudant.com domains
     if (parsed.hostname.match(/cloudant\.com$/) && parsed.protocol == "http:") {
@@ -69,11 +77,11 @@ module.exports = function(config) {
   // worry that the trailing `/` doubles up depending on how URLs are built, this creates 
   // "Database does not exist." errors. 
   // Issue: cloudant/nodejs-cloudant#129
-  if (outUrl.slice(-1) == '/') {
+  if (outUrl && outUrl.slice(-1) == '/') {
     outUrl = outUrl.slice(0, -1);
   }
 
-  return outUrl;
+  return (outUrl || null);
 };
 
 module.exports.getOptions = getOptions;

tests/reconfigure.js

@@ -1,5 +1,6 @@
 var should = require('should');
 var reconfigure = require('../lib/reconfigure.js');
+var assert = require('assert');
 
 describe('Reconfigure', function() {
 
@@ -103,4 +104,23 @@ describe('Reconfigure', function() {
     done();
   });
 
+  it('detects bad urls', function(done) {
+    var credentials = { url: 'invalid' };
+    var url = reconfigure(credentials);
+    assert.equal(url, null);
+    var credentials = { url: '' };
+    var url = reconfigure(credentials);
+    assert.equal(url, null);
+    var credentials = { url: 'http://' };
+    var url = reconfigure(credentials);
+    assert.equal(url, null);
+    var credentials = { };
+    var url = reconfigure(credentials);
+    assert.equal(url, null);
+    var credentials = 'invalid';
+    var url = reconfigure(credentials);
+    assert.equal(url, null);
+    done();
+  });
+
 });