Changeset af0cc3aa37cdfc89dbbf6a332d86b7cdf0b97349

Timestamp:

05/24/07 17:05:28 (6 years ago)

Author:

iacopo <iacopo@…>

Children:

6ecf068da5fba67c2aa66cbf2e358d2c24ac58f1

Parents:

a0262d65402e841ba795780fac249f10bda80490

git-committer:

iacopo <iacopo@…> (05/24/07 17:05:28)

Message:

Home selection.
Check user duplicate unix/ldap.
Backup policy selection.

git-svn-id:  https://labs.truelite.it/svn/octofuss/trunk@346 5a101938-5c21-0410-9b5a-a83d6f3706a9

Location:

lib/octofuss

Files:

• cluster/__init__.py (modified) (2 diffs)
• users/__init__.py (modified) (10 diffs)
• users/ui/__init__.py (modified) (8 diffs)

lib/octofuss/cluster/__init__.py

@@ -187 +187 @@
 
                 self.selected_cluster = None
+
+                #Check when cannot import some modules
+                self.restartRequired = False
+
                 
                 self.model = ClusterTreeModel(self.network)
@@ -383 +387 @@
 
         def install_software(self,obj,path):
-                #try:
-                from octofuss.packages import PackagesAdmin
-                if len(path) is 1:
-                        s = PackagesAdmin(self.network[path[0]])
-                elif len(path) is 2:
-                        s = PackagesAdmin(Host(path[1]))
-                self.change_app_content(s)
-                #except Exception, e:
-                #        self.__error_dialog(str(e))
+                try:
+                        if self.restartRequired:
+                                raise Exception("You need to check some problems!")
+                        from octofuss.packages import PackagesAdmin
+                        if len(path) is 1:
+                                s = PackagesAdmin(self.network[path[0]])
+                        elif len(path) is 2:
+                                s = PackagesAdmin(Host(path[1]))
+                        self.change_app_content(s)
+                except Exception, e:
+                        self.restartRequired = True
+                        self.__error_dialog(str(e))
 
         def add_host(self, obj,path, res):

lib/octofuss/users/__init__.py

@@ -190 +190 @@
 
         def getName(self):
-                return self.objectClass['posixAccount'].getAttribute('cn')
+                return self.objectClass['posixAccount'].getAttribute('uid')
 
         def getPassword(self):
@@ -423 +423 @@
         list = ldap.search(filter="(uid=*)", findattr=[])
 
+        #Keep track of local system users, and avoid duplicate "username"
+        global locallist
+
         objectList = {} 
         # Parsing the list and create users object
@@ -484 +487 @@
                 if objectList.has_key(ldapuser.getName().getValue()):
                         raise UserError("Incongruous ldap tree\nDuplicate user name in ldap server: "+ldapuser.getName().getValue())
+                if locallist.has_key(ldapuser.getName().getValue()):
+                        print "Ldap user "+ldapuser.getName().getValue()+" already present in system users."
+                        continue 
                 objectList[ldapuser.getName().getValue()]=ldapuser
  
@@ -566 +572 @@
 # Second = create LDAP groups
 ldapgrouplist = __ldap_group()
-#Third = create LDAP users
+#Third = create UNIX users
+locallist =  __local()
+#Fourth = create LDAP users
 ldaplist = __ldap_user()
-#Fourth = create UNIX users
-locallist =  __local()
+
 
 
@@ -871 +878 @@
                 
                 
-                  
+        def createHomeDirectoryNoControl(self, dir, uid, gid):
+                """ Create home directory with owner and group """
+                # Check if home already exists
+                #It does less checks. It create the dir only if it doesn't exist.
+                
+                if dir:
+                        if not os.path.isdir(dir):
+                                #os.mkdir(dir)
+                                os.system("/bin/cp -a /etc/skel "+dir)
+                                os.chown(dir, int(uid), int(gid))
+                                os.system("chown -R "+uid+"."+gid+" "+dir)
+                                os.chmod(dir,0700)
+                                
+                        else:
+                                raise UserError("Home directory "+dir+" already exists!")
+                else:
+                        raise UserError("Directory  must be not null!")
+                 
 
         def createHomeDirectory(self, name, uid, gid, path="/home"):
@@ -1173 +1197 @@
                                 user = self.getUser(username)
                                 flags = user.getAttribute('sambaSamAccount','sambaAcctFlags')
+                                 
+                                
                                 if flags != None:
                                         if "D" in flags.getValue():
@@ -1449 +1475 @@
                 # Create user directory
                 # __createHomeDirectory(self, name, uid, gid, path="/home/"):
-                self.createHomeDirectory(l.getName().getValue(), l.getUidNumber().getValue(), l.getGid().getValue())
+                homePrefix = "/home/"
+                lenHome = len(homePrefix)
+                dir = l.getHome().getValue()
+                if dir.startswith(homePrefix) and dir[lenHome:].strip() != "":
+                        self.createHomeDirectoryNoControl(l.getName().getValue(), l.getUidNumber().getValue(), l.getGid().getValue())
+                else:
+                        raise UserError("User created, but could not create home directory.")
+
 
 
@@ -1745 +1778 @@
                         raise UserError("User already exists!")
 
-                if os.path.isdir("/home/"+l.getName().getValue()):
+                homePrefix = "/home/"
+                lenHome = len(homePrefix)
+                dir = l.getHome().getValue()
+                if dir.startswith(homePrefix) and dir[lenHome:].strip() != "":
+                        pass
+                else:
+                        raise UserError("Invalid home directory!")
+                if os.path.isdir(dir):
                         raise UserError("Directory already exist")
 
@@ -1800 +1840 @@
                 #Home directory work
                 #Trying to create home 
-                self.createHomeDirectory(l.getName().getValue(),l.getUidNumber().getValue(),l.getGid().getValue())
+                self.createHomeDirectoryNoControl(dir, l.getUidNumber().getValue(), l.getGid().getValue())
+
                 
                 
@@ -1901 +1942 @@
 
                                         else:
-                                                raise Exception("Could not compress and delete home directory!\nTry without compress it.")
+                                                raise Exception("Could not compress and delete home directory!")
                                 elif compress == -9:
                                         #Rename

lib/octofuss/users/ui/__init__.py

@@ -28 +28 @@
 #backend = Backend()
 backend = backendSingleton
-
 
 
@@ -1492 +1491 @@
                 mainFrame = gtk.Frame(_("New User"))
                 vboxMain = gtk.VBox()
-                mainTable = gtk.Table(7,2,False)
+                mainTable = gtk.Table(8,2,False)
 
                 fieldLabel = gtk.Label(_("<b><big>Base preferences</big></b>"))
@@ -1552 +1551 @@
 
 
+                #Home directory selection
+                labelHome = gtk.Label(_("Home directory"))
+                al5 = gtk.Alignment(xalign=0.5)
+                al5.add(labelHome)
+
+                entryHome= gtk.Entry()
+
+                mainTable.attach(al5,0,1,5,6,xoptions=gtk.FILL,yoptions=gtk.SHRINK,ypadding=10,xpadding=30)
+                mainTable.attach(entryHome,1,2,5,6,yoptions=gtk.SHRINK,ypadding=10,xpadding=10)
+
+
                 # Maing group selection comboBox
                 groupComboLabel = gtk.Label(_("Main group"))
-                al5 = gtk.Alignment(xalign=0.5)
-                al5.add(groupComboLabel)
+                al6 = gtk.Alignment(xalign=0.5)
+                al6.add(groupComboLabel)
 
                 groupComboBox = gtk.ComboBox()
@@ -1565 +1575 @@
                 groupComboBox.set_active(0)
 
-                mainTable.attach(al5,0,1,5,6,xoptions=gtk.FILL,yoptions=gtk.SHRINK,ypadding=10,xpadding=30)
-                mainTable.attach(groupComboBox,1,2,5,6,yoptions=gtk.SHRINK,ypadding=10,xpadding=10)
+                mainTable.attach(al6,0,1,6,7,xoptions=gtk.FILL,yoptions=gtk.SHRINK,ypadding=10,xpadding=30)
+                mainTable.attach(groupComboBox,1,2,6,7,yoptions=gtk.SHRINK,ypadding=10,xpadding=10)
 
                 groupLabel = gtk.Label(_("<b><big>User privileges</big></b>"))
@@ -1572 +1582 @@
                 groupLabel.set_use_markup(True)
 
-                mainTable.attach(groupLabel,0,1,6,7,xoptions=gtk.FILL,yoptions=gtk.SHRINK,ypadding=10,xpadding=10)
+                mainTable.attach(groupLabel,0,1,7,8,xoptions=gtk.FILL,yoptions=gtk.SHRINK,ypadding=10,xpadding=10)
 
 
@@ -1644 +1654 @@
                 v.pack_start(mainFrame)
                 save = gtk.Button(stock="gtk-add")
-                save.connect("clicked", self.__save_clicked,entryRealname,entryUsername,entryPassword,entryPasswordConferma,groupsToShow,self.__groupList, groupComboBox)
+                save.connect("clicked", self.__save_clicked,entryRealname,entryUsername,entryPassword,entryPasswordConferma,entryHome,groupsToShow,self.__groupList, groupComboBox)
 
                 cancel = gtk.Button(stock="gtk-cancel")
@@ -1657 +1667 @@
                 
 
-        def __save_clicked(self,button, entryRealname,entryUsername,entryPassword,entryPasswordConferma,groupsToShow, groupList,groupComboBox):
+        def __save_clicked(self,button, entryRealname,entryUsername,entryPassword,entryPasswordConferma,entryHome,groupsToShow, groupList,groupComboBox):
                 """ Check fields and add the user to Ldap Server """ 
                 global backend
@@ -1711 +1721 @@
                         n.setAttribute("objectClass",attrObjectClass)
                         n.setAttribute("gidNumber", str(gid))
-                        n.setAttribute("homeDirectory","/home/"+entryUsername.get_text())
+                        #n.setAttribute("homeDirectory","/home/"+entryUsername.get_text())
+                        homePrefix = "/home/"
+                        lenHome = len(homePrefix)
+                        directoryHome = entryHome.get_text().replace(" ","")                                
+
+                        if not entryHome.get_text():
+                                n.setAttribute("homeDirectory","/home/"+entryUsername.get_text())
+                        elif directoryHome.startswith(homePrefix):
+                                import string
+                                for i in directoryHome[lenHome:]:
+                                        if i in string.ascii_letters or i in string.digits:
+                                                pass
+                                        else:
+                                                self.showDialog(_("Invalid characters in home directory field!"),gtk.MESSAGE_ERROR)
+                                                return
+
+                                            
+                                if directoryHome[lenHome:].strip() != "":
+                                        n.setAttribute("homeDirectory",directoryHome) 
+                                else:
+                                        self.showDialog(_("Home directory /home/ is not a valid path."),gtk.MESSAGE_ERROR)
+                                        return
+                               
+                        else:
+                                #Display security error
+                                self.showDialog(_("Home directory selection is permitted only under /home/"),gtk.MESSAGE_ERROR)
+                                return
+                                
+                            
                         n.setAttribute("loginShell","/bin/sh")