Changeset 23 for trunk

Timestamp:

03/13/08 17:52:16 (10 months ago)

Author:

mgorbach

Message:

Security system, UI refinement and other fixes. Ready for beta 1

Location:

trunk

Files:

• Images (deleted)
• MFClient.h (modified) (2 diffs)
• MFClient.m (modified) (8 diffs)
• MFClientFS.h (modified) (3 diffs)
• MFClientFS.m (modified) (6 diffs)
• MFCommunicationServer.m (modified) (1 diff)
• MFConstants.h (modified) (2 diffs)
• MFConstants.m (modified) (1 diff)
• MFCore-Info.plist (deleted)
• MFCore.h (added)
• MFCore.m (added)
• MFFSDelegateProtocol.h (modified) (2 diffs)
• MFFilesystem.h (modified) (4 diffs)
• MFFilesystem.m (modified) (5 diffs)
• MFFilesystemController.h (modified) (1 diff)
• MFFilesystemController.m (modified) (7 diffs)
• MFLoggingController.h (modified) (1 diff)
• MFLoggingController.m (modified) (3 diffs)
• MFMainController.h (modified) (1 diff)
• MFMainController.m (modified) (1 diff)
• MFNetworkFS.h (added)
• MFPlugin.h (modified) (1 diff)
• MFPlugin.m (modified) (2 diffs)
• MFPluginController.m (modified) (1 diff)
• MFPreferencesController.h (added)
• MFPreferencesController.m (added)
• MFSecurity.h (added)
• MFSecurity.m (added)
• MFServerFS.h (modified) (2 diffs)
• MFServerFS.m (modified) (8 diffs)
• MFServerFSProtocol.h (modified) (2 diffs)
• MFServerProtocol.h (modified) (2 diffs)
• MGSmoothingImageView.h (added)
• MGSmoothingImageView.m (added)
• MacFusion2.xcodeproj/project.pbxproj (modified) (58 diffs)
• MacfusionMain-Info.plist (deleted)
• MacfusionMenuling-Info.plist (deleted)
• Menuling/MFMenulingAppDelegate.m (modified) (2 diffs)
• Menuling/MFQuickMountController.m (modified) (2 diffs)
• Menuling/MGFadingWindow.h (modified) (1 diff)
• Menuling/MGFadingWindow.m (modified) (1 diff)
• Menuling/MainMenu.xib (deleted)
• Menuling/QuickMount.xib (deleted)
• Menuling/Resources (added)
• Menuling/Resources/MacFusion_Menu_Dark.png (added)
• Menuling/Resources/MacFusion_Menu_Light.png (added)
• Menuling/Resources/MainMenu.xib (added)
• Menuling/Resources/QuickMount.xib (added)
• Resources (added)
• Resources/Credits.rtf (added)
• Resources/MFCore-Info.plist (added)
• Resources/MFPreferences.xib (added)
• Resources/MacfusionMain-Info.plist (added)
• Resources/MacfusionMenuling-Info.plist (added)
• Resources/macfusion.tiff (added)
• Resources/macfusionAdvancedView.xib (added)
• Resources/macfusionIcon.icns (added)
• Resources/topView.xib (added)
• SSHFS/SSHFSDelegate.m (modified) (14 diffs)
• SSHFS/new_ssh_askpass.m (added)
• SSHFS/sshfs-Info.plist (modified) (1 diff)
• SSHFS/sshfsConfiguration.xib (modified) (33 diffs)
• SSHFS/sshfs_icon.icns (modified) (previous)
• Settings/MFFilesystemCell.h (modified) (1 diff)
• Settings/MFFilesystemCell.m (modified) (7 diffs)
• Settings/MFFilesystemTableView.h (added)
• Settings/MFFilesystemTableView.m (added)
• Settings/MFSettingsController.h (modified) (1 diff)
• Settings/MFSettingsController.m (modified) (15 diffs)
• Settings/main.xib (modified) (100 diffs)
• fuse.plist (deleted)
• macfusionAgent.m (modified) (1 diff)

trunk/MFClient.h

@@ -21 +21 @@
         id <MFServerProtocol> server;
         id delegate;
+        bool triedBootstrap;
 }
 
@@ -32 +33 @@
 - (MFClientFS*)mountRecent:(MFClientRecent*)recent
                                          error:(NSError**)error;
+- (void)deleteFilesystem:(MFClientFS*)fs;
 
 // Accessors

trunk/MFClient.m

@@ -12 +12 @@
 #import "MFConstants.h"
 #import "MFClientRecent.h"
+#import <Security/Security.h>
+#import "MFCore.h"
 
 #define ORDERING_FILE_PATH @"~/Library/Application Support/Macfusion/Ordering.plist"
@@ -20 +22 @@
 - (void)removeFilesystem:(MFClientFS*)fs;
 - (void)loadOrdering;
+- (void)setupKeychainMonitoring;
+- (void)writeOrdering;
+// Security monitoring
 
 @property(readwrite, retain) NSMutableArray* persistentFilesystems;
@@ -100 +105 @@
                 plugins = [NSMutableArray array];
                 recents = [NSMutableArray array];
+                [self setupKeychainMonitoring];
+                setStateForAgentLoginItem(YES);
+                triedBootstrap = NO;
         }
         return self;
@@ -160 +168 @@
                 [self fillInitialStatus];
                 return YES;
+        }
+        else
+        {
+                // Try to start the server process
+                NSAlert* serverStartAlert = [NSAlert new];
+                [serverStartAlert setMessageText: @"The macfusion agent process is not started"];
+                [serverStartAlert setInformativeText: @"Would you like to start the agent?\nOtherwise, Macfusion will Quit."];
+                [serverStartAlert setShowsSuppressionButton: YES];
+                [serverStartAlert addButtonWithTitle:@"Start"];
+                [serverStartAlert addButtonWithTitle:@"Quit"];
+                [[serverStartAlert suppressionButton] setTitle: @"Start agent automatically on login"];
+                NSInteger returnValue = [serverStartAlert runModal];
+                // MFLogS(self, @"Return %d supression state %d", returnValue, [[serverStartAlert suppressionButton] state]);
+                
+                if ([[serverStartAlert suppressionButton] state])
+                        setStateForAgentLoginItem(YES);
+                        
+                if (returnValue == NSAlertSecondButtonReturn)
+                {
+                        [NSApp terminate: self];
+                }
+                else if (returnValue == NSAlertFirstButtonReturn)
+                {
+                        NSString* agentPath = [[NSBundle bundleWithPath: mainUIBundlePath()] pathForResource:@"macfusionAgent" ofType:nil];
+                        [NSTask launchedTaskWithLaunchPath: agentPath arguments:[NSArray array]];
+                        [[NSRunLoop currentRunLoop] runUntilDate:[[NSDate date] addTimeInterval: 1.5]];
+                        
+                        if ([self establishCommunication])
+                        {
+                                [self fillInitialStatus];
+                                return YES;
+                        }
+                        else
+                        {
+                                NSAlert* faliureAlert = [NSAlert alertWithMessageText:@"Could not start or connect to the macfusion agent"
+                                                                                                                defaultButton:@"OK"
+                                                                                                          alternateButton:@""
+                                                                                                                  otherButton:@""
+                                                                                        informativeTextWithFormat:@"Macfusion will Quit."];
+                                [faliureAlert setAlertStyle: NSCriticalAlertStyle];
+                                [faliureAlert runModal];
+                                [NSApp terminate: self];
+                        }
+                }
         }
         
@@ -236 +288 @@
 }
 
+- (void)deleteFilesystem:(MFClientFS*)fs
+{
+        NSString* uuid = [fs uuid];
+        [server deleteFilesystemWithUUID: uuid];
+}
+
 #pragma mark Recents
 - (void)handleRecentsUpdatedNotification:(NSNotification*)note
@@ -260 +318 @@
         
         return nil;
+}
+
+#pragma mark Security
+OSStatus myKeychainCallback (
+                                                         SecKeychainEvent keychainEvent,
+                                                         SecKeychainCallbackInfo *info,
+                                                         void *context
+)
+{
+        MFClient* self = (MFClient*)context;
+        // MFLogS(self, @"Keychain callback received event is %d", keychainEvent);
+        SecKeychainItemRef itemRef = info -> item;
+        NSString* uuid = (NSString*)uuidForKeychainItemRef(itemRef);
+        MFClientFS* fs = [self filesystemWithUUID:uuid];
+        if (fs)
+        {
+                // MFLogS(self, @"Updating secrets for fs %@ due to keychain change", fs);
+                [fs updateSecrets];
+        }
+        return 0;
+}
+
+- (void)setupKeychainMonitoring
+{
+        SecKeychainEventMask eventMask = kSecUpdateEventMask | kSecAddEventMask;
+        SecKeychainAddCallback(myKeychainCallback , eventMask, self);
 }
 
@@ -375 +459 @@
                 [fs setDisplayOrder: [persistentFilesystems indexOfObject: fs]];
         }
+        
+        [self writeOrdering];
 }
 
@@ -407 +493 @@
 - (void)handleApplicationTerminatingNotification:(NSNotification*)note
 {
-        [self writeOrdering];
+        // [self writeOrdering];
 }
 

trunk/MFClientFS.h

@@ -18 +18 @@
         MFClientPlugin* plugin;
         NSDictionary* backupParameters;
+        NSDictionary* backupSecrets;
         BOOL isEditing;
         NSInteger displayOrder;
@@ -32 +33 @@
 - (void)handleStatusInfoChangedNotification:(NSNotification*)note;
 - (void)handleParametersChangedNotification:(NSNotification*)note;
+- (void)setPauseTimeout:(BOOL)p;
 
 // Editing
@@ -38 +40 @@
 - (NSDictionary*)displayDictionary;
 
+// UI
+- (NSDictionary*)configurationViewControllers;
+
 @property(readwrite, assign) NSInteger displayOrder;
 @property(readwrite, retain) id<MFClientFSDelegateProtocol> clientFSDelegate; 
+@property(readonly) NSImage* iconImage;
 @end

trunk/MFClientFS.m

@@ -11 +11 @@
 #import "MFClientPlugin.h"
 #import "MFServerFSProtocol.h"
+#import "MFSecurity.h"
 
 @interface MFClientFS (PrivateAPI)
@@ -54 +55 @@
                 [self registerNotifications];
                 displayOrder = 9999;
+                [self updateSecrets];
         }
         
@@ -176 +178 @@
         backupParameters = [NSDictionary dictionaryWithDictionary: 
                                                 [self parameters]];
+        backupSecrets = [NSDictionary dictionaryWithDictionary: secrets];
 }
 
@@ -192 +195 @@
                 if (result)
                 {
+                        // Validation failed
                         return result;
                 }
                 else
                 {
+                        // Update secure information
+                        if (![secrets isEqualToDictionary: backupSecrets])
+                        {
+                                setSecretsDictionaryForFilesystem( secrets, self );
+                        }
                         isEditing = NO;
                         return nil;
@@ -204 +213 @@
                 isEditing = NO;
                 [self setParameters: [backupParameters mutableCopy] ];
+                [self setSecrets: [backupSecrets mutableCopy]];
+
         }
         
@@ -209 +220 @@
 }
 
-- (void)willChangeValueForKey:(NSString*)key
-{
-        if ([key isLike:@"parameters.*"] && !isEditing)
-        {
-                [[NSException exceptionWithName:kMFBadAPIUsageException
-                                                                reason:@"Trying to modify parameters without beginEditing"
-                                                          userInfo:nil] raise];
-        }
-        
-        [super willChangeValueForKey:key];
+- (NSImage*)iconImage
+{
+        return [[NSImage alloc] initWithContentsOfFile: 
+                        self.iconPath];
+}
+
+- (void)setPauseTimeout:(BOOL)p
+{
+        [remoteFilesystem setPauseTimeout: p];
+}
+
+# pragma mark UI
+- (NSDictionary*)configurationViewControllers
+{
+        NSMutableDictionary* myControllers = [NSMutableDictionary dictionary];
+        NSViewController* macfusionAdvancedController = [[NSViewController alloc] initWithNibName: @"macfusionAdvancedView"
+                                                                                                                                                                           bundle: [NSBundle bundleForClass: [self class]]];
+        [myControllers setObject: macfusionAdvancedController forKey:kMFUIMacfusionAdvancedViewKey];
+        NSDictionary* delegateControllers = [delegate configurationViewControllers];
+        if (!delegateControllers)
+        {
+                MFLogS(self, @"No view controllers specified by delegate");
+        }
+        
+        [myControllers addEntriesFromDictionary: delegateControllers];
+        return [myControllers copy];
 }
 

trunk/MFCommunicationServer.m

@@ -219 +219 @@
 }
                                  
+- (void)deleteFilesystemWithUUID:(NSString*)uuid
+{
+        MFServerFS* fs = [[MFFilesystemController sharedController] filesystemWithUUID: uuid];
+        NSAssert(fs, @"CommunicationServer asked to remove filesystem with bad uuid");
+        [[MFFilesystemController sharedController] deleteFilesystem: fs];
+}
+
+#pragma mark Security Tokens
+- (NSString*)tokenForFilesystemWithUUID:(NSString*)uuid
+{
+        MFServerFS* fs = [[MFFilesystemController sharedController] filesystemWithUUID: uuid];
+        return [[MFFilesystemController sharedController] tokenForFilesystem: fs];
+}
+
+- (MFServerFS*)filesystemForToken:(NSString*)token
+{
+        MFServerFS* fs = [[MFFilesystemController sharedController] filesystemForToken: token];
+        if (fs)
+                [[MFFilesystemController sharedController] invalidateToken: token];
+        return fs;
+}
 
 #pragma mark Sever Protocol Methods

trunk/MFConstants.h

@@ -66 +66 @@
 #define kMFFSPersistentParameter @"isPersistent"
 #define kMFFSDescriptionParameter @"description"
+#define kMFFSVolumeImagePathParameter @"imagePath"
 
 // Status keys
@@ -106 +107 @@
 extern NSString* kMFUIMainViewKey;
 extern NSString* kMFUIAdvancedViewKey;
+extern NSString* kMFUIMacfusionAdvancedViewKey;
 

trunk/MFConstants.m

@@ -30 +30 @@
 */
 
-NSString* kMFUIMainViewKey=@"main2";
+NSString* kMFUIMainViewKey=@"main";
 NSString* kMFUIAdvancedViewKey=@"advanced";
+NSString* kMFUIMacfusionAdvancedViewKey=@"macfusion";

trunk/MFFSDelegateProtocol.h

@@ -1 +1 @@
 /*
- *  MFServerProtocol.h
+ *  MFFSDelegate.h
  *  MacFusion2
  *
@@ -43 +43 @@
 - (NSError*)errorForParameters:(NSDictionary*)parameters 
                                                 output:(NSString*)output;
+
+// Security
+- (NSArray*)secretsList;
+- (NSArray*)secretsClientsList;
 @end

trunk/MFFilesystem.h

@@ -1 +1 @@
 //
 //  MFFilesystem.h
-//  macfusiond
+//  MacFusion2
 //
 //  Created by Michael Gorbach on 11/5/07.
@@ -16 +16 @@
         NSMutableDictionary* statusInfo;
         id <MFFSDelegateProtocol> delegate;
+        NSMutableDictionary* secrets;
 }
 
@@ -35 +36 @@
 - (NSMutableDictionary*)fillParametersWithImpliedValues:(NSDictionary*)params;
 - (NSError*)error;
-
 - (id <MFFSDelegateProtocol>)delegate;
+- (void)updateSecrets;
 
 @property(readwrite, assign) NSString* status;
@@ -44 +45 @@
 @property(readonly) NSMutableDictionary* parameters;
 @property(readonly) NSDictionary* statusInfo;
+@property (readwrite, retain) NSMutableDictionary* secrets;
 @property(readonly) NSString* pluginID;
 @property(readonly) NSString* descriptionString;
 @property(readonly) NSString* iconPath;
 @property(readonly) NSString* filePath;
+@property(readonly) NSString* imagePath;
 
 @end

trunk/MFFilesystem.m

@@ -1 +1 @@
 //
 //  MFFilesystem.m
-//  macfusiond
+//  MacFusion2
 //
 //  Created by Michael Gorbach on 11/5/07.
@@ -10 +10 @@
 //#import "MFPluginController.h"
 #import "MFPlugin.h"
-#import "MFConstants.h"
+#import "MFConstants.h"]
+#import "MFSecurity.h"
 
 #define FS_DIR_PATH @"~/Library/Application Support/Macfusion/Filesystems"
@@ -184 +185 @@
 }
 
+- (void)updateSecrets
+{
+        NSMutableDictionary* updateSecrets = [getSecretsDictionaryForFilesystem( self ) mutableCopy];
+        self.secrets = updateSecrets ? updateSecrets : [NSMutableDictionary dictionary];
+}
+
 - (NSMutableDictionary*)parametersWithImpliedValues
 {
@@ -192 +199 @@
 {
         return [self valueForParameterNamed: kMFFSVolumeIconPathParameter ];
+}
+
+- (NSString*)imagePath
+{
+        return [self valueForParameterNamed: kMFFSVolumeImagePathParameter ];
 }
 
@@ -230 +242 @@
 }
 
+- (NSString*)description
+{
+        return [NSString stringWithFormat: @"%@ (%@)", [super description], self.name];
+}
+
+@synthesize secrets;
 @end

trunk/MFFilesystemController.h

@@ -15 +15 @@
         NSMutableArray* recents;
         NSMutableArray* mountedPaths;
+        NSMutableDictionary* tokens;
         
         DASessionRef appearSession;
         DASessionRef disappearSession;
-        
-        BOOL firstTimeMounting;
 }
 
+// Init
 + (MFFilesystemController*)sharedController;
 - (void)loadFilesystems;
-- (NSDictionary*)filesystemsDictionary;
-- (NSMutableArray*)filesystems;
+
+
+// Action methods
 - (MFServerFS*)newFilesystemWithPlugin:(MFServerPlugin*)plugin;
 - (MFServerFS*)quickMountWithURL:(NSURL*)url 
                                                    error:(NSError**)error;
+- (void)deleteFilesystem:(MFServerFS*)fs;
 
-- (void)storeFilesystem:(MFServerFS*)fs;
 - (MFServerFS*)filesystemWithUUID:(NSString*)uuid;
 
-- (void)addMountedPath:(NSString*)path;
-- (void)removeMountedPath:(NSString*)path;
+// Security Tokens
+- (NSString*)tokenForFilesystem:(MFServerFS*)fs;
+- (void)invalidateToken:(NSString*)token;
+- (MFServerFS*)filesystemForToken:(NSString*)token;
 
-
+// Accessors
+- (NSDictionary*)filesystemsDictionary;
 @property(readonly, retain) NSMutableArray* filesystems;
 @property(readonly, retain) NSMutableArray* recents;

trunk/MFFilesystemController.m

@@ -26 +26 @@
 - (void)recordRecentFilesystem:(MFServerFS*)fs;
 - (NSString*)getUUIDXattrAtPath:(NSString*)path;
+- (void)addMountedPath:(NSString*)path;
+- (void)removeMountedPath:(NSString*)path;
+- (void)storeFilesystem:(MFServerFS*)fs;
+- (void)removeFilesystem:(MFServerFS*)fs;
 
 @property(readwrite, retain) NSMutableArray* filesystems;
@@ -80 +84 @@
                 mountedPaths = [NSMutableArray array];
                 recents = [NSMutableArray array];
+                tokens = [NSMutableDictionary dictionary];
                 [self loadRecentFilesystems];
                 [self setUpVolumeMonitoring];
@@ -150 +155 @@
                                         [[self getUUIDXattrAtPath: mountedPath] isEqualToString: fs.uuid])
                                 {
-                                        MFLogS(self, @"Premounth hit");
+//                                      MFLogS(self, @"Pre-mount condition hit on %@", fs.uuid);
                                         [fs handleMountNotification];
                                 }
@@ -204 +209 @@
         [fs performSelector:@selector(mount) withObject:nil afterDelay:0];
         return fs;
+}
+
+- (void)deleteFilesystem:(MFServerFS*)fs
+{
+        if (fs.filePath)
+                [[NSFileManager defaultManager] removeFileAtPath:fs.filePath handler:nil];
+        [self removeFilesystem: fs];
 }
 
@@ -269 +281 @@
                 if (equal) 
                 {
-                        MFLogS(self, @"Duplicate recents detected, %@ and %@",
-                                   params, recent);
+                        // MFLogS(self, @"Duplicate recents detected, %@ and %@",
+                        //         params, recent);