Changeset 30822 in osm for applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/mac/MacProvider.java

Timestamp:

2014-11-29T16:30:52+01:00 (10 years ago)

Author:

donvip

Message:

[josm_native-password-manager] update Netbeans Keyring code + make plugin rely on JNA plugin

File:

• applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/mac/MacProvider.java (modified) (4 diffs)

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

@@ -77 +77 @@
 
     public void save(String key, char[] password, String description) {
-        delete(key); // XXX supposed to use SecKeychainItemModifyContent instead, but this seems like too much work
         try {
             byte[] serviceName = key.getBytes("UTF-8");
@@ -83 +82 @@
             // Keychain Access seems to expect UTF-8, so do not use Utils.chars2Bytes:
             byte[] data = new String(password).getBytes("UTF-8");
-            error("save", SecurityLibrary.LIBRARY.SecKeychainAddGenericPassword(null, serviceName.length, serviceName,
-                    accountName.length, accountName, data.length, data, null));
+            Pointer[] itemRef = new Pointer[1];
+            error("find (for save)", SecurityLibrary.LIBRARY.SecKeychainFindGenericPassword(null, serviceName.length, serviceName,
+                    accountName.length, accountName, null, null, itemRef));
+            if (itemRef[0] != null) {
+                error("save (update)", SecurityLibrary.LIBRARY.SecKeychainItemModifyContent(itemRef[0], null, data.length, data));
+                SecurityLibrary.LIBRARY.CFRelease(itemRef[0]);
+            } else {
+                error("save (new)", SecurityLibrary.LIBRARY.SecKeychainAddGenericPassword(null, serviceName.length, serviceName,
+                        accountName.length, accountName, data.length, data, null));
+            }
         } catch (UnsupportedEncodingException x) {
             LOG.log(Level.WARNING, null, x);
@@ -100 +107 @@
             if (itemRef[0] != null) {
                 error("delete", SecurityLibrary.LIBRARY.SecKeychainItemDelete(itemRef[0]));
+                SecurityLibrary.LIBRARY.CFRelease(itemRef[0]);
             }
         } catch (UnsupportedEncodingException x) {
@@ -108 +116 @@
     private static void error(String msg, int code) {
         if (code != 0 && code != /* errSecItemNotFound, always returned from find it seems */-25300) {
-            // XXX translate, but SecCopyErrorMessageString returns weird CFStringRef
-            LOG.warning(msg + ": " + code);
+            Pointer translated = SecurityLibrary.LIBRARY.SecCopyErrorMessageString(code, null);
+            String str;
+            if (translated == null) {
+                str = String.valueOf(code);
+            } else {
+                char[] buf = new char[(int) SecurityLibrary.LIBRARY.CFStringGetLength(translated)];
+                for (int i = 0; i < buf.length; i++) {
+                    buf[i] = SecurityLibrary.LIBRARY.CFStringGetCharacterAtIndex(translated, i);
+                }
+                SecurityLibrary.LIBRARY.CFRelease(translated);
+                str = new String(buf) + " (" + code + ")";
+            }
+            LOG.log(Level.WARNING, "{0}: {1}", new Object[] {msg, str});
         }
     }