Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b4a840e

Browse files
geoffw0geoffw0
committed
C++: Make the checks happy.
1 parent 9976825 commit b4a840e

3 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎cpp/ql/src/Security/CWE/CWE-611/XML.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import semmle.code.cpp.ir.dataflow.DataFlow
99
/**
1010
* A flow state representing a possible configuration of an XML object.
1111
*/
12-
abstract class XXEFlowState extends DataFlow::FlowState {
12+
abstract class XxeFlowState extends DataFlow::FlowState {
1313
bindingset[this]
14-
XXEFlowState() { any() } // required characteristic predicate
14+
XxeFlowState() { any() } // required characteristic predicate
1515
}
1616

1717
/**
@@ -36,9 +36,9 @@ abstract class XmlLibrary extends string {
3636

3737
/**
3838
* An `Expr` that changes the configuration of an XML object, transforming the
39-
* `XXEFlowState` that flows through it.
39+
* `XxeFlowState` that flows through it.
4040
*/
41-
abstract class XXEFlowStateTransformer extends Expr {
41+
abstract class XxeFlowStateTransformer extends Expr {
4242
/**
4343
* Gets the flow state that `flowstate` is transformed into.
4444
*
@@ -48,5 +48,5 @@ abstract class XXEFlowStateTransformer extends Expr {
4848
* transform(tranform(x)) = tranform(x)
4949
* ```
5050
*/
51-
abstract XXEFlowState transform(XXEFlowState flowstate);
51+
abstract XxeFlowState transform(XxeFlowState flowstate);
5252
}

‎cpp/ql/src/Security/CWE/CWE-611/XXE.ql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class XXEConfiguration extends DataFlow::Configuration {
3535
override predicate isAdditionalFlowStep(
3636
DataFlow::Node node1, string state1, DataFlow::Node node2, string state2
3737
) {
38-
// create additional flow steps for `XXEFlowStateTransformer`s
39-
state2 = node2.asConvertedExpr().(XXEFlowStateTransformer).transform(state1) and
38+
// create additional flow steps for `XxeFlowStateTransformer`s
39+
state2 = node2.asConvertedExpr().(XxeFlowStateTransformer).transform(state1) and
4040
DataFlow::simpleLocalFlowStep(node1, node2)
4141
}
4242

4343
override predicate isBarrier(DataFlow::Node node, string flowstate) {
4444
// when the flowstate is transformed at a call node, block the original
4545
// flowstate value.
46-
node.asConvertedExpr().(XXEFlowStateTransformer).transform(flowstate) != flowstate
46+
node.asConvertedExpr().(XxeFlowStateTransformer).transform(flowstate) != flowstate
4747
}
4848
}
4949

‎cpp/ql/src/Security/CWE/CWE-611/Xerces.qll‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ predicate encodeXercesFlowState(
3838
* A flow state representing the configuration of an `AbstractDOMParser` or
3939
* `SAXParser` object.
4040
*/
41-
class XercesFlowState extends XXEFlowState {
41+
class XercesFlowState extends XxeFlowState {
4242
XercesFlowState() { encodeXercesFlowState(this, _, _) }
4343
}
4444

4545
/**
4646
* The `AbstractDOMParser` class.
4747
*/
48-
class AbstractDOMParserClass extends Class {
49-
AbstractDOMParserClass() { this.hasName("AbstractDOMParser") }
48+
class AbstractDomParserClass extends Class {
49+
AbstractDomParserClass() { this.hasName("AbstractDOMParser") }
5050
}
5151

5252
/**
5353
* The `XercesDOMParser` class.
5454
*/
55-
class XercesDOMParserClass extends Class {
56-
XercesDOMParserClass() { this.hasName("XercesDOMParser") }
55+
class XercesDomParserClass extends Class {
56+
XercesDomParserClass() { this.hasName("XercesDOMParser") }
5757
}
5858

5959
/**
@@ -66,7 +66,7 @@ class XercesDomParserLibrary extends XmlLibrary {
6666
// source is the write on `this` of a call to the `XercesDOMParser`
6767
// constructor.
6868
exists(CallInstruction call |
69-
call.getStaticCallTarget() = any(XercesDOMParserClass c).getAConstructor() and
69+
call.getStaticCallTarget() = any(XercesDomParserClass c).getAConstructor() and
7070
node.asInstruction().(WriteSideEffectInstruction).getDestinationAddress() =
7171
call.getThisArgument() and
7272
encodeXercesFlowState(flowstate, 0, 1) // default configuration
@@ -76,7 +76,7 @@ class XercesDomParserLibrary extends XmlLibrary {
7676
override predicate configurationSink(DataFlow::Node node, string flowstate) {
7777
// sink is the read of the qualifier of a call to `AbstractDOMParser.parse`.
7878
exists(Call call |
79-
call.getTarget().getClassAndName("parse") instanceof AbstractDOMParserClass and
79+
call.getTarget().getClassAndName("parse") instanceof AbstractDomParserClass and
8080
call.getQualifier() = node.asConvertedExpr()
8181
) and
8282
flowstate instanceof XercesFlowState and
@@ -213,14 +213,14 @@ class Sax2XmlReaderLibrary extends XmlLibrary {
213213
* `SAXParser.setDisableDefaultEntityResolution`. Transforms the flow
214214
* state through the qualifier according to the setting in the parameter.
215215
*/
216-
class DisableDefaultEntityResolutionTransformer extends XXEFlowStateTransformer {
216+
class DisableDefaultEntityResolutionTransformer extends XxeFlowStateTransformer {
217217
Expr newValue;
218218

219219
DisableDefaultEntityResolutionTransformer() {
220220
exists(Call call, Function f |
221221
call.getTarget() = f and
222222
(
223-
f.getDeclaringType() instanceof AbstractDOMParserClass or
223+
f.getDeclaringType() instanceof AbstractDomParserClass or
224224
f.getDeclaringType() instanceof SaxParserClass
225225
) and
226226
f.hasName("setDisableDefaultEntityResolution") and
@@ -229,7 +229,7 @@ class DisableDefaultEntityResolutionTransformer extends XXEFlowStateTransformer
229229
)
230230
}
231231

232-
final override XXEFlowState transform(XXEFlowState flowstate) {
232+
final override XxeFlowState transform(XxeFlowState flowstate) {
233233
exists(int createEntityReferenceNodes |
234234
encodeXercesFlowState(flowstate, _, createEntityReferenceNodes) and
235235
(
@@ -248,19 +248,19 @@ class DisableDefaultEntityResolutionTransformer extends XXEFlowStateTransformer
248248
* `AbstractDOMParser.setCreateEntityReferenceNodes`. Transforms the flow
249249
* state through the qualifier according to the setting in the parameter.
250250
*/
251-
class CreateEntityReferenceNodesTransformer extends XXEFlowStateTransformer {
251+
class CreateEntityReferenceNodesTransformer extends XxeFlowStateTransformer {
252252
Expr newValue;
253253

254254
CreateEntityReferenceNodesTransformer() {
255255
exists(Call call, Function f |
256256
call.getTarget() = f and
257-
f.getClassAndName("setCreateEntityReferenceNodes") instanceof AbstractDOMParserClass and
257+
f.getClassAndName("setCreateEntityReferenceNodes") instanceof AbstractDomParserClass and
258258
this = call.getQualifier() and
259259
newValue = call.getArgument(0)
260260
)
261261
}
262262

263-
final override XXEFlowState transform(XXEFlowState flowstate) {
263+
final override XxeFlowState transform(XxeFlowState flowstate) {
264264
exists(int disabledDefaultEntityResolution |
265265
encodeXercesFlowState(flowstate, disabledDefaultEntityResolution, _) and
266266
(
@@ -289,7 +289,7 @@ class FeatureDisableDefaultEntityResolution extends Variable {
289289
* specifying the feature `XMLUni::fgXercesDisableDefaultEntityResolution`.
290290
* Transforms the flow state through the qualifier according to this setting.
291291
*/
292-
class SetFeatureTransformer extends XXEFlowStateTransformer {
292+
class SetFeatureTransformer extends XxeFlowStateTransformer {
293293
Expr newValue;
294294

295295
SetFeatureTransformer() {
@@ -303,7 +303,7 @@ class SetFeatureTransformer extends XXEFlowStateTransformer {
303303
)
304304
}
305305

306-
final override XXEFlowState transform(XXEFlowState flowstate) {
306+
final override XxeFlowState transform(XxeFlowState flowstate) {
307307
exists(int createEntityReferenceNodes |
308308
encodeXercesFlowState(flowstate, _, createEntityReferenceNodes) and
309309
(
@@ -340,7 +340,7 @@ class DomConfigurationSetParameter extends Function {
340340
* `DOMConfiguration` pointer returned by `DOMLSParser.getDomConfig` - and it
341341
* is *that* qualifier we want to transform the flow state of.
342342
*/
343-
class DomConfigurationSetParameterTransformer extends XXEFlowStateTransformer {
343+
class DomConfigurationSetParameterTransformer extends XxeFlowStateTransformer {
344344
Expr newValue;
345345

346346
DomConfigurationSetParameterTransformer() {
@@ -361,7 +361,7 @@ class DomConfigurationSetParameterTransformer extends XXEFlowStateTransformer {
361361
)
362362
}
363363

364-
final override XXEFlowState transform(XXEFlowState flowstate) {
364+
final override XxeFlowState transform(XxeFlowState flowstate) {
365365
exists(int createEntityReferenceNodes |
366366
encodeXercesFlowState(flowstate, _, createEntityReferenceNodes) and
367367
(

0 commit comments

Comments
 (0)