mirror of
				https://github.com/Frooodle/Stirling-PDF.git
				synced 2025-11-01 01:21:18 +01:00 
			
		
		
		
	Merge pull request #771 from Stirling-Tools/pixeebot/drip-2024-02-02-pixee-java/upgrade-tempfile-to-nio
Modernize and secure temp file creation
This commit is contained in:
		
						commit
						36c277961f
					
				@ -4,6 +4,7 @@ import io.github.pixee.security.Filenames;
 | 
			
		||||
import java.io.ByteArrayOutputStream;
 | 
			
		||||
import java.io.File;
 | 
			
		||||
import java.io.IOException;
 | 
			
		||||
import java.nio.file.Files;
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.HashMap;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
@ -136,7 +137,7 @@ public class PdfOverlayController {
 | 
			
		||||
            try (PDDocument overlayPdf = Loader.loadPDF(overlayFiles[overlayFileIndex])) {
 | 
			
		||||
                PDDocument singlePageDocument = new PDDocument();
 | 
			
		||||
                singlePageDocument.addPage(overlayPdf.getPage(pageCountInCurrentOverlay));
 | 
			
		||||
                File tempFile = File.createTempFile("overlay-page-", ".pdf");
 | 
			
		||||
                File tempFile = Files.createTempFile("overlay-page-", ".pdf").toFile();
 | 
			
		||||
                singlePageDocument.save(tempFile);
 | 
			
		||||
                singlePageDocument.close();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -7,6 +7,7 @@ import java.io.File;
 | 
			
		||||
import java.io.FileOutputStream;
 | 
			
		||||
import java.io.IOException;
 | 
			
		||||
import java.io.InputStream;
 | 
			
		||||
import java.nio.file.Files;
 | 
			
		||||
 | 
			
		||||
import javax.imageio.ImageIO;
 | 
			
		||||
 | 
			
		||||
@ -169,7 +170,7 @@ public class StampController {
 | 
			
		||||
        if (!resourceDir.equals("")) {
 | 
			
		||||
            ClassPathResource classPathResource = new ClassPathResource(resourceDir);
 | 
			
		||||
            String fileExtension = resourceDir.substring(resourceDir.lastIndexOf("."));
 | 
			
		||||
            File tempFile = File.createTempFile("NotoSansFont", fileExtension);
 | 
			
		||||
            File tempFile = Files.createTempFile("NotoSansFont", fileExtension).toFile();
 | 
			
		||||
            try (InputStream is = classPathResource.getInputStream();
 | 
			
		||||
                    FileOutputStream os = new FileOutputStream(tempFile)) {
 | 
			
		||||
                IOUtils.copy(is, os);
 | 
			
		||||
 | 
			
		||||
@ -7,6 +7,7 @@ import java.io.File;
 | 
			
		||||
import java.io.FileOutputStream;
 | 
			
		||||
import java.io.IOException;
 | 
			
		||||
import java.io.InputStream;
 | 
			
		||||
import java.nio.file.Files;
 | 
			
		||||
 | 
			
		||||
import javax.imageio.ImageIO;
 | 
			
		||||
 | 
			
		||||
@ -143,7 +144,7 @@ public class WatermarkController {
 | 
			
		||||
        if (!resourceDir.equals("")) {
 | 
			
		||||
            ClassPathResource classPathResource = new ClassPathResource(resourceDir);
 | 
			
		||||
            String fileExtension = resourceDir.substring(resourceDir.lastIndexOf("."));
 | 
			
		||||
            File tempFile = File.createTempFile("NotoSansFont", fileExtension);
 | 
			
		||||
            File tempFile = Files.createTempFile("NotoSansFont", fileExtension).toFile();
 | 
			
		||||
            try (InputStream is = classPathResource.getInputStream();
 | 
			
		||||
                    FileOutputStream os = new FileOutputStream(tempFile)) {
 | 
			
		||||
                IOUtils.copy(is, os);
 | 
			
		||||
 | 
			
		||||
@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 | 
			
		||||
public class GeneralUtils {
 | 
			
		||||
 | 
			
		||||
    public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
 | 
			
		||||
        File tempFile = File.createTempFile("temp", null);
 | 
			
		||||
        File tempFile = Files.createTempFile("temp", null).toFile();
 | 
			
		||||
        try (FileOutputStream os = new FileOutputStream(tempFile)) {
 | 
			
		||||
            os.write(multipartFile.getBytes());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user