Added guest user for live system

master3.3
Mike Hiretsky 14 years ago
parent d21c9943f0
commit c605846538

@ -49,7 +49,7 @@ from cl_string import tableReport
from time import sleep from time import sleep
from subprocess import Popen,PIPE from subprocess import Popen,PIPE
from server.utils import dialogYesNo from server.utils import dialogYesNo
from cl_migrate_users import migrate from cl_migrate_users import migrate,currentUsers
from cl_utils import getUserPassword from cl_utils import getUserPassword
from encrypt import encrypt from encrypt import encrypt
@ -1136,11 +1136,14 @@ class cl_install(color_print):
def configureSystem(self): def configureSystem(self):
"""configure current system""" """configure current system"""
self.printSUCCESS("Configurating system") self.printSUCCESS(_("Configurating system"))
error = None error = None
try: try:
if self.clVars.Get('os_root_type') == "livecd": if self.clVars.Get('os_root_type') == "livecd":
self.applyTemplatesLive() self.applyTemplatesLive()
self.printSUCCESS(_("Adding guest user"))
objUsers = currentUsers()
objUsers.addUsers(['guest'],['guest'])
except (InstallError,DistributiveError),e: except (InstallError,DistributiveError),e:
error = e error = e
except (Exception),e: except (Exception),e:

@ -188,6 +188,7 @@ class migrateShadow(_shareData):
systemShadowNewData = self.getNewDataSystemShadow() systemShadowNewData = self.getNewDataSystemShadow()
return systemShadowNewData, dataNewShadow, dataThisShadow return systemShadowNewData, dataNewShadow, dataThisShadow
class migrate(color_print): class migrate(color_print):
"""Migrate users ang groups to new system""" """Migrate users ang groups to new system"""
templateShadow = "%(user)s:%(hash)s:%(days)s:0:%(maxDays)s:%(warnDays)s:::" templateShadow = "%(user)s:%(hash)s:%(days)s:0:%(maxDays)s:%(warnDays)s:::"
@ -419,3 +420,26 @@ class migrate(color_print):
return False return False
self.saveNewFiles() self.saveNewFiles()
return True return True
class currentUsers(migrate):
"""Current users"""
def __init__(self):
self.prefixNewSystem = '/'
self.objGroups = migrateGroups(self.prefixNewSystem)
self.objUsers = migrateUsers(self.prefixNewSystem)
def addUsers(self,users,passwd):
"""Added users and groups to current system"""
if not self.checkPermFiles():
return False
getDataInFile = _shareData().getDataInFile
self.dataUsers = getDataInFile(fileName=migrateUsers.filePasswd,lenData=7)
self.dataGroups = getDataInFile(fileName=migrateGroups.fileGroups,lenData=4)
self.dataShadow = getDataInFile(fileName=migrateShadow.fileShadow,lenData=9)
getHash = encrypt().getHashPasswd
for userName, pwd in zip(users,passwd):
pwdHash = getHash(pwd,"shadow_ssha256")
if not self.addUser(userName, pwdHash):
return False
self.saveNewFiles()
return True

Loading…
Cancel
Save