Skip to content
Open
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
4 changes: 4 additions & 0 deletions csharp/ql/lib/change-notes/2026-08-19-odata-taint-step.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
category: feature
---
* Added taint modeling for OData action parameter binding (`Microsoft.AspNet.OData`/`Microsoft.AspNetCore.OData`). Values cast, `as`-converted, or type-tested out of `ODataActionParameters`, and entities tracked by `Delta<T>` (via `GetInstance`, `Patch`, `Put`, `CopyChangedValues`, and `CopyUnchangedValues`), now taint the members of the target type.
7 changes: 7 additions & 0 deletions csharp/ql/lib/ext/Microsoft.AspNet.OData.model.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
extensions:
- addsTo:
pack: codeql/csharp-all
extensible: summaryModel
data:
- ["Microsoft.AspNet.OData", "Delta<TStructuralType>", True, "GetInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
- ["Microsoft.AspNetCore.OData.Deltas", "Delta<T>", True, "GetInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ private import semmle.code.csharp.dispatch.Dispatch
private import semmle.code.csharp.commons.ComparisonTest
// import `TaintedMember` definitions from other files to avoid potential reevaluation
private import semmle.code.csharp.frameworks.JsonNET
private import semmle.code.csharp.frameworks.OData
private import semmle.code.csharp.frameworks.WCF
private import semmle.code.csharp.security.dataflow.flowsources.Remote

Expand Down
125 changes: 125 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/frameworks/OData.qll
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/**
* Provides taint modeling for `Microsoft.AspNet.OData`/`Microsoft.AspNetCore.OData`
* (and the older `System.Web.Http.OData`) OData action parameter binding.
*
* OData actions receive their untrusted payload in one of two shapes that
* bypass the usual "type used as an action-method parameter" taint modeling:
*
* - `ODataActionParameters`, an untyped `Dictionary<string, object>` whose
* values are cast, `as`-converted, or type-tested to arbitrary model types
* by the action method body.
* - `Delta<T>`, a change-tracking wrapper for PATCH/PUT requests, whose
* tracked property values are exposed via `GetInstance()` or copied onto an
* existing entity via `Patch`/`Put`/`CopyChangedValues`/`CopyUnchangedValues`.
*
* In both cases the type that ends up holding the client-controlled data has
* no static relationship to the action method's parameter types, so its
* members need to be taint-tracked explicitly.
*/

import csharp
private import semmle.code.csharp.commons.Collections
private import semmle.code.csharp.dataflow.FlowSteps
private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
private import semmle.code.csharp.security.dataflow.flowsources.Remote

/** The `ODataActionParameters` dictionary type, across OData library versions. */
class ODataActionParametersClass extends Class {
ODataActionParametersClass() {
this.hasFullyQualifiedName("Microsoft.AspNet.OData", "ODataActionParameters") or
this.hasFullyQualifiedName("Microsoft.AspNetCore.OData.Formatter", "ODataActionParameters") or
this.hasFullyQualifiedName("System.Web.Http.OData", "ODataActionParameters")
}
}

/** An indexer read on an `ODataActionParameters` dictionary, e.g. `parameters["Foo"]`. */
class ODataActionParameterRead extends ElementAccess {
ODataActionParameterRead() { this.getQualifier().getType() instanceof ODataActionParametersClass }
}

/** Holds if `e` may (locally) hold the value of an `ODataActionParameters` entry. */
private predicate isODataParameterValue(Expr e) {
TaintTracking::localExprTaint(any(ODataActionParameterRead r), e)
}

/** The generic ``Delta`1`` change-tracking class, across OData library versions. */
class DeltaClass extends UnboundGenericClass {
DeltaClass() {
this.getNumberOfTypeParameters() = 1 and
(
this.hasFullyQualifiedName("Microsoft.AspNet.OData", "Delta`1") or
this.hasFullyQualifiedName("Microsoft.AspNetCore.OData.Deltas", "Delta`1")
)
}
}

/**
* A type that a value read out of `ODataActionParameters` is cast, `as`-converted,
* or type-tested to -- directly, or wrapped in a collection (`List<T>`,
* `IEnumerable<T>`, arrays, ...) -- or a type that is tracked by a `Delta<T>`.
*/
class ODataBoundType extends ValueOrRefType {
ODataBoundType() {
exists(Cast c | isODataParameterValue(c.getExpr()) |
this = c.getTargetType() or
this = c.getTargetType().(CollectionType).getElementType() or
this = c.getTargetType().(ParamsCollectionType).getElementType()
)
or
exists(IsExpr ie, Type t |
isODataParameterValue(ie.getExpr()) and
t = ie.getPattern().(TypePatternExpr).getCheckedType()
|
this = t or
this = t.(CollectionType).getElementType() or
this = t.(ParamsCollectionType).getElementType()
)
or
this = any(ConstructedClass c | c.getUnboundGeneric() instanceof DeltaClass).getTypeArgument(0)
}
}

/** The `Patch`, `Put`, `CopyChangedValues`, and `CopyUnchangedValues` methods on `Delta<T>`. */
class DeltaMutatingMethod extends Method {
DeltaMutatingMethod() {
this.getDeclaringType() instanceof DeltaClass and
this.hasName(["Patch", "Put", "CopyChangedValues", "CopyUnchangedValues"])
}
}

/**
* Taint members (transitively) on types used in
* 1. Casts, `as`-conversions, or type tests applied to `ODataActionParameters` values.
* 2. The type argument of a `Delta<T>`.
*
* Note that this also impacts uses of such types in other contexts, the same
* trade-off `AspNetRemoteFlowSourceMember` (`Remote.qll`) makes for ASP.NET
* action-method parameters.
*/
private class ODataBoundMember extends TaintTracking::TaintedMember, CandidateMemberToTaint {
ODataBoundMember() {
exists(Type t, Type t0 | t = this.getDeclaringType() |
(t = t0 or t = t0.(CollectionType).getElementType()) and
(
t0 = any(ODataBoundMember m).getType()
or
t0 instanceof ODataBoundType
)
)
}
}

/**
* A call to `Delta<T>.Patch`/`Put`/`CopyChangedValues`/`CopyUnchangedValues`
* copies the changes tracked by the `Delta<T>` receiver onto its `original`
* entity argument.
*/
private class DeltaMutatingCallTaintStep extends AdditionalTaintStep {
override predicate step(DataFlow::Node node1, DataFlow::Node node2) {
exists(MethodCall mc |
mc.getTarget().getUnboundDeclaration() instanceof DeltaMutatingMethod and
node1.asExpr() = mc.getQualifier() and
node2.(PostUpdateNode).getPreUpdateNode().asExpr() = mc.getArgument(0)
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ class AspNetServiceRemoteFlowSource extends AspNetRemoteFlowSource, DataFlow::Pa
override string getSourceType() { result = "ASP.NET web service input" }
}

private class CandidateMemberToTaint extends Member {
/** A public, non-static, auto-implemented property or field, candidate for taint-tracking. */
class CandidateMemberToTaint extends Member {
CandidateMemberToTaint() {
this.isPublic() and
not this.isStatic() and
Expand Down
99 changes: 99 additions & 0 deletions csharp/ql/test/library-tests/frameworks/OData/OData.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
namespace Test
{
using Microsoft.AspNet.OData;
using System.Collections.Generic;

public class EntityMetadata
{
public string Owner { get; set; }
}

public class BoundEntity
{
public string Name { get; set; }

public string Content { get; set; }

public EntityMetadata Metadata { get; set; }

public List<EntityMetadata> Revisions { get; set; }
}

public class RelatedItem
{
public string Label { get; set; }

public string Category { get; set; }
}

public class Widget
{
public string Name { get; set; }
}

public class UnrelatedType
{
// Never reached via an ODataActionParameters/Delta<T> cast, so this
// member must stay untainted even though `UnrelatedType` itself is
// used elsewhere in the file.
public string Name { get; set; }
}

public class SampleController
{
void Sink(object o) { }

void CastFromDictionary(ODataActionParameters parameters)
{
var entity = (BoundEntity)parameters["Entity"];
Sink(entity);
Sink(entity.Name);
Sink(entity.Content);
Sink(entity.Metadata.Owner);
foreach (var m in entity.Revisions)
{
Sink(m.Owner);
}
}

void IsAsFromDictionary(ODataActionParameters parameters)
{
if (parameters["Items"] is IEnumerable<RelatedItem> items1)
{
foreach (var item in items1)
{
Sink(item.Label);
}
}

var items2 = parameters["Items"] as IEnumerable<RelatedItem>;
foreach (var item in items2)
{
Sink(item.Category);
}
}

void DeltaPatch(Delta<Widget> delta, Widget original)
{
delta.Patch(original);
Sink(original.Name);
}

void DeltaGetInstance(Delta<Widget> delta)
{
var w = delta.GetInstance();
Sink(w.Name);
}

void Untainted()
{
var w = new Widget();
w.Name = "safe";
Sink(w.Name);

var u = new UnrelatedType();
u.Name = "also safe";
Sink(u.Name);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
| OData.cs:46:55:46:64 | parameters | OData.cs:49:18:49:23 | access to local variable entity |
| OData.cs:46:55:46:64 | parameters | OData.cs:50:18:50:28 | access to property Name |
| OData.cs:46:55:46:64 | parameters | OData.cs:51:18:51:31 | access to property Content |
| OData.cs:46:55:46:64 | parameters | OData.cs:52:18:52:38 | access to property Owner |
| OData.cs:46:55:46:64 | parameters | OData.cs:55:22:55:28 | access to property Owner |
| OData.cs:59:55:59:64 | parameters | OData.cs:65:26:65:35 | access to property Label |
| OData.cs:59:55:59:64 | parameters | OData.cs:72:22:72:34 | access to property Category |
| OData.cs:76:39:76:43 | delta | OData.cs:79:18:79:30 | access to property Name |
| OData.cs:82:45:82:49 | delta | OData.cs:85:18:85:23 | access to property Name |
21 changes: 21 additions & 0 deletions csharp/ql/test/library-tests/frameworks/OData/OData.ql
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import csharp

module TaintConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) {
exists(Parameter p | p = n.asParameter() |
p.getType().hasFullyQualifiedName("Microsoft.AspNet.OData", "ODataActionParameters")
or
p.getType().getUnboundDeclaration().hasFullyQualifiedName("Microsoft.AspNet.OData", "Delta`1")
)
}

predicate isSink(DataFlow::Node sink) {
exists(MethodCall c | c.getArgument(0) = sink.asExpr() and c.getTarget().hasName("Sink"))
}
}

module Taint = TaintTracking::Global<TaintConfig>;

from DataFlow::Node source, DataFlow::Node sink
where Taint::flow(source, sink)
select source, sink
2 changes: 2 additions & 0 deletions csharp/ql/test/library-tests/frameworks/OData/options
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
semmle-extractor-options: /nostdlib /noconfig
semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/Microsoft.AspNet.OData/7.7.5/Microsoft.AspNet.OData.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// This file contains auto-generated code.
// Generated from `Microsoft.AspNet.OData, Version=7.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35`.
namespace Microsoft.AspNet.OData
{
public class ODataActionParameters : System.Collections.Generic.Dictionary<string, object>
{
public ODataActionParameters() => throw null;
}

public class Delta<TStructuralType> where TStructuralType : class
{
public Delta() => throw null;
public TStructuralType GetInstance() => throw null;
public void Patch(TStructuralType original) => throw null;
public void Put(TStructuralType original) => throw null;
public void CopyChangedValues(TStructuralType original) => throw null;
public void CopyUnchangedValues(TStructuralType original) => throw null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
</ItemGroup>
</Project>