Skip to content

Commit ea4cd87

Browse files
szhGitHub Enterprise
authored andcommitted
Merge pull request #15 from Conjur-Enterprise/fix-snyk
CNJR-6430: Normalize token file path
2 parents 34ccf01 + d7311eb commit ea4cd87

File tree

3 files changed

+5
-220
lines changed

3 files changed

+5
-220
lines changed

.gitleaks.toml

Lines changed: 0 additions & 219 deletions
This file was deleted.

kics.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Exclude the docker-compose file from the scan since it's only used in the
2+
# development and CI (build, test) processes.
3+
exclude-paths:
4+
- conjur-api-java/docker-compose.yml

src/main/java/com/cyberark/conjur/api/Token.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static Token fromJson(String json){
132132

133133
public static Token fromFile(Path filepath, Charset encoding)
134134
throws IOException {
135-
byte[] encodedJson = Files.readAllBytes(filepath);
135+
byte[] encodedJson = Files.readAllBytes(filepath.normalize());
136136
String json = new String(encodedJson, encoding);
137137
return fromJson(json);
138138
}

0 commit comments

Comments
 (0)