C#: Extract attributes of referenced assembly

tamasvajk · tamasvajk · commit 5f18840a9ea5 · 2020-11-11T09:46:18.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs
@@ -198,12 +198,12 @@ public void AnalyseTree(SyntaxTree tree)
         /// Perform an analysis on an assembly.
         /// </summary>
         /// <param name="assembly">Assembly to analyse.</param>
-        private void AnalyseAssembly(PortableExecutableReference assembly)
+        private void AnalyseReferenceAssembly(PortableExecutableReference assembly)
         {
             // CIL first - it takes longer.
             if (options.CIL)
                 extractionTasks.Add(() => DoExtractCIL(assembly));
-            extractionTasks.Add(() => DoAnalyseAssembly(assembly));
+            extractionTasks.Add(() => DoAnalyseReferenceAssembly(assembly));
         }
 
         private static bool FileIsUpToDate(string src, string dest)
@@ -250,7 +250,7 @@ private void DoAnalyseCompilation(string cwd, string[] args)
         ///     extraction within the snapshot.
         /// </summary>
         /// <param name="r">The assembly to extract.</param>
-        private void DoAnalyseAssembly(PortableExecutableReference r)
+        private void DoAnalyseReferenceAssembly(PortableExecutableReference r)
         {
             try
             {
@@ -294,6 +294,8 @@ private void DoAnalyseAssembly(PortableExecutableReference r)
                             AnalyseNamespace(cx, module.GlobalNamespace);
                         }
 
+                        Entities.Attribute.ExtractAttributes(cx, assembly, Extraction.Entities.Assembly.Create(cx, assembly.GetSymbolLocation()));
+
                         cx.PopulateAll();
                     }
                 }
@@ -335,7 +337,7 @@ public void AnalyseReferences()
         {
             foreach (var r in compilation.References.OfType<PortableExecutableReference>())
             {
-                AnalyseAssembly(r);
+                AnalyseReferenceAssembly(r);
             }
         }
 
diff --git a/csharp/ql/test/library-tests/attributes/AttributeElements.ql b/csharp/ql/test/library-tests/attributes/AttributeElements.ql
@@ -3,5 +3,5 @@ import csharp
 from Attributable element, Attribute attribute
 where
   attribute = element.getAnAttribute() and
-  (element.(Element).fromSource() or element instanceof Assembly)
+  (element.(Element).fromSource() or element.(Assembly).getName() = "attributes")
 select element, attribute, attribute.getType().getQualifiedName()
diff --git a/csharp/ql/test/library-tests/attributes/ExternalAttributeArguments.expected b/csharp/ql/test/library-tests/attributes/ExternalAttributeArguments.expected
@@ -1,4 +1,10 @@
 arguments
+| Assembly1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 0 | 1 |
+| Assembly1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 1 | array creation of type Object[] |
+| Assembly1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 2 | typeof(...) |
+| Assembly1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 3 | (...) ... |
+| Assembly1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 4 | null |
+| Assembly1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 5 | array creation of type Object[] |
 | Class1 | 0 | 3 |
 | Class1 | 1 | array creation of type Int32[] |
 | Class1 | 2 | null |
@@ -12,6 +18,7 @@ arguments
 | Method1 | 4 | array creation of type Int32[] |
 | Method1 | 5 | array creation of type Object[] |
 literals
+| 1 | Int32 | 1 |
 | 3 | Int32 | 3 |
 | 42 | Int32 | 42 |
 | null | null | null |
@@ -20,9 +27,13 @@ enums
 | (...) ... | 43 | access to type Enum1 | 43 |
 typeof
 | typeof(...) | access to type Class1 |
+| typeof(...) | access to type CustomAttribute |
 array
 | array creation of type Int32[] | 3 | 0 | 1 |
 | array creation of type Int32[] | 3 | 1 | 2 |
 | array creation of type Int32[] | 3 | 2 | 3 |
 | array creation of type Object[] | 2 | 0 | 1 |
 | array creation of type Object[] | 2 | 1 | typeof(...) |
+| array creation of type Object[] | 3 | 0 | 1 |
+| array creation of type Object[] | 3 | 1 | 2 |
+| array creation of type Object[] | 3 | 2 | null |

Original file line number	Diff line number	Diff line change
`@@ -198,12 +198,12 @@ public void AnalyseTree(SyntaxTree tree)`
`198`	`198`	`/// Perform an analysis on an assembly.`
`199`	`199`	`/// </summary>`
`200`	`200`	`/// <param name="assembly">Assembly to analyse.</param>`
`201`		`- private void AnalyseAssembly(PortableExecutableReference assembly)`
	`201`	`+ private void AnalyseReferenceAssembly(PortableExecutableReference assembly)`
`202`	`202`	`{`
`203`	`203`	`// CIL first - it takes longer.`
`204`	`204`	`if (options.CIL)`
`205`	`205`	`extractionTasks.Add(() => DoExtractCIL(assembly));`
`206`		`- extractionTasks.Add(() => DoAnalyseAssembly(assembly));`
	`206`	`+ extractionTasks.Add(() => DoAnalyseReferenceAssembly(assembly));`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`private static bool FileIsUpToDate(string src, string dest)`
`@@ -250,7 +250,7 @@ private void DoAnalyseCompilation(string cwd, string[] args)`
`250`	`250`	`/// extraction within the snapshot.`
`251`	`251`	`/// </summary>`
`252`	`252`	`/// <param name="r">The assembly to extract.</param>`
`253`		`- private void DoAnalyseAssembly(PortableExecutableReference r)`
	`253`	`+ private void DoAnalyseReferenceAssembly(PortableExecutableReference r)`
`254`	`254`	`{`
`255`	`255`	`try`
`256`	`256`	`{`
`@@ -294,6 +294,8 @@ private void DoAnalyseAssembly(PortableExecutableReference r)`
`294`	`294`	`AnalyseNamespace(cx, module.GlobalNamespace);`
`295`	`295`	`}`
`296`	`296`
	`297`	`+ Entities.Attribute.ExtractAttributes(cx, assembly, Extraction.Entities.Assembly.Create(cx, assembly.GetSymbolLocation()));`
	`298`	`+`
`297`	`299`	`cx.PopulateAll();`
`298`	`300`	`}`
`299`	`301`	`}`
`@@ -335,7 +337,7 @@ public void AnalyseReferences()`
`335`	`337`	`{`
`336`	`338`	`foreach (var r in compilation.References.OfType<PortableExecutableReference>())`
`337`	`339`	`{`
`338`		`- AnalyseAssembly(r);`
	`340`	`+ AnalyseReferenceAssembly(r);`
`339`	`341`	`}`
`340`	`342`	`}`
`341`	`343`