Changeset 522

Timestamp:

04/15/08 12:53:02 (9 months ago)

Author:

gbooker

Message:

Added some checking and an attempt to correct permissions on the import helper

Files:

• trunk/SapphireFrappliance/SapphireImportHelper.m (modified) (2 diffs)

trunk/SapphireFrappliance/SapphireImportHelper.m

@@ -19 +19 @@
- */
-
+#import <Security/Security.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+
-#import "SapphireImportHelper.h"
-#import "SapphireMetaData.h"
@@ -198 +202 @@
-}
-
+- (BOOL)isSlashReadOnly
+{
+        struct statfs *mntbufp;
+        
+    int i, mountCount = getmntinfo(&mntbufp, MNT_NOWAIT);
+        for(i=0; i<mountCount; i++)
+        {
+                if(!strcmp(mntbufp[i].f_mntonname, "/"))
+                        return (mntbufp[i].f_flags & MNT_RDONLY) ? YES : NO;
+        }
+        
+        return NO;
+}
+
+- (BOOL)fixClientPermissions:(NSString *)path
+{
+        /* Permissions are incorrect */
+        AuthorizationItem authItems[2] = {
+                {kAuthorizationEnvironmentUsername, strlen("frontrow"), "frontrow", 0},
+                {kAuthorizationEnvironmentPassword, strlen("frontrow"), "frontrow", 0},
+        };
+        AuthorizationEnvironment environ = {2, authItems};
+        AuthorizationItem rightSet[] = {{kAuthorizationRightExecute, 0, NULL, 0}};
+        AuthorizationRights rights = {1, rightSet};
+        AuthorizationRef auth;
+        OSStatus result = AuthorizationCreate(&rights, &environ, kAuthorizationFlagPreAuthorize | kAuthorizationFlagExtendRights, &auth);
+        if(result == errAuthorizationSuccess)
+        {
+                BOOL roslash = [self isSlashReadOnly];
+                if(roslash)
+                {
+                        char *command = "mount -uw /";
+                        char *arguments[] = {"-c", command, NULL};
+                        AuthorizationExecuteWithPrivileges(auth, "/bin/sh", kAuthorizationFlagDefaults, arguments, NULL);
+                }
+                char *command = "chmod +rx \"$HELP\"";
+                setenv("HELP", [path fileSystemRepresentation], 1);
+                char *arguments[] = {"-c", command, NULL};
+                result = AuthorizationExecuteWithPrivileges(auth, "/bin/sh", kAuthorizationFlagDefaults, arguments, NULL);
+                unsetenv("HELP");
+                if(roslash)
+                {
+                        char *command = "mount -ur /";
+                        char *arguments[] = {"-c", command, NULL};
+                        AuthorizationExecuteWithPrivileges(auth, "/bin/sh", kAuthorizationFlagDefaults, arguments, NULL);
+                }
+        }
+        if(result != errAuthorizationSuccess)
+                return NO;
+        
+        return YES;
+}
+
-- (void)startClient
-{
-        NSString *path = [[NSBundle bundleForClass:[SapphireImportHelper class]] pathForResource:@"ImportHelper" ofType:@""];
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-