fix: Ignore searchDomain for localhost and IP

Backport of 8cfb230

lib/helpers.js

@@ -30,7 +30,7 @@ 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.
  */
-var Url, cleanProperty, isObject, merge, mergeSafe, reduce, ref, replacePathParams;
+var IPv4, Url, buildHostname, canApplySearchDomain, cleanProperty, isObject, merge, mergeSafe, reduce, ref, replacePathParams;
 
 ref = require('lodash'), merge = ref.merge, isObject = ref.isObject, reduce = ref.reduce;
 
@@ -91,6 +91,25 @@ this.parseDefaults = function(rawConfig, serviceName) {
   };
 };
 
+IPv4 = /^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$/;
+
+canApplySearchDomain = function(hostname) {
+  if (hostname === 'localhost') {
+    return false;
+  }
+  if (hostname[hostname.length - 1] === '.') {
+    return false;
+  }
+  return hostname.indexOf(':') === -1 && !IPv4.test(hostname);
+};
+
+buildHostname = function(hostname, searchDomain) {
+  if (searchDomain && canApplySearchDomain(hostname)) {
+    return hostname + "." + searchDomain + ".";
+  }
+  return hostname;
+};
+
 this.applyBaseUrl = function(baseUrl, options) {
   var basePath, hostname, pathname, port, protocol, query, search, searchDomain, uri;
   uri = options.uri;
@@ -106,9 +125,7 @@ this.applyBaseUrl = function(baseUrl, options) {
   query = uri.query, search = uri.search;
   searchDomain = options.searchDomain;
   delete options.searchDomain;
-  if (searchDomain && hostname && hostname[hostname.length - 1] !== '.') {
-    hostname += "." + searchDomain + ".";
-  }
+  hostname = buildHostname(hostname, searchDomain);
   uri = Url.format({
     protocol: protocol,
     hostname: hostname,

src/helpers.coffee

@@ -71,6 +71,18 @@ cleanProperty = (obj, value, key) ->
   delete defaults.endpointDefaults
   { defaults, endpointDefaults }
 
+IPv4 = /^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$/
+canApplySearchDomain = (hostname) ->
+  return false if hostname == 'localhost'
+  return false if hostname[hostname.length - 1] == '.'
+  # A hostname shouldn't contain ":" (IPv6 adddress) or be an IPv4 address
+  hostname.indexOf(':') == -1 && !IPv4.test(hostname)
+
+buildHostname = (hostname, searchDomain) ->
+  if searchDomain && canApplySearchDomain(hostname)
+    return "#{hostname}.#{searchDomain}."
+  hostname
+
 @applyBaseUrl = (baseUrl, options) ->
   uri = options.uri
   uri = Url.parse uri if 'string' == typeof uri
@@ -88,8 +100,7 @@ cleanProperty = (obj, value, key) ->
 
   {searchDomain} = options
   delete options.searchDomain # in case request starts looking at it
-  if searchDomain && hostname && hostname[hostname.length - 1] != '.'
-    hostname += ".#{searchDomain}."
+  hostname = buildHostname(hostname, searchDomain)
 
   uri = Url.format {protocol, hostname, port, pathname, query, search}
   options.uri = replacePathParams(uri, options.pathParams)

test/option_mappers.test.coffee

@@ -93,6 +93,22 @@ describe 'option mappers', ->
 
       client.foo.bar '123'
 
+    it 'never appends the searchDomain to localhost', (done) ->
+      client = new MyApi myApi: { baseUrl: 'http://localhost/v2', searchDomain: 'bar123' }
+      client.hub = fetch: (opts, cb) ->
+        assert.equal 'http://localhost/v2/foo/bars/123', opts.uri
+        done()
+
+      client.foo.bar '123'
+
+    it 'never appends the searchDomain to an IP address', (done) ->
+      client = new MyApi myApi: { baseUrl: 'http://127.0.0.1:3000/v2', searchDomain: 'bar123' }
+      client.hub = fetch: (opts, cb) ->
+        assert.equal 'http://127.0.0.1:3000/v2/foo/bars/123', opts.uri
+        done()
+
+      client.foo.bar '123'
+
   describe 'onlyGlobal', ->
     it 'does not disturb the endpoint function', (done) ->
       myApi_onlyGlobal.hub = fetch: (opts, cb) ->