fix(style_compiler): don’t resolve absolute urls that start with a / during compilation

tbosch · tbosch · commit a941fb08f7ca · 2015-10-15T11:13:52.000-07:00
Closes #4763
diff --git a/modules/angular2/src/core/compiler/style_url_resolver.ts b/modules/angular2/src/core/compiler/style_url_resolver.ts
@@ -15,7 +15,7 @@ export class StyleWithImports {
 }
 
 export function isStyleUrlResolvable(url: string): boolean {
-  if (isBlank(url) || url.length === 0) return false;
+  if (isBlank(url) || url.length === 0 || url[0] == '/') return false;
   var schemeMatch = RegExpWrapper.firstMatch(_urlWithSchemaRe, url);
   return isBlank(schemeMatch) || schemeMatch[1] == 'package';
 }
@@ -42,4 +42,4 @@ export function extractStyleUrls(resolver: UrlResolver, baseUrl: string, cssText
 var _cssImportRe = /@import\s+(?:url\()?\s*(?:(?:['"]([^'"]*))|([^;\)\s]*))[^;]*;?/g;
 // TODO: can't use /^[^:/?#.]+:/g due to clang-format bug:
 //       https://github.com/angular/angular/issues/4596
-var _urlWithSchemaRe = /^['"]?([a-zA-Z\-\+\.]+):/g;
+var _urlWithSchemaRe = /^([a-zA-Z\-\+\.]+):/g;
diff --git a/modules/angular2/test/core/compiler/style_url_resolver_spec.ts b/modules/angular2/test/core/compiler/style_url_resolver_spec.ts
@@ -96,6 +96,11 @@ export function main() {
 
     it('should not resolve urls with other schema',
        () => { expect(isStyleUrlResolvable('http://otherurl')).toBe(false); });
+
+    it('should not resolve urls with absolute paths', () => {
+      expect(isStyleUrlResolvable('/otherurl')).toBe(false);
+      expect(isStyleUrlResolvable('//otherurl')).toBe(false);
+    });
   });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export class StyleWithImports {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`export function isStyleUrlResolvable(url: string): boolean {`
`18`		`- if (isBlank(url) \|\| url.length === 0) return false;`
	`18`	`+ if (isBlank(url) \|\| url.length === 0 \|\| url[0] == '/') return false;`
`19`	`19`	`var schemeMatch = RegExpWrapper.firstMatch(_urlWithSchemaRe, url);`
`20`	`20`	`return isBlank(schemeMatch) \|\| schemeMatch[1] == 'package';`
`21`	`21`	`}`
`@@ -42,4 +42,4 @@ export function extractStyleUrls(resolver: UrlResolver, baseUrl: string, cssText`
`42`	`42`	`var _cssImportRe = /@import\s+(?:url\()?\s(?:(?:['"]([^'"]))\|([^;\)\s]))[^;];?/g;`
`43`	`43`	`// TODO: can't use /^[^:/?#.]+:/g due to clang-format bug:`
`44`	`44`	`// https://github.com/angular/angular/issues/4596`
`45`		`-var _urlWithSchemaRe = /^['"]?([a-zA-Z\-\+\.]+):/g;`
	`45`	`+var _urlWithSchemaRe = /^([a-zA-Z\-\+\.]+):/g;`