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

Fix handling of access tokens in Configuration #574

Merged
merged 2 commits into from
Jan 6, 2016
Merged

Fix handling of access tokens in Configuration #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
471507c
Fix configuration to create new instance on load
jianghaolu Jan 6, 2016
240a42f
Use a single auth filter instead of a list
jianghaolu Jan 6, 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
26 changes: 7 additions & 19 deletions core/azure-core/src/main/java/com/microsoft/windowsazure/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ public class Configuration {
* of the proxy to use
*/
public static final String PROPERTY_HTTP_PROXY_PORT = "http.proxyPort";

/**
* The configuration instance.
*/
private static Configuration instance;

/**
* The configuration properties.
Expand All @@ -85,21 +80,14 @@ public Configuration(Builder builder) {
}

public static Configuration getInstance() {
if (instance == null) {
try {
instance = Configuration.load();
} catch (IOException e) {
log.error(
"Unable to load META-INF/com.microsoft.windowsazure.properties",
e);
instance = new Configuration();
}
try {
return Configuration.load();
} catch (IOException e) {
log.error(
"Unable to load META-INF/com.microsoft.windowsazure.properties",
e);
return new Configuration();
}
return instance;
}

public static void setInstance(final Configuration configuration) {
Configuration.instance = configuration;
}

public static Configuration load() throws IOException {
Expand Down
8 changes: 3 additions & 5 deletions ...e/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,11 @@ public HttpClientBuilder applyConfig(HttpClientBuilder httpClientBuilder) {
httpClientBuilder.addInterceptorFirst(new HttpHeaderRemovalFilter());
}

if (properties.containsKey("AuthFilters"))
if (properties.containsKey("AuthFilter"))
{
@SuppressWarnings("unchecked")
ArrayList<ServiceRequestFilter> filters = (ArrayList<ServiceRequestFilter>) properties.get("AuthFilters");
for (ServiceRequestFilter filter : filters) {
httpClientBuilder.addInterceptorFirst(new FilterInterceptor(filter));
}
ServiceRequestFilter filter = (ServiceRequestFilter) properties.get("AuthFilter");
httpClientBuilder.addInterceptorFirst(new FilterInterceptor(filter));
}

return httpClientBuilder;
Expand Down
11 changes: 1 addition & 10 deletions ...zure-core/src/main/java/com/microsoft/windowsazure/credentials/TokenCloudCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,7 @@ public void setToken(String token) {
@Override
@SuppressWarnings("unchecked")
public <T> void applyConfig(String profile, Map<String, Object> properties) {
ArrayList<AdalAuthFilter> filters;
if (!properties.containsKey("AuthFilters"))
{
filters = new ArrayList<AdalAuthFilter>();
properties.put("AuthFilters", filters);
} else {
filters = (ArrayList<AdalAuthFilter>)properties.get("AuthFilters");
}

filters.add(new AdalAuthFilter(this.token));
properties.put("AuthFilter", new AdalAuthFilter(this.token));
}

}
3 changes: 1 addition & 2 deletions ...c/test/java/com/microsoft/windowsazure/services/servicebus/ServiceBusIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ public Client alter(String profile, Client instance,
});

// applied as default configuration
Configuration.setInstance(config);
service = ServiceBusService.create();
service = ServiceBusService.create(config);
}

@Test
Expand Down
15 changes: 3 additions & 12 deletions ...yvault/src/main/java/com/microsoft/azure/keyvault/authentication/KeyVaultCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestContext;
import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestFilter;
import com.microsoft.windowsazure.credentials.CloudCredentials;
import org.apache.http.auth.AUTH;

/**
* An implementation of {@link CloudCredentials} that supports automatic bearer
Expand All @@ -38,7 +39,7 @@
*/
public abstract class KeyVaultCredentials extends CloudCredentials implements BearerCredentialsSupport {

private static final String AUTH_FILTERS_KEY = "AuthFilters";
private static final String AUTH_FILTERS_KEY = "AuthFilter";

private final HashMap<String, Map<String, String>> cachedChallenges = new HashMap<String, Map<String, String>>();

Expand All @@ -48,17 +49,7 @@ public <T> void applyConfig(String profile, Map<String, Object> properties) {

// Modifies properties to add our authenticating filter.

// First get the existing list of filters...
ArrayList<ServiceRequestFilter> filters;
if (!properties.containsKey(AUTH_FILTERS_KEY)) {
filters = new ArrayList<ServiceRequestFilter>();
properties.put(AUTH_FILTERS_KEY, filters);
} else {
filters = (ArrayList<ServiceRequestFilter>) properties.get(AUTH_FILTERS_KEY);
}

// ...then we add our filter.
filters.add(new ServiceRequestFilter() {
properties.put(AUTH_FILTERS_KEY, new ServiceRequestFilter() {

@Override
public void filter(ServiceRequestContext request) {
Expand Down