Bug 1120802

+++ This bug was initially created as a clone of Bug #1004746 +++

Description of problem:
From satellite WebUI, config file comparison doesnt check for user, mode and permissions.

It displays compare results for only selinux and file content. 

Other way when checking from client side
rhncfg-client verify

It display results for user, group, permissions, selinux and file content.
 
Version-Release number of selected component (if applicable):


How reproducible:
Always

Steps to Reproduce:
1. change in file's user, group and permissions
2. Schedule compare from satellite GUI 
3. Check for results from event -> history 

Actual results:
It should display differences in user, group and permissions

Expected results:
It will display "No Differences"

Additional info:

--- Additional comment from Neha on 2013-09-05 08:05:59 EDT ---

Current code for diff functionality 

   else:
            result = ''.join(diff(temp_file, path))

        os.unlink(temp_file)
        return sectx_result + result


It displays results -> content diff + selinux diff


And from cmd line:

rhncfg-client verify 

                                  /root/nerawat/nerawat2/test1
                                  /root/nerawat/nerawat2/test2
                    mode,modified /root/nerawat/test1
 user,group,mode,selinux,modified /root/nerawat/test2
                                  /root/nerawat/test3
                          selinux /root/nerawat/test4
                                  /root/test

--- Additional comment from Neha on 2013-09-05 08:15:10 EDT ---

I tried to change code according to cli functionality, Will do some more testing and will try to submit patch for the same 

--- file_utils_orig.py  2013-08-30 06:23:04.000000000 -0400
+++ file_utils.py       2013-09-05 11:38:32.000000000 -0400
@@ -19,6 +19,8 @@
 import tempfile
 import base64
 import difflib
+import pwd
+import grp
 try:
     from selinux import lgetfilecon, is_selinux_enabled
 except:
@@ -96,10 +98,73 @@
         self._validate_struct(file_struct)
 
         temp_file, temp_dirs = self.process(file_struct)
         path = file_struct['path']
+       owner_result = ''
+       group_result = ''
+       perm_result = ''
         sectx_result = ''
         result = ''
 
+       stat_err = 0
+        
+       try:
+            cur_stat = os.lstat(path)
+        except:
+            stat_err = 1
+
+       if file_struct['filetype'] != 'symlink':
+           if not stat_err:
+                #check for owner differences
+                 cur_uid = cur_stat[stat.ST_UID]
+                 try:
+                     cur_user = pwd.getpwuid(cur_uid)[0]
+                 except KeyError:
+                     #Orphan UID with no name,return unknown
+                     cur_user = "unknown(UID %d)" % (cur_uid,)
+            else:
+                 cur_user = "missing"
+              
+           if cur_user == file_struct['username']:
+                owner_result = ""
+
+            else:
+                 owner_result = "User name differ: actual: [%s], expected: [%s]\n" % (cur_user, file_struct['username'])
+            
+           if not stat_err:
+                #check for group differences
+                cur_gid = cur_stat[stat.ST_GID]
+                try:
+                    cur_group = grp.getgrgid(cur_gid)[0]
+                except KeyError:
+                    #Orphan GID with no name,return unknown
+                    cur_group = "unknown(GID %d)" % (cur_gid,)
+            else:
+                cur_group = "missing"
+
+            if cur_group == file_struct['groupname']:
+                group_result = ""
+            else:
+                group_result = "Group name differ: actual: [%s], expected: [%s]\n" % (cur_group, file_struct['groupname'])
+
+           #check for permissions differences
+            if not stat_err:
+                cur_perm = str(oct(stat.S_IMODE(cur_stat[stat.ST_MODE])))
+               print cur_perm
+            else:
+                cur_perm = "missing"
+
+            #rip off the leading '0' from the mode returned by stat()
+            if cur_perm[0] == '0':
+                cur_perm = cur_perm[1:]
+
+            #perm_status gets displayed with the verbose option.
+            if cur_perm == file_struct['filemode']:
+                perm_result = ""
+            else:
+                perm_result = "File mode differ: actual: [%s], expected: [%s]\n" % (cur_perm, file_struct['filemode'])
+
         try:
             cur_sectx = lgetfilecon(path)[1]
         except OSError: # workarounding BZ 690238
@@ -131,7 +196,7 @@
             result = ''.join(diff(temp_file, path))
 
         os.unlink(temp_file)
-        return sectx_result + result
+        return owner_result + group_result + perm_result + sectx_result + result
 
     def _validate_struct(self, file_struct):
         for k in self.file_struct_fields.keys():

--- Additional comment from Neha on 2013-10-22 07:25:13 EDT ---

According to current functionality only selinux check and check for links

SELinux contexts differ:  actual: [root:object_r:user_home_dir_t], expected: [user_u:role_r]


After adding diff functionality for group, user and mod:

User name differ: actual: [nerawat], expected: [root]
Group name differ: actual: [nerawat], expected: [root]
File mode differ: actual: [777], expected: [775]

~ Neha