honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove uses of Strings.cleanPath (elastic/x-pack-elasticsearch#1709) 

This is the xpack side of
https://github.com/elastic/elasticsearch/pull/25209

Original commit: elastic/x-pack-elasticsearch@4f59f011e9
This commit is contained in:
Ryan Ernst 2017-06-13 21:10:02 -07:00 committed by GitHub
parent 9311d056ad
commit abe217ebc3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/main/java/org/elasticsearch/xpack/ssl/CertUtils.java
View File

@ -99,7 +99,7 @@ public class CertUtils {
if (environment != null) { if (environment != null) {
return environment.configFile().resolve(path); return environment.configFile().resolve(path);
} }
return PathUtils.get(Strings.cleanPath(path)); return PathUtils.get(path).normalize();
} }
/** /**

12
plugin/src/main/java/org/elasticsearch/xpack/ssl/CertificateTool.java
View File

@ -185,12 +185,12 @@ public class CertificateTool extends EnvironmentAwareCommand {
file = resolvePath(input); file = resolvePath(input);
} }
} }
return file; return file.toAbsolutePath();
} }
@SuppressForbidden(reason = "resolve paths against CWD for a CLI tool") @SuppressForbidden(reason = "resolve paths against CWD for a CLI tool")
private static Path resolvePath(String pathStr) { private static Path resolvePath(String pathStr) {
return PathUtils.get(Strings.cleanPath(pathStr)).toAbsolutePath(); return PathUtils.get(pathStr).normalize();
} }
/** /**
@ -203,7 +203,7 @@ public class CertificateTool extends EnvironmentAwareCommand {
static Collection<CertificateInformation> getCertificateInformationList(Terminal terminal, String inputFile) static Collection<CertificateInformation> getCertificateInformationList(Terminal terminal, String inputFile)
throws Exception { throws Exception {
if (inputFile != null) { if (inputFile != null) {
return parseFile(resolvePath(inputFile)); return parseFile(resolvePath(inputFile).toAbsolutePath());
} }
Map<String, CertificateInformation> map = new HashMap<>(); Map<String, CertificateInformation> map = new HashMap<>();
boolean done = false; boolean done = false;
@ -311,7 +311,7 @@ public class CertificateTool extends EnvironmentAwareCommand {
Environment env, int keysize, int days) throws Exception { Environment env, int keysize, int days) throws Exception {
if (caCertPath != null) { if (caCertPath != null) {
assert caKeyPath != null; assert caKeyPath != null;
final String resolvedCaCertPath = resolvePath(caCertPath).toString(); final String resolvedCaCertPath = resolvePath(caCertPath).toAbsolutePath().toString();
Certificate[] certificates = CertUtils.readCertificates(Collections.singletonList(resolvedCaCertPath), env); Certificate[] certificates = CertUtils.readCertificates(Collections.singletonList(resolvedCaCertPath), env);
if (certificates.length != 1) { if (certificates.length != 1) {
throw new IllegalArgumentException("expected a single certificate in file [" + caCertPath + "] but found [" + throw new IllegalArgumentException("expected a single certificate in file [" + caCertPath + "] but found [" +
@ -613,11 +613,11 @@ public class CertificateTool extends EnvironmentAwareCommand {
if (validFilename == false) { if (validFilename == false) {
return new Name(name, principal, null, "[" + filename + "] is not a valid filename"); return new Name(name, principal, null, "[" + filename + "] is not a valid filename");
} }
return new Name(name, principal, Strings.cleanPath(filename), null); return new Name(name, principal, resolvePath(filename).toString(), null);
} }
static boolean isValidFilename(String name) { static boolean isValidFilename(String name) {
return ALLOWED_FILENAME_CHAR_PATTERN.matcher(Strings.cleanPath(name)).matches() return ALLOWED_FILENAME_CHAR_PATTERN.matcher(resolvePath(name).toString()).matches()
&& name.startsWith(".") == false; && name.startsWith(".") == false;
} }
} }