JS: Autoformat

asgerf · asgerf · commit 0bd60c1989c4 · 2021-03-02T12:39:05.000Z
diff --git a/javascript/ql/src/semmle/javascript/JsonSchema.qll b/javascript/ql/src/semmle/javascript/JsonSchema.qll
@@ -18,8 +18,7 @@ module JsonSchema {
   }
 
   /** A data flow node that is used a JSON schema. */
-  abstract class SchemaRoot extends DataFlow::Node {
-  }
+  abstract class SchemaRoot extends DataFlow::Node { }
 
   /** An object literal with a `$schema` property indicating it is the root of a JSON schema. */
   private class SchemaNodeByTag extends SchemaRoot, DataFlow::ObjectLiteralNode {
@@ -35,9 +34,7 @@ module JsonSchema {
     or
     result = getAPartOfJsonSchema(t.continue()).getAPropertySource()
     or
-    exists(DataFlow::TypeBackTracker t2 |
-      result = getAPartOfJsonSchema(t2).backtrack(t2, t)
-    )
+    exists(DataFlow::TypeBackTracker t2 | result = getAPartOfJsonSchema(t2).backtrack(t2, t))
   }
 
   /** Gets a data flow node that is part of a JSON schema. */
@@ -68,7 +65,7 @@ module JsonSchema {
       }
 
       /**
-       * Gets an API node for a function produced by `new Ajv().compile()` or similar. 
+       * Gets an API node for a function produced by `new Ajv().compile()` or similar.
        *
        * Note that this does not include the instance method `new Ajv().validate` as its
        * signature is different.
@@ -83,9 +80,7 @@ module JsonSchema {
        * Gets an API node that refers to an error produced by this Ajv instance.
        */
       API::Node getAValidationError() {
-        exists(API::Node base |
-          base = [ref(), getAValidationFunction()]
-        |
+        exists(API::Node base | base = [ref(), getAValidationFunction()] |
           result = base.getMember("errors")
           or
           result = base.getMember("errorsText").getReturn()
@@ -122,7 +117,12 @@ module JsonSchema {
 
     private class AjvSchemaNode extends SchemaRoot {
       AjvSchemaNode() {
-        this = any(Instance i).ref().getMember(["addSchema", "validate", "compile", "compileAsync"]).getParameter(0).getARhs()
+        this =
+          any(Instance i)
+              .ref()
+              .getMember(["addSchema", "validate", "compile", "compileAsync"])
+              .getParameter(0)
+              .getARhs()
       }
     }
   }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -866,12 +866,15 @@ predicate isInterpretedAsRegExp(DataFlow::Node source) {
       not exists(PropAccess p | p.getBase() = mce.getEnclosingExpr())
     )
     or
-    exists(DataFlow::SourceNode schema |
-      schema = JsonSchema::getAPartOfJsonSchema()
-    |
+    exists(DataFlow::SourceNode schema | schema = JsonSchema::getAPartOfJsonSchema() |
       source = schema.getAPropertyWrite("pattern").getRhs()
       or
-      source = schema.getAPropertySource("patternProperties").getAPropertyWrite().getPropertyNameExpr().flow()
+      source =
+        schema
+            .getAPropertySource("patternProperties")
+            .getAPropertyWrite()
+            .getPropertyNameExpr()
+            .flow()
     )
   )
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/ExceptionXss.qll b/javascript/ql/src/semmle/javascript/security/dataflow/ExceptionXss.qll
@@ -156,9 +156,7 @@ module ExceptionXss {
       this = any(JsonSchema::Ajv::Instance i).getAValidationError().getAnImmediateUse()
     }
 
-    override string getDescription() {
-      result = "JSON schema validation error"
-    }
+    override string getDescription() { result = "JSON schema validation error" }
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -866,12 +866,15 @@ predicate isInterpretedAsRegExp(DataFlow::Node source) {`
`866`	`866`	`not exists(PropAccess p \| p.getBase() = mce.getEnclosingExpr())`
`867`	`867`	`)`
`868`	`868`	`or`
`869`		`- exists(DataFlow::SourceNode schema \|`
`870`		`- schema = JsonSchema::getAPartOfJsonSchema()`
`871`		`- \|`
	`869`	`+ exists(DataFlow::SourceNode schema \| schema = JsonSchema::getAPartOfJsonSchema() \|`
`872`	`870`	`source = schema.getAPropertyWrite("pattern").getRhs()`
`873`	`871`	`or`
`874`		`- source = schema.getAPropertySource("patternProperties").getAPropertyWrite().getPropertyNameExpr().flow()`
	`872`	`+ source =`
	`873`	`+ schema`
	`874`	`+ .getAPropertySource("patternProperties")`
	`875`	`+ .getAPropertyWrite()`
	`876`	`+ .getPropertyNameExpr()`
	`877`	`+ .flow()`
`875`	`878`	`)`
`876`	`879`	`)`
`877`	`880`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,7 @@ module ExceptionXss {`
`156`	`156`	`this = any(JsonSchema::Ajv::Instance i).getAValidationError().getAnImmediateUse()`
`157`	`157`	`}`
`158`	`158`
`159`		`- override string getDescription() {`
`160`		`- result = "JSON schema validation error"`
`161`		`- }`
	`159`	`+ override string getDescription() { result = "JSON schema validation error" }`
`162`	`160`	`}`
`163`	`161`
`164`	`162`	`/**`