Changeset 6197

Timestamp:

Jun 15, 2008, 8:47:24 PM (14 years ago)

Author:

livings124

Message:

drop EMKeychain and just do the Keychain manipulations ourselves

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (5 diffs)
• macosx/Controller.m (modified) (1 diff)
• macosx/EMKeychain (deleted)
• macosx/PrefsController.m (modified) (7 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -83 +83 @@
                 A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
                 A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A219798A0D07B78400438EA7 /* GroupToolbarItem.m */; };
-                A21A23740E00B7FF00D424F8 /* EMKeychainProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = A21A23700E00B7FF00D424F8 /* EMKeychainProxy.m */; };
-                A21A23750E00B7FF00D424F8 /* EMKeychainItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A21A23720E00B7FF00D424F8 /* EMKeychainItem.m */; };
                 A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
                 A22180980D148A71007D09ED /* GroupsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A22180970D148A71007D09ED /* GroupsWindowController.m */; };
@@ -488 +486 @@
                 A21979890D07B78400438EA7 /* GroupToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupToolbarItem.h; path = macosx/GroupToolbarItem.h; sourceTree = "<group>"; };
                 A219798A0D07B78400438EA7 /* GroupToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupToolbarItem.m; path = macosx/GroupToolbarItem.m; sourceTree = "<group>"; };
-                A21A23700E00B7FF00D424F8 /* EMKeychainProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EMKeychainProxy.m; path = macosx/EMKeychain/EMKeychainProxy.m; sourceTree = "<group>"; };
-                A21A23710E00B7FF00D424F8 /* EMKeychainItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EMKeychainItem.h; path = macosx/EMKeychain/EMKeychainItem.h; sourceTree = "<group>"; };
-                A21A23720E00B7FF00D424F8 /* EMKeychainItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EMKeychainItem.m; path = macosx/EMKeychain/EMKeychainItem.m; sourceTree = "<group>"; };
-                A21A23730E00B7FF00D424F8 /* EMKeychainProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EMKeychainProxy.h; path = macosx/EMKeychain/EMKeychainProxy.h; sourceTree = "<group>"; };
                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
                 A22180960D148A71007D09ED /* GroupsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupsWindowController.h; path = macosx/GroupsWindowController.h; sourceTree = "<group>"; };
@@ -935 +929 @@
                                 E138A9720C04D88F00C5426C /* CTGradient */,
                                 E1B6FBEB0C0D70AC0015FE4D /* UKKQueue */,
-                                A21A236F0E00B7DC00D424F8 /* EMKeychain */,
                                 A21282A50CA6C66800EAEE0F /* StatusBarView.h */,
                                 A21282A60CA6C66800EAEE0F /* StatusBarView.m */,
@@ -1236 +1229 @@
                         sourceTree = "<group>";
                 };
-                A21A236F0E00B7DC00D424F8 /* EMKeychain */ = {
-                        isa = PBXGroup;
-                        children = (
-                                A21A23700E00B7FF00D424F8 /* EMKeychainProxy.m */,
-                                A21A23710E00B7FF00D424F8 /* EMKeychainItem.h */,
-                                A21A23720E00B7FF00D424F8 /* EMKeychainItem.m */,
-                                A21A23730E00B7FF00D424F8 /* EMKeychainProxy.h */,
-                        );
-                        name = EMKeychain;
-                        sourceTree = "<group>";
-                };
                 A234D0D40C79FB6000A82373 /* Additions */ = {
                         isa = PBXGroup;
@@ -2027 +2009 @@
                                 A2725B6E0DE5C4F5003445E7 /* FileListNode.m in Sources */,
                                 A2725D5D0DE7507C003445E7 /* TrackerTableView.m in Sources */,
-                                A21A23740E00B7FF00D424F8 /* EMKeychainProxy.m in Sources */,
-                                A21A23750E00B7FF00D424F8 /* EMKeychainItem.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.m

@@ -229 +229 @@
                                 [fDefaults boolForKey: @"ProxyAuthorize"],
                                 [[fDefaults stringForKey: @"ProxyUsername"] UTF8String],
-                                NULL); /* reset in prefs - from Keychain */
+                                ""); /* reset in prefs - from Keychain */
         
         [NSApp setDelegate: self];

trunk/macosx/PrefsController.m

@@ -52 +52 @@
 #define TOOLBAR_REMOTE      @"TOOLBAR_REMOTE"
 
-#define PROXY_KEYCHAIN_SERVICE  @"Transmission:Proxy"
-#define PROXY_KEYCHAIN_NAME     @"Proxy"
-
-#define RPC_KEYCHAIN_SERVICE    @"Transmission:Remote"
-#define RPC_KEYCHAIN_NAME       @"Remote"
+#define PROXY_KEYCHAIN_SERVICE  "Transmission:Proxy"
+#define PROXY_KEYCHAIN_NAME     "Proxy"
+
+#define RPC_KEYCHAIN_SERVICE    "Transmission:Remote"
+#define RPC_KEYCHAIN_NAME       "Remote"
 
 @interface PrefsController (Private)
@@ -66 +66 @@
 - (void) importFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
 
-- (void) setKeychainPassword: (NSString *) password forService: (NSString *) service username: (NSString *) username;
+- (void) setKeychainPassword: (NSString *) password forService: (const char *) service username: (const char *) username;
 
 @end
@@ -769 +769 @@
 - (void) setProxyPassword: (id) sender
 {
-    NSString * password = [[sender stringValue] retain];
+    NSString * password = [sender stringValue];
     [self setKeychainPassword: password forService: PROXY_KEYCHAIN_SERVICE username: PROXY_KEYCHAIN_NAME];
     
@@ -777 +777 @@
 - (void) updateProxyPassword
 {
-    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: PROXY_KEYCHAIN_SERVICE
-                                            withUsername: PROXY_KEYCHAIN_NAME];
-    
-    NSString * password;
-    if (!(password = [keychainItem password]))
-        password = @"";
-    
-    tr_sessionSetProxyPassword(fHandle, [password UTF8String]);
-    
-    [fProxyPasswordField setStringValue: password];
+    UInt32 passwordLength;
+        const char * password = nil;
+    SecKeychainFindGenericPassword(NULL, strlen(PROXY_KEYCHAIN_SERVICE), PROXY_KEYCHAIN_SERVICE,
+        strlen(PROXY_KEYCHAIN_NAME), PROXY_KEYCHAIN_NAME, &passwordLength, (void **)&password, NULL);
+    
+    if (password != NULL)
+    {
+        char fullPassword[passwordLength+1];
+        strncpy(fullPassword, password, passwordLength);
+        fullPassword[passwordLength] = '\0';
+        SecKeychainItemFreeContent(NULL, (void *)password);
+        
+        tr_sessionSetProxyPassword(fHandle, fullPassword);
+        [fProxyPasswordField setStringValue: [NSString stringWithUTF8String: fullPassword]];
+    }
 }
 
@@ -806 +811 @@
 - (void) setRPCPassword: (id) sender
 {
-    NSString * password = [[sender stringValue] retain];
+    NSString * password = [sender stringValue];
     [self setKeychainPassword: password forService: RPC_KEYCHAIN_SERVICE username: RPC_KEYCHAIN_NAME];
     
@@ -814 +819 @@
 - (void) updateRPCPassword
 {
-    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: RPC_KEYCHAIN_SERVICE
-                                            withUsername: RPC_KEYCHAIN_NAME];
-    
-    NSString * password;
-    if (!(password = [keychainItem password]))
-        password = @"";
-    
-    tr_sessionSetRPCPassword(fHandle, [password UTF8String]);
-    
-    [fRPCPasswordField setStringValue: password];
+    UInt32 passwordLength;
+        const char * password = nil;
+    SecKeychainFindGenericPassword(NULL, strlen(RPC_KEYCHAIN_SERVICE), RPC_KEYCHAIN_SERVICE,
+        strlen(RPC_KEYCHAIN_NAME), RPC_KEYCHAIN_NAME, &passwordLength, (void **)&password, NULL);
+    
+    if (password != NULL)
+    {
+        char fullPassword[passwordLength+1];
+        strncpy(fullPassword, password, passwordLength);
+        fullPassword[passwordLength] = '\0';
+        SecKeychainItemFreeContent(NULL, (void *)password);
+        
+        tr_sessionSetRPCPassword(fHandle, fullPassword);
+        [fRPCPasswordField setStringValue: [NSString stringWithUTF8String: fullPassword]];
+    }
 }
 
@@ -1150 +1160 @@
 }
 
-- (void) setKeychainPassword: (NSString *) password forService: (NSString *) service username: (NSString *) username
-{
+- (void) setKeychainPassword: (NSString *) password forService: (const char *) service username: (const char *) username
+{
+    SecKeychainItemRef item = NULL;
     BOOL shouldAdd = password && ![password isEqualToString: @""];
     
-    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: service withUsername: username];
-    if (keychainItem)
+    OSStatus result = SecKeychainFindGenericPassword(NULL, strlen(service), service, strlen(username), username, NULL, NULL, &item);
+    if (result == noErr && item)
+    {
+        if (shouldAdd) //found, so update
+        {
+            result = SecKeychainItemModifyAttributesAndData(item, NULL, [password length], (const void *)[password UTF8String]);
+            if (result != noErr)
+                NSLog(@"Problem updating Keychain item: %s", GetMacOSStatusErrorString(result));
+        }
+        else //remove the item
+        {
+            result = SecKeychainItemDelete(item);
+            if (result != noErr)
+                NSLog(@"Problem removing Keychain item: %s", GetMacOSStatusErrorString(result));
+        }
+    }
+    else if (result == errSecItemNotFound) //not found, so add
     {
         if (shouldAdd)
-            [keychainItem setPassword: password];
-        else
-            [keychainItem removeFromKeychain];
+        {
+            result = SecKeychainAddGenericPassword(NULL, strlen(service), service, strlen(username), username,
+                        [password length], (const void *)[password UTF8String], NULL);
+            if (result != noErr)
+                NSLog(@"Problem adding Keychain item: %s", GetMacOSStatusErrorString(result));
+        }
     }
     else
-    {
-        if (shouldAdd)
-            [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: service withUsername: username password: password];
-    }
+        NSLog(@"Problem accessing Keychain: %s", GetMacOSStatusErrorString(result));
 }