@@ -79,30 +79,23 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
79
79
}
80
80
81
81
predicate isSink ( Endpoint e , string kind ) {
82
- exists (
83
- string package , string type , boolean subtypes , string name , string signature , string ext ,
84
- string input
85
- |
86
- sinkSpec ( e , package , type , subtypes , name , signature , ext , input ) and
87
- ExternalFlow:: sinkModel ( package , type , subtypes , name , [ signature , "" ] , ext , input , kind , _)
82
+ exists ( string package , string type , string name , string signature , string ext , string input |
83
+ sinkSpec ( e , package , type , name , signature , ext , input ) and
84
+ ExternalFlow:: sinkModel ( package , type , _, name , [ signature , "" ] , ext , input , kind , _)
88
85
)
89
86
}
90
87
91
88
predicate isNeutral ( Endpoint e ) {
92
89
exists ( string package , string type , string name , string signature |
93
- sinkSpec ( e , package , type , _ , name , signature , _, _) and
90
+ sinkSpec ( e , package , type , name , signature , _, _) and
94
91
ExternalFlow:: neutralModel ( package , type , name , [ signature , "" ] , _)
95
92
)
96
93
}
97
94
98
95
additional predicate sinkSpec (
99
- Endpoint e , string package , string type , boolean subtypes , string name , string signature ,
100
- string ext , string input
96
+ Endpoint e , string package , string type , string name , string signature , string ext , string input
101
97
) {
102
- package = FrameworkCandidatesImpl:: getCallable ( e ) .getDeclaringType ( ) .getPackage ( ) .toString ( ) and
103
- type = FrameworkCandidatesImpl:: getCallable ( e ) .getDeclaringType ( ) .getName ( ) and
104
- subtypes = false and
105
- name = FrameworkCandidatesImpl:: getCallable ( e ) .getName ( ) and
98
+ FrameworkCandidatesImpl:: getCallable ( e ) .hasQualifiedName ( package , type , name ) and
106
99
signature = ExternalFlow:: paramsString ( getCallable ( e ) ) and
107
100
ext = "" and
108
101
exists ( int paramIdx | e .isParameterOf ( _, paramIdx ) | input = "Argument[" + paramIdx + "]" )
0 commit comments