#370 update no-http-string rule to read template strings

closes #370
microsoft · May 12, 2017 · f2faf05 · f2faf05
1 parent 648f1fb
commit f2faf05
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/noHttpStringRule.ts b/src/noHttpStringRule.ts
@@ -38,7 +38,21 @@ export class Rule extends Lint.Rules.AbstractRule {
 
 class NoHttpStringWalker extends ErrorTolerantWalker {
     protected visitStringLiteral(node: ts.StringLiteral): void {
-        const stringText : string = (<ts.LiteralExpression>node).text;
+        this.visitLiteralExpression(node);
+        super.visitStringLiteral(node);
+    }
+
+    protected visitNode(node: ts.Node): void {
+        if (node.kind === ts.SyntaxKind.NoSubstitutionTemplateLiteral) {
+            this.visitLiteralExpression(<ts.NoSubstitutionTemplateLiteral>node);
+        } else if (node.kind === ts.SyntaxKind.TemplateHead) {
+            this.visitLiteralExpression(<ts.TemplateHead>node);
+        }
+        super.visitNode(node);
+    }
+
+    private visitLiteralExpression(node: ts.LiteralExpression | ts.LiteralLikeNode): void {
+        const stringText : string = node.text;
         // tslint:disable no-http-string
         if (stringText.indexOf('http:') === 0) {
             if (!this.isSuppressed(stringText)) {
@@ -47,7 +61,6 @@ class NoHttpStringWalker extends ErrorTolerantWalker {
                 this.addFailure(failure);
             }
         }
-        super.visitStringLiteral(node);
     }
 
     private isSuppressed(stringText: string) : boolean {

diff --git a/src/tests/NoHttpStringRuleTests.ts b/src/tests/NoHttpStringRuleTests.ts
@@ -19,6 +19,30 @@ describe('noHttpStringRule', (): void => {
         ]);
     });
 
+    it('should ban http template strings in variables', (): void => {
+        const inputScript: string = 'var x = `http://www.examples.com`';
+        TestHelper.assertViolations(ruleName, inputScript, [
+            {
+                "failure": "Forbidden http url in string: 'http://www.examples.com'",
+                "name": "file.ts",
+                "ruleName": ruleName,
+                "startPosition": {"character": 9, "line": 1}
+            }
+        ]);
+    });
+
+    it('should ban http multipart template strings in variables', (): void => {
+        const inputScript: string = 'var x = `http://www.${example}.com`';
+        TestHelper.assertViolations(ruleName, inputScript, [
+            {
+                "failure": "Forbidden http url in string: 'http://www.'",
+                "name": "file.ts",
+                "ruleName": ruleName,
+                "startPosition": {"character": 9, "line": 1}
+            }
+        ]);
+    });
+
     it('should ban http strings in default values', (): void => {
         const inputScript: string = 'function f(x : string = \'http://www.example.com/whatever\') {}';
         TestHelper.assertViolations(ruleName, inputScript, [