Skip to content

Commit 1c06aff

Browse files
egregius313egregius313
authored
Merge pull request github#12578 from egregius313/egregius313/conform-dataflow-configs-to-config-naming-convention
Conform dataflow config modules to follow `*Config` naming convention
2 parents 029d924 + c852d3a commit 1c06aff

31 files changed

+81
-83
lines changed

‎cpp/ql/src/Likely Bugs/Format/NonConstantFormat.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ predicate isSinkImpl(DataFlow::Node sink, Expr formatString) {
132132
exists(FormattingFunctionCall fc | formatString = fc.getArgument(fc.getFormatParameterIndex()))
133133
}
134134

135-
module NonConstFlowConfiguration implements DataFlow::ConfigSig {
135+
module NonConstFlowConfig implements DataFlow::ConfigSig {
136136
predicate isSource(DataFlow::Node source) {
137137
exists(boolean isIndirect, Type t |
138138
isNonConst(source, isIndirect) and
@@ -146,7 +146,7 @@ module NonConstFlowConfiguration implements DataFlow::ConfigSig {
146146
predicate isBarrier(DataFlow::Node node) { isBarrierNode(node) }
147147
}
148148

149-
module NonConstFlow = TaintTracking::Make<NonConstFlowConfiguration>;
149+
module NonConstFlow = TaintTracking::Make<NonConstFlowConfig>;
150150

151151
from FormattingFunctionCall call, Expr formatString
152152
where

‎cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,15 @@ deprecated class LeapYearCheckConfiguration extends DataFlow::Configuration {
223223
* Data flow configuration for finding a variable access that would flow into
224224
* a function call that includes an operation to check for leap year.
225225
*/
226-
private module LeapYearCheckConfiguration implements DataFlow::ConfigSig {
226+
private module LeapYearCheckConfig implements DataFlow::ConfigSig {
227227
predicate isSource(DataFlow::Node source) { source.asExpr() instanceof VariableAccess }
228228

229229
predicate isSink(DataFlow::Node sink) {
230230
exists(ChecksForLeapYearFunctionCall fc | sink.asExpr() = fc.getAnArgument())
231231
}
232232
}
233233

234-
module LeapYearCheckFlow = DataFlow::Make<LeapYearCheckConfiguration>;
234+
module LeapYearCheckFlow = DataFlow::Make<LeapYearCheckConfig>;
235235

236236
/**
237237
* Data flow configuration for finding an operation with hardcoded 365 that will flow into
@@ -264,7 +264,7 @@ deprecated class FiletimeYearArithmeticOperationCheckConfiguration extends DataF
264264
* Data flow configuration for finding an operation with hardcoded 365 that will flow into
265265
* a `FILEINFO` field.
266266
*/
267-
private module FiletimeYearArithmeticOperationCheckConfiguration implements DataFlow::ConfigSig {
267+
private module FiletimeYearArithmeticOperationCheckConfig implements DataFlow::ConfigSig {
268268
predicate isSource(DataFlow::Node source) {
269269
exists(Expr e, Operation op | e = source.asExpr() |
270270
op.getAChild*().getValue().toInt() = 365 and
@@ -284,7 +284,7 @@ private module FiletimeYearArithmeticOperationCheckConfiguration implements Data
284284
}
285285

286286
module FiletimeYearArithmeticOperationCheckFlow =
287-
DataFlow::Make<FiletimeYearArithmeticOperationCheckConfiguration>;
287+
DataFlow::Make<FiletimeYearArithmeticOperationCheckConfig>;
288288

289289
/**
290290
* Taint configuration for finding an operation with hardcoded 365 that will flow into any known date/time field.
@@ -334,7 +334,7 @@ deprecated class PossibleYearArithmeticOperationCheckConfiguration extends Taint
334334
/**
335335
* Taint configuration for finding an operation with hardcoded 365 that will flow into any known date/time field.
336336
*/
337-
private module PossibleYearArithmeticOperationCheckConfiguration implements DataFlow::ConfigSig {
337+
private module PossibleYearArithmeticOperationCheckConfig implements DataFlow::ConfigSig {
338338
predicate isSource(DataFlow::Node source) {
339339
exists(Operation op | op = source.asConvertedExpr() |
340340
op.getAChild*().getValue().toInt() = 365 and
@@ -372,4 +372,4 @@ private module PossibleYearArithmeticOperationCheckConfiguration implements Data
372372
}
373373

374374
module PossibleYearArithmeticOperationCheckFlow =
375-
TaintTracking::Make<PossibleYearArithmeticOperationCheckConfiguration>;
375+
TaintTracking::Make<PossibleYearArithmeticOperationCheckConfig>;

‎cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ deprecated class NetworkToBufferSizeConfiguration extends DataFlow::Configuratio
147147
}
148148
}
149149

150-
private module NetworkToBufferSizeConfiguration implements DataFlow::ConfigSig {
150+
private module NetworkToBufferSizeConfig implements DataFlow::ConfigSig {
151151
predicate isSource(DataFlow::Node node) { node.asExpr() instanceof NetworkFunctionCall }
152152

153153
predicate isSink(DataFlow::Node node) { node.asExpr() = any(BufferAccess ba).getAccessedLength() }
@@ -161,4 +161,4 @@ private module NetworkToBufferSizeConfiguration implements DataFlow::ConfigSig {
161161
}
162162
}
163163

164-
module NetworkToBufferSizeFlow = DataFlow::Make<NetworkToBufferSizeConfiguration>;
164+
module NetworkToBufferSizeFlow = DataFlow::Make<NetworkToBufferSizeConfig>;

‎cpp/ql/src/Security/CWE/CWE-022/TaintedPath.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ predicate hasUpperBoundsCheck(Variable var) {
7070
)
7171
}
7272

73-
module TaintedPathConfiguration implements DataFlow::ConfigSig {
73+
module TaintedPathConfig implements DataFlow::ConfigSig {
7474
predicate isSource(DataFlow::Node node) { node instanceof FlowSource }
7575

7676
predicate isSink(DataFlow::Node node) {
@@ -90,7 +90,7 @@ module TaintedPathConfiguration implements DataFlow::ConfigSig {
9090
}
9191
}
9292

93-
module TaintedPath = TaintTracking::Make<TaintedPathConfiguration>;
93+
module TaintedPath = TaintTracking::Make<TaintedPathConfig>;
9494

9595
from
9696
FileFunction fileFunction, Expr taintedArg, FlowSource taintSource,

‎cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ predicate isBarrierImpl(DataFlow::Node node) {
9797
* given sink. This avoids a cartesian product between all sinks and all `ExecState`s in
9898
* `ExecTaintConfiguration::isSink`.
9999
*/
100-
module ExecStateConfiguration implements DataFlow::ConfigSig {
100+
module ExecStateConfig implements DataFlow::ConfigSig {
101101
predicate isSource(DataFlow::Node source) { any(ExecState state).getOutgoingNode() = source }
102102

103103
predicate isSink(DataFlow::Node sink) { isSinkImpl(sink, _, _) }
@@ -109,9 +109,9 @@ module ExecStateConfiguration implements DataFlow::ConfigSig {
109109
}
110110
}
111111

112-
module ExecState = TaintTracking::Make<ExecStateConfiguration>;
112+
module ExecState = TaintTracking::Make<ExecStateConfig>;
113113

114-
module ExecTaintConfiguration implements DataFlow::StateConfigSig {
114+
module ExecTaintConfig implements DataFlow::StateConfigSig {
115115
class FlowState = TState;
116116

117117
predicate isSource(DataFlow::Node source, FlowState state) {
@@ -120,7 +120,7 @@ module ExecTaintConfiguration implements DataFlow::StateConfigSig {
120120
}
121121

122122
predicate isSink(DataFlow::Node sink, FlowState state) {
123-
ExecStateConfiguration::isSink(sink) and
123+
ExecStateConfig::isSink(sink) and
124124
state.(ExecState).isFeasibleForSink(sink)
125125
}
126126

@@ -141,7 +141,7 @@ module ExecTaintConfiguration implements DataFlow::StateConfigSig {
141141
}
142142
}
143143

144-
module ExecTaint = TaintTracking::MakeWithState<ExecTaintConfiguration>;
144+
module ExecTaint = TaintTracking::MakeWithState<ExecTaintConfig>;
145145

146146
from
147147
ExecTaint::PathNode sourceNode, ExecTaint::PathNode sinkNode, string taintCause, string callChain,

‎cpp/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ predicate missingGuard(VariableAccess va, string effect) {
9090
)
9191
}
9292

93-
module UncontrolledArithConfiguration implements DataFlow::ConfigSig {
93+
module UncontrolledArithConfig implements DataFlow::ConfigSig {
9494
predicate isSource(DataFlow::Node source) {
9595
exists(RandomFunction rand, Call call | call.getTarget() = rand |
9696
rand.getFunctionOutput().isReturnValue() and
@@ -122,7 +122,7 @@ module UncontrolledArithConfiguration implements DataFlow::ConfigSig {
122122
}
123123
}
124124

125-
module UncontrolledArith = TaintTracking::Make<UncontrolledArithConfiguration>;
125+
module UncontrolledArith = TaintTracking::Make<UncontrolledArithConfig>;
126126

127127
/** Gets the expression that corresponds to `node`, if any. */
128128
Expr getExpr(DataFlow::Node node) { result = [node.asExpr(), node.asDefiningArgument()] }

‎cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Va
5454

5555
predicate isFlowSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
5656

57-
module TaintedAllocationSizeConfiguration implements DataFlow::ConfigSig {
57+
module TaintedAllocationSizeConfig implements DataFlow::ConfigSig {
5858
predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
5959

6060
predicate isSink(DataFlow::Node sink) { allocSink(_, sink) }
@@ -95,7 +95,7 @@ module TaintedAllocationSizeConfiguration implements DataFlow::ConfigSig {
9595
}
9696
}
9797

98-
module TaintedAllocationSize = TaintTracking::Make<TaintedAllocationSizeConfiguration>;
98+
module TaintedAllocationSize = TaintTracking::Make<TaintedAllocationSizeConfig>;
9999

100100
from
101101
Expr alloc, TaintedAllocationSize::PathNode source, TaintedAllocationSize::PathNode sink,

‎cpp/ql/src/Security/CWE/CWE-311/CleartextBufferWrite.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SensitiveBufferWrite extends Expr instanceof BufferWrite::BufferWrite {
3939
* A taint flow configuration for flow from user input to a buffer write
4040
* into a sensitive expression.
4141
*/
42-
module ToBufferConfiguration implements DataFlow::ConfigSig {
42+
module ToBufferConfig implements DataFlow::ConfigSig {
4343
predicate isSource(DataFlow::Node source) { source instanceof FlowSource }
4444

4545
predicate isBarrier(DataFlow::Node node) {
@@ -49,7 +49,7 @@ module ToBufferConfiguration implements DataFlow::ConfigSig {
4949
predicate isSink(DataFlow::Node sink) { isSinkImpl(sink, _) }
5050
}
5151

52-
module ToBufferFlow = TaintTracking::Make<ToBufferConfiguration>;
52+
module ToBufferFlow = TaintTracking::Make<ToBufferConfig>;
5353

5454
predicate isSinkImpl(DataFlow::Node sink, SensitiveBufferWrite w) {
5555
w.getASource() = sink.asIndirectExpr()

‎cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import FromSensitiveFlow::PathGraph
2323
/**
2424
* A taint flow configuration for flow from a sensitive expression to a `FileWrite` sink.
2525
*/
26-
module FromSensitiveConfiguration implements DataFlow::ConfigSig {
26+
module FromSensitiveConfig implements DataFlow::ConfigSig {
2727
predicate isSource(DataFlow::Node source) { isSourceImpl(source, _) }
2828

2929
predicate isSink(DataFlow::Node sink) { isSinkImpl(sink, _, _) }
@@ -33,7 +33,7 @@ module FromSensitiveConfiguration implements DataFlow::ConfigSig {
3333
}
3434
}
3535

36-
module FromSensitiveFlow = TaintTracking::Make<FromSensitiveConfiguration>;
36+
module FromSensitiveFlow = TaintTracking::Make<FromSensitiveConfig>;
3737

3838
predicate isSinkImpl(DataFlow::Node sink, FileWrite w, Expr dest) {
3939
exists(Expr e |

‎cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ predicate isSourceImpl(DataFlow::Node source) {
234234
* A taint flow configuration for flow from a sensitive expression to a network
235235
* operation.
236236
*/
237-
module FromSensitiveConfiguration implements DataFlow::ConfigSig {
237+
module FromSensitiveConfig implements DataFlow::ConfigSig {
238238
predicate isSource(DataFlow::Node source) { isSourceImpl(source) }
239239

240240
predicate isSink(DataFlow::Node sink) { isSinkSendRecv(sink, _) }
@@ -250,12 +250,12 @@ module FromSensitiveConfiguration implements DataFlow::ConfigSig {
250250
}
251251
}
252252

253-
module FromSensitiveFlow = TaintTracking::Make<FromSensitiveConfiguration>;
253+
module FromSensitiveFlow = TaintTracking::Make<FromSensitiveConfig>;
254254

255255
/**
256256
* A taint flow configuration for flow from a sensitive expression to an encryption operation.
257257
*/
258-
module ToEncryptionConfiguration implements DataFlow::ConfigSig {
258+
module ToEncryptionConfig implements DataFlow::ConfigSig {
259259
predicate isSource(DataFlow::Node source) { FromSensitiveFlow::hasFlow(source, _) }
260260

261261
predicate isSink(DataFlow::Node sink) { isSinkEncrypt(sink, _) }
@@ -271,12 +271,12 @@ module ToEncryptionConfiguration implements DataFlow::ConfigSig {
271271
}
272272
}
273273

274-
module ToEncryptionFlow = TaintTracking::Make<ToEncryptionConfiguration>;
274+
module ToEncryptionFlow = TaintTracking::Make<ToEncryptionConfig>;
275275

276276
/**
277277
* A taint flow configuration for flow from an encryption operation to a network operation.
278278
*/
279-
module FromEncryptionConfiguration implements DataFlow::ConfigSig {
279+
module FromEncryptionConfig implements DataFlow::ConfigSig {
280280
predicate isSource(DataFlow::Node source) { isSinkEncrypt(source, _) }
281281

282282
predicate isSink(DataFlow::Node sink) { FromSensitiveFlow::hasFlowTo(sink) }
@@ -286,7 +286,7 @@ module FromEncryptionConfiguration implements DataFlow::ConfigSig {
286286
}
287287
}
288288

289-
module FromEncryptionFlow = TaintTracking::Make<FromEncryptionConfiguration>;
289+
module FromEncryptionFlow = TaintTracking::Make<FromEncryptionConfig>;
290290

291291
from
292292
FromSensitiveFlow::PathNode source, FromSensitiveFlow::PathNode sink,

0 commit comments

Comments
 (0)