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

some review feedback

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2019-12-10 12:30:47 +01:00
parent e5d465da9a
commit c4fd80d12b
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
javascript/ql/src/semmle/javascript/frameworks/Electron.qll
View File

@@ -134,14 +134,17 @@ module Electron {
this.getArgument(0).mayHaveStringValue(result)
}
override DataFlow::Node getCallbackParameter(int i) {
override DataFlow::Node getEventHandlerParameter(int i) {
result = this.getABoundCallbackParameter(1, i + 1)
}
override DataFlow::Node getAReturnedValue(EventEmitter::EventDispatch dispatch) {
dispatch.(DataFlow::InvokeNode).getCalleeName() = "sendSync" and
override DataFlow::Node getAReturnedValue() {
result = this.getABoundCallbackParameter(1, 0).getAPropertyWrite("returnValue").getRhs()
}
override predicate canReturnTo(EventEmitter::EventDispatch dispatch) {
dispatch.(DataFlow::InvokeNode).getCalleeName() = "sendSync"
}
}
/**

27
javascript/ql/src/semmle/javascript/frameworks/EventEmitter.qll
View File

@@ -67,14 +67,20 @@ module EventEmitter {
/** Gets the name of the channel if possible. */
abstract string getChannel();
/** Gets the `i`th parameter in the callback registered as the event handler. */
abstract DataFlow::Node getCallbackParameter(int i);
/** Gets the `i`th parameter in the event handler. */
abstract DataFlow::Node getEventHandlerParameter(int i);
/**
* Gets a value that is returned by the event handler to the `dispatch` where the event was dispatched.
* Gets a value that is returned by the event handler.
* The default implementation is that no value can be returned.
*/
DataFlow::Node getAReturnedValue(EventDispatch dispatch) { none() }
DataFlow::Node getAReturnedValue() { none() }
/**
* Holds if this event handler can return a value to the given `dispatch`.
* The default implementation is that there exists no such dispatch.
*/
predicate canReturnTo(EventDispatch dispatch) { none() }
}
/**
@@ -117,16 +123,17 @@ module EventEmitter {
override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
exists(int i | i >= 0 |
pred = dispatch.getDispatchedArgument(i) and
succ = reg.getCallbackParameter(i)
succ = reg.getEventHandlerParameter(i)
)
or
pred = reg.getAReturnedValue(dispatch) and
reg.canReturnTo(dispatch) and
pred = reg.getAReturnedValue() and
succ = dispatch
}
}
/**
* Concrete classes for modelling EventEmitter in NodeJS.
* Concrete classes for modeling EventEmitter in NodeJS.
*/
private module NodeJSEventEmitter {
private class NodeJSEventEmitter extends EventEmitter {
@@ -141,20 +148,16 @@ module EventEmitter {
}
private class EventEmitterRegistration extends EventRegistration, DataFlow::MethodCallNode {
override EventEmitter emitter;
EventEmitterRegistration() { this = emitter.ref().getAMethodCall(EventEmitter::on()) }
override string getChannel() { this.getArgument(0).mayHaveStringValue(result) }
override DataFlow::Node getCallbackParameter(int i) {
override DataFlow::Node getEventHandlerParameter(int i) {
result = this.(DataFlow::MethodCallNode).getABoundCallbackParameter(1, i)
}
}
private class EventEmitterDispatch extends EventDispatch, DataFlow::MethodCallNode {
override EventEmitter emitter;
EventEmitterDispatch() {
this = emitter.ref().getAMethodCall("emit")
}