#430 Extract code from querystring even if it is before the #fragment…

… in url
TheHive-Project · Jan 19, 2018 · c1012c8 · c1012c8
1 parent 11611a5
commit c1012c8
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 16 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -114,6 +114,7 @@
     <script src="bower_components/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js"></script>
     <script src="bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.js"></script>
     <script src="bower_components/file-saver/FileSaver.js"></script>
+    <script src="bower_components/js-url/url.js"></script>
     <!-- endbower -->
 
     <script type="text/javascript" src="bower_components/ace-builds/src-min-noconflict/ace.js"></script>

diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js
@@ -422,4 +422,5 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra
                 $rootScope.title = toState.title;
             }
         });
-    });
+    })
+    .constant('UrlParser', url);
diff --git a/ui/app/scripts/controllers/AuthenticationCtrl.js b/ui/app/scripts/controllers/AuthenticationCtrl.js
@@ -4,7 +4,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers')
-        .controller('AuthenticationCtrl', function($scope, $state, $location, $uibModalStack, $stateParams, AuthenticationSrv, NotificationSrv, appConfig) {
+        .controller('AuthenticationCtrl', function($scope, $state, $location, $uibModalStack, $stateParams, AuthenticationSrv, NotificationSrv, UtilsSrv, UrlParser, appConfig) {
             $scope.params = {};
 
             $uibModalStack.dismissAll();
@@ -45,8 +45,8 @@
                 });
             };
 
-            if(angular.isDefined($location.search().code) || $stateParams.autoLogin) {
-                var code = angular.isDefined($location.search().code) ? $location.search().code : undefined;
+            var code = UtilsSrv.extractQueryParam('code', UrlParser('query', $location.absUrl()));
+            if(angular.isDefined(code) || $stateParams.autoLogin) {
                 $scope.ssoLogin(code);
             }
         });

diff --git a/ui/app/scripts/services/UtilsSrv.js b/ui/app/scripts/services/UtilsSrv.js
@@ -1,21 +1,21 @@
 (function() {
     'use strict';
     angular.module('theHiveServices')
-        .factory('UtilsSrv', function() {
+        .factory('UtilsSrv', function($location) {
             var sensitiveTypes = ['url', 'ip', 'mail', 'domain', 'filename'];
 
-            var service =  {
-                guid: function () {
-                  function s4() {
-                    return Math.floor((1 + Math.random()) * 0x10000)
-                      .toString(16)
-                      .substring(1);
-                  }
-                  return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
-                    s4() + '-' + s4() + s4() + s4();
+            var service = {
+                guid: function() {
+                    function s4() {
+                        return Math.floor((1 + Math.random()) * 0x10000)
+                            .toString(16)
+                            .substring(1);
+                    }
+                    return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
+                        s4() + '-' + s4() + s4() + s4();
                 },
                 objectify: function(arr, property) {
-                    return _.map(arr, function(str){
+                    return _.map(arr, function(str) {
                         var obj = {};
                         obj[property] = str;
                         return obj;
@@ -101,6 +101,21 @@
                         scope.value = scope.oldValue;
                         scope.updatable.updating = false;
                     };
+                },
+
+                extractQueryParam: function(paramName, queryString) {
+                    if (!queryString || !paramName)
+                        return;
+                    var param = $location.search()[paramName];
+
+                    if (param) {
+                        return param;
+                    } else {
+                        var parsedQuery = _.find(queryString.split('&'), function(str) {
+                            return str.startsWith(paramName + '=');
+                        });
+                        return parsedQuery ? parsedQuery.substr(paramName.length + 1) : undefined;
+                    }
                 }
             };
 

diff --git a/ui/bower.json b/ui/bower.json
@@ -52,7 +52,8 @@
     "underscore.string": "^3.3.4",
     "angular-drag-and-drop-lists": "^2.1.0",
     "angular-bootstrap-colorpicker": "^3.0.31",
-    "file-saver": "^1.3.3"
+    "file-saver": "^1.3.3",
+    "js-url": "^2.5.2"
   },
   "devDependencies": {
     "angular-mocks": "1.5.8"

diff --git a/ui/test/karma.conf.js b/ui/test/karma.conf.js
@@ -73,6 +73,7 @@ module.exports = function(config) {
       'bower_components/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js',
       'bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.js',
       'bower_components/file-saver/FileSaver.js',
+      'bower_components/js-url/url.js',
       'bower_components/angular-mocks/angular-mocks.js',
       // endbower
       "bower_components/cryptojslib/components/core-min.js",
-Original file line number
+Diff line change
@@ Expand Up @@
                     $rootScope.title = toState.title;
                 }
             });
-        });
+        })
+        .constant('UrlParser', url);