#import "StatusWindow.h"
#import "StatusWindowController.h"
#import "CustomMenuTableView.h"
+#import "AudioscrobblerController.h"
#import <Security/Security.h>
#import <sys/types.h>
#import <sys/stat.h>
-#import <ITKit/ITLoginItem.h>
-
-#import <ITKit/ITHotKeyCenter.h>
-#import <ITKit/ITKeyCombo.h>
-#import <ITKit/ITKeyComboPanel.h>
-#import <ITKit/ITWindowPositioning.h>
-#import <ITKit/ITKeyBroadcaster.h>
-
+#import <ITKit/ITKit.h>
#import <ITKit/ITTSWBackgroundView.h>
-#import <ITKit/ITWindowEffect.h>
-#import <ITKit/ITCutWindowEffect.h>
-#import <ITKit/ITDissolveWindowEffect.h>
-#import <ITKit/ITSlideHorizontallyWindowEffect.h>
-#import <ITKit/ITSlideVerticallyWindowEffect.h>
-#import <ITKit/ITPivotWindowEffect.h>
-
#define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
+#define AUDIOSCROBBLER_KEYCHAIN_SERVICE(user) [[NSString stringWithFormat:@"Audioscrobbler: %@", user] UTF8String]
+#define AUDIOSCROBBLER_KEYCHAIN_KIND "application password"
/*************************************************************************/
#pragma mark -
/*************************************************************************/
@interface PreferencesController (Private)
++ (SecKeychainItemRef)keychainItemForUser:(NSString *)user;
++ (BOOL)keychainItemExistsForUser:(NSString *)user;
++ (BOOL)createKeychainItemForUser:(NSString *)user andPassword:(NSString *)password;
++ (BOOL)deleteKeychainItemForUser:(NSString *)user;
++ (BOOL)setKeychainItemPassword:(NSString *)password forUser:(NSString *)user;
+
- (void)setupWindow;
- (void)setupCustomizationTables;
- (void)setupMenuItems;
static PreferencesController *prefs = nil;
+/*************************************************************************/
+#pragma mark -
+#pragma mark STATIC KEYCHAIN SUPPORT METHODS
+/*************************************************************************/
+
++ (SecKeychainItemRef)keychainItemForUser:(NSString *)user
+{
+ SecKeychainSearchRef search;
+ SecKeychainItemRef item;
+ OSStatus status;
+ SecKeychainAttribute attributes[3];
+ SecKeychainAttributeList list;
+
+ if ((user == nil) || ([user length] == 0)) {
+ return nil;
+ }
+
+ ITDebugLog(@"Audioscrobbler: Searching for keychain item for %@.", user);
+ attributes[0].tag = kSecAccountItemAttr;
+ attributes[0].data = (char *)[user UTF8String];
+ attributes[0].length = [user length];
+ attributes[1].tag = kSecDescriptionItemAttr;
+ attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
+ attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
+ attributes[2].tag = kSecLabelItemAttr;
+ attributes[2].data = (char *)AUDIOSCROBBLER_KEYCHAIN_SERVICE(user);
+ attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE(user));
+ list.count = 3;
+ list.attr = attributes;
+
+ status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, &list, &search);
+
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error searching for existing keychain item: %i", status);
+ }
+
+ status = SecKeychainSearchCopyNext(search, &item);
+
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error searching for existing keychain item: %i", status);
+ item = nil;
+ }
+
+ CFRelease(search);
+ return item;
+}
+
++ (BOOL)keychainItemExistsForUser:(NSString *)user
+{
+ SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
+ BOOL exists = (item != nil);
+ if (item) {
+ CFRelease(item);
+ }
+ return exists;
+}
+
++ (BOOL)createKeychainItemForUser:(NSString *)user andPassword:(NSString *)password
+{
+ SecKeychainItemRef item;
+ OSStatus status;
+ SecKeychainAttribute attributes[3];
+ SecKeychainAttributeList list;
+
+ ITDebugLog(@"Audioscrobbler: Creating new keychain item for %@.", user);
+ attributes[0].tag = kSecAccountItemAttr;
+ attributes[0].data = (char *)[user UTF8String];
+ attributes[0].length = [user length];
+ attributes[1].tag = kSecDescriptionItemAttr;
+ attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
+ attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
+ attributes[2].tag = kSecLabelItemAttr;
+ attributes[2].data = (char *)AUDIOSCROBBLER_KEYCHAIN_SERVICE(user);
+ attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE(user));
+ list.count = 3;
+ list.attr = attributes;
+
+ status = SecKeychainItemCreateFromContent(kSecGenericPasswordItemClass, &list, [password length], [password UTF8String], NULL, NULL, &item);
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error creating keychain item: %i", status);
+ }
+ return (status == noErr);
+}
+
++ (BOOL)deleteKeychainItemForUser:(NSString *)user
+{
+ OSStatus status = errSecNotAvailable;
+ SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
+ if (item != nil) {
+ status = SecKeychainItemDelete(item);
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
+ }
+ CFRelease(item);
+ }
+ return (status == noErr);
+}
+
++ (BOOL)setKeychainItemPassword:(NSString *)password forUser:(NSString *)user
+{
+ OSStatus status = errSecNotAvailable;
+ SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
+ if (item != nil) {
+ status = SecKeychainItemModifyContent(item, NULL, [password length], [password UTF8String]);
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
+ }
+ CFRelease(item);
+ }
+ return (status == noErr);
+}
+
++ (NSString *)getKeychainItemPasswordForUser:(NSString *)user
+{
+ OSStatus status = errSecNotAvailable;
+ SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
+ NSString *pass = nil;
+ if (item != nil) {
+ UInt32 length;
+ char *buffer;
+ status = SecKeychainItemCopyContent(item, NULL, NULL, &length, (void **)&buffer);
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error getting keychain item password: %i", status);
+ } else {
+ NSLog(@"Audioscrobbler: password buffer: \"%s\" \"Length: %i\"", buffer, length);
+ pass = [[NSString alloc] initWithBytes:buffer length:length encoding:NSUTF8StringEncoding];
+ }
+ if (status != noErr) {
+ ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
+ }
+ SecKeychainItemFreeContent(NULL, buffer);
+ CFRelease(item);
+ }
+ NSLog(@"Audioscrobbler: Retrieved password: \"%@\"", pass);
+ return [pass autorelease];
+}
/*************************************************************************/
#pragma mark -
@"Rewind",
@"ShowPlayer",
@"TrackInfo",
+ @"AlbumArt",
@"UpcomingSongs",
@"IncrementVolume",
@"DecrementVolume",
@"Rewind",
@"Show Player",
@"Track Info",
+ @"Album Art",
@"Upcoming Songs",
@"Increment Volume",
@"Decrement Volume",
[NSString stringWithUTF8String:"Set Rating: ★★☆☆☆"],
[NSString stringWithUTF8String:"Set Rating: ★★★☆☆"],
[NSString stringWithUTF8String:"Set Rating: ★★★★☆"],
- [NSString stringWithUTF8String:"Set Rating: ★★★★★"],
+ [NSString stringWithUTF8String:"Set Rating: ★★★★"],
nil];
hotKeysDictionary = [[NSMutableDictionary alloc] init];
controller = nil;
[showScriptsButton setEnabled:NO];
}
} else if ( [sender tag] == 1120) {
- mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] cString], 0744);
+ mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] UTF8String], 0744);
[[NSWorkspace sharedWorkspace] openFile:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
} else if ( [sender tag] == 6010) {
//Toggle the other Audioscrobbler options
[audioscrobblerUseCacheCheckbox setEnabled:SENDER_STATE];
[audioscrobblerUserTextField setEnabled:SENDER_STATE];
[audioscrobblerPasswordTextField setEnabled:SENDER_STATE];
+ if (SENDER_STATE) {
+ [[AudioscrobblerController sharedController] attemptHandshake:NO];
+ }
} else if ( [sender tag ] == 6015) {
- [df setString:[sender stringValue] forKey:@"audioscrobblerUser"];
+ //Here we create a new keychain item if needed and deletes the keychain item if the field is cleared.
+ NSString *currentAccount = [df stringForKey:@"audioscrobblerUser"], *newAccount = [sender stringValue];
+ if ([newAccount length] == 0) {
+ [PreferencesController deleteKeychainItemForUser:currentAccount];
+ } else if (![currentAccount isEqualToString:newAccount] && [[audioscrobblerPasswordTextField stringValue] length] > 0) {
+ [df setObject:newAccount forKey:@"audioscrobblerUser"];
+ if ([PreferencesController keychainItemExistsForUser:currentAccount]) {
+ //Delete the current keychain item if there is one
+ [PreferencesController deleteKeychainItemForUser:currentAccount];
+ }
+ [PreferencesController createKeychainItemForUser:newAccount andPassword:[audioscrobblerPasswordTextField stringValue]];
+ [[AudioscrobblerController sharedController] attemptHandshake:YES];
+ }
} else if ( [sender tag ] == 6030) {
- //Set the password in the keychain
- char *service = "Audioscrobbler";
- NSString *account = [df stringForKey:@"audioscrobblerUser"];
- SecKeychainItemRef item;
- OSStatus status = SecKeychainFindGenericPassword(NULL, strlen(service), service, [account length], [account UTF8String], NULL, NULL, &item);
- if (status == errSecItemNotFound) {
- //Create the keychain
- } else if (status == noErr) {
- //Modify the current item
- //SecKeychainItemFreeContent(NULL, item);
- } else {
- ITDebugLog(@"Audioscrobbler: Unable to retrieve keychain password.");
+ //Here we set the password for an existing keychain item or we create a new keychain item.
+ if ([[audioscrobblerUserTextField stringValue] length] > 0) {
+ NSString *account = [df stringForKey:@"audioscrobblerUser"];
+ if ([PreferencesController keychainItemExistsForUser:account]) {
+ //Update the current keychain item
+ [PreferencesController setKeychainItemPassword:[sender stringValue] forUser:account];
+ } else if ([[sender stringValue] length] > 0 && [[audioscrobblerUserTextField stringValue] length]) {
+ //Create a new keychain item
+ [PreferencesController createKeychainItemForUser:account andPassword:[sender stringValue]];
+ }
}
} else if ( [sender tag] == 6045) {
[df setBool:SENDER_STATE forKey:@"audioscrobblerCacheSubmissions"];
//Set the server password
const char *instring = [[sender stringValue] UTF8String];
const char *password = "p4s5w0rdMT1.2";
- unsigned char *result;
+ char *result;
NSData *hashedPass, *passwordStringHash;
if ([[sender stringValue] length] == 0) {
[df setObject:[NSData data] forKey:@"sharedPlayerPassword"];
return;
}
- result = SHA1(instring, strlen(instring), NULL);
+ result = (char *)SHA1((unsigned char *)instring, strlen(instring), NULL);
hashedPass = [NSData dataWithBytes:result length:strlen(result)];
- result = SHA1(password, strlen(password), NULL);
+ result = (char *)SHA1((unsigned char *)password, strlen(password), NULL);
passwordStringHash = [NSData dataWithBytes:result length:strlen(result)];
if (![hashedPass isEqualToData:passwordStringHash]) {
[df setObject:hashedPass forKey:@"sharedPlayerPassword"];
}
} else if ( [sender tag] == 5150 ) {
const char *instring = [[sender stringValue] UTF8String];
- unsigned char *result;
- result = SHA1(instring, strlen(instring), NULL);
+ char *result;
+ result = (char *)SHA1((unsigned char *)instring, strlen(instring), NULL);
[df setObject:[NSData dataWithBytes:result length:strlen(result)] forKey:@"connectPassword"];
} else if ( [sender tag] == 5110 ) {
//Cancel
} else if ( [sender tag] == 6020 ) {
//OK password entry, retry connect
const char *instring = [[passwordPanelTextField stringValue] UTF8String];
- unsigned char *result;
- result = SHA1(instring, strlen(instring), NULL);
+ char *result;
+ result = (char *)SHA1((unsigned char *)instring, strlen(instring), NULL);
[df setObject:[NSData dataWithBytes:result length:strlen(result)] forKey:@"connectPassword"];
[passwordPanel orderOut:nil];
[NSApp stopModalWithCode:1];
- (IBAction)changeStatusWindowSetting:(id)sender
{
- StatusWindow *sw = [StatusWindow sharedWindow];
+ StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
ITDebugLog(@"Changing status window setting of tag %i", [sender tag]);
if ( [sender tag] == 2010) {
- (void)autoLaunchOK
{
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
- (void)autoLaunchCancel
{
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
}
#pragma mark PRIVATE METHOD IMPLEMENTATIONS
/*************************************************************************/
+- (void)audioscrobblerStatusChanged:(NSNotification *)note
+{
+ [audioscrobblerStatusTextField setStringValue:[[note userInfo] objectForKey:@"StatusString"]];
+}
+
- (void)setupWindow
{
ITDebugLog(@"Loading Preferences.nib.");
int selectedBGStyle;
id anItem;
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioscrobblerStatusChanged:) name:@"AudioscrobblerStatusChanged" object:nil];
+ if ([df boolForKey:@"audioscrobblerEnabled"]) {
+ NSString *status = [[AudioscrobblerController sharedController] lastStatus];
+ [audioscrobblerStatusTextField setStringValue:(status == nil) ? @"Idle" : status];
+ }
+
[df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"];
ITDebugLog(@"Setting up preferences UI.");
[audioscrobblerPasswordTextField setEnabled:NO];
[audioscrobblerUseCacheCheckbox setEnabled:NO];
}
- [audioscrobblerUserTextField setStringValue:[df stringForKey:@"audioscrobblerUser"]];
- if ([[audioscrobblerUserTextField stringValue] length] > 0) {
- [audioscrobblerPasswordTextField setStringValue:@"******"];
+ NSString *audioscrobblerUser = [df stringForKey:@"audioscrobblerUser"];
+ if (audioscrobblerUser != nil && [audioscrobblerUser length] > 0 && [PreferencesController keychainItemExistsForUser:audioscrobblerUser]) {
+ NSString *password = [PreferencesController getKeychainItemPasswordForUser:audioscrobblerUser];
+ [audioscrobblerUserTextField setStringValue:audioscrobblerUser];
+ if (password != nil) {
+ [audioscrobblerPasswordTextField setStringValue:password];
+ }
}
+ [audioscrobblerUseCacheCheckbox setState:[df boolForKey:@"audioscrobblerCacheSubmissions"]];
[[NSNotificationCenter defaultCenter] addObserver:sharingTableView selector:@selector(reloadData) name:@"ITMTFoundNetService" object:nil];
- (void)setStatusWindowEntryEffect:(Class)effectClass
{
- StatusWindow *sw = [StatusWindow sharedWindow];
+ StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
float time = ([df floatForKey:@"statusWindowAppearanceSpeed"] ? [df floatForKey:@"statusWindowAppearanceSpeed"] : 0.8);
[df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowAppearanceEffect"];
- (void)setStatusWindowExitEffect:(Class)effectClass
{
- StatusWindow *sw = [StatusWindow sharedWindow];
+ StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
float time = ([df floatForKey:@"statusWindowVanishSpeed"] ? [df floatForKey:@"statusWindowVanishSpeed"] : 0.8);
[df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowVanishEffect"];
git.ithinksw.org / MenuTunes.git / blobdiff