Skip to content

Java: Move HeaderSplittingSink and WhitelistedSource into importable library #3928

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.

Sign up for GitHub

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

Merged
aschackmull merged 10 commits into from
Aug 5, 2020
Merged

Java: Move HeaderSplittingSink and WhitelistedSource into importable library #3928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f560e0
Extract `HeaderSplittingSink` and `WhitelistedSource`
rvermeulen Jul 8, 2020
fed506a
Rename TrustedSource to SafeHeaderSplittingSource
rvermeulen Jul 9, 2020
b66f391
Extend source and sink from DataFlow::Node instead of DataFlow::exprNode
rvermeulen Jul 9, 2020
7435dac
Move source and sink into importable library
rvermeulen Jul 9, 2020
4ad6357
Add missing Java import
rvermeulen Jul 9, 2020
782573e
Add and format qldocs according to the style guide.
rvermeulen Jul 9, 2020
b147be6
Restrict SafeHeaderSplittingSource to RemoteFlowSource
rvermeulen Jul 9, 2020
b3bb4cb
Rename and update qldoc of default safe header splitting source
rvermeulen Jul 9, 2020
c739c73
Update class qldocs
rvermeulen Jul 9, 2020
c2733ad
Apply grammar suggestions
rvermeulen Jul 20, 2020
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
5 changes: 3 additions & 2 deletions java/ql/src/Security/CWE/CWE-113/ResponseSplitting.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@
*/

import java
import ResponseSplitting
import semmle.code.java.dataflow.FlowSources
import semmle.code.java.security.ResponseSplitting
import DataFlow::PathGraph

class ResponseSplittingConfig extends TaintTracking::Configuration {
ResponseSplittingConfig() { this = "ResponseSplittingConfig" }

override predicate isSource(DataFlow::Node source) {
source instanceof RemoteFlowSource and
not source instanceof WhitelistedSource
not source instanceof SafeHeaderSplittingSource
}

override predicate isSink(DataFlow::Node sink) { sink instanceof HeaderSplittingSink }
Expand Down
38 changes: 0 additions & 38 deletions java/ql/src/Security/CWE/CWE-113/ResponseSplitting.qll
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion java/ql/src/Security/CWE/CWE-113/ResponseSplittingLocal.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import java
import semmle.code.java.dataflow.FlowSources
import ResponseSplitting
import semmle.code.java.security.ResponseSplitting
import DataFlow::PathGraph

class ResponseSplittingLocalConfig extends TaintTracking::Configuration {
Expand Down
49 changes: 49 additions & 0 deletions java/ql/src/semmle/code/java/security/ResponseSplitting.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/** Provides classes to reason about header splitting attacks. */

import java
import semmle.code.java.dataflow.DataFlow
Comment thread
rvermeulen marked this conversation as resolved.
import semmle.code.java.dataflow.FlowSources
import semmle.code.java.frameworks.Servlets
import semmle.code.java.frameworks.JaxWS

/** A sink that is vulnerable to an HTTP header splitting attack. */
abstract class HeaderSplittingSink extends DataFlow::Node { }

/** A source that introduces data considered safe to use by a header splitting source. */
abstract class SafeHeaderSplittingSource extends DataFlow::Node {
SafeHeaderSplittingSource() { this instanceof RemoteFlowSource }
}

/** A sink that identifies a Java Servlet or JaxWs method that is vulnerable to an HTTP header splitting attack. */
private class ServletHeaderSplittingSink extends HeaderSplittingSink {
ServletHeaderSplittingSink() {
exists(ResponseAddCookieMethod m, MethodAccess ma |
ma.getMethod() = m and
this.asExpr() = ma.getArgument(0)
)
or
exists(ResponseAddHeaderMethod m, MethodAccess ma |
ma.getMethod() = m and
this.asExpr() = ma.getAnArgument()
)
or
exists(ResponseSetHeaderMethod m, MethodAccess ma |
ma.getMethod() = m and
this.asExpr() = ma.getAnArgument()
)
or
exists(JaxRsResponseBuilder builder, Method m |
m = builder.getAMethod() and m.getName() = "header"
|
this.asExpr() = m.getAReference().getArgument(1)
)
}
}

/** A default source that introduces data considered safe to use by a header splitting source. */
private class DefaultSafeHeaderSplittingSource extends SafeHeaderSplittingSource {
DefaultSafeHeaderSplittingSource() {
this.asExpr().(MethodAccess).getMethod() instanceof HttpServletRequestGetHeaderMethod or
this.asExpr().(MethodAccess).getMethod() instanceof CookieGetNameMethod
}
}