Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JS: Add view-component-input threat model #18466

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ extensions:
# Since responses are enabled by default in the shared threat-models configuration,
# we need to disable it here to keep existing behavior for the javascript analysis.
- ["response", false, -2147483647]
- ["view-component-input", true, 100] # For testing
47 changes: 47 additions & 0 deletions javascript/ql/lib/semmle/javascript/ViewComponentInput.qll
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/**
* Provides a classes and predicates for contributing to the `view-component-input` threat model.
*/

private import javascript

/**
* An input to a view component, such as React props.
*/
abstract class ViewComponentInput extends DataFlow::Node {
/** Gets a string that describes the type of this threat-model source. */
abstract string getSourceType();
}

private class ViewComponentInputAsThreatModelSource extends ThreatModelSource::Range instanceof ViewComponentInput
{
ViewComponentInputAsThreatModelSource() { not isSafeType(this.asExpr().getType()) }

final override string getThreatModel() { result = "view-component-input" }

final override string getSourceType() { result = ViewComponentInput.super.getSourceType() }
}

private predicate isSafeType(Type t) {
t instanceof NumberLikeType
or
t instanceof BooleanLikeType
or
t instanceof UndefinedType
or
t instanceof NullType
or
t instanceof VoidType
or
hasSafeTypes(t, t.(UnionType).getNumElementType())
or
isSafeType(t.(IntersectionType).getAnElementType())
}

/** Hold if the first `n` components of `t` are safe types. */
private predicate hasSafeTypes(UnionType t, int n) {
isSafeType(t.getElementType(0)) and
n = 1
or
isSafeType(t.getElementType(n - 1)) and
hasSafeTypes(t, n - 1)
}
14 changes: 14 additions & 0 deletions javascript/ql/lib/semmle/javascript/frameworks/Angular2.qll
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ private import semmle.javascript.security.dataflow.CodeInjectionCustomizations
private import semmle.javascript.security.dataflow.ClientSideUrlRedirectCustomizations
private import semmle.javascript.DynamicPropertyAccess
private import semmle.javascript.dataflow.internal.PreCallGraphStep
private import semmle.javascript.ViewComponentInput

/**
* Provides classes for working with Angular (also known as Angular 2.x) applications.
Expand Down Expand Up @@ -554,4 +555,17 @@ module Angular2 {
this = API::Node::ofType("@angular/core", "ElementRef").getMember("nativeElement").asSource()
}
}

private class InputFieldAsViewComponentInput extends ViewComponentInput {
InputFieldAsViewComponentInput() {
this =
API::moduleImport("@angular/core")
.getMember("Input")
.getReturn()
.getADecoratedMember()
.asSource()
}

override string getSourceType() { result = "Angular component input field" }
}
}
7 changes: 7 additions & 0 deletions javascript/ql/lib/semmle/javascript/frameworks/React.qll
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import javascript
private import semmle.javascript.dataflow.internal.FlowSteps as FlowSteps
private import semmle.javascript.dataflow.internal.PreCallGraphStep
private import semmle.javascript.ViewComponentInput

/**
* Gets a reference to the 'React' object.
Expand Down Expand Up @@ -868,3 +869,9 @@ private class PropsFlowStep extends PreCallGraphStep {
)
}
}

private class ReactPropAsViewComponentInput extends ViewComponentInput {
ReactPropAsViewComponentInput() { this = any(ReactComponent c).getADirectPropsAccess() }

override string getSourceType() { result = "React props" }
}
89 changes: 81 additions & 8 deletions javascript/ql/lib/semmle/javascript/frameworks/Vue.qll
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/

import javascript
import semmle.javascript.ViewComponentInput

module Vue {
/** The global variable `Vue`, as an API graph entry point. */
Expand Down Expand Up @@ -85,17 +86,16 @@ module Vue {
* A class with a `@Component` decorator, making it usable as an "options" object in Vue.
*/
class ClassComponent extends DataFlow::ClassNode {
private ClassDefinition cls;
DataFlow::Node decorator;

ClassComponent() {
exists(ClassDefinition cls |
this = cls.flow() and
cls.getADecorator().getExpression() = decorator.asExpr() and
(
componentDecorator().flowsTo(decorator)
or
componentDecorator().getACall() = decorator
)
this = cls.flow() and
cls.getADecorator().getExpression() = decorator.asExpr() and
(
componentDecorator().flowsTo(decorator)
or
componentDecorator().getACall() = decorator
)
}

Expand All @@ -105,6 +105,9 @@ module Vue {
* These options correspond to the options one would pass to `new Vue({...})` or similar.
*/
API::Node getDecoratorOptions() { result = decorator.(API::CallNode).getParameter(0) }

/** Gets the AST node for the class definition. */
ClassDefinition getClassDefinition() { result = cls }
}

private string memberKindVerb(DataFlow::MemberKind kind) {
Expand Down Expand Up @@ -460,6 +463,12 @@ module Vue {

SingleFileComponent() { this = MkSingleFileComponent(file) }

/** Gets a call to `defineProps` in this component. */
DataFlow::CallNode getDefinePropsCall() {
result = DataFlow::globalVarRef("defineProps").getACall() and
result.getFile() = file
}

override Template::Element getTemplateElement() {
exists(HTML::Element e | result.(Template::HtmlElement).getElement() = e |
e.getFile() = file and
Expand Down Expand Up @@ -697,4 +706,68 @@ module Vue {

override ClientSideRemoteFlowKind getKind() { result = kind }
}

/**
* Holds if the given type annotation indicates a value that is not typically considered taintable.
*/
private predicate isSafeType(TypeAnnotation type) {
type.isBooleany() or
type.isNumbery() or
type.isRawFunction() or
type instanceof FunctionTypeExpr
}

/**
* Holds if the given field has a type that indicates that is can not contain a taintable value.
*/
private predicate isSafeField(FieldDeclaration field) { isSafeType(field.getTypeAnnotation()) }

private DataFlow::Node getPropSpec(Component component) {
result = component.getOption("props")
or
result = component.(SingleFileComponent).getDefinePropsCall().getArgument(0)
}

/**
* Holds if `component` has an input prop with the given name, that is of a taintable type.
*/
private predicate hasTaintableProp(Component component, string name) {
exists(DataFlow::SourceNode spec | spec = getPropSpec(component).getALocalSource() |
spec.(DataFlow::ArrayCreationNode).getAnElement().getStringValue() = name
or
exists(DataFlow::PropWrite write |
write = spec.getAPropertyWrite(name) and
not DataFlow::globalVarRef(["Number", "Boolean"]).flowsTo(write.getRhs())
)
)
or
exists(FieldDeclaration field |
field = component.getAsClassComponent().getClassDefinition().getField(name) and
DataFlow::moduleMember("vue-property-decorator", "Prop")
.getACall()
.flowsToExpr(field.getADecorator().getExpression()) and
not isSafeField(field)
)
or
// defineProps() can be called with only type arguments and then the Vue compiler will
// infer the prop types.
exists(CallExpr call, FieldDeclaration field |
call = component.(SingleFileComponent).getDefinePropsCall().asExpr() and
field = call.getTypeArgument(0).(InterfaceTypeExpr).getMember(name) and
not isSafeField(field)
)
}

private class PropAsViewComponentInput extends ViewComponentInput {
PropAsViewComponentInput() {
exists(Component component, string name | hasTaintableProp(component, name) |
this = component.getAnInstanceRef().getAPropertyRead(name)
or
// defineProps() returns the props
this = component.(SingleFileComponent).getDefinePropsCall().getAPropertyRead(name)
)
}

override string getSourceType() { result = "Vue prop" }
}
}
13 changes: 3 additions & 10 deletions javascript/ql/src/meta/alerts/TaintSources.ql
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@
import javascript
import meta.internal.TaintMetrics

string getName(DataFlow::Node node) {
result = node.(RemoteFlowSource).getSourceType()
or
not node instanceof RemoteFlowSource and
result = "Taint source"
}

from DataFlow::Node node
where node = relevantTaintSource()
select node, getName(node)
from ThreatModelSource node
where node = relevantTaintSource() and node.getThreatModel() = "remote"
select node, getTaintSourceName(node)
19 changes: 19 additions & 0 deletions javascript/ql/src/meta/alerts/ThreatModelSources.ql
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* @name Threat model sources
* @description Sources of possibly untrusted input that can be configured via threat models.
* @kind problem
* @problem.severity recommendation
* @id js/meta/alerts/threat-model-sources
* @tags meta
* @precision very-low
*/

import javascript
import meta.internal.TaintMetrics

from ThreatModelSource node, string threatModel
where
node = relevantTaintSource() and
threatModel = node.getThreatModel() and
threatModel != "remote" // "remote" is reported by TaintSources.ql
select node, getTaintSourceName(node) + " (\"" + threatModel + "\" threat model)"
11 changes: 9 additions & 2 deletions javascript/ql/src/meta/internal/TaintMetrics.qll
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ DataFlow::Node relevantTaintSink(string kind) {
DataFlow::Node relevantTaintSink() { result = relevantTaintSink(_) }

/**
* Gets a relevant remote flow source.
* Gets a relevant threat model source.
*/
RemoteFlowSource relevantTaintSource() { not result.getFile() instanceof IgnoredFile }
ThreatModelSource relevantTaintSource() { not result.getFile() instanceof IgnoredFile }

/**
* Gets the output of a call that shows intent to sanitize a value
Expand All @@ -100,3 +100,10 @@ DataFlow::Node relevantSanitizerInput() {
result = any(HtmlSanitizerCall call).getInput() and
not result.getFile() instanceof IgnoredFile
}

string getTaintSourceName(DataFlow::Node node) {
result = node.(ThreatModelSource).getSourceType()
or
not node instanceof ThreatModelSource and
result = "Taint source"
}
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { Component } from "@angular/core";
import { Component, Input } from "@angular/core";
import { DomSanitizer } from '@angular/platform-browser';

@Component({
selector: "sink-component",
template: "not important"
})
export class SinkComponent {
sink1: string;
sink2: string;
sink3: string;
sink4: string;
sink5: string;
sink6: string;
sink7: string;
sink8: string;
sink9: string;
@Input() sink1: string;
@Input() sink2: string;
@Input() sink3: string;
@Input() sink4: string;
@Input() sink5: string;
@Input() sink6: string;
@Input() sink7: string;
@Input() sink8: string;
@Input() sink9: string;

constructor(private sanitizer: DomSanitizer) {}
constructor(private sanitizer: DomSanitizer) { }

foo() {
this.sanitizer.bypassSecurityTrustHtml(this.sink1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,13 @@ taintFlow
| source.component.ts:16:33:16:40 | source() | sink.component.ts:22:48:22:57 | this.sink1 |
testAttrSourceLocation
| inline.component.ts:8:43:8:60 | [testAttr]=taint | inline.component.ts:8:55:8:59 | <toplevel> |
threatModelSource
| sink.component.ts:22:48:22:57 | this.sink1 | view-component-input |
| sink.component.ts:23:48:23:57 | this.sink2 | view-component-input |
| sink.component.ts:24:48:24:57 | this.sink3 | view-component-input |
| sink.component.ts:25:48:25:57 | this.sink4 | view-component-input |
| sink.component.ts:26:48:26:57 | this.sink5 | view-component-input |
| sink.component.ts:27:48:27:57 | this.sink6 | view-component-input |
| sink.component.ts:28:48:28:57 | this.sink7 | view-component-input |
| sink.component.ts:29:48:29:57 | this.sink8 | view-component-input |
| sink.component.ts:30:48:30:57 | this.sink9 | view-component-input |
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ query predicate testAttrSourceLocation(HTML::Attribute attrib, Angular2::Templat
attrib.getName() = "[testAttr]" and
top = attrib.getCodeInAttribute()
}

query predicate threatModelSource(ThreatModelSource source, string kind) {
kind = source.getThreatModel()
}
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,28 @@ test_JsxName_this
| thisAccesses.js:61:19:61:41 | <this.t ... s.this> | thisAccesses.js:61:20:61:23 | this |
locationSource
| importedComponent.jsx:3:32:3:39 | location |
threatModelSource
| es5.js:4:24:4:33 | this.props | view-component-input |
| es5.js:20:24:20:33 | this.props | view-component-input |
| es6.js:1:37:1:36 | args | view-component-input |
| es6.js:3:24:3:33 | this.props | view-component-input |
| exportedComponent.jsx:1:29:1:33 | props | view-component-input |
| importedComponent.jsx:3:24:3:40 | {color, location} | view-component-input |
| importedComponent.jsx:3:32:3:39 | location | remote |
| namedImport.js:3:27:3:26 | args | view-component-input |
| namedImport.js:5:19:5:18 | args | view-component-input |
| plainfn.js:1:16:1:20 | props | view-component-input |
| plainfn.js:5:17:5:21 | props | view-component-input |
| plainfn.js:9:17:9:21 | props | view-component-input |
| plainfn.js:20:28:20:32 | props | view-component-input |
| preact.js:1:38:1:37 | args | view-component-input |
| preact.js:2:12:2:16 | props | view-component-input |
| preact.js:9:38:9:37 | args | view-component-input |
| probably-a-component.js:1:31:1:30 | args | view-component-input |
| probably-a-component.js:3:9:3:18 | this.props | view-component-input |
| props.js:2:37:2:36 | args | view-component-input |
| props.js:26:16:26:20 | props | view-component-input |
| rare-lifecycle-methods.js:1:33:1:32 | args | view-component-input |
| statePropertyWrites.js:38:24:38:33 | this.props | view-component-input |
| thisAccesses.js:31:12:31:16 | props | view-component-input |
| thisAccesses.js:48:18:48:18 | y | view-component-input |
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ import ReactComponent_getAPropRead
import ReactName

query DataFlow::SourceNode locationSource() { result = DOM::locationSource() }

query predicate threatModelSource(ThreatModelSource source, string kind) {
kind = source.getThreatModel()
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
</template>
<script>
export default {
data: function() { return { dataA: 42 } }
props: ['input'],
data: function() { return { dataA: 42 + this.input } }
}
</script>
<style>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<script>
var x = require('x');
module.exports = { // not properly detected by the module system yet
data: function() { return { dataA: 42 } }
props: ['input'],
data: function() { return { dataA: 42 + this.input } }
}
</script>
<style>
Expand Down
Loading
Loading