Adjust framework coverage jobs to cover C#

tamasvajk · tamasvajk · commit 016e8fb2cf31 · 2021-06-28T11:20:32.000+02:00
diff --git a/csharp/documentation/library-coverage/cwe-sink.csv b/csharp/documentation/library-coverage/cwe-sink.csv
@@ -0,0 +1,2 @@
+CWE,Sink identifier,Label
+CWE-079,html,Cross-site scripting
diff --git a/csharp/documentation/library-coverage/frameworks.csv b/csharp/documentation/library-coverage/frameworks.csv
@@ -0,0 +1,2 @@
+Framework name,URL,Namespace prefixes
+System,,System.* System
diff --git a/csharp/ql/src/meta/frameworks/Coverage.ql b/csharp/ql/src/meta/frameworks/Coverage.ql
@@ -0,0 +1,14 @@
+/**
+ * @name Framework coverage
+ * @description The number of API endpoints covered by CSV models sorted by
+ *              package and source-, sink-, and summary-kind.
+ * @kind table
+ * @id cs/meta/framework-coverage
+ */
+
+import csharp
+import semmle.code.csharp.dataflow.ExternalFlow
+
+from string namespace, int pkgs, string kind, string part, int n
+where modelCoverage(namespace, pkgs, kind, part, n)
+select namespace, pkgs, kind, part, n
diff --git a/misc/scripts/library-coverage/compare.py b/misc/scripts/library-coverage/compare.py
@@ -24,11 +24,9 @@ def compare_folders(folder1, folder2, output_file):
     Compares the contents of two folders and writes the differences to the output file.
     """
 
-    languages = ['java']
-
     return_md = ""
 
-    for lang in languages:
+    for lang in settings.languages:
         expected_files = ""
 
         generated_output_rst = settings.generated_output_rst.format(
diff --git a/misc/scripts/library-coverage/create-pr.py b/misc/scripts/library-coverage/create-pr.py
@@ -22,8 +22,7 @@
 
 
 def overwrite_files():
-    languages = ['java']
-    for lang in languages:
+    for lang in settings.languages:
         repo_output_rst = settings.repo_output_rst.format(language=lang)
         repo_output_csv = settings.repo_output_csv.format(language=lang)
 
diff --git a/misc/scripts/library-coverage/generate-report.py b/misc/scripts/library-coverage/generate-report.py
@@ -110,7 +110,9 @@ def add_package_stats_to_row(row, sorted_cwes, collect):
 # Languages for which we want to generate coverage reports.
 configs = [
     utils.LanguageConfig(
-        "java", "Java", ".java", query_prefix + "java/ql/src/meta/frameworks/Coverage.ql")
+        "java", "Java", ".java", query_prefix + "java/ql/src/meta/frameworks/Coverage.ql"),
+    utils.LanguageConfig(
+        "csharp", "C#", ".cs", query_prefix + "csharp/ql/src/meta/frameworks/Coverage.ql")
 ]
 
 # The names of input and output files. The placeholder {language} is replaced with the language name.
@@ -125,8 +127,8 @@ def add_package_stats_to_row(row, sorted_cwes, collect):
     output_rst = settings.generated_output_rst
     output_csv = settings.generated_output_csv
 
-for config in configs:
-    lang = config.lang
+for lang in settings.languages:
+    config = [c for c in configs if c.lang == lang][0]
     db = "empty-" + lang
     ql_output = output_ql_csv.format(language=lang)
     utils.create_empty_database(lang, config.ext, db)
diff --git a/misc/scripts/library-coverage/generate-timeseries.py b/misc/scripts/library-coverage/generate-timeseries.py
@@ -71,13 +71,16 @@ def get_packages(lang, query):
 
 configs = [
     utils.LanguageConfig(
-        "java", "Java", ".java", "java/ql/src/meta/frameworks/Coverage.ql")
+        "java", "Java", ".java", "java/ql/src/meta/frameworks/Coverage.ql"),
+    utils.LanguageConfig(
+        "csharp", "C#", ".cs", "csharp/ql/src/meta/frameworks/Coverage.ql")
 ]
 
 # todo: change this when we cover multiple languages. We should compute the SHAs
 # only once and not per language
 output_prefix = "framework-coverage-timeseries-"
-for config in configs:
+for lang in settings.languages:
+    config = [c for c in configs if c.lang == lang][0]
     with open(output_prefix + config.lang + ".csv", 'w', newline='') as csvfile_total:
         with open(output_prefix + config.lang + "-packages.csv", 'w', newline='') as csvfile_packages:
             csvwriter_total = csv.writer(csvfile_total)
diff --git a/misc/scripts/library-coverage/settings.py b/misc/scripts/library-coverage/settings.py
@@ -20,3 +20,5 @@
 output_csv_file_name = "coverage.csv"
 repo_output_rst = documentation_folder + output_rst_file_name
 repo_output_csv = documentation_folder + output_csv_file_name
+
+languages = ['java', 'csharp']

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+CWE,Sink identifier,Label`
	`2`	`+CWE-079,html,Cross-site scripting`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Framework name,URL,Namespace prefixes`
	`2`	`+System,,System.* System`