-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15409 from erik-krogh/path-java
Java: Improve the QHelp for `java/path-injection`.
- Loading branch information
Showing
10 changed files
with
125 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
19 changes: 19 additions & 0 deletions
19
java/ql/src/Security/CWE/CWE-022/examples/TaintedPathGoodFolder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| public void sendUserFileGood(Socket sock, String user) { | ||
| BufferedReader filenameReader = new BufferedReader( | ||
| new InputStreamReader(sock.getInputStream(), "UTF-8")); | ||
| String filename = filenameReader.readLine(); | ||
|
|
||
| Path publicFolder = Paths.get("/home/" + user + "/public").normalize().toAbsolutePath(); | ||
| Path filePath = publicFolder.resolve(filename).normalize().toAbsolutePath(); | ||
|
|
||
| // GOOD: ensure that the path stays within the public folder | ||
| if (!filePath.startsWith(publicFolder + File.separator)) { | ||
| throw new IllegalArgumentException("Invalid filename"); | ||
| } | ||
| BufferedReader fileReader = new BufferedReader(new FileReader(filePath.toString())); | ||
| String fileLine = fileReader.readLine(); | ||
| while(fileLine != null) { | ||
| sock.getOutputStream().write(fileLine.getBytes()); | ||
| fileLine = fileReader.readLine(); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
java/ql/src/Security/CWE/CWE-022/examples/TaintedPathGoodNormalize.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| public void sendUserFileGood(Socket sock, String user) { | ||
| BufferedReader filenameReader = new BufferedReader( | ||
| new InputStreamReader(sock.getInputStream(), "UTF-8")); | ||
| String filename = filenameReader.readLine(); | ||
| // GOOD: ensure that the filename has no path separators or parent directory references | ||
| if (filename.contains("..") || filename.contains("/") || filename.contains("\\")) { | ||
| throw new IllegalArgumentException("Invalid filename"); | ||
| } | ||
| BufferedReader fileReader = new BufferedReader(new FileReader(filename)); | ||
| String fileLine = fileReader.readLine(); | ||
| while(fileLine != null) { | ||
| sock.getOutputStream().write(fileLine.getBytes()); | ||
| fileLine = fileReader.readLine(); | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters