hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 09:43:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

TS: Allow changing the port

Browse Source
This commit is contained in:
Asger F
2019-08-20 10:41:25 +01:00
parent 6f217502f9
commit f18f54fd0d
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
javascript/extractor/src/com/semmle/js/parser/TypeScriptParser.java
View File

@@ -1,6 +1,21 @@
package com.semmle.js.parser; package com.semmle.js.parser;
import ch.qos.logback.classic.Level; import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.lang.ProcessBuilder.Redirect;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@@ -21,21 +36,8 @@ import com.semmle.util.logging.LogbackUtils;
import com.semmle.util.process.AbstractProcessBuilder; import com.semmle.util.process.AbstractProcessBuilder;
import com.semmle.util.process.Builder; import com.semmle.util.process.Builder;
import com.semmle.util.process.Env; import com.semmle.util.process.Env;
import java.io.BufferedReader;
import java.io.BufferedWriter; import ch.qos.logback.classic.Level;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.lang.ProcessBuilder.Redirect;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/** /**
* The Java half of our wrapper for invoking the TypeScript parser. * The Java half of our wrapper for invoking the TypeScript parser.
@@ -105,14 +107,6 @@ public class TypeScriptParser {
*/ */
public static final String TYPESCRIPT_NODE_FLAGS = "SEMMLE_TYPESCRIPT_NODE_FLAGS"; public static final String TYPESCRIPT_NODE_FLAGS = "SEMMLE_TYPESCRIPT_NODE_FLAGS";
/**
* Flags that may be passed using {@link #TYPESCRIPT_NODE_FLAGS}
*/
private static final Set<String> allowedDebugNodeFlags = new HashSet<String>(Arrays.fromList(
"--inspect",
"--inspect-brk"
));
/** The Node.js parser wrapper process, if it has been started already. */ /** The Node.js parser wrapper process, if it has been started already. */
private Process parserWrapperProcess; private Process parserWrapperProcess;
@@ -253,8 +247,16 @@ public class TypeScriptParser {
File parserWrapper = getParserWrapper(); File parserWrapper = getParserWrapper();
String debugFlagString = Env.systemEnv().getNonEmpty(TYPESCRIPT_NODE_FLAGS); String debugFlagString = Env.systemEnv().getNonEmpty(TYPESCRIPT_NODE_FLAGS);
List<String> debugFlags = debugFlagString == null ? new ArrayList<>() : debugFlagString.split(" "); List<String> debugFlags = new ArrayList<>();
debugFlags.retainAll(allowedDebugNodeFlags); if (debugFlagString != null) {
for (String flag : debugFlagString.split(" ")) {
if (!flag.startsWith("--inspect") || flag.contains(":")) {
System.err.println("Ignoring unrecognized Node flag: '" + flag + "'");
} else {
debugFlags.add(flag);
}
}
}
List<String> cmd = getNodeJsRuntimeInvocation(); List<String> cmd = getNodeJsRuntimeInvocation();
cmd.add("--max_old_space_size=" + (mainMemoryMb + reserveMemoryMb)); cmd.add("--max_old_space_size=" + (mainMemoryMb + reserveMemoryMb));