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

Skip to content

Commit bc23809

Browse files
geoffw0geoffw0
committed
Merge branch 'main' into modelchanges2
2 parents 7015a9c + 2cf10a7 commit bc23809

22 files changed

Lines changed: 559 additions & 21 deletions

File tree

‎csharp/ql/test/library-tests/csharp9/PrintAst.expected‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,106 @@ NativeInt.cs:
105105
# 25| 0: [CastExpr] (...) ...
106106
# 25| 1: [LocalVariableAccess] access to local variable x
107107
# 25| 1: [LocalVariableAccess] access to local variable v
108+
TypeParameterNullability.cs:
109+
# 1| [Interface] I1
110+
# 3| [Class] A2
111+
# 5| 5: [Method] F1
112+
# 5| -1: [TypeMention] Void
113+
#-----| 1: (Type parameters)
114+
# 5| 0: [TypeParameter] T
115+
#-----| 2: (Parameters)
116+
# 5| 0: [Parameter] t
117+
# 5| 4: [BlockStmt] {...}
118+
# 6| 6: [Method] F2
119+
# 6| -1: [TypeMention] Void
120+
#-----| 1: (Type parameters)
121+
# 6| 0: [TypeParameter] T
122+
#-----| 2: (Parameters)
123+
# 6| 0: [Parameter] t
124+
# 6| -1: [TypeMention] T?
125+
# 6| 1: [TypeMention] T
126+
# 6| 4: [BlockStmt] {...}
127+
# 7| 7: [Method] F3
128+
# 7| -1: [TypeMention] Void
129+
#-----| 1: (Type parameters)
130+
# 7| 0: [TypeParameter] T
131+
#-----| 2: (Parameters)
132+
# 7| 0: [Parameter] t
133+
# 7| 4: [BlockStmt] {...}
134+
# 8| 8: [Method] F4
135+
# 8| -1: [TypeMention] Void
136+
#-----| 1: (Type parameters)
137+
# 8| 0: [TypeParameter] T
138+
#-----| 2: (Parameters)
139+
# 8| 0: [Parameter] t
140+
# 8| 4: [BlockStmt] {...}
141+
# 9| 9: [Method] F5
142+
# 9| -1: [TypeMention] Void
143+
#-----| 1: (Type parameters)
144+
# 9| 0: [TypeParameter] T
145+
#-----| 2: (Parameters)
146+
# 9| 0: [Parameter] t
147+
# 9| 4: [BlockStmt] {...}
148+
# 10| 10: [Method] F6
149+
# 10| -1: [TypeMention] Void
150+
#-----| 1: (Type parameters)
151+
# 10| 0: [TypeParameter] T
152+
#-----| 2: (Parameters)
153+
# 10| 0: [Parameter] t
154+
# 10| -1: [TypeMention] T?
155+
# 10| 1: [TypeMention] T
156+
# 10| 4: [BlockStmt] {...}
157+
# 13| [Class] B2
158+
#-----| 3: (Base types)
159+
# 13| 0: [TypeMention] A2
160+
# 15| 5: [Method] F1
161+
# 15| -1: [TypeMention] Void
162+
#-----| 1: (Type parameters)
163+
# 15| 0: [TypeParameter] T
164+
#-----| 2: (Parameters)
165+
# 15| 0: [Parameter] t
166+
# 15| 4: [BlockStmt] {...}
167+
# 16| 6: [Method] F2
168+
# 16| -1: [TypeMention] Void
169+
#-----| 1: (Type parameters)
170+
# 16| 0: [TypeParameter] T
171+
#-----| 2: (Parameters)
172+
# 16| 0: [Parameter] t
173+
# 16| -1: [TypeMention] T?
174+
# 16| 1: [TypeMention] T
175+
# 16| 4: [BlockStmt] {...}
176+
# 17| 7: [Method] F3
177+
# 17| -1: [TypeMention] Void
178+
#-----| 1: (Type parameters)
179+
# 17| 0: [TypeParameter] T
180+
#-----| 2: (Parameters)
181+
# 17| 0: [Parameter] t
182+
# 17| 4: [BlockStmt] {...}
183+
# 18| 8: [Method] F4
184+
# 18| -1: [TypeMention] Void
185+
#-----| 1: (Type parameters)
186+
# 18| 0: [TypeParameter] T
187+
#-----| 2: (Parameters)
188+
# 18| 0: [Parameter] t
189+
# 18| 4: [BlockStmt] {...}
190+
# 19| 9: [Method] F6
191+
# 19| -1: [TypeMention] Void
192+
#-----| 1: (Type parameters)
193+
# 19| 0: [TypeParameter] T
194+
#-----| 2: (Parameters)
195+
# 19| 0: [Parameter] t
196+
# 19| -1: [TypeMention] T?
197+
# 19| 1: [TypeMention] T
198+
# 19| 4: [BlockStmt] {...}
199+
# 22| [Class] B3
200+
#-----| 3: (Base types)
201+
# 22| 0: [TypeMention] A2
202+
# 24| 5: [Method] F2
203+
# 24| -1: [TypeMention] Void
204+
#-----| 1: (Type parameters)
205+
# 24| 0: [TypeParameter] T
206+
#-----| 2: (Parameters)
207+
# 24| 0: [Parameter] t
208+
# 24| -1: [TypeMention] T?
209+
# 24| 1: [TypeMention] T
210+
# 24| 4: [BlockStmt] {...}

‎csharp/ql/test/library-tests/csharp9/TypeParameterNullability.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
interface I1 {}
2+
3+
class A2
4+
{
5+
public virtual void F1<T>(T? t) { } // value or ref type
6+
public virtual void F2<T>(T? t) where T: struct { } // value type
7+
public virtual void F3<T>(T? t) where T: class { } // ref type
8+
public virtual void F4<T>(T? t) where T: A2 { } // A2, ref type
9+
public virtual void F5<T>(T? t) where T: I1 { } // I1, value or ref type
10+
public virtual void F6<T>(T? t) where T: struct, I1 { } // I1, value type
11+
}
12+
13+
class B2 : A2
14+
{
15+
public override void F1<T>(T? t) where T: default { } // value or ref type
16+
public override void F2<T>(T? t) { } // value type
17+
public override void F3<T>(T? t) where T: class { } // ref type
18+
public override void F4<T>(T? t) where T: class { } // A2, ref type
19+
public override void F6<T>(T? t) { } // I1, value type
20+
}
21+
22+
class B3 : A2
23+
{
24+
public override void F2<T>(T? t) where T: struct { } // value type
25+
}

‎csharp/ql/test/library-tests/csharp9/typeParameterNullability.expected‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
refType
2+
| TypeParameterNullability.cs:7:28:7:28 | T |
3+
| TypeParameterNullability.cs:8:28:8:28 | T |
4+
| TypeParameterNullability.cs:17:29:17:29 | T |
5+
| TypeParameterNullability.cs:18:29:18:29 | T |
6+
valueType
7+
| TypeParameterNullability.cs:6:28:6:28 | T |
8+
| TypeParameterNullability.cs:10:28:10:28 | T |
9+
| TypeParameterNullability.cs:16:29:16:29 | T |
10+
| TypeParameterNullability.cs:19:29:19:29 | T |
11+
| TypeParameterNullability.cs:24:29:24:29 | T |
12+
valueOrRefType
13+
| TypeParameterNullability.cs:5:28:5:28 | T |
14+
| TypeParameterNullability.cs:9:28:9:28 | T |
15+
| TypeParameterNullability.cs:15:29:15:29 | T |

‎csharp/ql/test/library-tests/csharp9/typeParameterNullability.ql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import csharp
2+
3+
query predicate refType(TypeParameter tp) {
4+
tp.fromSource() and
5+
tp.isRefType()
6+
}
7+
8+
query predicate valueType(TypeParameter tp) {
9+
tp.fromSource() and
10+
tp.isValueType()
11+
}
12+
13+
query predicate valueOrRefType(TypeParameter tp) {
14+
tp.fromSource() and
15+
not tp.isRefType() and
16+
not tp.isValueType()
17+
}

‎csharp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies/ExternalDependencies.expected‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎csharp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies/ExternalDependenciesSourceLinks.expected‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎csharp/ql/test/query-tests/Metrics/Files/FLinesOfDuplicatedCode/flinesofduplicatedcode.expected‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎java/change-notes/2020-10-07-fastjson-deserialization-sink.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
lgtm,codescanning
2+
* The "Deserialization of user-controlled data" (`java/unsafe-deserialization`) query
3+
now recognizes `FastJson` deserialization.

‎java/ql/src/semmle/code/java/frameworks/FastJson.qll‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/**
2+
* Provides classes and predicates for working with the FastJson framework.
3+
*/
4+
5+
import java
6+
7+
/**
8+
* The class `com.alibaba.fastjson.JSON`.
9+
*/
10+
class FastJson extends RefType {
11+
FastJson() { this.hasQualifiedName("com.alibaba.fastjson", "JSON") }
12+
}
13+
14+
/**
15+
* A FastJson parse method. This is either `JSON.parse` or `JSON.parseObject`.
16+
*/
17+
class FastJsonParseMethod extends Method {
18+
FastJsonParseMethod() {
19+
this.getDeclaringType() instanceof FastJson and
20+
this.hasName(["parse", "parseObject"])
21+
}
22+
}
23+
24+
/**
25+
* A call to `ParserConfig.setSafeMode`.
26+
*/
27+
class FastJsonSetSafeMode extends MethodAccess {
28+
FastJsonSetSafeMode() {
29+
exists(Method m |
30+
this.getMethod() = m and
31+
m.hasName("setSafeMode") and
32+
m.getDeclaringType().hasQualifiedName("com.alibaba.fastjson.parser", "ParserConfig")
33+
)
34+
}
35+
36+
/** Gets the constant value passed to this call, if any. */
37+
boolean getMode() { result = this.getArgument(0).(CompileTimeConstantExpr).getBooleanValue() }
38+
}
39+
40+
/**
41+
* Holds if there is some call to `ParserConfig.setSafeMode` that does not
42+
* explicitly disable safe mode.
43+
*/
44+
predicate fastJsonLooksSafe() {
45+
exists(FastJsonSetSafeMode setsafe | not setsafe.getMode() = false)
46+
}

‎java/ql/src/semmle/code/java/security/UnsafeDeserialization.qll‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import semmle.code.java.frameworks.Kryo
22
import semmle.code.java.frameworks.XStream
33
import semmle.code.java.frameworks.SnakeYaml
4+
import semmle.code.java.frameworks.FastJson
45
import semmle.code.java.frameworks.apache.Lang
56

67
class ObjectInputStreamReadObjectMethod extends Method {
@@ -77,6 +78,10 @@ predicate unsafeDeserialization(MethodAccess ma, Expr sink) {
7778
or
7879
ma instanceof UnsafeSnakeYamlParse and
7980
sink = ma.getArgument(0)
81+
or
82+
ma.getMethod() instanceof FastJsonParseMethod and
83+
not fastJsonLooksSafe() and
84+
sink = ma.getArgument(0)
8085
)
8186
}
8287

0 commit comments

Comments
 (0)