|
|
@ -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
|
|
|
|