hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2279 from max-schaefer/js/touchstone-files

Browse Source 
Approved by asger-semmle
This commit is contained in:
semmle-qlci
2019-11-08 14:33:23 +00:00
committed by GitHub
parent 9b346b1d52 d7831d2680
commit d9c7549dbe
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
View File

@@ -1,5 +1,16 @@
package com.semmle.js.extractor;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.regex.Pattern;
import com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase;
import com.semmle.js.extractor.trapcache.CachingTrapWriter;
import com.semmle.js.extractor.trapcache.ITrapCache;
@@ -10,15 +21,6 @@ import com.semmle.util.files.FileUtil;
import com.semmle.util.io.WholeIO;
import com.semmle.util.trap.TrapWriter;
import com.semmle.util.trap.TrapWriter.Label;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.regex.Pattern;
/**
* The file extractor extracts a single file and handles source archive population and TRAP caching;
@@ -154,6 +156,9 @@ public class FileExtractor {
byte[] bytes = new byte[fileHeaderSize];
int length = fis.read(bytes);
if (length == -1)
return false;
// Avoid invalid or unprintable UTF-8 files.
if (config.getDefaultEncoding().equals("UTF-8") && hasUnprintableUtf8(bytes, length)) {
return true;
@@ -167,6 +172,9 @@ public class FileExtractor {
return true;
}
// Avoid Touchstone files
if (isTouchstone(bytes, length)) return true;
return false;
} catch (IOException e) {
Exceptions.ignore(e, "Let extractor handle this one.");
@@ -198,6 +206,11 @@ public class FileExtractor {
return false;
}
private boolean isTouchstone(byte[] bytes, int length) {
String s = new String(bytes, 0, length, StandardCharsets.US_ASCII);
return s.startsWith("! TOUCHSTONE file ") || s.startsWith("[Version] 2.0");
}
/**
* Returns true if the byte sequence contains invalid UTF-8 or unprintable ASCII characters.
*/

2
javascript/extractor/tests/ts/input/touchstone-file.ts Normal file
View File

@@ -0,0 +1,2 @@
! TOUCHSTONE file generated by me
[Version] 2.0

1
javascript/extractor/tests/ts/input/touchstone-file2.ts Normal file
View File

@@ -0,0 +1 @@
[Version] 2.0