Merge pull request #16675 from mbaluda/main

Extract .xsaccess files as JSON

Author: erik-krogh

javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java

@@ -159,6 +159,7 @@
  *   <li>Files with base name "package.json" or "tsconfig.json", and files whose base name
  *       is of the form "codeql-javascript-*.json".
  *   <li>JavaScript, JSON or YAML files whose base name starts with ".eslintrc".
+ *   <li>JSON files whose base name is ".xsaccess".
  *   <li>All extension-less files.
  * </ul>
  *
@@ -393,9 +394,10 @@ private void setupFilters() {
     for (FileType filetype : defaultExtract)
       for (String extension : filetype.getExtensions()) patterns.add("**/*" + extension);
 
-    // include .eslintrc files, package.json files, tsconfig.json files, and
-    // codeql-javascript-*.json files
+    // include .eslintrc files, .xsaccess files, package.json files, 
+    // tsconfig.json files, and codeql-javascript-*.json files
     patterns.add("**/.eslintrc*");
+    patterns.add("**/.xsaccess");
     patterns.add("**/package.json");
     patterns.add("**/tsconfig*.json");
     patterns.add("**/codeql-javascript-*.json");

javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java

@@ -184,8 +184,8 @@ protected boolean contains(File f, String lcExt, ExtractorConfig config) {
         if (super.contains(f, lcExt, config)) return true;
 
         // detect JSON-encoded configuration files whose name starts with `.` and ends with `rc`
-        // (e.g., `.eslintrc` or `.babelrc`)
-        if (f.isFile() && f.getName().matches("\\..*rc")) {
+        // (e.g., `.eslintrc` or `.babelrc`) as well as `.xsaccess` files
+        if (f.isFile() && f.getName().matches("\\..*rc|\\.xsaccess")) {
           try (BufferedReader br = new BufferedReader(new FileReader(f))) {
             // check whether the first two non-empty lines look like the start of a JSON object
             // (two lines because the opening brace is usually on a line by itself)

javascript/extractor/tests/xsaccess/input/.xsaccess

@@ -0,0 +1,3 @@
+{
+  "exposed": true // Expose data via http
+}

javascript/extractor/tests/xsaccess/output/trap/.xsaccess.trap

@@ -0,0 +1,22 @@
+#10000=@"/.xsaccess;sourcefile"
+files(#10000,"/.xsaccess")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=*
+json(#20000,5,#10000,0,"{\n  ""ex ...  http\n}")
+#20001=@"loc,{#10000},1,1,3,1"
+locations_default(#20001,#10000,1,1,3,1)
+json_locations(#20000,#20001)
+#20002=*
+json(#20002,1,#20000,0,"true")
+#20003=@"loc,{#10000},2,14,2,17"
+locations_default(#20003,#10000,2,14,2,17)
+json_locations(#20002,#20003)
+json_literals("true","true",#20002)
+json_properties(#20000,"exposed",#20002)
+numlines(#10000,3,0,0)
+filetype(#10000,"json")