Skip to content

ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
r-kamath wants to merge 2 commits into from
Closed

ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available #1319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc2ac9f
ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when …
r-kamath Aug 11, 2016
5587d5a
ZEPPELIN-1319 add check for Windows path
r-kamath Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,15 @@ public String getServerContextPath() {
}

public String getKeyStorePath() {
return getRelativeDir(
String.format("%s/%s",
getConfDir(),
getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH)));
String path = getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH);
if (path != null && path.startsWith("/") || isWindowsPath(path)) {
return path;
} else {
return getRelativeDir(
String.format("%s/%s",
getConfDir(),
getString(path)));
}
}

public String getKeyStoreType() {
Expand All @@ -297,10 +302,13 @@ public String getKeyManagerPassword() {

public String getTrustStorePath() {
String path = getString(ConfVars.ZEPPELIN_SSL_TRUSTSTORE_PATH);
if (path == null) {
return getKeyStorePath();
if (path != null && path.startsWith("/") || isWindowsPath(path)) {
return path;
} else {
return getRelativeDir(path);
return getRelativeDir(
String.format("%s/%s",
getConfDir(),
getString(path)));
}
}

Expand Down