Thread: [Selinux-commits] SF.net SVN: selinux: [2246] trunk/policycoreutils (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2246
          http://svn.sourceforge.net/selinux/?rev=2246&view=rev
Author:   ssmalley
Date:     2007-02-21 09:09:32 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: policycoreutils patch
Date: Tue, 20 Feb 2007 09:50:32 -0500

chcat fixes:
    * Broken stderr handling fix
    * if serange ends in a ":" chop it off.
    * Switch chcat to exec semanage rather than use builtin so that 
proper transitions happen, otherwise I would have to run chcat under an 
semanage context.

Man pages fixes to be more standard.

Modified Paths:
--------------
    trunk/policycoreutils/scripts/chcat
    trunk/policycoreutils/scripts/chcat.8
    trunk/policycoreutils/scripts/fixfiles.8
    trunk/policycoreutils/semanage/seobject.py

Modified: trunk/policycoreutils/scripts/chcat
===================================================================

--- trunk/policycoreutils/scripts/chcat	2007-02-21 17:06:44 UTC (rev 2245)
+++ trunk/policycoreutils/scripts/chcat	2007-02-21 17:09:32 UTC (rev 2246)
@@ -25,12 +25,23 @@
 import commands, sys, os, pwd, string, getopt, selinux
 import seobject
 import gettext
+import codecs
+import locale
+sys.stderr = codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__, 'replace')
+sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace')
 
 try:
     gettext.install('policycoreutils')
-except:
-    pass
+except IOError:
+       import __builtin__
+       __builtin__.__dict__['_'] = unicode
 
+def errorExit(error):
+    sys.stderr.write("%s: " % sys.argv[0])
+    sys.stderr.write("%s\n" % error)
+    sys.stderr.flush()
+    sys.exit(1)
+
 def verify_users(users):
     for u in users:
         try:
@@ -62,12 +73,20 @@
         for i in newcat[1:]:
             if i not in cats:
                 cats.append(i)
+
         new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ","))
-        
+        if new_serange[-1:] == ":":
+            new_serange = new_serange[:-1]
+            
         if add_ind:
-            logins.add(u, user[0], new_serange)
+            cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
         else:
-            logins.modify(u, user[0], new_serange)
+            cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u)
+        rc = commands.getstatusoutput(cmd)
+        if rc[0] != 0:
+            print rc[1]
+            errors += 1
+
     return errors
         
 def chcat_add(orig, newcat, objects,login_ind):
@@ -133,11 +152,17 @@
                 cats.remove(i)
 
         new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ","))
+        if new_serange[-1:] == ":":
+            new_serange = new_serange[:-1]
         
         if add_ind:
-            logins.add(u, user[0], new_serange)
+            cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
         else:
-            logins.modify(u, user[0], new_serange)
+            cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u)
+        rc = commands.getstatusoutput(cmd)
+        if rc[0] != 0:
+            print rc[1]
+            errors += 1
     return errors
         
 def chcat_remove(orig, newcat, objects, login_ind):
@@ -198,11 +223,17 @@
             user = seusers["__default__"]
         serange = user[1].split("-")
         new_serange = "%s-%s:%s" % (serange[0],newcat[0], string.join(newcat[1:], ","))
-        
+        if new_serange[-1:] == ":":
+            new_serange = new_serange[:-1]
+
         if add_ind:
-            logins.add(u, user[0], new_serange)
+            cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
         else:
-            logins.modify(u, user[0], new_serange)
+            cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u)
+        rc = commands.getstatusoutput(cmd)
+        if rc[0] != 0:
+            print rc[1]
+            errors += 1
     return errors
     
 def chcat_replace(newcat, objects, login_ind):
@@ -362,6 +393,10 @@
 
         if list_ind == 0 and len(cmds) < 1:
             usage()
+
+    except getopt.error, error:
+        errorExit(_("Options Error %s ") % error.msg)
+
     except ValueError, e:
         usage()
 

Modified: trunk/policycoreutils/scripts/chcat.8
===================================================================
--- trunk/policycoreutils/scripts/chcat.8	2007-02-21 17:06:44 UTC (rev 2245)
+++ trunk/policycoreutils/scripts/chcat.8	2007-02-21 17:09:32 UTC (rev 2246)
@@ -3,30 +3,31 @@
 chcat \- change file SELinux security category
 .SH SYNOPSIS
 .B chcat
-\fICATEGORY FILE\fR...
+\fIcategory file\fR...
 .br
 .B chcat -l 
-\fICATEGORY USER\fR...
+\fIcategory user\fR...
 .br
 .B chcat
-\fI[[+|-]CATEGORY],...]  FILE\fR...
+\fI[[+|-]category...]  file\fR...
 .br
 .B chcat -l 
-\fI[[+|-]CATEGORY],...]  USER\fR...
+\fI[[+|-]category...]  user\fR...
 .br
 .B chcat
-[\fI-d\fR] \fIFILE\fR...
+[\fI-d\fR] \fIfile\fR...
 .br
 .B chcat -l 
-[\fI-d\fR] \fIUSER\fR...
+[\fI-d\fR] \fIuser\fR...
 .br
 .B chcat
-\fI-L\fR [-l] [ USER ... ] 
+\fI-L\fR [ -l ] [ user ... ] 
 .br
+.SH DESCRIPTION
 .PP
-Change/Remove the security CATEGORY for each FILE/USER.
+Change/Remove the security \fIcategory\fR for each \fIfile\fR or \fIuser\fR.
 .PP
-Use +/- to add/remove categories from a FILE/USER.
+Use +/- to add/remove categories from a \fIfile\fR or \fIuser\fR.
 .PP
 .B
 Note:

Modified: trunk/policycoreutils/scripts/fixfiles.8
===================================================================
--- trunk/policycoreutils/scripts/fixfiles.8	2007-02-21 17:06:44 UTC (rev 2245)
+++ trunk/policycoreutils/scripts/fixfiles.8	2007-02-21 17:09:32 UTC (rev 2246)
@@ -54,7 +54,7 @@
 change any incorrect file context labels.
 .TP 
 .B relabel
-Prompt for removal of contents of /tmp directory and then change any inccorect file context labels to match the install file_contexts file.
+Prompt for removal of contents of /tmp directory and then change any incorrect file context labels to match the install file_contexts file.
 .TP 
 .B verify
 List out files with incorrect file context labels, but do not change them.

Modified: trunk/policycoreutils/semanage/seobject.py
===================================================================
--- trunk/policycoreutils/semanage/seobject.py	2007-02-21 17:06:44 UTC (rev 2245)
+++ trunk/policycoreutils/semanage/seobject.py	2007-02-21 17:09:32 UTC (rev 2246)
@@ -209,7 +209,7 @@
 		os.write(fd, self.out())
 		os.close(fd)
 		os.rename(newfilename, self.filename)
-
+                
 class semanageRecords:
 	def __init__(self):
 		self.sh = semanage_handle_create()
@@ -464,7 +464,8 @@
 				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
 				if rc < 0:
 					raise ValueError(_("Could not set MLS level for %s") % name)
-
+                        if selinux.security_check_context("system_u:object_r:%s_home_t:s0" % prefix) != 0:
+                               raise ValueError(_("Invalid prefix %s") % prefix)
 			rc = semanage_user_set_prefix(self.sh, u, prefix)
 			if rc < 0:
 				raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
@@ -530,7 +531,9 @@
 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
 
 			if prefix != "":
-				semanage_user_set_prefix(self.sh, u, prefix)
+                               if selinux.security_check_context("system_u:object_r:%s_home_t" % prefix) != 0:
+                                      raise ValueError(_("Invalid prefix %s") % prefix)
+                               semanage_user_set_prefix(self.sh, u, prefix)
 
 			if len(roles) != 0:
                                for r in rlist:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Selinux-commits] SF.net SVN: selinux: [2246] trunk/policycoreutils (Page 2)

selinux-commits