finish up elevate implementation for now

diff --git a/basis/elevate/elevate-docs.factor b/basis/elevate/elevate-docs.factor
index 494d376eb990a986d2cf013dea0ccc0a63dd7754..42c3402cafd2e0520533abc1db17a737550d8121 100644 (file)
--- a/basis/elevate/elevate-docs.factor
+++ b/basis/elevate/elevate-docs.factor
@@ -1,4 +1,4 @@
-USING: help.syntax help.markup ;
+USING: arrays help.markup help.syntax strings ;
 IN: elevate
 
 ABOUT: elevate

diff --git a/basis/elevate/elevate.factor b/basis/elevate/elevate.factor
index afedf350f80bcd457c40f65d14da92eb06400616..14d23f6cf4c88a6c930574a846c7fb4cfa8b80df 100644 (file)
--- a/basis/elevate/elevate.factor
+++ b/basis/elevate/elevate.factor
@@ -1,8 +1,33 @@
-USING: arrays command-line fry io.launcher kernel math namespaces
-sequences system unix.ffi ;
+USING: accessors arrays assocs command-line environment
+formatting fry io.launcher kernel ui locals math namespaces
+sequences splitting strings system unix.ffi unix.process ;
 IN: elevate
 
-: apple-script-elevate ( command -- ) 2drop ;
+<PRIVATE
+ERROR: elevated-failed path ;
+ERROR: lowered-failed ;
+
+CONSTANT: apple-script-charmap H{
+    { "\n" "\\n" }
+    { "\r" "\\r" }
+    { "\t" "\\t" }
+    { "\"" "\\\"" }
+    { "\\" "\\\\" }
+}
+
+: quote-apple-script ( str -- str' )
+    [ 1string [ apple-script-charmap at ] [ ] bi or ] { } map-as
+    "" join "\"" dup surround ;
+
+: run-apple-script ( str -- ) drop ;
+
+: apple-script-elevated ( command -- )
+    quote-apple-script
+    "do shell script %s with administrator privileges without altering line endings"
+    sprintf run-apple-script ;
+
+: posix-replace-process ( command-list -- code )
+  [ first ] [ rest ] bi exec-with-path ;
 
 GENERIC: glue-command ( prefix command -- glued )
 
@@ -12,31 +37,55 @@ M: array glue-command
 M: string glue-command
     " " glue ;
 
-ERROR: elevated-failed path ;
+GENERIC: failed-process? ( process -- ? )
+M: f failed-process? not ;
+M: fixnum failed-process? -1 = ;
+M: process failed-process? status>> zero? not ;
 
-HOOK: elevated os ( command win-console? posix-graphical? -- process )
+PRIVATE>
 
+HOOK: elevated os ( command replace? win-console? posix-graphical? -- process )
+
+! TODO
 M: windows elevated
-    2drop run-process ;
+    3drop run-process ;
 
-M: macosx elevated
-    nip [ ! graphical (through applescript)
-        apple-script-elevate
-    ] [
-        f f linux os [ elevated ] with-variable
-    ] if ;
+! TODO
+M:: macosx elevated ( command replace? win-console? posix-graphical? -- process )
+    posix-graphical? [ ! graphical (through applescript)
+        command apple-script-elevated
+    ] when
+    command replace? win-console? posix-graphical?
+    linux os [ elevated ] with-variable ;
 
-M: linux elevated
-    nip getuid zero? [
-        drop ! we are already root: do nothing
+M:: linux elevated ( command replace? win-console? posix-graphical? -- process )
+    getuid zero? [
+        <process> command >>command ! we are already root: just give a process
     ] [
-        { "gksudo" "kdesudo" "sudo" } { "sudo" } ? ! graphical handled
-        swap '[ _ glue-command ] map
-        [ " " split [ first utf8 string>alien ] [ rest ] execvp ] map
-        [ -1 = ] all? elevated-failed
+        ! graphical handled
+        posix-graphical? ui-running? or "DISPLAY" os-env and
+        { "gksudo" "kdesudo" "sudo" } { "sudo" } ?
+
+        command '[ _ glue-command ] map [
+            replace? [
+                " " split posix-replace-process
+            ] [ run-process ] if
+        ] map
+        ! if they all failed, then it failed, but if one passed, that's normal (success)
+        [ [ failed-process? ] all? [ command elevated-failed ] [ ] if ] keep
     ] if ;
 
-: elevate ( option? -- ) (command-line) elevated ;
+: elevate ( win-console? posix-graphical? -- ) [ (command-line) t ] 2dip elevated drop ;
+
+HOOK: lowered os ( -- )
+
+! https://wiki.sei.cmu.edu/confluence/display/c/POS36-C.+Observe+correct+revocation+order+while+relinquishing+privileges
+! group ID must be lowered before user ID otherwise program may re-gain root!
+M: linux lowered
+    getgid setgid failed-process? [ lowered-failed ] [ ] if
+    getuid setuid failed-process? [ lowered-failed ] [ ] if ;
 
-HOOK: lowered os ( relaunch? -- )
+M: macosx lowered
+    linux os [ lowered ] with-variable ;
 
+M: windows lowered ;
\ No newline at end of file