Skip to content

Commit 2397cd0

Browse files
authored
Merge pull request #43 from cfieber/make_blacklist_great_again
fixes open file leak in ssl blacklist reading
2 parents 11f3a83 + d370129 commit 2397cd0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ allprojects {
3333
group = 'com.netflix.spinnaker.kork'
3434

3535
spinnaker {
36-
dependenciesVersion = "0.44.0"
36+
dependenciesVersion = "0.50.0"
3737
}
3838

3939
jacoco {

kork-web/src/main/groovy/com/netflix/spinnaker/tomcat/x509/ReloadingFileBlacklist.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public Set<Entry> load(String key) throws Exception {
8989
if (!f.exists()) {
9090
return Collections.emptySet();
9191
}
92-
return ImmutableSet.copyOf(Files.lines(f.toPath())
92+
return ImmutableSet.copyOf(Files.readAllLines(f.toPath())
93+
.stream()
9394
.map(String::trim)
9495
.filter(line -> !(line.isEmpty() || line.startsWith("#")))
9596
.map(Entry::fromString)

0 commit comments

Comments
 (0)