fix build

Tinkoff · Aug 29, 2019 · 3f99451 · 3f99451
1 parent 8e834f2
commit 3f99451
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 30 deletions.
diff --git a/projects/ng-dompurify/src/lib/ng-dompurify.service.ts b/projects/ng-dompurify/src/lib/ng-dompurify.service.ts
@@ -1,5 +1,5 @@
-import {inject, Inject, Injectable, Sanitizer, SecurityContext} from '@angular/core';
-import {sanitize, addHook, HookName} from 'dompurify';
+import {Inject, Injectable, Sanitizer, SecurityContext} from '@angular/core';
+import {sanitize, addHook, removeAllHooks} from 'dompurify';
 import {SANITIZE_STYLE} from './tokens/sanitize-style';
 import {DOMPURIFY_HOOKS} from './tokens/dompurify-hooks';
 import {DOMPURIFY_CONFIG} from './tokens/dompurify-config';

diff --git a/projects/ng-dompurify/src/lib/test/ng-dompurify-dom.pipe.spec.ts b/projects/ng-dompurify/src/lib/test/ng-dompurify-dom.pipe.spec.ts
@@ -7,6 +7,7 @@ import {NgDompurifyModule} from '../ng-dompurify.module';
 import {sanitizeStyle} from './test-samples/sanitizeStyle';
 import {SANITIZE_STYLE} from '../tokens/sanitize-style';
 import {cleanUrl, dirtyUrl} from './test-samples/url';
+import {removeAllHooks} from 'dompurify';
 
 describe('NgDompurifyPipe', () => {
     @Component({
@@ -18,14 +19,15 @@ describe('NgDompurifyPipe', () => {
     })
     class TestComponent {
         content = '';
-        context = SecurityContext.HTML;
-        config = {};
+        context?: SecurityContext = SecurityContext.HTML;
+        config? = {};
 
         @ViewChild('element', { static: false })
         readonly element!: ElementRef<HTMLElement>;
 
         get html(): boolean {
-            return this.context === SecurityContext.HTML
+            return this.context === undefined
+                || this.context === SecurityContext.HTML
                 || this.context === SecurityContext.SCRIPT
                 || this.context === SecurityContext.NONE;
         }
@@ -63,7 +65,7 @@ describe('NgDompurifyPipe', () => {
     });
 
     afterEach(() => {
-        TestBed.resetTestingModule();
+        removeAllHooks();
     });
 
     it('sanitizes HTML', () => {
@@ -73,6 +75,15 @@ describe('NgDompurifyPipe', () => {
         expect(testComponent.element.nativeElement.innerHTML).toBe(cleanHtml);
     });
 
+    it('sanitizes HTML by default', () => {
+        testComponent.content = dirtyHtml;
+        testComponent.context = undefined;
+        testComponent.config = undefined;
+        fixture.detectChanges();
+
+        expect(testComponent.element.nativeElement.innerHTML).toBe(cleanHtml);
+    });
+
     it('sanitizes HTML with config', () => {
         testComponent.content = dirtyHtml;
         testComponent.config = {FORBID_TAGS: ['br']};

diff --git a/projects/ng-dompurify/src/lib/test/ng-dompurify-dom.service.spec.ts b/projects/ng-dompurify/src/lib/test/ng-dompurify-dom.service.spec.ts
@@ -12,26 +12,27 @@ import {TestBed} from '@angular/core/testing';
 import {sanitizeStyle} from './test-samples/sanitizeStyle';
 import {SANITIZE_STYLE} from '../tokens/sanitize-style';
 import {cleanStyle, dirtyStyle} from './test-samples/style';
+import {removeAllHooks} from 'dompurify';
 
 describe('NgDompurifyDomSanitizer', () => {
     let service: NgDompurifyDomSanitizer;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             providers: [
-                NgDompurifyDomSanitizer,
                 {
                     provide: SANITIZE_STYLE,
                     useValue: sanitizeStyle,
                 },
+                NgDompurifyDomSanitizer,
             ],
         });
 
         service = TestBed.get(NgDompurifyDomSanitizer);
     });
 
     afterEach(() => {
-        TestBed.resetTestingModule();
+        removeAllHooks();
     });
 
     it('should be created', () => {

diff --git a/projects/ng-dompurify/src/lib/test/ng-dompurify.service.spec.ts b/projects/ng-dompurify/src/lib/test/ng-dompurify.service.spec.ts
@@ -8,6 +8,7 @@ import {DOMPURIFY_HOOKS} from '../tokens/dompurify-hooks';
 import {SANITIZE_STYLE} from '../tokens/sanitize-style';
 import {sanitizeStyle} from './test-samples/sanitizeStyle';
 import {cleanStyleTag, dirtyStyleTag} from './test-samples/style';
+import {removeAllHooks} from 'dompurify';
 
 describe('NgDompurifySanitizer', () => {
     const hooks: ReadonlyArray<NgDompurifyHook> = [{
@@ -23,23 +24,23 @@ describe('NgDompurifySanitizer', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             providers: [
-                NgDompurifySanitizer,
                 {
                     provide: SANITIZE_STYLE,
                     useValue: sanitizeStyle,
                 },
                 {
                     provide: DOMPURIFY_HOOKS,
                     useValue: hooks,
-                }
+                },
+                NgDompurifySanitizer,
             ],
         });
 
         service = TestBed.get(NgDompurifySanitizer);
     });
 
     afterEach(() => {
-        TestBed.resetTestingModule();
+        removeAllHooks();
     });
 
     it('should be created', () => {
@@ -97,7 +98,7 @@ describe('NgDompurifySanitizer default DI', () => {
     });
 
     afterEach(() => {
-        TestBed.resetTestingModule();
+        removeAllHooks();
     });
 
     it('sanitizes styles into nothing by default', () => {

diff --git a/projects/ng-dompurify/src/lib/test/test-samples/style.ts b/projects/ng-dompurify/src/lib/test/test-samples/style.ts
@@ -1,4 +1,4 @@
 export const dirtyStyle = 'expression(evil)';
 export const cleanStyle = '';
-export const dirtyStyleTag = '<br><style>.red {color: red; background: expression(evil)}</style>';
+export const dirtyStyleTag = '<br><style>@import "malicious.css"; .red {color: red; background: expression(evil)}</style>';
 export const cleanStyleTag = '<br><style>.red{\ncolor:red;\n}</style>';
diff --git a/projects/ng-dompurify/src/lib/utils/addCSSRules.ts b/projects/ng-dompurify/src/lib/utils/addCSSRules.ts
@@ -1,28 +1,24 @@
 import {SanitizeStyle} from '../types/sanitize-style';
 import {validateStyles} from './validateStyles';
+import {isSelectorRule} from './isSelectorRule';
 
 /**
  * Take CSS rules and analyze them, create string wrapper to
  * apply them to the DOM later on. Note that only selector rules
  * are supported right now
- *
- * @private
  */
 export function addCSSRules(cssRules: CSSRuleList, sanitizeStyle: SanitizeStyle): ReadonlyArray<string> {
     const output: string[] = [];
 
     for (let index = cssRules.length - 1; index >= 0; index--) {
         const rule = cssRules[index];
 
-        // check for rules with selector
-        if (rule.type === 1 && (rule instanceof CSSStyleRule) && rule.selectorText) {
-            output.push(rule.selectorText + '{');
-
-            if (rule.style) {
-                output.push(...validateStyles(rule.style, sanitizeStyle));
-            }
-
-            output.push('}');
+        if (isSelectorRule(rule)) {
+            output.push(
+                rule.selectorText + '{',
+                ...validateStyles(rule.style, sanitizeStyle),
+                '}'
+            );
         }
     }
 

diff --git a/projects/ng-dompurify/src/lib/utils/createAfterSanitizeAttributes.ts b/projects/ng-dompurify/src/lib/utils/createAfterSanitizeAttributes.ts
@@ -4,8 +4,6 @@ import {validateStyles} from './validateStyles';
 
 /**
  * afterSanitizeAttributes factory to sanitize CSS rules from inline styles through custom function
- *
- * @private
  */
 export function createAfterSanitizeAttributes(sanitizeStyle: SanitizeStyle): DompurifyHook {
     return node => {

diff --git a/projects/ng-dompurify/src/lib/utils/createUponSanitizeElementHook.ts b/projects/ng-dompurify/src/lib/utils/createUponSanitizeElementHook.ts
@@ -4,8 +4,6 @@ import {addCSSRules} from './addCSSRules';
 
 /**
  * uponSanitizeElementHook factory to sanitize CSS rules from HTMLStyleElement through custom function
- *
- * @private
  */
 export function createUponSanitizeElementHook(sanitizeStyle: SanitizeStyle): DompurifyHook {
     return node => {

diff --git a/projects/ng-dompurify/src/lib/utils/isSelectorRule.ts b/projects/ng-dompurify/src/lib/utils/isSelectorRule.ts
@@ -0,0 +1,8 @@
+/**
+ * Checks CSSRule for basic CSSStyleRule selector rule
+ */
+export function isSelectorRule(rule: CSSRule): rule is CSSStyleRule {
+    return rule.type === CSSRule.STYLE_RULE
+        && rule instanceof CSSStyleRule
+        && !!rule.selectorText;
+}
diff --git a/projects/ng-dompurify/src/lib/utils/validateStyles.ts b/projects/ng-dompurify/src/lib/utils/validateStyles.ts
@@ -3,8 +3,6 @@ import {SanitizeStyle} from '../types/sanitize-style';
 /**
  *  Take CSS property-value pairs and validate them through provided method,
  *  then add the styles to an array of property-value pairs
- *
- *  @private
  */
 export function validateStyles(styles: CSSStyleDeclaration, sanitizeStyle: SanitizeStyle): ReadonlyArray<string> {
     const output: string[] = [];