hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix semantic merge conflict

Browse Source
This commit is contained in:
Esben Sparre Andreasen
2022-04-01 09:31:49 +02:00
committed by Stephan Brandauer
parent c95ab031ef
commit 5ac608d503
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointFeatures.qll
View File

@@ -275,9 +275,12 @@ class CalleeName extends EndpointFeature, TCalleeName {
override string getName() { result = "calleeName" }
override string getValue(DataFlow::Node endpoint) {
exists(DataFlow::CallNode call | endpoint = call.getAnArgument() |
result = strictconcat(string component | component = call.getCalleeName() | component, " ")
)
result =
strictconcat(DataFlow::CallNode call, string component |
endpoint = call.getAnArgument() and component = call.getCalleeName()
|
component, " "
)
}
}
@@ -288,14 +291,13 @@ class ReceiverName extends EndpointFeature, TReceiverName {
override string getName() { result = "receiverName" }
override string getValue(DataFlow::Node endpoint) {
exists(DataFlow::CallNode call | endpoint = call.getAnArgument() |
result =
strictconcat(string component |
component = call.getReceiver().asExpr().(VarRef).getName()
|
component, " "
)
)
result =
strictconcat(DataFlow::CallNode call, string component |
endpoint = call.getAnArgument() and
component = call.getReceiver().asExpr().(VarRef).getName()
|
component, " "
)
}
}
@@ -306,14 +308,13 @@ class ArgumentIndex extends EndpointFeature, TArgumentIndex {
override string getName() { result = "argumentIndex" }
override string getValue(DataFlow::Node endpoint) {
exists(DataFlow::CallNode call | endpoint = call.getAnArgument() |
result =
strictconcat(string component |
component = any(int argIndex | call.getArgument(argIndex) = endpoint).toString()
|
component, " "
)
)
result =
strictconcat(DataFlow::CallNode call, string component |
endpoint = call.getAnArgument() and
component = any(int argIndex | call.getArgument(argIndex) = endpoint).toString()
|
component, " "
)
}
}
@@ -331,16 +332,13 @@ class CalleeApiName extends EndpointFeature, TCalleeApiName {
override string getName() { result = "calleeApiName" }
override string getValue(DataFlow::Node endpoint) {
exists(API::Node apiNode |
endpoint = apiNode.getInducingNode().(DataFlow::CallNode).getAnArgument()
|
result =
strictconcat(string component |
AccessPaths::accessPaths(apiNode, false, _, component)
|
component, " "
)
)
result =
strictconcat(API::Node apiNode, string component |
endpoint = apiNode.getInducingNode().(DataFlow::CallNode).getAnArgument() and
AccessPaths::accessPaths(apiNode, false, _, component)
|
component, " "
)
}
}