Skip to content

Commit c852d3a

Browse files
committed
Rename configurations from "Conf" to "Config"
1 parent 2d5944f commit c852d3a

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

java/ql/lib/semmle/code/java/frameworks/android/OnActivityResultSource.qll

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class OnActivityResultIncomingIntent extends DataFlow::Node {
6363
/**
6464
* A data flow configuration for implicit intents being used in `startActivityForResult`.
6565
*/
66-
private module ImplicitStartActivityForResultConf implements DataFlow::ConfigSig {
66+
private module ImplicitStartActivityForResultConfig implements DataFlow::ConfigSig {
6767
predicate isSource(DataFlow::Node source) {
6868
exists(ClassInstanceExpr cc |
6969
cc.getConstructedType() instanceof TypeIntent and source.asExpr() = cc
@@ -103,7 +103,8 @@ private module ImplicitStartActivityForResultConf implements DataFlow::ConfigSig
103103
}
104104
}
105105

106-
private module ImplicitStartActivityForResult = DataFlow::Make<ImplicitStartActivityForResultConf>;
106+
private module ImplicitStartActivityForResult =
107+
DataFlow::Make<ImplicitStartActivityForResultConfig>;
107108

108109
/** An Android Activity or Fragment. */
109110
private class ActivityOrFragment extends Class {

java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ deprecated class FragmentInjectionTaintConf extends TaintTracking::Configuration
2323
}
2424
}
2525

26-
private module FragmentInjectionTaintConf implements DataFlow::ConfigSig {
26+
private module FragmentInjectionTaintConfig implements DataFlow::ConfigSig {
2727
predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
2828

2929
predicate isSink(DataFlow::Node sink) { sink instanceof FragmentInjectionSink }
@@ -37,4 +37,4 @@ private module FragmentInjectionTaintConf implements DataFlow::ConfigSig {
3737
* Taint-tracking flow for unsafe user input
3838
* that is used to create Android fragments dynamically.
3939
*/
40-
module FragmentInjectionTaintFlow = TaintTracking::Make<FragmentInjectionTaintConf>;
40+
module FragmentInjectionTaintFlow = TaintTracking::Make<FragmentInjectionTaintConfig>;

java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ deprecated class IntentUriPermissionManipulationConf extends TaintTracking::Conf
3535
}
3636
}
3737

38-
private module IntentUriPermissionManipulationConf implements DataFlow::ConfigSig {
38+
private module IntentUriPermissionManipulationConfig implements DataFlow::ConfigSig {
3939
predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
4040

4141
predicate isSink(DataFlow::Node sink) { sink instanceof IntentUriPermissionManipulationSink }
@@ -53,4 +53,4 @@ private module IntentUriPermissionManipulationConf implements DataFlow::ConfigSi
5353
* Taint tracking flow for user-provided Intents being returned to third party apps.
5454
*/
5555
module IntentUriPermissionManipulationFlow =
56-
TaintTracking::Make<IntentUriPermissionManipulationConf>;
56+
TaintTracking::Make<IntentUriPermissionManipulationConfig>;

java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ deprecated class UnsafeContentResolutionConf extends TaintTracking::Configuratio
2626
}
2727
}
2828

29-
private module UnsafeContentResolutionConf implements DataFlow::ConfigSig {
29+
private module UnsafeContentResolutionConfig implements DataFlow::ConfigSig {
3030
predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
3131

3232
predicate isSink(DataFlow::Node sink) { sink instanceof ContentUriResolutionSink }
@@ -41,4 +41,4 @@ private module UnsafeContentResolutionConf implements DataFlow::ConfigSig {
4141
}
4242

4343
/** Taint-tracking flow to find paths from remote sources to content URI resolutions. */
44-
module UnsafeContentResolutionFlow = TaintTracking::Make<UnsafeContentResolutionConf>;
44+
module UnsafeContentResolutionFlow = TaintTracking::Make<UnsafeContentResolutionConfig>;

java/ql/test/TestUtilities/InlineFlowTest.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private predicate defaultSource(DataFlow::Node src) {
4747
src.asExpr().(MethodAccess).getMethod().getName() = ["source", "taint"]
4848
}
4949

50-
module DefaultFlowConf implements DataFlow::ConfigSig {
50+
module DefaultFlowConfig implements DataFlow::ConfigSig {
5151
predicate isSource(DataFlow::Node n) { defaultSource(n) }
5252

5353
predicate isSink(DataFlow::Node n) {
@@ -57,9 +57,9 @@ module DefaultFlowConf implements DataFlow::ConfigSig {
5757
int fieldFlowBranchLimit() { result = 1000 }
5858
}
5959

60-
private module DefaultValueFlow = DataFlow::Make<DefaultFlowConf>;
60+
private module DefaultValueFlow = DataFlow::Make<DefaultFlowConfig>;
6161

62-
private module DefaultTaintFlow = TaintTracking::Make<DefaultFlowConf>;
62+
private module DefaultTaintFlow = TaintTracking::Make<DefaultFlowConfig>;
6363

6464
class DefaultValueFlowConf extends DataFlow::Configuration {
6565
DefaultValueFlowConf() { this = "qltest:defaultValueFlowConf" }

java/ql/test/library-tests/dataflow/state/test.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ predicate step(Node n1, Node n2, string s1, string s2) {
3939

4040
predicate checkNode(Node n) { n.asExpr().(Argument).getCall().getCallee().hasName("check") }
4141

42-
module Conf implements DataFlow::StateConfigSig {
42+
module Config implements DataFlow::StateConfigSig {
4343
class FlowState = string;
4444

4545
predicate isSource(Node n, FlowState s) { src(n, s) }
@@ -55,7 +55,7 @@ module Conf implements DataFlow::StateConfigSig {
5555

5656
int explorationLimit() { result = 0 }
5757

58-
module Flow = TaintTracking::MakeWithState<Conf>;
58+
module Flow = TaintTracking::MakeWithState<Config>;
5959

6060
module PartialFlow = Flow::FlowExploration<explorationLimit/0>;
6161

0 commit comments

Comments
 (0)