Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cb0075f

Browse files
asgerfasgerf
committed
JS: Remove use of deprecated API
1 parent 3a6da34 commit cb0075f

12 files changed

Lines changed: 20 additions & 24 deletions

File tree

‎javascript/ql/examples/queries/dataflow/StoredXss/StoredXss.ql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import javascript
1111
import DataFlow
12-
import semmle.javascript.security.dataflow.StoredXss
12+
import semmle.javascript.security.dataflow.StoredXssQuery
1313
import DataFlow::PathGraph
1414

1515
/**
@@ -21,7 +21,7 @@ import DataFlow::PathGraph
2121
* connection.query(..., (e, data) => { ... });
2222
* ```
2323
*/
24-
class MysqlSource extends StoredXss::Source {
24+
class MysqlSource extends Source {
2525
MysqlSource() {
2626
this =
2727
moduleImport("mysql")
@@ -32,6 +32,6 @@ class MysqlSource extends StoredXss::Source {
3232
}
3333
}
3434

35-
from StoredXss::Configuration cfg, PathNode source, PathNode sink
35+
from Configuration cfg, PathNode source, PathNode sink
3636
where cfg.hasFlowPath(source, sink)
3737
select sink.getNode(), source, sink, "Stored XSS from $@.", source.getNode(), "database value."

‎javascript/ql/examples/queries/dataflow/StoredXss/StoredXssTypeTracking.ql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import javascript
1212
import DataFlow
13-
import semmle.javascript.security.dataflow.StoredXss
13+
import semmle.javascript.security.dataflow.StoredXssQuery
1414
import DataFlow::PathGraph
1515

1616
/**
@@ -42,10 +42,10 @@ DataFlow::SourceNode mysqlConnection() { result = mysqlConnection(DataFlow::Type
4242
* }
4343
* ```
4444
*/
45-
class MysqlSource extends StoredXss::Source {
45+
class MysqlSource extends Source {
4646
MysqlSource() { this = mysqlConnection().getAMethodCall("query").getCallback(1).getParameter(1) }
4747
}
4848

49-
from StoredXss::Configuration cfg, PathNode source, PathNode sink
49+
from Configuration cfg, PathNode source, PathNode sink
5050
where cfg.hasFlowPath(source, sink)
5151
select sink.getNode(), source, sink, "Stored XSS from $@.", source.getNode(), "database value."

‎javascript/ql/src/Security/CWE-089/SqlInjection.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313

1414
import javascript
15-
import semmle.javascript.security.dataflow.SqlInjection
16-
import semmle.javascript.security.dataflow.NosqlInjection
15+
import semmle.javascript.security.dataflow.SqlInjectionQuery as SqlInjection
16+
import semmle.javascript.security.dataflow.NosqlInjectionQuery as NosqlInjection
1717
import DataFlow::PathGraph
1818

1919
from DataFlow::Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink

‎javascript/ql/src/semmle/javascript/heuristics/AdditionalSinks.qll‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import javascript
88
private import SyntacticHeuristics
99
private import semmle.javascript.security.dataflow.CodeInjectionCustomizations
1010
private import semmle.javascript.security.dataflow.CommandInjectionCustomizations
11-
private import semmle.javascript.security.dataflow.DomBasedXss as DomBasedXss
12-
private import semmle.javascript.security.dataflow.ReflectedXss as ReflectedXss
11+
private import semmle.javascript.security.dataflow.Xss as Xss
1312
private import semmle.javascript.security.dataflow.SqlInjectionCustomizations
1413
private import semmle.javascript.security.dataflow.NosqlInjectionCustomizations
1514
private import semmle.javascript.security.dataflow.TaintedPathCustomizations
@@ -31,7 +30,7 @@ private class HeuristicCommandInjectionSink extends HeuristicSink, CommandInject
3130
}
3231
}
3332

34-
private class HeuristicDomBasedXssSink extends HeuristicSink, DomBasedXss::DomBasedXss::Sink {
33+
private class HeuristicDomBasedXssSink extends HeuristicSink, Xss::DomBasedXss::Sink {
3534
HeuristicDomBasedXssSink() {
3635
isAssignedToOrConcatenatedWith(this, "(?i)(html|innerhtml)") or
3736
isArgTo(this, "(?i)(html|render)") or
@@ -40,7 +39,7 @@ private class HeuristicDomBasedXssSink extends HeuristicSink, DomBasedXss::DomBa
4039
}
4140
}
4241

43-
private class HeuristicReflectedXssSink extends HeuristicSink, ReflectedXss::ReflectedXss::Sink {
42+
private class HeuristicReflectedXssSink extends HeuristicSink, Xss::ReflectedXss::Sink {
4443
HeuristicReflectedXssSink() {
4544
isAssignedToOrConcatenatedWith(this, "(?i)(html|innerhtml)") or
4645
isArgTo(this, "(?i)(html|render)") or

‎javascript/ql/test/library-tests/Security/CWE-338/InsecureRandomnessSource.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import javascript
2-
import semmle.javascript.security.dataflow.InsecureRandomness::InsecureRandomness
2+
import semmle.javascript.security.dataflow.InsecureRandomnessQuery
33

44
from Source s
55
select s

‎javascript/ql/test/library-tests/frameworks/Vue/tests.ql‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import javascript
2+
import semmle.javascript.security.dataflow.Xss
23

34
query predicate instance_getAPropertyValue(Vue::Instance i, string name, DataFlow::Node prop) {
45
i.getAPropertyValue(name) = prop
@@ -18,14 +19,10 @@ query predicate instance_heapStep(
1819

1920
query predicate templateElement(Vue::Template::Element template) { any() }
2021

21-
import semmle.javascript.security.dataflow.DomBasedXss
22-
2322
query predicate vhtmlSourceWrite(Vue::VHtmlSourceWrite w, DataFlow::Node pred, DataFlow::Node succ) {
2423
w.step(pred, succ)
2524
}
2625

27-
import semmle.javascript.security.dataflow.DomBasedXss
28-
2926
query predicate xssSink(DomBasedXss::Sink s) { any() }
3027

3128
query RemoteFlowSource remoteFlowSource() { any() }

‎javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import javascript
2-
import semmle.javascript.security.dataflow.TaintedPath::TaintedPath
2+
import semmle.javascript.security.dataflow.TaintedPathQuery
33
import testUtilities.ConsistencyChecking

‎javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import javascript
22
import testUtilities.ConsistencyChecking
3-
import semmle.javascript.security.dataflow.DomBasedXss as DomXss
3+
import semmle.javascript.security.dataflow.DomBasedXssQuery as DomXss

‎javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
import javascript
15-
import semmle.javascript.security.dataflow.DomBasedXss::DomBasedXss
15+
import semmle.javascript.security.dataflow.DomBasedXssQuery
1616
import DataFlow::PathGraph
1717
import semmle.javascript.heuristics.AdditionalSources
1818

‎javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssWithCustomSanitizer.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Modern version of ReflectedXssWithCustomSanitizer_old.ql
33
//
44
import javascript
5-
import semmle.javascript.security.dataflow.ReflectedXss::ReflectedXss
5+
import semmle.javascript.security.dataflow.ReflectedXssQuery
66

77
class IsVarNameSanitizer extends TaintTracking::AdditionalSanitizerGuardNode, DataFlow::CallNode {
88
IsVarNameSanitizer() { getCalleeName() = "isVarName" }

0 commit comments

Comments
 (0)