credentialsCache = new EnumMap<>(RequestorType.class);
private OAuthToken oauthCache;
-
+
+ /**
+ * Create a new {@link NPMCredentialsAgent}
+ * @param type The backend storage type
+ */
public NPMCredentialsAgent(NPMType type) {
this.type = type;
@@ -96,5 +111,5 @@
@Override
- public PasswordAuthentication lookup(RequestorType rt, String host) throws CredentialsAgentException {
+ public PasswordAuthentication lookup(RequestorType rt, String host) {
PasswordAuthentication cache = credentialsCache.get(rt);
if (cache != null)
@@ -126,5 +141,5 @@
@Override
- public void store(RequestorType rt, String host, PasswordAuthentication credentials) throws CredentialsAgentException {
+ public void store(RequestorType rt, String host, PasswordAuthentication credentials) {
char[] username, password;
if (credentials == null) {
@@ -170,10 +185,10 @@
getProvider().save(prefix+".password", password, passwordDescription);
}
- credentialsCache.put(rt, new PasswordAuthentication(stringNotNull(username), password));
- }
- }
-
- @Override
- public OAuthToken lookupOAuthAccessToken() throws CredentialsAgentException {
+ credentialsCache.put(rt, new PasswordAuthentication(stringNotNull(username), password != null ? password : new char[0]));
+ }
+ }
+
+ @Override
+ public OAuthToken lookupOAuthAccessToken() {
if (oauthCache != null)
return oauthCache;
@@ -185,11 +200,33 @@
@Override
- public void storeOAuthAccessToken(OAuthToken oat) throws CredentialsAgentException {
+ public IOAuthToken lookupOAuthAccessToken(String host) throws CredentialsAgentException {
+ String prolog = getOAuthDescriptor();
+ OAuthVersion[] versions = OAuthVersion.values();
+ // Prefer newer OAuth protocols
+ for (int i = versions.length - 1; i >= 0; i--) {
+ OAuthVersion version = versions[i];
+ char[] tokenObject = getProvider().read(prolog + ".object." + version + "." + host);
+ char[] parametersObject = getProvider().read(prolog + ".parameters." + version + "." + host);
+ if (version == OAuthVersion.OAuth20 // There is currently only an OAuth 2.0 path
+ && tokenObject != null && tokenObject.length > 0
+ && parametersObject != null && parametersObject.length > 0) {
+ OAuth20Parameters oAuth20Parameters = new OAuth20Parameters(stringNotNull(parametersObject));
+ try {
+ return new OAuth20Token(oAuth20Parameters, stringNotNull(tokenObject));
+ } catch (OAuth20Exception e) {
+ throw new CredentialsAgentException(e);
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void storeOAuthAccessToken(OAuthToken oat) {
String key, secret;
if (oat == null) {
key = null;
secret = null;
- }
- else {
+ } else {
key = oat.getKey();
secret = oat.getSecret();
@@ -207,4 +244,24 @@
}
+ @Override
+ public void storeOAuthAccessToken(String host, IOAuthToken accessToken) {
+ String prolog = getOAuthDescriptor();
+ if (accessToken == null) {
+ // Assume all oauth tokens must be removed
+ for (OAuthVersion version : OAuthVersion.values()) {
+ getProvider().delete(prolog + ".object." + version + "." + host);
+ getProvider().delete(prolog + ".parameters." + version + "." + host);
+ }
+ } else {
+ OAuthVersion oauthType = accessToken.getOAuthType();
+ getProvider().save(prolog + ".object." + oauthType + "." + host,
+ accessToken.toPreferencesString().toCharArray(),
+ tr("JOSM/OAuth/{0}/Token", URI.create(host).getHost()));
+ getProvider().save(prolog + ".parameters." + oauthType + "." + host,
+ accessToken.getParameters().toPreferencesString().toCharArray(),
+ tr("JOSM/OAuth/{0}/Parameters", URI.create(host).getHost()));
+ }
+ }
+
private static String stringNotNull(char[] charData) {
if (charData == null)
@@ -217,11 +274,11 @@
HtmlPanel pnlMessage = new HtmlPanel();
HTMLEditorKit kit = (HTMLEditorKit)pnlMessage.getEditorPane().getEditorKit();
- kit.getStyleSheet().addRule(".warning-body {background-color:rgb(253,255,221);padding: 10pt; border-color:rgb(128,128,128);border-style: solid;border-width: 1px;}");
+ kit.getStyleSheet().addRule(".warning-body {background-color:rgb(253,255,221);padding: 10pt;" +
+ "border-color:rgb(128,128,128);border-style: solid;border-width: 1px;}");
StringBuilder text = new StringBuilder();
- text.append(""
- + ""
- + ""+tr("Native Password Manager Plugin")+"
"
- + tr("The username and password is protected by {0}.", type.getName())
- );
+ text.append("
")
+ .append(tr("Native Password Manager Plugin"))
+ .append("
")
+ .append(tr("The username and password is protected by {0}.", type.getName()));
List sensitive = new ArrayList<>();
if (Config.getPref().get("osm-server.username", null) != null) {
@@ -243,6 +300,13 @@
sensitive.add(tr("oauth secret"));
}
+ List otherKeys = Config.getPref().getSensitive().stream().sorted().collect(Collectors.toList());
+ // Remove keys for which we have specific translated texts
+ otherKeys.removeAll(Arrays.asList("osm-server.username", "osm-server.password",
+ DefaultProxySelector.PROXY_USER, DefaultProxySelector.PROXY_PASS,
+ "oauth.access-token.key", "oauth.access-token.secret"));
+ sensitive.addAll(otherKeys);
if (!sensitive.isEmpty()) {
- text.append(tr("
Warning: There may be sensitive data left in your preference file. ({0})", String.join(", ", sensitive)));
+ text.append(tr("
Warning: There may be sensitive data left in your preference file. ({0})",
+ String.join(", ", sensitive)));
}
pnlMessage.setText(text.toString());