Small code tidy-ups

MaccaTech · Aug 9, 2015 · 2edc9b2 · 2edc9b2
1 parent 04fcb2d
commit 2edc9b2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 45 deletions.
diff --git a/PostgreSQL/Classes/PGServerController.m b/PostgreSQL/Classes/PGServerController.m
@@ -175,7 +175,7 @@ - (void)runAction:(PGServerAction)action server:(PGServer *)server authorization
 
         // Execute
         @synchronized(server) {
-            [PGProcess runShellCommand:command authorization:authorization authStatus:&authStatus output:&output error:&error];
+            [PGProcess runShellCommand:command forRootUser:YES authorization:authorization authStatus:&authStatus output:&output error:&error];
         }
 
         result = output;

diff --git a/PostgreSQL/Classes/Utils/PGLaunchd.m b/PostgreSQL/Classes/Utils/PGLaunchd.m
@@ -9,13 +9,6 @@
 #import "PGLaunchd.h"
 #import <ServiceManagement/ServiceManagement.h>
 
-#pragma mark - Interfaces
-
-@interface PGLaunchd()
-@end
-
-
-
 #pragma mark - PGLaunchd
 
 @implementation PGLaunchd
@@ -58,7 +51,7 @@ + (BOOL)startDaemonWithFile:(NSString *)file forRootUser:(BOOL)root authorizatio
 
     NSString *command = [NSString stringWithFormat:@"launchctl load -F \"%@\"", file];
     NSString *output = nil;
-    BOOL succeeded = [self runShellCommand:command forRootUser:root authorization:authorization authStatus:authStatus output:&output error:error];
+    BOOL succeeded = [PGProcess runShellCommand:command forRootUser:root authorization:authorization authStatus:authStatus output:&output error:error];
     if (!succeeded) return NO;
 
     return YES;
@@ -71,27 +64,10 @@ + (BOOL)stopDaemonWithName:(NSString *)name forRootUser:(BOOL)root authorization
 
     NSString *command = [NSString stringWithFormat:@"launchctl remove \"%@\"", name];
     NSString *output = nil;
-    BOOL succeeded = [self runShellCommand:command forRootUser:root authorization:authorization authStatus:authStatus output:&output error:error];
+    BOOL succeeded = [PGProcess runShellCommand:command forRootUser:root authorization:authorization authStatus:authStatus output:&output error:error];
     if (!succeeded) return NO;
 
     return YES;
 }
 
-
-
-#pragma mark Private
-
-+ (BOOL)runShellCommand:(NSString *)command forRootUser:(BOOL)root authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus output:(NSString *__autoreleasing *)output error:(NSString *__autoreleasing *)error
-{
-    if (root && !authorization) return NO;
-    if (!NonBlank(command)) return NO;
-
-    // Will run as root, but want user-specific launchd, so command must switch user
-    if (!root && authorization)
-        command = [NSString stringWithFormat:@"su \"%@\" -c '%@'", NSUserName(), command];
-
-    // Run
-    return [PGProcess runShellCommand:command authorization:authorization authStatus:authStatus output:output error:error];
-}
-
 @end
diff --git a/PostgreSQL/Classes/Utils/PGProcess.h b/PostgreSQL/Classes/Utils/PGProcess.h
@@ -36,13 +36,13 @@
  *
  * @return YES if started without throwing an exception or authorization error
  */
-+ (BOOL)startShellCommand:(NSString *)command authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus error:(NSString **)error;
++ (BOOL)startShellCommand:(NSString *)command forRootUser:(BOOL)root authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus error:(NSString **)error;
 /**
  * Runs command in shell with authorization (if not nil). Returns output.
  *
  * @return YES if ran without throwing an exception or authorization error
  */
-+ (BOOL)runShellCommand:(NSString *)command authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus output:(NSString **)output error:(NSString **)error;
++ (BOOL)runShellCommand:(NSString *)command forRootUser:(BOOL)root authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus output:(NSString **)output error:(NSString **)error;
 
 /**
  * Starts executable without authorization. Does not wait for output.

diff --git a/PostgreSQL/Classes/Utils/PGProcess.m b/PostgreSQL/Classes/Utils/PGProcess.m
@@ -53,14 +53,11 @@ @implementation PGProcess
 + (NSString *)authorizingScript
 {
     static NSString *script;
-    static BOOL initialized;
-
-    // Find script in bundle
-    if (!initialized) {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
         script = [[NSBundle bundleForClass:[self class]] pathForResource:@"PGPrefsRunAsAdmin" ofType:@"scpt"];
         if (!script) DLog(@"Cannot find resource PGPrefsRunAsAdmin.scpt!");
-        initialized = YES;
-    }
+    });
 
     return script;
 }
@@ -69,19 +66,16 @@ + (AuthorizationRights *)authorizationRights
     static NSString *authorizingScript;
     static AuthorizationItem authorizationItem;
     static AuthorizationRights authorizationRights;
-    static BOOL initialized;
-
-    // Create rights
-    if (!initialized) {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
         authorizingScript = [self authorizingScript];
         if (authorizingScript) {
             AuthorizationItem item = {kAuthorizationRightExecute, authorizingScript.length, &authorizingScript, 0};
             AuthorizationRights rights = {1, &authorizationItem};
             authorizationItem = item;
             authorizationRights = rights;
         }
-        initialized = YES;
-    }
+    });
 
     return authorizationRights.count == 0 ? nil : &authorizationRights;
 }
@@ -102,15 +96,25 @@ + (NSString *)runShellCommand:(NSString *)command error:(NSString *__autoreleasi
 }
 + (BOOL)runShellCommand:(NSString *)command output:(NSString *__autoreleasing *)output error:(NSString *__autoreleasing *)error
 {
+    command = TrimToNil(command);
+    if (!command) return NO;
+
     return [self runExecutable:@"/bin/bash" withArgs:@[@"-c", command] authorization:nil authStatus:nil output:output error:error];
 }
-+ (BOOL)startShellCommand:(NSString *)command authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus error:(NSString *__autoreleasing *)error
++ (BOOL)startShellCommand:(NSString *)command forRootUser:(BOOL)root authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus error:(NSString *__autoreleasing *)error
 {
-    return [self runShellCommand:command authorization:authorization authStatus:authStatus output:nil error:error];
+    return [self runShellCommand:command forRootUser:root authorization:authorization authStatus:authStatus output:nil error:error];
 }
-+ (BOOL)runShellCommand:(NSString *)command authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus output:(NSString *__autoreleasing *)output error:(NSString *__autoreleasing *)error
++ (BOOL)runShellCommand:(NSString *)command forRootUser:(BOOL)root authorization:(AuthorizationRef)authorization authStatus:(OSStatus *)authStatus output:(NSString *__autoreleasing *)output error:(NSString *__autoreleasing *)error
 {
-    if (!authorization) return [self runShellCommand:command output:output error:error];
+    command = TrimToNil(command);
+    if (!command) return NO;
+
+    // No authorization provided - run unauthorized or abort
+    if (!authorization) {
+        if (root) return NO;
+        else return [self runShellCommand:command output:output error:error];
+    }
 
     // Program error - authorization script missing!
     NSString *authorizingScript = [self authorizingScript];
@@ -119,6 +123,9 @@ + (BOOL)runShellCommand:(NSString *)command authorization:(AuthorizationRef)auth
         return NO;
     }
 
+    // Script always runs as root, so need to switch user
+    if (!root) command = [NSString stringWithFormat:@"su \"%@\" -c '%@'", NSUserName(), command];
+
     // Execute
     return [self runExecutable:@"/usr/bin/osascript" withArgs:@[authorizingScript, command] authorization:authorization authStatus:authStatus output:output error:error];
 }