Skip to content
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

added env var RD_INSECURE_SSL_NO_WARN handling #215

Merged
merged 1 commit into from
Apr 5, 2019
Merged

added env var RD_INSECURE_SSL_NO_WARN handling #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions rd-api-client/src/main/java/org/rundeck/client/RundeckClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public class RundeckClient {
public static final Pattern API_VERS_PATTERN = Pattern.compile("^(.*)(/api/(\\d+)/?)$");
public static final String ENV_BYPASS_URL = "RD_BYPASS_URL";
public static final String ENV_INSECURE_SSL = "RD_INSECURE_SSL";
public static final String ENV_INSECURE_SSL_NO_WARN = "RD_INSECURE_SSL_NO_WARN";
public static final String ENV_INSECURE_SSL_HOSTNAME = "RD_INSECURE_SSL_HOSTNAME";
public static final String ENV_ALT_SSL_HOSTNAME = "RD_ALT_SSL_HOSTNAME";
public static final String ENV_HTTP_TIMEOUT = "RD_HTTP_TIMEOUT";
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/rundeck/client/tool/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.function.Function;

import static org.rundeck.client.RundeckClient.ENV_INSECURE_SSL;
import static org.rundeck.client.RundeckClient.ENV_INSECURE_SSL_NO_WARN;


/**
Expand Down Expand Up @@ -194,7 +195,8 @@ public static Tool tool(final Rd rd) {
"rundeck.client.insecure.ssl",
System.getenv(ENV_INSECURE_SSL)
));
if (insecureSsl) {
boolean insecureSslNoWarn = Boolean.parseBoolean(System.getenv(ENV_INSECURE_SSL_NO_WARN));
if (insecureSsl && !insecureSslNoWarn ) {
belt.finalOutput().warning(
"# WARNING: RD_INSECURE_SSL=true, no hostname or certificate trust verification will be performed");
}
Expand Down