Permalink
Show file tree
Hide file tree
57 changes: 46 additions & 11 deletions
57
core/src/main/java/io/micronaut/core/io/file/DefaultFileSystemResourceLoader.java
110 changes: 72 additions & 38 deletions
110
core/src/main/java/io/micronaut/core/io/scan/DefaultClassPathResourceLoader.java
19 changes: 19 additions & 0 deletions
19
core/src/test/groovy/io/micronaut/core/io/ClasspathResourceLoaderSpec.groovy
28 changes: 16 additions & 12 deletions
28
core/src/test/groovy/io/micronaut/core/io/FileSystemResourceLoaderSpec.groovy
9 changes: 4 additions & 5 deletions
9
inject/src/main/java/io/micronaut/context/env/DefaultEnvironment.java
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge pull request from GHSA-cjx7-399x-p2rj
* Don't allow resolving files using relative paths outside of the base * Revert change around reading properties files Co-authored-by: Lukas, Strmiska <strmik@gmail.com> Co-authored-by: jameskleeh <james.kleeh@gmail.com>
- Loading branch information
1 parent
d481bee
commit a0cfeb1
Showing
7 changed files
with
159 additions
and
68 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 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
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
Empty file.
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
Oops, something went wrong.