AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup intermediate paths in ArbitraryDataWriter.

Browse Source
This commit is contained in:
CalDescent 2021-08-14 17:32:25 +01:00
parent a7282a5794
commit c50a11e58a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java
View File

@ -123,6 +123,12 @@ public class ArbitraryDataWriter {
patch.create(); patch.create();
this.filePath = patch.getFinalPath(); this.filePath = patch.getFinalPath();
// Delete the input directory
if (FilesystemUtils.pathInsideDataOrTempPath(builtPath)) {
File directory = new File(builtPath.toString());
FileUtils.deleteDirectory(directory);
}
// Validate the patch // Validate the patch
if (this.filePath == null) { if (this.filePath == null) {
throw new IllegalStateException("Null path after creating patch"); throw new IllegalStateException("Null path after creating patch");
@ -146,8 +152,12 @@ public class ArbitraryDataWriter {
} }
// FUTURE: other compression types // FUTURE: other compression types
// Delete the input directory
if (FilesystemUtils.pathInsideDataOrTempPath(this.filePath)) {
File directory = new File(this.filePath.toString());
FileUtils.deleteDirectory(directory);
}
// Replace filePath pointer with the zipped file path // Replace filePath pointer with the zipped file path
// Don't delete the original file/directory, since this may be outside of our directory scope
this.filePath = this.compressedPath; this.filePath = this.compressedPath;
} catch (IOException e) { } catch (IOException e) {
@ -163,10 +173,11 @@ public class ArbitraryDataWriter {
this.aesKey = AES.generateKey(256); this.aesKey = AES.generateKey(256);
AES.encryptFile("AES", this.aesKey, this.filePath.toString(), this.encryptedPath.toString()); AES.encryptFile("AES", this.aesKey, this.filePath.toString(), this.encryptedPath.toString());
// Replace filePath pointer with the encrypted file path // Delete the input file
if (FilesystemUtils.pathInsideDataOrTempPath(this.filePath)) { if (FilesystemUtils.pathInsideDataOrTempPath(this.filePath)) {
Files.delete(this.filePath); Files.delete(this.filePath);
} }
// Replace filePath pointer with the encrypted file path
this.filePath = this.encryptedPath; this.filePath = this.encryptedPath;
} catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | NoSuchPaddingException } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | NoSuchPaddingException