Changeset 26361 in osm for applications/editors/josm/plugins/native-password-manager/src/org

Timestamp:

2011-07-18T13:13:10+02:00 (14 years ago)

Author:

bastik

Message:

make it work for windows

Location:

applications/editors/josm/plugins/native-password-manager/src/org

Files:

• netbeans/modules/keyring/fallback/FallbackProvider.java (modified) (4 diffs)
• openstreetmap/josm/plugins/npm/InitializationWizard.java (modified) (1 diff)
• openstreetmap/josm/plugins/npm/Win32Provider.java (modified) (2 diffs)

applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java

@@ -60 +60 @@
 
     private EncryptionProvider encryption;
-    private IPreferences pre;
-    
+    private IPreferences prefs;
+
     // simple interface for a generic preferences store
     public interface IPreferences {
-        String get(String key, String def);
-        void put(String key, String val);
+        byte[] getByteArray(String key, byte[] def);
+        void putByteArray(String key, byte[] val);
         void remove(String key);
     }
 
-    public FallbackProvider(EncryptionProvider encryption, IPreferences pref) {
+    public FallbackProvider(EncryptionProvider encryption, IPreferences prefs) {
         this.encryption = encryption;
-        this.pre = pref;
+        this.prefs = prefs;
     }
-    
+
     public boolean enabled() {
         if (encryption.enabled()) {
@@ -98 +98 @@
 
     public char[] read(String key) {
-        String ciphertext_string = pre.get(key, null);
-        byte[] ciphertext = ciphertext_string == null ? null : Utils.chars2Bytes(ciphertext_string.toCharArray());
+        byte[] ciphertext = prefs.getByteArray(key, null);
         if (ciphertext == null) {
             return null;
@@ -116 +115 @@
     private boolean _save(String key, char[] password, String description) {
         try {
-            byte[] encryptedPasswordByteArray = encryption.encrypt(password);
-            String encryptedPassword = encryptedPasswordByteArray == null ? null : String.valueOf(Utils.bytes2Chars(encryptedPasswordByteArray));
-            pre.put(key, encryptedPassword);
+            prefs.putByteArray(key, encryption.encrypt(password));
         } catch (Exception x) {
             LOG.log(Level.FINE, "failed to encrypt password for " + key, x);
             return false;
-        }
-        if (description != null) {
-            // Preferences interface gives no access to *.properties comments, so:
-            pre.put(key + DESCRIPTION, description);
         }
         return true;
@@ -131 +124 @@
 
     public void delete(String key) {
-        pre.remove(key);
-        pre.remove(key + DESCRIPTION);
+        prefs.remove(key);
+        prefs.remove(key + DESCRIPTION);
     }
 

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java

@@ -399 +399 @@
         NPMType[] potentialManagers;
         
-        if (Main.platform instanceof PlatformHookUnixoid) {
-            potentialManagers = new NPMType[] { NPMType.GNOME_KEYRING, NPMType.KWALLET };
+        if (Main.platform instanceof PlatformHookWindows) {
+            potentialManagers = new NPMType[] { NPMType.CRYPT32 };
         } else if (Main.platform instanceof PlatformHookOsx) {
             potentialManagers = new NPMType[] { NPMType.KEYCHAIN };
-        } else if (Main.platform instanceof PlatformHookWindows) {
-            potentialManagers = new NPMType[] { NPMType.CRYPT32 };
+        } else if (Main.platform instanceof PlatformHookUnixoid) {
+            potentialManagers = new NPMType[] { NPMType.GNOME_KEYRING, NPMType.KWALLET };
         } else
             throw new AssertionError();

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/Win32Provider.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.npm;
+
+import org.apache.commons.codec.binary.Base64;
 
 import org.netbeans.modules.keyring.fallback.FallbackProvider;
@@ -9 +11 @@
     
     private static class JOSMPreferences implements IPreferences {
-        @Override public String get(String key, String def) {
-            return Main.pref.get(key, def);
+    
+        @Override public byte[] getByteArray(String key, byte[] def) {
+            String p = Main.pref.get(key, null);
+            return p == null ? def : Base64.decodeBase64(p);
         }
 
-        @Override public void put(String key, String val) {
-            Main.pref.put(key, val);
+        @Override public void putByteArray(String key, byte[] val) {
+            Main.pref.put(key, val == null ? null : Base64.encodeBase64String(val));
         }