C#: Check accessor declaration for publicness

koesie10 · koesie10 · commit e524e358f035 · 2023-09-18T13:40:23.000+02:00
diff --git a/csharp/ql/src/utils/modeleditor/AutomodelVsCode.qll b/csharp/ql/src/utils/modeleditor/AutomodelVsCode.qll
@@ -27,7 +27,7 @@ private predicate isUninteresting(DotNet::Declaration c) {
  */
 class CallableMethod extends DotNet::Declaration {
   CallableMethod() {
-    this.(Modifiable).isEffectivelyPublic() and
+    [this.(Modifiable), this.(Accessor).getDeclaration()].isEffectivelyPublic() and
     not isUninteresting(this)
   }
 
diff --git a/csharp/ql/test/utils/modeleditor/FetchApplicationModeMethods.expected b/csharp/ql/test/utils/modeleditor/FetchApplicationModeMethods.expected
@@ -5,4 +5,4 @@
 | PublicClass.cs:19:33:19:50 | call to method ReadLine | System.Console#ReadLine() | true | supported | System.Console | 7.0.0.0 | neutral | type | source | classification |
 | PublicClass.cs:19:33:19:50 | call to method ReadLine | System.Console#ReadLine() | true | supported | System.Console | 7.0.0.0 | source | type | source | classification |
 | PublicClass.cs:24:9:24:30 | call to method WriteLine | System.Console#WriteLine(System.String) | true | supported | System.Console | 7.0.0.0 | neutral | type | source | classification |
-| PublicInterface.cs:11:9:11:30 | call to method WriteLine | System.Console#WriteLine(System.String) | true | supported | System.Console | 7.0.0.0 | neutral | type | source | classification |
+| PublicInterface.cs:13:9:13:30 | call to method WriteLine | System.Console#WriteLine(System.String) | true | supported | System.Console | 7.0.0.0 | neutral | type | source | classification |
diff --git a/csharp/ql/test/utils/modeleditor/FetchFrameworkModeMethods.expected b/csharp/ql/test/utils/modeleditor/FetchFrameworkModeMethods.expected
@@ -1,5 +1,9 @@
 | PublicClass.cs:7:17:7:21 | stuff | GitHub.CodeQL.PublicClass#stuff(System.String) | false | supported | PublicClass.cs | library |  | type | unknown | classification |
 | PublicClass.cs:12:24:12:34 | staticStuff | GitHub.CodeQL.PublicClass#staticStuff(System.String) | false | supported | PublicClass.cs | library |  | type | unknown | classification |
 | PublicClass.cs:17:20:17:33 | nonPublicStuff | GitHub.CodeQL.PublicClass#nonPublicStuff(System.String) | false | supported | PublicClass.cs | library |  | type | unknown | classification |
+| PublicClass.cs:27:45:27:47 | get_PublicProperty | GitHub.CodeQL.PublicClass#get_PublicProperty() | false | supported | PublicClass.cs | library |  | type | unknown | classification |
+| PublicClass.cs:27:50:27:52 | set_PublicProperty | GitHub.CodeQL.PublicClass#set_PublicProperty(System.String) | false | supported | PublicClass.cs | library |  | type | unknown | classification |
 | PublicInterface.cs:7:10:7:14 | stuff | GitHub.CodeQL.PublicInterface#stuff(System.String) | false | supported | PublicInterface.cs | library |  | type | unknown | classification |
-| PublicInterface.cs:9:17:9:27 | staticStuff | GitHub.CodeQL.PublicInterface#staticStuff(System.String) | false | supported | PublicInterface.cs | library |  | type | unknown | classification |
+| PublicInterface.cs:9:29:9:31 | get_PublicProperty | GitHub.CodeQL.PublicInterface#get_PublicProperty() | false | supported | PublicInterface.cs | library |  | type | unknown | classification |
+| PublicInterface.cs:9:34:9:36 | set_PublicProperty | GitHub.CodeQL.PublicInterface#set_PublicProperty(System.String) | false | supported | PublicInterface.cs | library |  | type | unknown | classification |
+| PublicInterface.cs:11:17:11:27 | staticStuff | GitHub.CodeQL.PublicInterface#staticStuff(System.String) | false | supported | PublicInterface.cs | library |  | type | unknown | classification |
diff --git a/csharp/ql/test/utils/modeleditor/PublicClass.cs b/csharp/ql/test/utils/modeleditor/PublicClass.cs
@@ -2,7 +2,7 @@
 
 namespace GitHub.CodeQL;
 
-public class PublicClass
+public class PublicClass : PublicInterface
 {
     public void stuff(String arg)
     {
@@ -23,4 +23,6 @@ internal void internalStuff(String arg)
     {
         Console.WriteLine(arg);
     }
+
+    string PublicInterface.PublicProperty { get; set; }
 }
diff --git a/csharp/ql/test/utils/modeleditor/PublicInterface.cs b/csharp/ql/test/utils/modeleditor/PublicInterface.cs
@@ -6,6 +6,8 @@ public interface PublicInterface
 {
     void stuff(String arg);
 
+    string PublicProperty { get; set; }
+
     static void staticStuff(String arg)
     {
         Console.WriteLine(arg);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ private predicate isUninteresting(DotNet::Declaration c) {`
`27`	`27`	`*/`
`28`	`28`	`class CallableMethod extends DotNet::Declaration {`
`29`	`29`	`CallableMethod() {`
`30`		`- this.(Modifiable).isEffectivelyPublic() and`
	`30`	`+ [this.(Modifiable), this.(Accessor).getDeclaration()].isEffectivelyPublic() and`
`31`	`31`	`not isUninteresting(this)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GitHub.CodeQL;`
`4`	`4`
`5`		`-public class PublicClass`
	`5`	`+public class PublicClass : PublicInterface`
`6`	`6`	`{`
`7`	`7`	`public void stuff(String arg)`
`8`	`8`	`{`
`@@ -23,4 +23,6 @@ internal void internalStuff(String arg)`
`23`	`23`	`{`
`24`	`24`	`Console.WriteLine(arg);`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ string PublicInterface.PublicProperty { get; set; }`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ public interface PublicInterface`
`6`	`6`	`{`
`7`	`7`	`void stuff(String arg);`
`8`	`8`
	`9`	`+ string PublicProperty { get; set; }`
	`10`	`+`
`9`	`11`	`static void staticStuff(String arg)`
`10`	`12`	`{`
`11`	`13`	`Console.WriteLine(arg);`