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

Jump to bottom

adding proxy setting support from env to be more like other cli's #370

Merged
merged 1 commit into from
Aug 7, 2015
+136 −41
Merged

adding proxy setting support from env to be more like other cli's #370

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 cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies {
testCompile 'junit:junit:4.12'
testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile 'com.github.stefanbirkner:system-rules:1.12.0'
}

// create a self-contained jar that is executable
Expand Down
75 changes: 50 additions & 25 deletions cli/src/main/java/denominator/cli/Denominator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,6 @@
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;

import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jce.provider.X509CertParser;
import org.bouncycastle.openssl.PEMKeyPair;
import org.bouncycastle.openssl.PEMParser;
import org.yaml.snakeyaml.Yaml;

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.Type;
import java.security.KeyFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import javax.inject.Singleton;

import dagger.ObjectGraph;
import dagger.Provides;
import denominator.Credentials;
Expand Down Expand Up @@ -86,6 +61,30 @@
import io.airlift.airline.Help;
import io.airlift.airline.Option;
import io.airlift.airline.OptionType;
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jce.provider.X509CertParser;
import org.bouncycastle.openssl.PEMKeyPair;
import org.bouncycastle.openssl.PEMParser;
import org.yaml.snakeyaml.Yaml;

import javax.inject.Singleton;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.Type;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.KeyFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import static com.google.common.base.Preconditions.checkArgument;
import static denominator.CredentialsConfiguration.credentials;
Expand Down Expand Up @@ -274,6 +273,8 @@ public static abstract class DenominatorCommand implements Runnable {

@SuppressWarnings("unchecked")
public void run() {
setProxyFromEnv();

if (providerName != null && credentialArgs != null) {
credentials = ListCredentials.from(Lists.transform(credentialArgs, decodeAnyPems));
} else if (providerConfigurationName != null) {
Expand Down Expand Up @@ -426,6 +427,30 @@ void overrideFromEnv(Map<String, String> env) {
}
}

static void setProxyFromEnv() {
setProtocolProxyFromEnv("http", System.getenv("HTTP_PROXY"));
setProtocolProxyFromEnv("https", System.getenv("HTTPS_PROXY"));
}

static void setProtocolProxyFromEnv(String proto, String envProxy) {
if (envProxy != null && !envProxy.isEmpty()) {
try {
URL proxyUrl = new URL(envProxy);

String proxyHost = System.getProperty(proto + ".proxyHost");
if ((proxyHost == null || proxyHost.isEmpty())) {
System.setProperty(proto + ".proxyHost", proxyUrl.getHost());
System.setProperty(proto + ".proxyPort",
Integer.toString(
proxyUrl.getPort() == -1 ? proxyUrl.getDefaultPort() : proxyUrl.getPort()));
}
} catch (MalformedURLException e) {
System.err.println("invalid " + proto + " proxy configuration: " + e.getMessage());
System.exit(1);
}
}
}

/**
* return a lazy iterator where possible to improve the perceived responsiveness of the cli
*/
Expand Down
101 changes: 85 additions & 16 deletions cli/src/test/java/denominator/cli/DenominatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
package denominator.cli;

import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

import java.io.IOException;
import java.net.URL;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;

import denominator.AllProfileResourceRecordSetApi;
import denominator.Credentials.ListCredentials;
import denominator.Credentials.MapCredentials;
Expand Down Expand Up @@ -47,6 +31,25 @@
import denominator.model.rdata.AData;
import denominator.model.rdata.CNAMEData;
import denominator.route53.AliasTarget;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.Assertion;
import org.junit.contrib.java.lang.system.ExpectedSystemExit;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.rules.ExpectedException;

import java.io.IOException;
import java.net.URL;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;

import static denominator.assertj.ModelAssertions.assertThat;
import static denominator.model.ResourceRecordSets.a;
Expand All @@ -55,11 +58,23 @@
import static java.util.Arrays.asList;
import static org.junit.Assert.fail;


public class DenominatorTest {

@Rule
public final ExpectedException thrown = ExpectedException.none();

@Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();

// Use this to make sure the message logged
@Rule
public final SystemErrRule systemErrRule = new SystemErrRule().enableLog();

// use this to test exit occurred on malformed
@Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none();

DNSApiManager mgr = denominator.Denominator.create(new MockProvider());

@Test // denominator providers
Expand Down Expand Up @@ -1200,6 +1215,60 @@ public void testGeoResourceRecordSetAddRegionsBadJson() {
.isEqualTo(old);
}

@Test
public void testProxySettingsWithPort() {
Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost:7878");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "https://10.0.0.1:8989");
assertThat(System.getProperty("http.proxyHost")).isEqualTo("localhost");
assertThat(System.getProperty("http.proxyPort")).isEqualTo("7878");
assertThat(System.getProperty("https.proxyHost")).isEqualTo("10.0.0.1");
assertThat(System.getProperty("https.proxyPort")).isEqualTo("8989");
}

@Test
public void testProxySettingsWithDefaultPorts() {
Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "https://10.0.0.1");
assertThat(System.getProperty("http.proxyHost")).isEqualTo("localhost");
assertThat(System.getProperty("http.proxyPort")).isEqualTo("80");
assertThat(System.getProperty("https.proxyHost")).isEqualTo("10.0.0.1");
assertThat(System.getProperty("https.proxyPort")).isEqualTo("443");
}

@Test
public void testProxySettingsFromProperties() {
System.setProperty("http.proxyHost", "192.168.0.1");
System.setProperty("https.proxyHost", "192.168.0.2");

Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "https://10.0.0.1");

assertThat(System.getProperty("http.proxyHost")).isEqualTo("192.168.0.1");
assertThat(System.getProperty("http.proxyPort")).isNull();
assertThat(System.getProperty("https.proxyHost")).isEqualTo("192.168.0.2");
assertThat(System.getProperty("https.proxyPort")).isNull();
}

@Test
public void testInvalidEnvProxySettings() {
exit.expectSystemExitWithStatus(1);
exit.checkAssertionAfterwards(new Assertion() {
@Override
public void checkAssertion() throws Exception {
assertThat(System.getProperty("http.proxyHost")).isEqualTo("localhost");
assertThat(System.getProperty("http.proxyPort")).isEqualTo("80");
assertThat(System.getProperty("https.proxyHost")).isNull();
assertThat(System.getProperty("https.proxyPort")).isNull();
assertThat(systemErrRule.getLog())
.isEqualToIgnoringCase(
"invalid https proxy configuration: no protocol: 10.0.0.1:8443\n");
}
});

Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "10.0.0.1:8443");
}

@Before
public void stockRecords() {
{
Expand Down