octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-24 13:57:33 +00:00
Code Issues Releases Wiki Activity

Better path check for security files (SFile)

Browse Source
This commit is contained in:
Aljoscha Rittner 2021-11-22 15:41:49 +01:00
parent e195987b78
commit 31b4d0f29d
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/net/sourceforge/plantuml/security/SFile.java
View File

@ -52,6 +52,8 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URI; import java.net.URI;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -246,7 +248,11 @@ public class SFile implements Comparable<SFile> {
return false; return false;
} }
// In any case SFile should not access the security folders (the files must be handled internally) // In any case SFile should not access the security folders (the files must be handled internally)
if (isDenied()) { try {
if (isDenied()) {
return false;
}
} catch (IOException e) {
return false; return false;
} }
// Files in "plantuml.include.path" and "plantuml.allowlist.path" are ok. // Files in "plantuml.include.path" and "plantuml.allowlist.path" are ok.
@ -291,13 +297,29 @@ public class SFile implements Comparable<SFile> {
* Checks, if the SFile is inside the folder (-structure) of the security area. * Checks, if the SFile is inside the folder (-structure) of the security area.
* *
* @return true, if the file is not allowed to read/write * @return true, if the file is not allowed to read/write
* @throws IOException If an I/O error occurs, which is possible because the check the pathname may require
* filesystem queries
*/ */
private boolean isDenied() { private boolean isDenied() throws IOException {
SFile securityPath = SecurityUtils.getSecurityPath(); SFile securityPath = SecurityUtils.getSecurityPath();
if (securityPath == null) { if (securityPath == null) {
return false; return false;
} }
return getCleanPathSecure().startsWith(securityPath.getCleanPathSecure()); return getSanitizedPath().startsWith(securityPath.getSanitizedPath());
}
/**
* Returns a sanitized, canonical and normalized Path to a file.
*
* @return the Path
* @throws IOException If an I/O error occurs, which is possible because the construction of the canonical pathname
* may require filesystem queries
* @see #getCleanPathSecure()
* @see File#getCanonicalPath()
* @see Path#normalize()
*/
private Path getSanitizedPath() throws IOException {
return Paths.get(new File(getCleanPathSecure()).getCanonicalPath()).normalize();
} }
private String getCleanPathSecure() { private String getCleanPathSecure() {

1
src/net/sourceforge/plantuml/security/SecurityUtils.java
View File

@ -358,7 +358,6 @@ public class SecurityUtils {
File userCredentials = new File(securityFilePath, userToken + ".credential"); File userCredentials = new File(securityFilePath, userToken + ".credential");
JsonValue jsonValue = loadJson(userCredentials); JsonValue jsonValue = loadJson(userCredentials);
return SecurityCredentials.fromJson(jsonValue); return SecurityCredentials.fromJson(jsonValue);
} }
} }
return SecurityCredentials.NONE; return SecurityCredentials.NONE;

6
test/net/sourceforge/plantuml/security/SFileTest.java
View File

@ -47,12 +47,10 @@ class SFileTest {
// A file is needed: // A file is needed:
File secretFile = File.createTempFile("user", ".credentials", secureFolder); File secretFile = File.createTempFile("user", ".credentials", secureFolder);
assertThat(secretFile).describedAs("File should be visible with standard java.io.File") assertThat(secretFile).describedAs("File should be visible with standard java.io.File").exists();
.exists();
SFile file = new SFile(secretFile.getAbsolutePath()); SFile file = new SFile(secretFile.getAbsolutePath());
assertThat(file.exists()).describedAs("File should be invisible for SFile") assertThat(file.exists()).describedAs("File should be invisible for SFile").isFalse();
.isFalse();
} }
} }