* If true, the access token is saved in clear text to the preferences file. The same * access token can therefore be used in multiple JOSM sessions. - * + *
* If false, the access token isn't saved to the preferences file. If JOSM is closed,
* the access token is lost and new token has to be generated by the OSM server the
@@ -65,50 +63,4 @@
public void setSaveToPreferences(boolean saveToPreferences) {
this.saveToPreferences = saveToPreferences;
- }
-
- /**
- * Replies the access token key. null, if no access token key is currently set.
- *
- * @return the access token key
- */
- public String getAccessTokenKey() {
- return accessTokenKey;
- }
-
- /**
- * Sets the access token key. Pass in null to remove the current access token key.
- *
- * @param accessTokenKey the access token key
- */
- public void setAccessTokenKey(String accessTokenKey) {
- this.accessTokenKey = accessTokenKey;
- }
-
- /**
- * Replies the access token secret. null, if no access token secret is currently set.
- *
- * @return the access token secret
- */
- public String getAccessTokenSecret() {
- return accessTokenSecret;
- }
-
- /**
- * Sets the access token secret. Pass in null to remove the current access token secret.
- *
- * @param accessTokenSecret access token secret, or null
- */
- public void setAccessTokenSecret(String accessTokenSecret) {
- this.accessTokenSecret = accessTokenSecret;
- }
-
- /**
- * Replies the access token.
- * @return the access token, can be {@code null}
- */
- public OAuthToken getAccessToken() {
- if (!containsAccessToken())
- return null;
- return new OAuthToken(accessTokenKey, accessTokenSecret);
}
@@ -143,30 +95,4 @@
* Sets the access token hold by this holder.
*
- * @param accessTokenKey the access token key
- * @param accessTokenSecret the access token secret
- */
- public void setAccessToken(String accessTokenKey, String accessTokenSecret) {
- this.accessTokenKey = accessTokenKey;
- this.accessTokenSecret = accessTokenSecret;
- }
-
- /**
- * Sets the access token hold by this holder.
- *
- * @param token the access token. Can be null to clear the content in this holder.
- */
- public void setAccessToken(OAuthToken token) {
- if (token == null) {
- this.accessTokenKey = null;
- this.accessTokenSecret = null;
- } else {
- this.accessTokenKey = token.getKey();
- this.accessTokenSecret = token.getSecret();
- }
- }
-
- /**
- * Sets the access token hold by this holder.
- *
* @param api The api the token is for
* @param token the access token. Can be null to clear the content in this holder.
@@ -187,14 +113,4 @@
/**
- * Replies true if this holder contains an complete access token, consisting of an
- * Access Token Key and an Access Token Secret.
- *
- * @return true if this holder contains an complete access token
- */
- public boolean containsAccessToken() {
- return accessTokenKey != null && accessTokenSecret != null;
- }
-
- /**
* Initializes the content of this holder from the Access Token managed by the
* credential manager.
@@ -205,17 +121,5 @@
public void init(CredentialsAgent cm) {
CheckParameterUtil.ensureParameterNotNull(cm, "cm");
- OAuthToken token = null;
- try {
- token = cm.lookupOAuthAccessToken();
- } catch (CredentialsAgentException e) {
- Logging.error(e);
- Logging.warn(tr("Failed to retrieve OAuth Access Token from credential manager"));
- Logging.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
- }
saveToPreferences = Config.getPref().getBoolean("oauth.access-token.save-to-preferences", true);
- if (token != null) {
- accessTokenKey = token.getKey();
- accessTokenSecret = token.getSecret();
- }
}
@@ -232,14 +136,8 @@
try {
if (!saveToPreferences) {
- cm.storeOAuthAccessToken(null);
for (String host : this.tokenMap.keySet()) {
cm.storeOAuthAccessToken(host, null);
}
} else {
- if (this.accessTokenKey != null && this.accessTokenSecret != null) {
- cm.storeOAuthAccessToken(new OAuthToken(accessTokenKey, accessTokenSecret));
- } else {
- cm.storeOAuthAccessToken(null);
- }
for (Map.Entry
+ * Note that this may make network requests for RFC 8414 compliant endpoints.
* @return a set of default parameters
*/
- public static OAuthParameters createDefault() {
- return createDefault(null);
+ public static IOAuthParameters createDefault() {
+ return createDefault(Config.getUrls().getDefaultOsmApiUrl(), OAuthVersion.OAuth20);
}
@@ -55,17 +56,6 @@
* at the given API url. URL parameters are only set if the URL equals {@link IUrls#getDefaultOsmApiUrl}
* or references the domain "dev.openstreetmap.org", otherwise they may be
+ * Note that this may make network requests for RFC 8414 compliant endpoints.
*
* @param apiUrl The API URL for which the OAuth default parameters are created. If null or empty, the default OSM API url is used.
@@ -80,6 +70,4 @@
switch (oAuthVersion) {
- case OAuth10a:
- return getDefaultOAuth10Parameters(apiUrl);
case OAuth20:
case OAuth21: // For now, OAuth 2.1 (draft) is just OAuth 2.0 with mandatory extensions, which we implement.
@@ -90,4 +78,31 @@
}
+ private static JsonObject getRFC8414Parameters(String apiUrl) {
+ HttpClient client = null;
+ try {
+ final URI apiURI = new URI(apiUrl);
+ final URL rfc8414URL = new URI(apiURI.getScheme(), apiURI.getHost(),
+ "/.well-known/oauth-authorization-server", null).toURL();
+ client = HttpClient.create(rfc8414URL);
+ HttpClient.Response response = client.connect();
+ if (response.getResponseCode() == 200) {
+ try (BufferedReader reader = response.getContentReader();
+ JsonReader jsonReader = Json.createReader(reader)) {
+ JsonStructure structure = jsonReader.read();
+ if (structure.getValueType() == JsonValue.ValueType.OBJECT) {
+ return structure.asJsonObject();
+ }
+ }
+ }
+ } catch (URISyntaxException | IOException e) {
+ throw new JosmRuntimeException(e);
+ } finally {
+ if (client != null) {
+ client.disconnect();
+ }
+ }
+ return Json.createObjectBuilder().build();
+ }
+
/**
* Get the default OAuth 2.0 parameters
@@ -98,39 +113,58 @@
final String clientId;
final String clientSecret;
- final String redirectUri;
+ final String redirectUri = "http://127.0.0.1:8111/oauth_authorization";
final String baseUrl;
- if (apiUrl != null && !Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl) && !"http://invalid".equals(apiUrl)) {
- clientId = "";
- clientSecret = "";
- baseUrl = apiUrl;
- HttpClient client = null;
- redirectUri = "";
- // Check if the server is RFC 8414 compliant
- try {
- client = HttpClient.create(new URL(apiUrl + (apiUrl.endsWith("/") ? "" : "/") + ".well-known/oauth-authorization-server"));
- HttpClient.Response response = client.connect();
- if (response.getResponseCode() == 200) {
- try (BufferedReader reader = response.getContentReader();
- JsonReader jsonReader = Json.createReader(reader)) {
- JsonStructure structure = jsonReader.read();
- if (structure.getValueType() == JsonValue.ValueType.OBJECT) {
- return parseAuthorizationServerMetadataResponse(clientId, clientSecret, apiUrl,
- redirectUri, structure.asJsonObject());
- }
- }
- }
- } catch (IOException | OAuthException e) {
+ apiUrl = apiUrl == null ? OsmApi.getOsmApi().getServerUrl() : apiUrl;
+ switch (apiUrl) {
+ case OSM_API_DEV:
+ case OSM_API_MASTER:
+ // This clientId/clientSecret are provided by taylor.smock. Feel free to change if needed, but
+ // do let one of the maintainers with server access know so that they can update the test OAuth
+ // token.
+ clientId = "-QZt6n1btDfqrfJNGUIMZjzcyqTgIV6sy79_W4kmQLM";
+ // Keep secret for dev apis, just in case we want to test something that needs it.
+ clientSecret = "SWnmRD4AdLO-2-ttHE5TR3eLF2McNf7dh0_Z2WNzJdI";
+ break;
+ case OSM_API_DEFAULT:
+ clientId = "edPII614Lm0_0zEpc_QzEltA9BUll93-Y-ugRQUoHMI";
+ // We don't actually use the client secret in our authorization flow.
+ clientSecret = null;
+ break;
+ case "https://www.openhistoricalmap.org/api":
+ // clientId provided by 1ec5 (Minh Nguyễn)
+ clientId = "Hl5yIhFS-Egj6aY7A35ouLOuZl0EHjj8JJQQ46IO96E";
+ clientSecret = null;
+ break;
+ default:
+ clientId = "";
+ clientSecret = null;
+ }
+ baseUrl = apiUrl;
+ // Check if the server is RFC 8414 compliant
+ try {
+ synchronized (RFC8414_RESPONSES) {
+ final JsonObject data;
+ if (NetworkManager.isOffline(apiUrl)) {
+ data = null;
+ } else {
+ data = RFC8414_RESPONSES.computeIfAbsent(apiUrl, OAuthParameters::getRFC8414Parameters);
+ }
+ if (data == null || data.isEmpty()) {
+ RFC8414_RESPONSES.remove(apiUrl);
+ } else {
+ return parseAuthorizationServerMetadataResponse(clientId, clientSecret, apiUrl,
+ redirectUri, data);
+ }
+ }
+ } catch (JosmRuntimeException e) {
+ if (e.getCause() instanceof URISyntaxException || e.getCause() instanceof IOException) {
Logging.trace(e);
- } finally {
- if (client != null) client.disconnect();
- }
- } else {
- clientId = "edPII614Lm0_0zEpc_QzEltA9BUll93-Y-ugRQUoHMI";
- // We don't actually use the client secret in our authorization flow.
- clientSecret = null;
- baseUrl = "https://www.openstreetmap.org/oauth2";
- redirectUri = "http://127.0.0.1:8111/oauth_authorization";
- apiUrl = OsmApi.getOsmApi().getBaseUrl();
- }
+ } else {
+ throw e;
+ }
+ } catch (OAuthException e) {
+ Logging.trace(e);
+ }
+ // Fall back to guessing the parameters.
return new OAuth20Parameters(clientId, clientSecret, baseUrl, apiUrl, redirectUri);
}
@@ -155,44 +189,4 @@
/**
- * Get the default OAuth 1.0a parameters
- * @param apiUrl The api url
- * @return The default parameters
- */
- private static OAuthParameters getDefaultOAuth10Parameters(String apiUrl) {
- final String consumerKey;
- final String consumerSecret;
- final String serverUrl;
-
- if (apiUrl != null && !Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl)) {
- consumerKey = ""; // a custom consumer key is required
- consumerSecret = ""; // a custom consumer secret is requireds
- serverUrl = apiUrl.replaceAll("/api$", "");
- } else {
- consumerKey = DEFAULT_JOSM_CONSUMER_KEY;
- consumerSecret = DEFAULT_JOSM_CONSUMER_SECRET;
- serverUrl = Config.getUrls().getOSMWebsite();
- }
-
- return new OAuthParameters(
- consumerKey,
- consumerSecret,
- serverUrl + "/oauth/request_token",
- serverUrl + "/oauth/access_token",
- serverUrl + "/oauth/authorize",
- serverUrl + "/login",
- serverUrl + "/logout");
- }
-
- /**
- * Replies a set of parameters as defined in the preferences.
- *
- * @param apiUrl the API URL. Must not be null.
- * @return the parameters
- */
- public static OAuthParameters createFromApiUrl(String apiUrl) {
- return (OAuthParameters) createFromApiUrl(apiUrl, OAuthVersion.OAuth10a);
- }
-
- /**
* Replies a set of parameters as defined in the preferences.
*
@@ -205,14 +199,4 @@
IOAuthParameters parameters = createDefault(apiUrl, oAuthVersion);
switch (oAuthVersion) {
- case OAuth10a:
- OAuthParameters oauth10aParameters = (OAuthParameters) parameters;
- return new OAuthParameters(
- Config.getPref().get("oauth.settings.consumer-key", oauth10aParameters.getConsumerKey()),
- Config.getPref().get("oauth.settings.consumer-secret", oauth10aParameters.getConsumerSecret()),
- Config.getPref().get("oauth.settings.request-token-url", oauth10aParameters.getRequestTokenUrl()),
- Config.getPref().get("oauth.settings.access-token-url", oauth10aParameters.getAccessTokenUrl()),
- Config.getPref().get("oauth.settings.authorise-url", oauth10aParameters.getAuthoriseUrl()),
- Config.getPref().get("oauth.settings.osm-login-url", oauth10aParameters.getOsmLoginUrl()),
- Config.getPref().get("oauth.settings.osm-logout-url", oauth10aParameters.getOsmLogoutUrl()));
case OAuth20:
case OAuth21: // Right now, OAuth 2.1 will work with our OAuth 2.0 implementation
@@ -229,187 +213,3 @@
}
}
-
- /**
- * Remembers the current values in the preferences.
- */
- @Override
- public void rememberPreferences() {
- Config.getPref().put("oauth.settings.consumer-key", getConsumerKey());
- Config.getPref().put("oauth.settings.consumer-secret", getConsumerSecret());
- Config.getPref().put("oauth.settings.request-token-url", getRequestTokenUrl());
- Config.getPref().put("oauth.settings.access-token-url", getAccessTokenUrl());
- Config.getPref().put("oauth.settings.authorise-url", getAuthoriseUrl());
- Config.getPref().put("oauth.settings.osm-login-url", getOsmLoginUrl());
- Config.getPref().put("oauth.settings.osm-logout-url", getOsmLogoutUrl());
- }
-
- private final String consumerKey;
- private final String consumerSecret;
- private final String requestTokenUrl;
- private final String accessTokenUrl;
- private final String authoriseUrl;
- private final String osmLoginUrl;
- private final String osmLogoutUrl;
-
- /**
- * Constructs a new {@code OAuthParameters}.
- * @param consumerKey consumer key
- * @param consumerSecret consumer secret
- * @param requestTokenUrl request token URL
- * @param accessTokenUrl access token URL
- * @param authoriseUrl authorise URL
- * @param osmLoginUrl the OSM login URL (for automatic mode)
- * @param osmLogoutUrl the OSM logout URL (for automatic mode)
- * @see #createDefault
- * @see #createFromApiUrl
- * @since 9220
- */
- public OAuthParameters(String consumerKey, String consumerSecret,
- String requestTokenUrl, String accessTokenUrl, String authoriseUrl, String osmLoginUrl, String osmLogoutUrl) {
- this.consumerKey = consumerKey;
- this.consumerSecret = consumerSecret;
- this.requestTokenUrl = requestTokenUrl;
- this.accessTokenUrl = accessTokenUrl;
- this.authoriseUrl = authoriseUrl;
- this.osmLoginUrl = osmLoginUrl;
- this.osmLogoutUrl = osmLogoutUrl;
- }
-
- /**
- * Creates a clone of the parameters in null.
- *
- * @param apiUrl The API URL for which the OAuth default parameters are created. If null or empty, the default OSM API url is used.
- * @return a set of default parameters for the given {@code apiUrl}
- * @since 5422
- */
- public static OAuthParameters createDefault(String apiUrl) {
- return (OAuthParameters) createDefault(apiUrl, OAuthVersion.OAuth10a);
- }
-
- /**
- * Replies a set of default parameters for a consumer accessing an OSM server
- * at the given API url. URL parameters are only set if the URL equals {@link IUrls#getDefaultOsmApiUrl}
- * or references the domain "dev.openstreetmap.org", otherwise they may be null.
+ * other.
- *
- * @param other the other parameters. Must not be null.
- * @throws IllegalArgumentException if other is null
- */
- public OAuthParameters(OAuthParameters other) {
- CheckParameterUtil.ensureParameterNotNull(other, "other");
- this.consumerKey = other.consumerKey;
- this.consumerSecret = other.consumerSecret;
- this.accessTokenUrl = other.accessTokenUrl;
- this.requestTokenUrl = other.requestTokenUrl;
- this.authoriseUrl = other.authoriseUrl;
- this.osmLoginUrl = other.osmLoginUrl;
- this.osmLogoutUrl = other.osmLogoutUrl;
- }
-
- /**
- * Gets the consumer key.
- * @return The consumer key
- */
- public String getConsumerKey() {
- return consumerKey;
- }
-
- /**
- * Gets the consumer secret.
- * @return The consumer secret
- */
- public String getConsumerSecret() {
- return consumerSecret;
- }
-
- /**
- * Gets the request token URL.
- * @return The request token URL
- */
- public String getRequestTokenUrl() {
- return requestTokenUrl;
- }
-
- /**
- * Gets the access token URL.
- * @return The access token URL
- */
- @Override
- public String getAccessTokenUrl() {
- return accessTokenUrl;
- }
-
- @Override
- public String getAuthorizationUrl() {
- return this.authoriseUrl;
- }
-
- @Override
- public OAuthVersion getOAuthVersion() {
- return OAuthVersion.OAuth10a;
- }
-
- @Override
- public String getClientId() {
- return this.consumerKey;
- }
-
- @Override
- public String getClientSecret() {
- return this.consumerSecret;
- }
-
- /**
- * Gets the authorise URL.
- * @return The authorise URL
- */
- public String getAuthoriseUrl() {
- return this.getAuthorizationUrl();
- }
-
- /**
- * Gets the URL used to login users on the website (for automatic mode).
- * @return The URL used to login users
- */
- public String getOsmLoginUrl() {
- return osmLoginUrl;
- }
-
- /**
- * Gets the URL used to logout users on the website (for automatic mode).
- * @return The URL used to logout users
- */
- public String getOsmLogoutUrl() {
- return osmLogoutUrl;
- }
-
- /**
- * Builds an {@link OAuthConsumer} based on these parameters.
- *
- * @return the consumer
- */
- public OAuthConsumer buildConsumer() {
- return new SignpostAdapters.OAuthConsumer(consumerKey, consumerSecret);
- }
-
- /**
- * Builds an {@link OAuthProvider} based on these parameters and a OAuth consumer consumer.
- *
- * @param consumer the consumer. Must not be null.
- * @return the provider
- * @throws IllegalArgumentException if consumer is null
- */
- public OAuthProvider buildProvider(OAuthConsumer consumer) {
- CheckParameterUtil.ensureParameterNotNull(consumer, "consumer");
- return new SignpostAdapters.OAuthProvider(
- requestTokenUrl,
- accessTokenUrl,
- authoriseUrl
- );
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- OAuthParameters that = (OAuthParameters) o;
- return Objects.equals(consumerKey, that.consumerKey) &&
- Objects.equals(consumerSecret, that.consumerSecret) &&
- Objects.equals(requestTokenUrl, that.requestTokenUrl) &&
- Objects.equals(accessTokenUrl, that.accessTokenUrl) &&
- Objects.equals(authoriseUrl, that.authoriseUrl) &&
- Objects.equals(osmLoginUrl, that.osmLoginUrl) &&
- Objects.equals(osmLogoutUrl, that.osmLogoutUrl);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(consumerKey, consumerSecret, requestTokenUrl, accessTokenUrl, authoriseUrl, osmLoginUrl, osmLogoutUrl);
- }
}
Index: unk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 18990)
+++ (revision )
@@ -1,82 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.oauth;
-
-import java.util.Objects;
-
-import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import oauth.signpost.OAuthConsumer;
-
-/**
- * An oauth token that has been obtained by JOSM and can be used to authenticate the user on the server.
- */
-public class OAuthToken {
-
- /**
- * Creates an OAuthToken from the token currently managed by the {@link OAuthConsumer}.
- *
- * @param consumer the consumer
- * @return the token
- */
- public static OAuthToken createToken(OAuthConsumer consumer) {
- return new OAuthToken(consumer.getToken(), consumer.getTokenSecret());
- }
-
- private final String key;
- private final String secret;
-
- /**
- * Creates a new token
- *
- * @param key the token key
- * @param secret the token secret
- */
- public OAuthToken(String key, String secret) {
- this.key = key;
- this.secret = secret;
- }
-
- /**
- * Creates a clone of another token
- *
- * @param other the other token. Must not be null.
- * @throws IllegalArgumentException if other is null
- */
- public OAuthToken(OAuthToken other) {
- CheckParameterUtil.ensureParameterNotNull(other, "other");
- this.key = other.key;
- this.secret = other.secret;
- }
-
- /**
- * Replies the token key
- *
- * @return the token key
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Replies the token secret
- *
- * @return the token secret
- */
- public String getSecret() {
- return secret;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(key, secret);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- OAuthToken that = (OAuthToken) obj;
- return Objects.equals(key, that.key) &&
- Objects.equals(secret, that.secret);
- }
-}
Index: /trunk/src/org/openstreetmap/josm/data/oauth/OAuthVersion.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/oauth/OAuthVersion.java (revision 18990)
+++ /trunk/src/org/openstreetmap/josm/data/oauth/OAuthVersion.java (revision 18991)
@@ -8,5 +8,9 @@
*/
public enum OAuthVersion {
- /** OAuth 1.0a */
+ /**
+ * OAuth 1.0a
+ * @deprecated The OSM API server has deprecated and will remove OAuth 1.0a support in June 2024.
+ */
+ @Deprecated
OAuth10a,
/** OAuth 2.0 */
Index: unk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (revision 18990)
+++ (revision )
@@ -1,162 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.oauth;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Map;
-
-import org.openstreetmap.josm.tools.HttpClient;
-
-import oauth.signpost.AbstractOAuthConsumer;
-import oauth.signpost.AbstractOAuthProvider;
-
-/**
- * Adapters to make {@code oauth.signpost} work with {@link HttpClient}.
- */
-public final class SignpostAdapters {
-
- private SignpostAdapters() {
- // Hide constructor for utility classes
- }
-
- /**
- * OAuth provider.
- */
- public static class OAuthProvider extends AbstractOAuthProvider {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructs a new {@code OAuthProvider}.
- * @param requestTokenEndpointUrl request token endpoint URL
- * @param accessTokenEndpointUrl access token endpoint URL
- * @param authorizationWebsiteUrl authorization website URL
- */
- public OAuthProvider(String requestTokenEndpointUrl, String accessTokenEndpointUrl, String authorizationWebsiteUrl) {
- super(requestTokenEndpointUrl, accessTokenEndpointUrl, authorizationWebsiteUrl);
- }
-
- @Override
- protected HttpRequest createRequest(String endpointUrl) throws Exception {
- return new HttpRequest(HttpClient.create(new URL(endpointUrl)));
- }
-
- @Override
- protected HttpResponse sendRequest(oauth.signpost.http.HttpRequest request) throws Exception {
- return new HttpResponse(((HttpRequest) request).request.connect());
- }
-
- @Override
- protected void closeConnection(oauth.signpost.http.HttpRequest request, oauth.signpost.http.HttpResponse response) throws Exception {
- if (response != null) {
- ((HttpResponse) response).response.disconnect();
- } else if (request != null) {
- ((HttpRequest) request).request.disconnect();
- }
- }
- }
-
- /**
- * OAuth consumer.
- */
- public static class OAuthConsumer extends AbstractOAuthConsumer {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructs a new {@code OAuthConsumer}.
- * @param consumerKey consumer key
- * @param consumerSecret consumer secret
- */
- public OAuthConsumer(String consumerKey, String consumerSecret) {
- super(consumerKey, consumerSecret);
- }
-
- @Override
- protected HttpRequest wrap(Object request) {
- return new HttpRequest((HttpClient) request);
- }
- }
-
- static final class HttpRequest implements oauth.signpost.http.HttpRequest {
- final HttpClient request;
-
- HttpRequest(HttpClient request) {
- this.request = request;
- }
-
- @Override
- public void setHeader(String name, String value) {
- request.setHeader(name, value);
- }
-
- @Override
- public String getMethod() {
- return request.getRequestMethod();
- }
-
- @Override
- public String getRequestUrl() {
- return request.getURL().toExternalForm();
- }
-
- @Override
- public String getContentType() {
- return request.getRequestHeader("Content-Type");
- }
-
- @Override
- public String getHeader(String name) {
- return request.getRequestHeader(name);
- }
-
- @Override
- public InputStream getMessagePayload() {
- return null;
- }
-
- @Override
- public void setRequestUrl(String url) {
- throw new IllegalStateException();
- }
-
- @Override
- public Map
")
+ + "Subsequent data upload requests don''t use your password any more.").replace(". ", ".
")
+ "