Merge pull request #213 from BulkSecurityGeneratorProjectV2/fix/JLL/t…

…emporary_file_local_information_disclosure
terrier-org · Apr 2, 2023 · 4acbea7 · 4acbea7
2 parents de95ef0 + f8ec85c
commit 4acbea7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/modules/core/src/main/java/org/terrier/indexing/SimpleMedlineXMLCollection.java b/modules/core/src/main/java/org/terrier/indexing/SimpleMedlineXMLCollection.java
@@ -29,6 +29,7 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.List;
 
 import org.terrier.utility.ApplicationSetup;
@@ -175,7 +176,7 @@ protected boolean openNextFile()
 				}
 
 
-				File temp = File.createTempFile("simpleMedlineXMLcollection", ".xml");
+				File temp = Files.createTempFile("simpleMedlineXMLcollection", ".xml").toFile();
 				Files.copyFile(new File(filename), temp);
 
 				//if(logger.isDebugEnabled()){

diff --git a/modules/core/src/main/java/org/terrier/indexing/SimpleXMLCollection.java b/modules/core/src/main/java/org/terrier/indexing/SimpleXMLCollection.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -589,7 +590,7 @@ protected boolean openNextFile()
 				}
 
 
-				File temp = File.createTempFile("simpleXMLcollection", ".xml");
+				File temp = Files.createTempFile("simpleXMLcollection", ".xml").toFile();
 				Files.copyFile(new File(filename), temp);
 
 				if(logger.isDebugEnabled()){

diff --git a/modules/tests/src/main/java/org/terrier/structures/postings/PostingTestUtils.java b/modules/tests/src/main/java/org/terrier/structures/postings/PostingTestUtils.java
@@ -35,6 +35,7 @@
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Iterator;
 import java.util.List;
 
@@ -157,7 +158,7 @@ public static void compareBlockFieldPostings(List<Posting> inputPostings, Iterab
 
 	  public static String writeBlockPostingsToFile(Iterator<Posting>[] iterators, List<BitIndexPointer> pointerList) throws Exception
 	    {
-	        File tmpFile = File.createTempFile("tmp", BitIn.USUAL_EXTENSION);
+	        File tmpFile = Files.createTempFile("tmp", BitIn.USUAL_EXTENSION).toFile();
 	        DirectInvertedOutputStream dios = new BlockDirectInvertedOutputStream(tmpFile.toString());
 	        for(Iterator<Posting> iterator : iterators)
 	        {
@@ -185,7 +186,7 @@ public static DataInput writeBlockPostingsToData(Iterator<Posting>[] iterators,
 
 	    public static String writeFieldPostingsToFile(Iterator<Posting>[] iterators, List<BitIndexPointer> pointerList) throws Exception
 	    {
-	        File tmpFile = File.createTempFile("tmp", BitIn.USUAL_EXTENSION);
+	        File tmpFile = Files.createTempFile("tmp", BitIn.USUAL_EXTENSION).toFile();
 	        DirectInvertedOutputStream dios = new FieldDirectInvertedOutputStream(tmpFile.toString());
 	        for(Iterator<Posting> iterator : iterators)
 	        {
@@ -213,7 +214,7 @@ public static DataInput writeFieldPostingsToData(Iterator<Posting>[] iterators,
 
 	    public static String writeBlockFieldPostingsToFile(Iterator<Posting>[] iterators, List<BitIndexPointer> pointerList) throws Exception
 	    {
-	        File tmpFile = File.createTempFile("tmp", BitIn.USUAL_EXTENSION);
+	        File tmpFile = Files.createTempFile("tmp", BitIn.USUAL_EXTENSION).toFile();
 	        DirectInvertedOutputStream dios = new BlockFieldDirectInvertedOutputStream(tmpFile.toString());
 	        for(Iterator<Posting> iterator : iterators)
 	        {
@@ -242,7 +243,7 @@ public static DataInput writeBlockFieldPostingsToData(Iterator<Posting>[] iterat
 
 	public static String writePostingsToFile(Iterator<Posting>[] iterators, List<BitIndexPointer> pointerList) throws Exception
 	{
-		File tmpFile = File.createTempFile("tmp", BitIn.USUAL_EXTENSION);
+		File tmpFile = Files.createTempFile("tmp", BitIn.USUAL_EXTENSION).toFile();
 		DirectInvertedOutputStream dios = new DirectInvertedOutputStream(tmpFile.toString());
 		for(Iterator<Posting> iterator : iterators)
 	 	{
@@ -271,7 +272,7 @@ public static DataInput writePostingsToData(Iterator<Posting>[] iterators, List<
 
 	public static String writePostingsToFileDocidOnly(Iterator<Posting>[] iterators, List<BitIndexPointer> pointerList) throws Exception
 	{
-		File tmpFile = File.createTempFile("tmp", BitIn.USUAL_EXTENSION);
+		File tmpFile = Files.createTempFile("tmp", BitIn.USUAL_EXTENSION).toFile();
 		DirectInvertedOutputStream dios = new DirectInvertedDocidOnlyOuptutStream(tmpFile.toString());
 		for(Iterator<Posting> iterator : iterators)
 	 	{

diff --git a/modules/tests/src/test/java/org/terrier/evaluation/TestAdhocEvaluation.java b/modules/tests/src/test/java/org/terrier/evaluation/TestAdhocEvaluation.java
@@ -30,6 +30,7 @@
 import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.file.Files;
 
 import junit.framework.TestCase;
 
@@ -40,7 +41,7 @@ public class TestAdhocEvaluation extends TestCase {
 
 	protected String makeRun(String qids[], String[][] docnos) throws Exception
 	{
-		final File tmpFile = File.createTempFile("/tmp", "tmp.res");
+		final File tmpFile = Files.createTempFile("/tmp", "tmp.res").toFile();
 		final PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(tmpFile)));
 		int queryIndex = 0;
 		for(String[] docnosByQ : docnos)
@@ -63,7 +64,7 @@ protected String makeRun(String qids[], String[][] docnos) throws Exception
 
 	protected String makeQrels(String qids[], String[][] rel_docnos) throws Exception
 	{
-		final File tmpFile = File.createTempFile("/tmp", "tmp.qrels");
+		final File tmpFile = Files.createTempFile("/tmp", "tmp.qrels").toFile();
 		final PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(tmpFile)));
 		int queryIndex = 0;
 		for(String[] docnosByQ : rel_docnos)