Merge pull request #457 from mapbox/code-ql-fixes

Fix codescan bugs

Author: mpothier

lib/events.js

@@ -272,7 +272,7 @@ MapboxEventManager.prototype = {
      */
   shouldEnableLogging: function(options){
     if (options.enableEventLogging === false) return false;
-    if (options.origin && options.origin.indexOf('api.mapbox.com') == -1) return false;
+    if (options.origin && options.origin !== 'https://api.mapbox.com') return false;
     // hard to make sense of events when a local instance is suplementing results from origin
     if (options.localGeocoder) return false;
     // hard to make sense of events when a custom filter is in use

lib/index.js

@@ -569,10 +569,9 @@ MapboxGeocoder.prototype = {
 
   _requestType: function(options, search) {
     var type;
-    const reverseGeocodeCoordRgx = /^[ ]*(-?\d+\.?\d*)[, ]+(-?\d+\.?\d*)[ ]*$/;
     if (options.localGeocoderOnly) {
       type = GEOCODE_REQUEST_TYPE.LOCAL;
-    } else if (options.reverseGeocode && reverseGeocodeCoordRgx.test(search)) {
+    } else if (options.reverseGeocode && utils.REVERSE_GEOCODE_COORD_RGX.test(search)) {
       type = GEOCODE_REQUEST_TYPE.REVERSE;
     } else {
       type = GEOCODE_REQUEST_TYPE.FORWARD;
@@ -649,8 +648,9 @@ MapboxGeocoder.prototype = {
     case GEOCODE_REQUEST_TYPE.FORWARD: {
       // Ensure that any reverse geocoding looking request is cleaned up
       // to be processed as only a forward geocoding request by the server.
-      const reverseGeocodeCoordRgx = /^[ ]*(-?\d+\.?\d*)[, ]+(-?\d+\.?\d*)*[ ]*$/;
-      if (reverseGeocodeCoordRgx.test(search)) {
+      const trimmedSearch = search.trim();
+      const reverseGeocodeCoordRgx = /^(-?\d{1,3}(\.\d{0,256})?)[, ]+(-?\d{1,3}(\.\d{0,256})?)?$/;
+      if (reverseGeocodeCoordRgx.test(trimmedSearch)) {
         search = search.replace(/,/g, ' ');
       }
       config = extend(config, { query: search });

lib/utils.js

@@ -60,7 +60,10 @@ function getAddressInfo(feature) {
   return addrInfo;
 }
 
+const REVERSE_GEOCODE_COORD_RGX = /^[ ]*(-?\d{1,3}(\.\d{0,256})?)[, ]+(-?\d{1,3}(\.\d{0,256})?)[ ]*$/;
+
 module.exports = {
   transformFeatureToGeolocationText: transformFeatureToGeolocationText,
   getAddressInfo: getAddressInfo,
+  REVERSE_GEOCODE_COORD_RGX: REVERSE_GEOCODE_COORD_RGX,
 }

package.json

@@ -8,7 +8,7 @@
   "scripts": {
     "start": "budo debug/index.js --dir debug --live -- -t brfs ",
     "prepublish": "NODE_ENV=production && mkdir -p dist && browserify lib/index.js --transform [ babelify --global ] --standalone MapboxGeocoder | uglifyjs -c -m > dist/mapbox-gl-geocoder.min.js && cp lib/mapbox-gl-geocoder.css dist/",
-    "test": "browserify -t envify test/index.js test/events.test.js | smokestack -b firefox | tap-status | tap-color",
+    "test": "browserify -t envify test/index.js test/events.test.js test/utils.test.js | smokestack -b firefox | tap-status | tap-color",
     "docs": "documentation build lib/index.js --format=md > API.md",
     "pretest": "npm run lint",
     "lint": "eslint lib test",

test/utils.test.js

@@ -0,0 +1,14 @@
+var test = require('tape');
+var utils = require('../lib/utils');
+
+test('REVERSE_GEOCODE_COORD_RGX', function (t) {
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('12, 34'), 'Reverse: "12, 34"');
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('1,2'), 'Reverse: "1,2"');
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('12.123, 34.345'), 'Reverse: "12.123, 34.345"');
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('12, 34.345'), 'Reverse: "12, 34.345"');
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('12., 34.'), 'Reverse: "12., 34."');
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('122, 41'), 'Reverse: "122, 41"');
+  t.ok(utils.REVERSE_GEOCODE_COORD_RGX.test('12, 123'), 'Reverse: "12, 123"');
+  t.notOk(utils.REVERSE_GEOCODE_COORD_RGX.test('1234, 4568'), 'Forward: "1234, 4568"');
+  t.notOk(utils.REVERSE_GEOCODE_COORD_RGX.test('123 Main'), 'Forward: "123 Main"');
+})