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

Add support for HTTP proxy #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for HTTP proxy #3

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
25 changes: 24 additions & 1 deletion src/main/java/org/sonar/plugins/openid/OpenIdClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import org.openid4java.message.sreg.SRegMessage;
import org.openid4java.message.sreg.SRegRequest;
import org.openid4java.message.sreg.SRegResponse;
import org.openid4java.util.HttpClientFactory;
import org.openid4java.util.ProxyProperties;
import org.slf4j.LoggerFactory;
import org.sonar.api.ServerExtension;
import org.sonar.api.config.Settings;
Expand All @@ -54,6 +56,11 @@ public class OpenIdClient implements ServerExtension {

public static final String PROPERTY_SONAR_URL = "sonar.openid.sonarServerUrl";
public static final String PROPERTY_OPENID_URL = "sonar.openid.providerUrl";
public static final String PROPERTY_OPENID_USE_PROXY = "sonar.openid.useProxy";
public static final String PROPERTY_PROXY_HTTP_HOST = "http.proxyHost";
public static final String PROPERTY_PROXY_HTTP_PORT = "http.proxyPort";
public static final String PROPERTY_PROXY_HTTP_USER = "http.proxyUser";
public static final String PROPERTY_PROXY_HTTP_PASSWORD = "http.proxyPassword";

static final String AX_ATTR_EMAIL = "email";
static final String SREG_ATTR_EMAIL = "email";
Expand Down Expand Up @@ -124,13 +131,29 @@ void initDiscoveryInfo() {
}

private void initManager() {
if (settings.getBoolean(PROPERTY_OPENID_USE_PROXY)) {
HttpClientFactory.setProxyProperties(getProxyProperties());
}
manager = new ConsumerManager();
manager.setAssociations(new InMemoryConsumerAssociationStore());
manager.setNonceVerifier(new InMemoryNonceVerifier(5000));
manager.getRealmVerifier().setEnforceRpId(false);
}

AuthRequest createAuthenticationRequest() {
@VisibleForTesting
ProxyProperties getProxyProperties()
{
ProxyProperties proxyProps = new ProxyProperties();
proxyProps.setProxyHostName(settings.getString(PROPERTY_PROXY_HTTP_HOST));
proxyProps.setProxyPort(settings.getInt(PROPERTY_PROXY_HTTP_PORT));
if (settings.getString(PROPERTY_PROXY_HTTP_USER) != null) {
proxyProps.setUserName(settings.getString(PROPERTY_PROXY_HTTP_USER));
proxyProps.setPassword(settings.getString(PROPERTY_PROXY_HTTP_PASSWORD));
}
return proxyProps;
}

AuthRequest createAuthenticationRequest() {
try {
AuthRequest authReq = manager.authenticate(discoveryInfo, returnToUrl);
FetchRequest fetch = FetchRequest.createFetchRequest();
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/org/sonar/plugins/openid/OpenIdClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.openid4java.message.ax.FetchResponse;
import org.openid4java.message.sreg.SRegMessage;
import org.openid4java.message.sreg.SRegResponse;
import org.openid4java.util.ProxyProperties;
import org.sonar.api.config.Settings;
import org.sonar.api.security.UserDetails;
import org.sonar.plugins.openid.api.OpenIdExtension;
Expand Down Expand Up @@ -227,6 +228,23 @@ public void authorized_by_extensions() throws Exception {
assertThat(client.verify("http://localhost:9000", new ParameterList())).isNotNull();
}

@Test
public void getProxySettings() {
Settings settings = new Settings();
settings.setProperty(OpenIdClient.PROPERTY_PROXY_HTTP_HOST, "proxy.local");
settings.setProperty(OpenIdClient.PROPERTY_PROXY_HTTP_PORT, 4585);
settings.setProperty(OpenIdClient.PROPERTY_PROXY_HTTP_USER, "john");
settings.setProperty(OpenIdClient.PROPERTY_PROXY_HTTP_PASSWORD, "123456aa");

OpenIdClient client = new OpenIdClient(settings);
ProxyProperties properties = client.getProxyProperties();

assertThat(properties.getProxyHostName()).isEqualTo("proxy.local");
assertThat(properties.getProxyPort()).isEqualTo(4585);
assertThat(properties.getUserName()).isEqualTo("john");
assertThat(properties.getPassword()).isEqualTo("123456aa");
}

private VerificationResult newAuthenticatedResult() throws DiscoveryException, MessageException {
VerificationResult verification = new VerificationResult();
verification.setVerifiedId(new UrlIdentifier("http://example.com"));
Expand Down