Changeset 38144

Timestamp:

07/08/2008 13:35:34 (4 years ago)

Author:

pmagrath@…

Message:

Added a new procedure for recursive chowning of directories. Inserted calls to this procedure where necessary.

Location:

branches/gsoc08-privileges/base/src/port1.0

Files:

• portextract.tcl (modified) (3 diffs)
• portutil.tcl (modified) (3 diffs)

branches/gsoc08-privileges/base/src/port1.0/portextract.tcl

@@ -94 +94 @@
 proc extract_main {args} {
     global UI_PREFIX euid egid worksrcpath macportsuser
-    global filespath
     
     if {![exists distfiles] && ![exists extract.only]} {
@@ -103 +102 @@
     foreach distfile [option extract.only] {
         ui_info "$UI_PREFIX [format [msgcat::mc "Extracting %s"] $distfile]"
-        if {[file exists $filespath/$distfile]} {
-                option extract.args "$filespath/$distfile"
-        } else {
-                option extract.args "[option distpath]/$distfile"
-        }
+        option extract.args "[option distpath]/$distfile"
         if {[catch {command_exec extract} result]} {
             return -code error "$result"
@@ -117 +112 @@
                 seteuid $euid   
                 ui_debug "euid changed to: [geteuid]"
-                file attributes "${worksrcpath}" -owner [name_to_uid "$macportsuser"]
+                chown  ${worksrcpath} ${macportsuser}
                 ui_debug "chowned $worksrcpath to $macportsuser"
                 seteuid [name_to_uid "$macportsuser"]
                 ui_debug "euid changed to: [geteuid]"
+        } else {
+                ui_debug "no need to chown $worksrcpath. uid=[getuid]. euid=[geteuid]."
         }
+                
         # end gsoc08-privileges
         

branches/gsoc08-privileges/base/src/port1.0/portutil.tcl

@@ -718 +718 @@
 # Provides "sed in place" functionality
 proc reinplace {args}  {
+        global euid macportsuser
+
     set extended 0
     while 1 {
@@ -776 +778 @@
     
         close $tmpfd
+    
+                # start gsoc08-privileges
+                if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } {
+                # if started with sudo but have dropped the privileges
+                        seteuid $euid   
+                        ui_debug "euid changed to: [geteuid]"
+                        chown $file ${macportsuser}
+                        ui_debug "chowned $file to $macportsuser"
+                        seteuid [name_to_uid "$macportsuser"]
+                        ui_debug "euid changed to: [geteuid]"
+                } else {
+                        ui_debug "no need to chown $file. uid=[getuid]. euid=[geteuid]."
+                }
+                        
+                # end gsoc08-privileges
     
         set attributes [file attributes $file]
@@ -2248 +2265 @@
 }
 
+##
+# Recusively chown the given file or directory to the specified user.
+#
+# @param path the file/directory to be chowned
+# @param user the user to chown file to
+proc chown {path user} {
+        file attributes $path -owner [name_to_uid "$user"]
+        
+    if {[file isdirectory $path]} {
+                foreach g [glob [file join $path *]] {
+                        chown $g $user
+                }
+    }
+}
+