arpitjain099 opened a new pull request, #18328:
URL: https://github.com/apache/iotdb/pull/18328
### Description
`ExecutableManager` addresses files under `libRoot` and `temporaryLibRoot`
by concatenating the root with a caller-supplied name:
```java
Path path = Paths.get(this.libRoot + File.separator + fileName);
```
A name containing parent-directory segments, or an absolute path, therefore
resolves outside the directory the manager is responsible for. The accessors
have no check that the result stayed inside its root.
This adds `resolveUnderRoot()`, which resolves the name against the root,
normalizes it, and rejects anything that escapes:
```java
public static Path resolveUnderRoot(String root, String fileName) throws
IOException {
Path rootPath = Paths.get(root).toAbsolutePath().normalize();
Path resolved = rootPath.resolve(fileName).normalize();
if (!resolved.startsWith(rootPath)) {
throw new IOException(
String.format("The resolved path %s is outside of the directory %s",
resolved, rootPath));
}
return resolved;
}
```
and routes the by-name accessors through it: `removeFileUnderLibRoot`,
`hasFileUnderLibRoot`, `hasFileUnderInstallDir`, `hasFileUnderTemporaryRoot`,
`saveTextAsFileUnderTemporaryRoot`, `removeFileUnderTemporaryRoot` and
`readTextFromFileUnderTemporaryRoot`.
Putting it in the shared accessor means the trigger, UDF and pipe-plugin
paths that all go through `ExecutableManager` get the same behaviour from one
place, rather than each growing its own check and drifting apart later.
The `has*` methods return `false` instead of propagating the exception,
since their callers use them as plain existence checks and would not expect one.
Normal names are unaffected, including relative ones that stay inside the
root such as `install/udf.jar` or `sub/../udf.jar`.
### Tests
`ExecutableManagerTest` covers:
- names inside the root resolve as before, including one that walks out and
back in
- `../name`, `../../name`, `sub/../../name` and an absolute path are all
rejected
- an escaping name passed to `saveTextAsFileUnderTemporaryRoot` writes
nothing to disk
- an escaping name passed to `removeFileUnderLibRoot` leaves the outside
file in place
- the `has*` predicates return `false` for an escaping name rather than
throwing
Verified with `mvn -pl iotdb-core/node-commons -am
-Dtest=ExecutableManagerTest test`: 7 tests pass with the change, and 5 of the
7 fail without it.
### This PR has:
- [x] been self-reviewed.
- [x] added unit tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
