TEST

angular · Dec 23, 2017 · 6389ae3 · 6389ae3
1 parent 33bb1d1
commit 6389ae3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/ng/sanitizeUri.js b/src/ng/sanitizeUri.js
@@ -69,9 +69,15 @@ function $$SanitizeUriProvider() {
 
   this.$get = function() {
     return function sanitizeUri(uri, isMediaUrl) {
+      if (!uri) return uri;
       var regex = isMediaUrl ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
       var normalizedVal;
-      normalizedVal = urlResolve(uri && uri.trim()).href;
+      try {
+        normalizedVal = urlResolve(uri.trim()).href;
+      } catch(e) {
+        console.log(uri);
+        throw e;
+      }
       if (normalizedVal !== '' && !normalizedVal.match(regex)) {
         return 'unsafe:' + normalizedVal;
       }

diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
@@ -11173,13 +11173,13 @@ describe('$compile', function() {
       $rootScope.$digest();
       expect(element.attr('src')).toEqual('unsafe:untrusted:foo();ponies');
 
-      element = $compile('<img src="http://{{testUrl}}"></img>')($rootScope);
-      $rootScope.testUrl = $sce.trustAsUrl('untrusted:foo();');
+      element = $compile('<img src="http://{{testUrl2}}"></img>')($rootScope);
+      $rootScope.testUrl2 = $sce.trustAsUrl('xyz;');
       $rootScope.$digest();
-      expect(element.attr('src')).toEqual('http://untrusted:foo();');
+      expect(element.attr('src')).toEqual('http://xyz;');
 
-      element = $compile('<img src="{{testUrl}}{{testUrl}}"></img>')($rootScope);
-      $rootScope.testUrl = $sce.trustAsUrl('untrusted:foo();');
+      element = $compile('<img src="{{testUrl3}}{{testUrl3}}"></img>')($rootScope);
+      $rootScope.testUrl3 = $sce.trustAsUrl('untrusted:foo();');
       $rootScope.$digest();
       expect(element.attr('src')).toEqual('unsafe:untrusted:foo();untrusted:foo();');
     }));
@@ -11220,7 +11220,7 @@ describe('$compile', function() {
         expect(element.attr('src')).toEqual('someSanitizedUrl');
 
         element = $compile('<img src="http://{{testUrl}}"></img>')($rootScope);
-        $rootScope.testUrl = $sce.trustAsUrl('javascript:foo();');
+        $rootScope.testUrl = $sce.trustAsUrl('xyz');
         $rootScope.$digest();
         expect(element.attr('src')).toEqual('someSanitizedUrl');
       });