calculate
/
calculate-utils-3-client
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactoring

Browse Source
develop 3.4.1.1
Mike Khiretskiy 9 years ago
parent b0ce98e865
commit 76171566a9
10 changed files with 1110 additions and 1002 deletions
Show Stats Download Patch File Download Diff File

59
bin/cl-client-resume-remount
Unescape View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2013-2014 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2013-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -25,11 +25,11 @@ import os
from os import path
import dbus.mainloop.glib
from calculate.lib.datavars import DataVars, VariableError
from calculate.lib.utils.files import isMount, getRunCommands
from calculate.client.client import Client
from argparse import ArgumentParser
from time import sleep
class ResourceRemounter:
"""
Object contains one method for handle 'Resuming' dbus signal.
@ -37,30 +37,27 @@ class ResourceRemounter:
'handle_resuming' method checks and remounts user remote resources.
Also the object refreshes NSS-cache.
"""
def __init__(self,dv):
nscd_refresh = "/usr/sbin/nscd-refresh"
def __init__(self, dv):
self.dv = dv
self.dv.defaultModule = 'client'
self.client = Client()
self.client.clVars = dv
self.check_server(True)
def check_server(self,refresh_nscd=False):
def check_server(self, refresh_nscd=False):
"""
Check the available of domain server and refresh nscd cache
"""
if self.client.checkDomainServer(
self.dv.Get('cl_remote_host'),
self.dv.Get('os_net_domain')):
try:
if refresh_nscd and path.exists(self.nscd_refresh):
os.system(self.nscd_refresh)
except:
pass
self.dv.Get('cl_remote_host'),
self.dv.Get('os_net_domain')):
if refresh_nscd and path.exists(self.nscd_refresh):
os.system(self.nscd_refresh)
return True
return False
nscd_refresh = "/usr/sbin/nscd-refresh"
def remount_remote(self):
"""
Remount remote resource of the domain
@ -69,7 +66,7 @@ class ResourceRemounter:
self.client.mountRemoteRes(self.dv.Get('cl_remote_pw'),
self.dv.Get('cl_client_remote_path'),
self.dv.Get('cl_remote_host'))
except:
except Exception:
pass
def remount_user_resources(self):
@ -78,21 +75,21 @@ class ResourceRemounter:
"""
try:
self.client.mountUserDomainRes(self.dv.Get('ur_login'),
self.dv.Get('desktop.ur_password'),
int(self.dv.Get('ur_uid')),
int(self.dv.Get('ur_gid')),
"unix","share","homes","ftp")
except:
self.dv.Get('desktop.ur_password'),
int(self.dv.Get('ur_uid')),
int(self.dv.Get('ur_gid')),
"unix", "share", "homes", "ftp")
except Exception:
pass
def handle_resuming(self,statename):
print("Restoring remote mounts for user %s"%self.dv.Get('ur_login'))
def handle_resuming(self, statename):
print("Restoring remote mounts for user %s" % self.dv.Get('ur_login'))
# waiting for the domain
for wait in [1,2,5,10]:
for wait in [1, 2, 5, 10]:
try:
if self.check_server(True):
break
except:
except Exception:
pass
sleep(wait)
# check and remount remote resources
@ -103,7 +100,7 @@ class ResourceRemounter:
def main(argv):
# processing the user argument
argp = ArgumentParser(add_help=True)
argp.add_argument("user",help="tracked user",metavar="USER")
argp.add_argument("user", help="tracked user", metavar="USER")
namespace = argp.parse_args(argv[1:])
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@ -114,17 +111,18 @@ def main(argv):
dv = DataVars()
dv.importData()
dv.flIniFile()
dv.Set('ur_login',namespace.user)
dv.Set('ur_login', namespace.user)
if dv.Get('desktop.ur_domain_set') == 'off':
print("%s isn't a domain user"%namespace.user)
print("%s isn't a domain user" % namespace.user)
sys.exit(0)
except VariableError as e:
sys.stderr.write(str(e)+'\n')
sys.stderr.write(str(e) + '\n')
sys.exit(1)
rm = ResourceRemounter(dv)
bus.add_signal_receiver(rm.handle_resuming,dbus_interface="org.freedesktop.UPower",
signal_name = "NotifyResume")
bus.add_signal_receiver(rm.handle_resuming,
dbus_interface="org.freedesktop.UPower",
signal_name="NotifyResume")
loop = gobject.MainLoop()
context = loop.get_context()
while True:
@ -132,5 +130,6 @@ def main(argv):
context.iteration(1)
sleep(1)
if __name__ == '__main__':
main(sys.argv)

648
pym/client/client.py
View File

File diff suppressed because it is too large Load Diff

245
pym/client/client_cache.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2012-2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2012-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -14,21 +14,38 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import os, sys, time
import os
import sys
import time
from calculate.lib.utils.files import getModeFile
from calculate.lib.cl_print import color_print
from calculate.lib.cl_ldap import ldapUser
from calculate.lib.cl_ldap import ldapUser
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_client3',sys.modules[__name__])
class _shareData(color_print):
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])
class Printable(object):
def __init__(self, parent):
if isinstance(parent, Printable):
self.parent = parent.parent
self.parent = parent
def printERROR(self, s):
self.parent.printERROR(s)
class _shareData(Printable):
"""Share class"""
fileName = ""
template = ""
lenData = 0
data = []
def getDataInFile(self, fileName='', lenData=0):
"""Get data list from file"""
return filter(lambda x: len(x)==lenData,
return filter(lambda x: len(x) == lenData,
map(lambda x: x.rstrip().split(":"), open(fileName)))
def getFileAccess(self, perm="READ"):
@ -36,14 +53,14 @@ class _shareData(color_print):
if os.access(self.fileName, os.R_OK):
return True
else:
self.printERROR(_("Failed to read the file")+_(": ") +
self.printERROR(_("Failed to read the file") + _(": ") +
self.fileName)
return False
elif perm == "WRITE":
if os.access(self.fileName, os.W_OK):
return True
else:
self.printERROR(_("Failed to write to file")+_(": ") +
self.printERROR(_("Failed to write to file") + _(": ") +
self.fileName)
return False
@ -55,14 +72,14 @@ class _shareData(color_print):
elif self.getFileAccess(perm="READ"):
self.data = self.getDataInFile(fileName=self.fileName,
lenData=self.lenData)
return self.data
return self.data
else:
return False
def save(self):
if self.getFileAccess(perm="WRITE"):
buff = "\n".join(map(lambda x: ":".join(x), self.data)) + "\n"
FD = open(self.fileName, "w+")
FD = open(self.fileName, "w+")
FD.write(buff)
FD.close()
return True
@ -73,7 +90,7 @@ class _shareData(color_print):
if self.getData() is False:
return False
else:
self.data = filter(lambda x: x[0]!=name, self.data)
self.data = filter(lambda x: x[0] != name, self.data)
return True
def replace(self, name, listData):
@ -101,12 +118,13 @@ class _shareData(color_print):
if self.getData() is False:
return False
else:
listData = filter(lambda x: x[0]==name, self.data)
listData = filter(lambda x: x[0] == name, self.data)
if listData:
return listData[0]
else:
return []
class passwd(_shareData):
'''Class for working with the file /etc/passwd'''
fileName = "/etc/passwd"
@ -115,10 +133,10 @@ class passwd(_shareData):
def add(self, name, uid, gid, gecos="", directory="", shell="/bin/bash"):
if not directory:
directory = "/home/%s" %name
userData = self.template%{'login':name, 'uid':uid, 'gid':gid,
'gecos':gecos, 'directory':directory,
'shell':shell}
directory = "/home/%s" % name
userData = self.template % {'login': name, 'uid': uid, 'gid': gid,
'gecos': gecos, 'directory': directory,
'shell': shell}
userList = userData.split(":")
if self.getData() is False:
return False
@ -130,15 +148,16 @@ class passwd(_shareData):
self.data.append(userList)
return True
class group(_shareData):
'''Class for working with the file /etc/group'''
fileName = "/etc/group"
template = "%(group_name)s:x:%(gid)s:%(user_list)s"
lenData = 4
def add(self, name, gid, userList=[]):
groupData = self.template%{'group_name':name, 'gid':gid,
'user_list':','.join(userList)}
def add(self, name, gid, userList=()):
groupData = self.template % {'group_name': name, 'gid': gid,
'user_list': ','.join(userList)}
groupList = groupData.split(":")
if self.getData() is False:
return False
@ -165,12 +184,12 @@ class group(_shareData):
# Constant gid
listDataWork[2] = self.data[index][2]
# Join user list
userList = delEmpty(self.data[index][3].split(',') +\
userList = delEmpty(self.data[index][3].split(',') +
listDataWork[3].split(','))
# unique list
userList = reduce(lambda x,y:\
(y in x and x) or x +[y],
userList,[])
userList = reduce(lambda x, y: \
(y in x and x) or x + [y],
userList, [])
listDataWork[3] = ','.join(userList)
self.data[index] = listDataWork
if flagFound:
@ -200,7 +219,7 @@ class group(_shareData):
return False
else:
dataGroup = map(lambda x: x[3].split(","),
filter(lambda x: x[0]==name, self.data))
filter(lambda x: x[0] == name, self.data))
if dataGroup:
return dataGroup[0]
else:
@ -214,28 +233,29 @@ class group(_shareData):
for dataList in self.data:
groupName, x, gid, userList = dataList
if groupName in groups:
usersList = ",".join(filter(lambda x: x!=userName,
userList.split(",")))
usersList = ",".join(filter(lambda x: x != userName,
userList.split(",")))
dataList[3] = usersList
data.append(dataList)
self.data = data
return self.data
class shadow(_shareData):
'''Class for working with the file /etc/shadow'''
fileName = "/etc/shadow"
template = "%(login)s:%(hash)s:%(shadowLastChange)s:\
%(shadowMin)s:%(shadowMax)s:%(shadowWarning)s:::"
template = ("%(login)s:%(hash)s:%(shadowLastChange)s:"
"%(shadowMin)s:%(shadowMax)s:%(shadowWarning)s:::")
lenData = 9
def add(self, name, pwdHash,
shadowLastChange=str(int(time.time()/86400)), shadowMin="0",
shadowMax="99999", shadowWarning="7"):
shadowData = self.template%{'login':name, 'hash':pwdHash,
'shadowLastChange':shadowLastChange,
'shadowMin':shadowMin,
'shadowMax':shadowMax,
'shadowWarning':shadowWarning}
shadowLastChange=str(int(time.time() / 86400)), shadowMin="0",
shadowMax="99999", shadowWarning="7"):
shadowData = self.template % {'login': name, 'hash': pwdHash,
'shadowLastChange': shadowLastChange,
'shadowMin': shadowMin,
'shadowMax': shadowMax,
'shadowWarning': shadowWarning}
shadowList = shadowData.split(":")
if self.getData() is False:
return False
@ -248,32 +268,32 @@ class shadow(_shareData):
return True
def equally(self, listDataA, listDataB):
getData = lambda x: x[:1] + x[2:]
getData = lambda x: x[:1] + x[2:]
return _shareData.equally(self, getData(listDataA),
getData(listDataB))
class _shareCache():
class _shareCache(_shareData):
def save(self):
path = os.path.dirname(self.fileName)
if not os.path.exists(path):
try:
os.makedirs(path)
except:
self.printERROR(_("Failed to create directory %s")%path)
except OSError:
self.printERROR(_("Failed to create directory %s") % path)
return False
if not os.path.exists(self.fileName):
try:
open(self.fileName, "w")
except:
self.printERROR(_("Failed to create file %s")%self.fileName)
except IOError:
self.printERROR(_("Failed to create file %s") % self.fileName)
return False
if self.getFileAccess(perm="WRITE"):
modeFile = 0600
if getModeFile(self.fileName, mode="mode") != modeFile:
os.chmod(self.fileName, modeFile)
buff = "\n".join(map(lambda x: ":".join(x), self.data)) + "\n"
FD = open(self.fileName, "w+")
FD = open(self.fileName, "w+")
FD.write(buff)
FD.close()
return True
@ -294,9 +314,11 @@ class _shareCache():
else:
return False
class cachePasswd(_shareCache, passwd):
fileName = "/var/lib/calculate/calculate-client/cache/passwd"
class cacheGroup(_shareCache, group):
fileName = "/var/lib/calculate/calculate-client/cache/group"
@ -306,27 +328,31 @@ class cacheGroup(_shareCache, group):
def equally(self, listDataA, listDataB):
return _shareData.equally(self, listDataA, listDataB)
class cacheShadow(_shareCache, shadow):
fileName = "/var/lib/calculate/calculate-client/cache/shadow"
class cacheCreateGroup(cacheGroup):
fileName = "/var/lib/calculate/calculate-client/cache/create_group"
class cacheCreatePasswd(cachePasswd):
fileName = "/var/lib/calculate/calculate-client/cache/create_passwd"
class userCache(color_print):
class userCache(Printable):
ldapObj = ldapUser()
def addUserToCache(self, userName, pwdHash):
'''Add LDAP user to cache'''
ldapData = self.ldapObj.getUserLdapInfo(userName, shadowAttr=True)
if not ldapData:
self.printERROR(_("User %s not found in LDAP")%userName)
self.printERROR(_("User %s not found in LDAP") % userName)
return False
groupName = ldapData['group']
groupName = ldapData['group']
# Add user
cachePasswdObj = cachePasswd()
cachePasswdObj = cachePasswd(self)
if not cachePasswdObj.add(userName, ldapData['uid'], ldapData['gid'],
gecos=ldapData['fullName'],
directory=ldapData['home'],
@ -334,9 +360,9 @@ class userCache(color_print):
return False
if not cachePasswdObj.save():
return False
cacheGroupObj = cacheGroup()
cacheGroupObj = cacheGroup(self)
# Add primary group
if not cacheGroupObj.add(groupName,ldapData['gid']):
if not cacheGroupObj.add(groupName, ldapData['gid']):
return False
# Add second groups
secondGroupsData = ldapData['groups']
@ -353,14 +379,14 @@ class userCache(color_print):
if not cacheGroupObj.add(groupName, gid, usersInGroup):
return False
allUsersSecondGroups.append(groupName)
deleteSecondGroups = list(set(cacheSecondUserGroups) -\
deleteSecondGroups = list(set(cacheSecondUserGroups) - \
set(allUsersSecondGroups))
if not cacheGroupObj.deleteUserInGroups(userName, deleteSecondGroups):
return False
if not cacheGroupObj.save():
return False
# Add shadow user
cacheShadowObj = cacheShadow()
cacheShadowObj = cacheShadow(self)
if not cacheShadowObj.add(userName, pwdHash,
shadowLastChange=ldapData['shadowLastChange'],
shadowMin=ldapData['shadowMin'],
@ -373,14 +399,14 @@ class userCache(color_print):
def delUserFromCacheCreate(self, userName):
'''Delete LDAP user from createCache'''
cacheCreatePasswdObj = cacheCreatePasswd()
cacheCreatePasswdObj = cacheCreatePasswd(self)
cacheUserData = cacheCreatePasswdObj.get(userName)
if cacheUserData is False:
return False
if not cacheUserData:
return True
gid = cacheUserData[3]
cacheCreateGroupObj = cacheCreateGroup()
cacheCreateGroupObj = cacheCreateGroup(self)
cacheSecondGroups = cacheCreateGroupObj.getSecondUserGroups(userName)
if cacheSecondGroups is False:
return False
@ -393,13 +419,13 @@ class userCache(color_print):
return False
if not cacheCreatePasswdObj.save():
return False
#delete groups
# delete groups
usersGids = map(lambda x: x[3], cacheCreatePasswdObj.data)
deleteGroups = map(lambda x: x[0],
filter(lambda x: not x[2] in usersGids and not x[3],
cacheCreateGroupObj.data))
for delGroupName in deleteGroups:
if not cacheCreateGroupObj.delete(delGroupName):
if not cacheCreateGroupObj.delete(delGroupName):
return False
if not cacheCreateGroupObj.save():
return False
@ -407,14 +433,14 @@ class userCache(color_print):
def delUserFromCache(self, userName):
'''Delete LDAP user from cache'''
cachePasswdObj = cachePasswd()
cachePasswdObj = cachePasswd(self)
cacheUserData = cachePasswdObj.get(userName)
if cacheUserData is False:
return False
if not cacheUserData:
return True
gid = cacheUserData[3]
cacheGroupObj = cacheGroup()
cacheGroupObj = cacheGroup(self)
cacheSecondGroups = cacheGroupObj.getSecondUserGroups(userName)
if cacheSecondGroups is False:
return False
@ -426,18 +452,18 @@ class userCache(color_print):
return False
if not cachePasswdObj.save():
return False
#delete groups
# delete groups
usersGids = map(lambda x: x[3], cachePasswdObj.data)
deleteGroups = map(lambda x: x[0],
filter(lambda x: not x[2] in usersGids and not x[3],
cacheGroupObj.data))
for delGroupName in deleteGroups:
if not cacheGroupObj.delete(delGroupName):
if not cacheGroupObj.delete(delGroupName):
return False
if not cacheGroupObj.save():
return False
# delete shadow user
cacheShadowObj = cacheShadow()
cacheShadowObj = cacheShadow(self)
if not cacheShadowObj.delete(userName):
return False
if not cacheShadowObj.save():
@ -446,13 +472,13 @@ class userCache(color_print):
def delUserFromSystem(self, userName):
'''Delete LDAP user from system files ( passwd, group, shadow )'''
cacheCreatePasswdObj = cacheCreatePasswd()
cacheCreatePasswdObj = cacheCreatePasswd(self)
cacheCreatePasswdData = cacheCreatePasswdObj.get(userName)
if cacheCreatePasswdData is False:
return False
if not cacheCreatePasswdData:
return True
passwdObj = passwd()
passwdObj = passwd(self)
userData = passwdObj.get(userName)
if userData is False:
return False
@ -464,18 +490,18 @@ class userCache(color_print):
if not passwdObj.save():
return False
# delete user group
groupObj = group()
groupObj = group(self)
listGroupData = groupObj.getData()
if listGroupData is False:
return False
cacheCreateGroupObj = cacheCreateGroup()
cacheCreateGroupObj = cacheCreateGroup(self)
secondUsersGroups = groupObj.getSecondUserGroups(userName)
usersGids = map(lambda x: x[3], passwdObj.data)
usersGids = map(lambda x: x[3], passwdObj.data)
listGroupDataWork = []
for index, groupData in enumerate(listGroupData):
groupName, x, gid, listUsers = groupData
listUsers = filter(lambda x: x.strip(), listUsers.split(','))
listUsers = ",".join(filter(lambda x: x!=userName, listUsers))
listUsers = ",".join(filter(lambda x: x != userName, listUsers))
cacheCreateGroupData = cacheCreateGroupObj.get(groupName)
if cacheCreateGroupData is False:
return False
@ -487,7 +513,7 @@ class userCache(color_print):
if not groupObj.save():
return False
# delete user shadow
shadowObj = shadow()
shadowObj = shadow(self)
shadowData = shadowObj.get(userName)
if shadowData is False:
return False
@ -515,7 +541,7 @@ class userCache(color_print):
def deleteCacheUsersFromSystem(self):
'''Delete cache users from system'''
cacheCreatePasswdObj = cacheCreatePasswd()
cacheCreatePasswdObj = cacheCreatePasswd(self)
cacheCreateListPasswdData = cacheCreatePasswdObj.getData()
if cacheCreateListPasswdData is False:
return False
@ -527,7 +553,7 @@ class userCache(color_print):
def getLoginDomainUsers(self):
'''Get all domain login users'''
cacheCreatePasswdObj = cacheCreatePasswd()
cacheCreatePasswdObj = cacheCreatePasswd(self)
cacheListCreatePasswdData = cacheCreatePasswdObj.getData()
if cacheListCreatePasswdData is False:
return False
@ -535,19 +561,19 @@ class userCache(color_print):
def addCacheUsersFromSystem(self):
'''Add cache users from system'''
cachePasswdObj = cachePasswd()
cachePasswdObj = cachePasswd(self)
cacheListPasswdData = cachePasswdObj.getData()
if cacheListPasswdData is False:
if not isinstance(cacheListPasswdData, (list, tuple)):
return False
# Add cache passwd users to system
passwdObj = passwd()
cacheCreatePasswdObj = cacheCreatePasswd()
passwdObj = passwd(self)
cacheCreatePasswdObj = cacheCreatePasswd(self)
cacheListCreatePasswdData = cacheCreatePasswdObj.getData()
if cacheListCreatePasswdData is False:
return False
# remove deleted users
cacheUsers = map(lambda x: x[0], cacheListPasswdData)
createUsers = map(lambda x: x[0], cacheListCreatePasswdData)
createUsers = map(lambda x: x[0], cacheListCreatePasswdData)
deletedUsers = list(set(createUsers) - set(cacheUsers))
for delUser in deletedUsers:
if not self.delUserFromSystem(delUser):
@ -573,9 +599,9 @@ class userCache(color_print):
return False
if retCacheCreate:
if not passwdObj.add(userName, uid, gid,
gecos=gecos,
directory=directory,
shell=shell):
gecos=gecos,
directory=directory,
shell=shell):
return False
addUsers.append(userName)
addUsersGid.append(gid)
@ -586,32 +612,32 @@ class userCache(color_print):
return False
if not cacheCreatePasswdObj.save():
return False
cacheShadowObj = cacheShadow()
cacheShadowObj = cacheShadow(self)
cacheListShadowData = cacheShadowObj.getData()
if cacheListShadowData is False:
if not isinstance(cacheListShadowData, (list, tuple)):
return False
# Add cache shadow users to system
shadowObj = shadow()
shadowObj = shadow(self)
for cacheShadowData in cacheListShadowData:
userName, pwdHash, shadowLastChange, shadowMin, shadowMax,\
shadowWarning, x,x,x = cacheShadowData
userName, pwdHash, shadowLastChange, shadowMin, shadowMax, \
shadowWarning, x, x, x = cacheShadowData
if userName in addUsers:
if not shadowObj.add(userName, pwdHash,
shadowLastChange=shadowLastChange,
shadowMin=shadowMin,
shadowMax=shadowMax,
shadowWarning=shadowWarning):
shadowLastChange=shadowLastChange,
shadowMin=shadowMin,
shadowMax=shadowMax,
shadowWarning=shadowWarning):
return False
if shadowObj.data:
if not shadowObj.save():
return False
cacheGroupObj = cacheGroup()
cacheGroupObj = cacheGroup(self)
cacheListGroupData = cacheGroupObj.getData()
if cacheListGroupData is False:
if not isinstance(cacheListGroupData, (list, tuple)):
return False
cacheCreateGroupObj = cacheCreateGroup()
cacheCreateGroupObj = cacheCreateGroup(self)
# Add cache group users to system
groupObj = group()
groupObj = group(self)
setAddUsers = set(addUsers)
for cacheGroupData in cacheListGroupData:
groupName, x, gid, listUsers = cacheGroupData
@ -641,17 +667,18 @@ class userCache(color_print):
if not self.isConnectToLdap():
self.printERROR(_("Failed to connect to the LDAP server"))
return False
cachePasswdObj = cachePasswd()
cachePasswdObj = cachePasswd(self)
cacheListPasswdData = cachePasswdObj.getData()
if cacheListPasswdData is False:
return False
if not cacheListPasswdData:
if (not isinstance(cacheListPasswdData, (tuple, list)) or
not cacheListPasswdData):
return True
cacheGroupObj = cacheGroup()
cacheGroupObj = cacheGroup(self)
cacheListGroupData = cacheGroupObj.getData()
if cacheListGroupData is False:
return False
cacheShadowObj = cacheShadow()
cacheShadowObj = cacheShadow(self)
deletedCacheUsers = []
for cachePasswdData in cacheListPasswdData:
userName, x, uid, gid, gecos, directory, shell = cachePasswdData
@ -659,8 +686,8 @@ class userCache(color_print):
if not ldapData:
deletedCacheUsers.append(userName)
continue
cacheGroupData = map(lambda x: x[0], filter(lambda x: x[2]==gid,
cacheListGroupData))
cacheGroupData = map(lambda x: x[0], filter(lambda x: x[2] == gid,
cacheListGroupData))
if not cacheGroupData:
deletedCacheUsers.append(userName)
continue
@ -671,29 +698,29 @@ class userCache(color_print):
if not cacheShadowData:
deletedCacheUsers.append(userName)
continue
x,x, shadowLastChange, shadowMin, shadowMax, shadowWarning,\
x,x,x = cacheShadowData
x, x, shadowLastChange, shadowMin, shadowMax, shadowWarning, \
x, x, x = cacheShadowData
groups = cacheGroupObj.getSecondUserGroups(userName)
gidsGroups = map(lambda x: x[2],
filter(lambda x : x[0] in groups,
filter(lambda x: x[0] in groups,
cacheGroupObj.data))
userShadowDict = {'uid': uid,
'gid': gid,
'fullName': gecos,
'home': directory,
'group': groupName,
'groups': (groups,gidsGroups),
'loginShell':shell,
'shadowLastChange':shadowLastChange,
'shadowMin':shadowMin,
'shadowMax':shadowMax,
'shadowWarning':shadowWarning}
'groups': (groups, gidsGroups),
'loginShell': shell,
'shadowLastChange': shadowLastChange,
'shadowMin': shadowMin,
'shadowMax': shadowMax,
'shadowWarning': shadowWarning}
flagDeleteUser = False
for attr, value in userShadowDict.items():
if attr == "groups":
for index, val in enumerate(value):
if set(map(lambda x: x[index],
ldapData[attr])) != set(val):
ldapData[attr])) != set(val):
flagDeleteUser = True
break
else:
@ -711,8 +738,8 @@ class userCache(color_print):
def clearCache(self):
'''Clear cache files'''
cacheObjs = (cachePasswd(), cacheShadow(), cacheGroup(),
cacheCreateGroup(), cacheCreatePasswd())
cacheObjs = (cachePasswd(self), cacheShadow(self), cacheGroup(self),
cacheCreateGroup(self), cacheCreatePasswd(self))
for cacheObj in cacheObjs:
if not cacheObj.save():
return False

11
pym/client/datavars.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2012-2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2012-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -15,14 +15,15 @@
# limitations under the License.
__app__ = 'calculate-client'
__version__ = '3.1.8'
__version__ = '3.4.2'
import os
import sys
from calculate.lib.datavars import DataVars
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_client3',sys.modules[__name__])
setLocalTranslate('cl_client3', sys.modules[__name__])
class DataVarsClient(DataVars):
"""Variable class for client package"""

237
pym/client/utils/cl_client.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2013-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -15,24 +15,24 @@
# limitations under the License.
import sys
from os import path
from calculate.core.server.func import Action,Tasks
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
from calculate.core.server.func import Action, Tasks
from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
from calculate.lib.utils.files import FilesError
from calculate.desktop.desktop import DesktopError
from calculate.client.client import ClientError
from calculate.lib.cl_template import TemplatesError
from calculate.lib.utils.files import isMount
setLocalTranslate('cl_client3',sys.modules[__name__])
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])
__ = getLazyLocalTranslate(_)
class ClClientAction(Action):
"""
Ввести машину в домен или вывести
"""
# ошибки, которые отображаются без подробностей
native_error = (FilesError,ClientError,DesktopError,TemplatesError)
native_error = (FilesError, ClientError, DesktopError, TemplatesError)
successMessage = None
failedMessage = None
@ -40,114 +40,115 @@ class ClClientAction(Action):
# список задач для действия
tasks = [
# команда вызвана только для монтировния remote ресурсов
{'name':'only_mount',
'condition':lambda Get:Get('cl_client_mount_set') == 'on'
},
# ввод в домен
{'name':'domain',
'condition':lambda Get:Get('cl_localhost_set') == 'off',
'depend':Tasks.hasnot('only_mount')
},
# вывод из домена
{'name':'undomain',
'condition':lambda Get:Get('cl_localhost_set') == 'on',
'depend':Tasks.hasnot('only_mount')
},
# машина не доменная
{'name':'only_mount:localpc',
'warning':__("This workstation is not in the domain"),
'condition':lambda Get:not Get('cl_remote_host')
},
# проверить может ли указанный сервер являться доменом
{'name':'domain:check_domain',
'message':__("Checking {cl_remote_host_new} for domain resources"),
'method':'Client.checkDomainServer(cl_remote_host_new,os_net_domain)',
},
# получить пароль для ввода в домен (или воспользоваться кэшированным)
{'name':'domain:get_password',
'method':'Client.getDomainPassword(cl_remote_host_new)'
},
{'name':'domain:set_remote_host',
'method':'Client.setVariable("cl_remote_host",cl_remote_host_new)'
},
# машина доменная
{'name':'mount_remote',
'method':'Client.mountRemoteRes(cl_remote_pw,cl_client_remote_path,'
# команда вызвана только для монтировния remote ресурсов
{'name': 'only_mount',
'condition': lambda Get: Get('cl_client_mount_set') == 'on'
},
# ввод в домен
{'name': 'domain',
'condition': lambda Get: Get('cl_localhost_set') == 'off',
'depend': Tasks.hasnot('only_mount')
},
# вывод из домена
{'name': 'undomain',
'condition': lambda Get: Get('cl_localhost_set') == 'on',
'depend': Tasks.hasnot('only_mount')
},
# машина не доменная
{'name': 'only_mount:localpc',
'warning': __("This workstation is not in the domain"),
'condition': lambda Get: not Get('cl_remote_host')
},
# проверить может ли указанный сервер являться доменом
{'name': 'domain:check_domain',
'message': __("Checking {cl_remote_host_new} for domain resources"),
'method': 'Client.checkDomainServer(cl_remote_host_new,os_net_domain)',
},
# получить пароль для ввода в домен (или воспользоваться кэшированным)
{'name': 'domain:get_password',
'method': 'Client.getDomainPassword(cl_remote_host_new)'
},
{'name': 'domain:set_remote_host',
'method': 'Client.setVariable("cl_remote_host",cl_remote_host_new)'
},
# машина доменная
{'name': 'mount_remote',
'method': 'Client.mountRemoteRes(cl_remote_pw,cl_client_remote_path,'
'cl_remote_host)',
'depend':Tasks.success() & Tasks.hasnot('localpc','undomain')
},
# отключить удаленный доменный ресурс
{'name':'undomain:unmount_remote',
'method':'Client.umountSleepPath(cl_client_remote_path)',
},
# удалить переменные клиента
{'name':'undomain:remove_vars',
'method':'Client.removeVars()'
},
# наложить шаблоны если они не актуальны
{'name':'need_templates',
'condition':lambda Get:Get('cl_client_relevance_set') == 'off',
'depend':Tasks.success(inessential=['mount_remote'])
},
# проверить информацию для ldap расположенную в домене
{'name':'domain:check_domain_info',
'method':'Client.checkDomainInfo(cl_remote_host)',
},
# наложить доменные шаблоны, если успешно подключен удаленный ресурс
{'name':'need_templates:apply_templates',
'message':__("Applying domain templates"),
'method':'Client.applyClientTemplates(cl_remote_host)',
'depend':Tasks.success_all('mount_remote')
},
# наложить недоменные шаблоны в случае локального режима
# или были проблемы с подключением удаленноых ресурсов
{'name':'need_templates:apply_templates',
'message':__("Applying non-domain templates"),
'method':'Client.applyClientTemplates("")',
'depend':Tasks.result('mount_remote',ne=True)
},
# удалить записи из /etc/passwd и синхронизировать кэш
{'name':'del_sync_cache',
'method':'Client.cDelLdapSysUsersAndSyncCache()',
'condition':lambda Get:Get('cl_remote_host'),
'depend':Tasks.success_all('mount_remote','need_templates')
},
# удалить записи из /etc/passwd и очистить кэш
{'name':'undomain:del_clear_cache',
'message':__("Clearing the user cache"),
'method':'Client.cDelLdapSysUsersAndClearCache()'
},
# синхронизировать кэш, добавить записи в /etc/passwd
{'name':'only_mount:add_sync_cache',
'method':'Client.cAddCacheUsersFromSystem()',
'depend':Tasks.failed_all('mount_remote')
},
# удалить службу client из автозапуска
{'name':'undomain:noautorun_client',
'method':'Client.delDaemonAutostart("client")'
},
# добавить службу client в автозапуск
{'name':'domain:autorun_client',
'method':'Client.addDaemonAutostart("client")'
},
# записать переменные клиента
{'name':'domain:write_vars',
'method':'Client.writeClientVars(cl_remote_host,cl_ver,cl_remote_pw)',
},
# сообщения о результатах работы действия
{'name':'domain:success',
'message':__("Workstation added to domain {cl_remote_host}")
},
{'name':'domain:failed',
'error':__("Failed to add the workstation to domain {cl_remote_host}"),
'depend':Tasks.failed() & Tasks.hasnot("interrupt"),
},
{'name':'undomain:success',
'message':__("Workstation removed from domain {cl_remote_host}")
},
{'name':'undomain:failed',
'error':__("Failed to remove the workstation from the domain"),
'depend':Tasks.failed() & Tasks.hasnot("interrupt"),
},
]
'depend': Tasks.success() & Tasks.hasnot('localpc', 'undomain')
},
# отключить удаленный доменный ресурс
{'name': 'undomain:unmount_remote',
'method': 'Client.umountSleepPath(cl_client_remote_path)',
},
# удалить переменные клиента
{'name': 'undomain:remove_vars',
'method': 'Client.removeVars()'
},
# наложить шаблоны если они не актуальны
{'name': 'need_templates',
'condition': lambda Get: Get('cl_client_relevance_set') == 'off',
'depend': Tasks.success(inessential=['mount_remote'])
},
# проверить информацию для ldap расположенную в домене
{'name': 'domain:check_domain_info',
'method': 'Client.checkDomainInfo(cl_remote_host)',
},
# наложить доменные шаблоны, если успешно подключен удаленный ресурс
{'name': 'need_templates:apply_templates',
'message': __("Applying domain templates"),
'method': 'Client.applyClientTemplates(cl_remote_host)',
'depend': Tasks.success_all('mount_remote')
},
# наложить недоменные шаблоны в случае локального режима
# или были проблемы с подключением удаленноых ресурсов
{'name': 'need_templates:apply_templates',
'message': __("Applying non-domain templates"),
'method': 'Client.applyClientTemplates("")',
'depend': Tasks.result('mount_remote', ne=True)
},
# удалить записи из /etc/passwd и синхронизировать кэш
{'name': 'del_sync_cache',
'method': 'Client.cDelLdapSysUsersAndSyncCache()',
'condition': lambda Get: Get('cl_remote_host'),
'depend': Tasks.success_all('mount_remote', 'need_templates')
},
# удалить записи из /etc/passwd и очистить кэш
{'name': 'undomain:del_clear_cache',
'message': __("Clearing the user cache"),
'method': 'Client.cDelLdapSysUsersAndClearCache()'
},
# синхронизировать кэш, добавить записи в /etc/passwd
{'name': 'only_mount:add_sync_cache',
'method': 'Client.cAddCacheUsersFromSystem()',
'depend': Tasks.failed_all('mount_remote')
},
# удалить службу client из автозапуска
{'name': 'undomain:noautorun_client',
'method': 'Client.delDaemonAutostart("client")'
},
# добавить службу client в автозапуск
{'name': 'domain:autorun_client',
'method': 'Client.addDaemonAutostart("client")'
},
# записать переменные клиента
{'name': 'domain:write_vars',
'method': 'Client.writeClientVars(cl_remote_host,cl_ver,cl_remote_pw)',
},
# сообщения о результатах работы действия
{'name': 'domain:success',
'message': __("Workstation added to domain {cl_remote_host}")
},
{'name': 'domain:failed',
'error': __(
"Failed to add the workstation to domain {cl_remote_host}"),
'depend': Tasks.failed() & Tasks.hasnot("interrupt"),
},
{'name': 'undomain:success',
'message': __("Workstation removed from domain {cl_remote_host}")
},
{'name': 'undomain:failed',
'error': __("Failed to remove the workstation from the domain"),
'depend': Tasks.failed() & Tasks.hasnot("interrupt"),
},
]

542
pym/client/utils/cl_client_sync.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2013-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -16,230 +16,237 @@
import sys
from os import path
from calculate.core.server.func import Action,Tasks
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
from calculate.core.server.func import Action, Tasks
from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
from calculate.lib.utils.files import FilesError
from calculate.desktop.desktop import DesktopError
from calculate.client.client import ClientError
from calculate.lib.cl_template import TemplatesError
from calculate.lib.utils.files import isMount
setLocalTranslate('cl_client3',sys.modules[__name__])
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])
__ = getLazyLocalTranslate(_)
class ClClientSyncLoginAction(Action):
"""
Синхронизировать локальный профиль с удаленным, подключить удаленные
ресурсы пользователя
"""
native_error = (FilesError,ClientError,DesktopError,TemplatesError)
native_error = (FilesError, ClientError, DesktopError, TemplatesError)
successMessage = None
failedMessage = None
interruptMessage = __("Synchronization manually interrupted")
tasks = [
# подключить удаленный ресурс домена
{'name':'mount_remote',
'method':'Client.mountRemoteRes(cl_remote_pw,cl_client_remote_path,'
# подключить удаленный ресурс домена
{'name': 'mount_remote',
'method': 'Client.mountRemoteRes(cl_remote_pw,cl_client_remote_path,'
'cl_remote_host)',
'condition':lambda Get: (Get('cl_remote_host') and
Get('os_remote_auth') and
not isMount(Get('cl_client_remote_path'))),
'condition': lambda Get: (Get('cl_remote_host') and
Get('os_remote_auth') and
not isMount(Get('cl_client_remote_path'))),
},
# check on domain user
{'name':'domain_user',
'condition':lambda Get: (Get('os_remote_auth') and
# check on domain user
{'name': 'domain_user',
'condition': lambda Get: (Get('os_remote_auth') and
Get('cl_remote_host') and
Get('desktop.ur_domain_set') == 'on'),
'else_message':__("The local profile will be used")
},
{'name':'domain_user:create_home',
'message':__("Creating the home directory for {ur_login}"),
'method':'Client.createUserDirectory(ur_home_path,ur_uid,'
'ur_gid)',
'condition':lambda Get:not path.exists(Get('ur_home_path'))
},
# password in kernel key
{'name':'domain_user:check_password',
'condition':lambda Get:Get('desktop.ur_password'),
'else_error':__("User password not found")
},
{'name':'ecryptfs',
'message':__("Mounting encrypted data"),
'method':'Desktop.createCryptDir(ur_login,ur_uid,ur_gid,'
'ur_home_path,True)',
'condition':lambda Get:(Get('desktop.ur_home_crypt_set') == 'on' and
Get('install.cl_autologin') != Get('ur_login'))
},
{'name':'domain_user:add_to_cache',
'essential':False,
'method':'Client.cAddUserToCache(ur_login,desktop.ur_password)',
'failed_warning':__("Unable to cache user info")
},
# подключить удаленные ресурсы пользователя
{'name':'domain_user:mount_resources',
'message':__("Mounting user resources"),
'method':'Client.mountUserDomainRes(ur_login,'
'desktop.ur_password,'
'ur_uid,ur_gid,"unix","share","homes","ftp")',
},
# проверка на попытку открыть вторую сессию для этого пользователя
{'name':'two_session',
'error':
__("A second X session cannot be opened for user {ur_login}."),
'condition':lambda dv: (dv.Get('ur_login') in
'else_message': __("The local profile will be used")
},
{'name': 'domain_user:create_home',
'message': __("Creating the home directory for {ur_login}"),
'method': 'Client.createUserDirectory(ur_home_path,ur_uid,'
'ur_gid)',
'condition': lambda Get: not path.exists(Get('ur_home_path'))
},
# password in kernel key
{'name': 'domain_user:check_password',
'condition': lambda Get: Get('desktop.ur_password'),
'else_error': __("User password not found")
},
{'name': 'ecryptfs',
'message': __("Mounting encrypted data"),
'method': 'Desktop.createCryptDir(ur_login,ur_uid,ur_gid,'
'ur_home_path,True)',
'condition': lambda Get: (Get('desktop.ur_home_crypt_set') == 'on' and
Get('install.cl_autologin') != Get(
'ur_login'))
},
{'name': 'domain_user:add_to_cache',
'essential': False,
'method': 'Client.cAddUserToCache(ur_login,desktop.ur_password)',
'failed_warning': __("Unable to cache user info")
},
# подключить удаленные ресурсы пользователя
{'name': 'domain_user:mount_resources',
'message': __("Mounting user resources"),
'method': 'Client.mountUserDomainRes(ur_login,'
'desktop.ur_password,'
'ur_uid,ur_gid,"unix","share","homes","ftp")',
},
# проверка на попытку открыть вторую сессию для этого пользователя
{'name': 'two_session',
'error':
__("A second X session cannot be opened for user {ur_login}."),
'condition': lambda dv: (dv.Get('ur_login') in
dv.Get('desktop.cl_desktop_online_user') and
int(dv.Select('desktop.cl_desktop_online_count',
where='desktop.cl_desktop_online_user',
eq=dv.Get('ur_login'),limit=1) > 1) and
dv.Get('cl_client_sync') == 'on')
},
{'name':'domain_user:domain_sync',
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")',
'condition':lambda Get:Get('cl_client_sync') == 'on'
},
# подключить профиль пользователя на удаленном домене
# если на нем находится актуальный профиль
{'name':'domain_sync:repl_profile',
'method':'Client.mountUserDomainRes(ur_login,desktop.ur_password,'
'ur_uid,ur_gid,"unix","remote_profile")',
'condition':lambda Get:Get('cl_replication_host')
},
# отправить команду архивирования профиля на удаленном домене
# если он новее локального профиля
{'name':'repl_profile:pack_remote',
'method':'Client.packRemote("remote_profile",'
'cl_client_local_sync_time,cl_client_pack_time,'
'cl_client_profile_name,ur_uid,ur_gid)',
'condition':lambda Get:Get('cl_client_sync_replication_set') == 'on',
'else_message':__("The local user profile does not "
int(dv.Select(
'desktop.cl_desktop_online_count',
where='desktop.cl_desktop_online_user',
eq=dv.Get('ur_login'), limit=1) > 1) and
dv.Get('cl_client_sync') == 'on')
},
{'name': 'domain_user:domain_sync',
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")',
'condition': lambda Get: Get('cl_client_sync') == 'on'
},
# подключить профиль пользователя на удаленном домене
# если на нем находится актуальный профиль
{'name': 'domain_sync:repl_profile',
'method': 'Client.mountUserDomainRes(ur_login,desktop.ur_password,'
'ur_uid,ur_gid,"unix","remote_profile")',
'condition': lambda Get: Get('cl_replication_host')
},
# отправить команду архивирования профиля на удаленном домене
# если он новее локального профиля
{'name': 'repl_profile:pack_remote',
'method': 'Client.packRemote("remote_profile",'
'cl_client_local_sync_time,cl_client_pack_time,'
'cl_client_profile_name,ur_uid,ur_gid)',
'condition': lambda Get: Get('cl_client_sync_replication_set') == 'on',
'else_message': __("The local user profile does not "
"need to be synchronized with the remote domain")
},
# монтируем профиль локального домена, если локальный профиль
# старее удаленного доменного или актуальный профиль
{'name':'domain_sync:mount_local',
'method':'Client.mountUserDomainRes(ur_login,desktop.ur_password,'
'ur_uid,ur_gid,"unix")',
# нет более ранних ошибок и локальный профиль нуждается
# в синхронизации с удаленным или профиль на локальном домене
'depend':(Tasks.success_all('mount_resources') &
# монтируем профиль локального домена, если локальный профиль
# старее удаленного доменного или актуальный профиль
{'name': 'domain_sync:mount_local',
'method': 'Client.mountUserDomainRes(ur_login,desktop.ur_password,'
'ur_uid,ur_gid,"unix")',
# нет более ранних ошибок и локальный профиль нуждается
# в синхронизации с удаленным или профиль на локальном домене
'depend': (Tasks.success_all('mount_resources') &
(Tasks.hasnot('repl_profile') |
Tasks.has('pack_remote')))
},
# синхронизируем с профилем локального домена
{'name':'mount_local!:sync_local',
'method':'Client.syncLoginProfile(cl_remote_host,ur_uid,'
# синхронизируем с профилем локального домена
{'name': 'mount_local!:sync_local',
'method': 'Client.syncLoginProfile(cl_remote_host,ur_uid,'
'ur_gid,ur_home_path,"unix",cl_client_profile_name)',
'condition':lambda Get:Get('cl_client_sync_local_set') == 'on',
'else_message':__("The local user profile does not "
'condition': lambda Get: Get('cl_client_sync_local_set') == 'on',
'else_message': __("The local user profile does not "
"need to be synchronized with the local domain")
},
# ошибка синхронизации с локальным доменом
{'name':'local_sync_error',
'warning':__("Error synchronizing with the local server {cl_remote_host}"),
'depend':Tasks.failed_one_of("mount_local","sync_local")
},
# подключить удаленный профиль пользователя с "репликации"
{'name':'repl_profile:repeat_repl_profile',
'method':'Client.mountUserDomainRes(ur_login,desktop.ur_password,'
'ur_uid,ur_gid,"remote_profile")',
},
# ждать архив от удаленного домена
{'name':'pack_remote:wait_archive',
'message': __("Packing the archive on the server"),
'method':'Client.waitingArchFile(cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning':__("Failed to find the profile "
# ошибка синхронизации с локальным доменом
{'name': 'local_sync_error',
'warning': __(
"Error synchronizing with the local server {cl_remote_host}"),
'depend': Tasks.failed_one_of("mount_local", "sync_local")
},
# подключить удаленный профиль пользователя с "репликации"
{'name': 'repl_profile:repeat_repl_profile',
'method': 'Client.mountUserDomainRes(ur_login,desktop.ur_password,'
'ur_uid,ur_gid,"remote_profile")',
},
# ждать архив от удаленного домена
{'name': 'pack_remote:wait_archive',
'message': __("Packing the archive on the server"),
'method': 'Client.waitingArchFile(cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning': __("Failed to find the profile "
"archive of {cl_replication_host}")
},
# распаковать архив из удаленного домена и удалить
# файлы которые отсутствуют в удаленном профиле
{'name':'wait_archive:unpack_profile',
'message':__("Unpacking the profile"),
'method':'Client.unpackArch(ur_home_path,cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning':__("Failed to unpack")
},
# удалить временные архивы
{'name':'clean_archfiles',
'method':'Client.cleanArchs(cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning':__("Unable to remove useless files"),
'essential':False,
'depend': Tasks.has('pack_remote')
},
# синхронизировать профиль с удаленным доменом в случае ошибки
{'name':'repl_profile:sync_remote',
'method':'Client.syncLoginProfile(cl_replication_host,ur_uid,'
# распаковать архив из удаленного домена и удалить
# файлы которые отсутствуют в удаленном профиле
{'name': 'wait_archive:unpack_profile',
'message': __("Unpacking the profile"),
'method': 'Client.unpackArch(ur_home_path,cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning': __("Failed to unpack")
},
# удалить временные архивы
{'name': 'clean_archfiles',
'method': 'Client.cleanArchs(cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning': __("Unable to remove useless files"),
'essential': False,
'depend': Tasks.has('pack_remote')
},
# синхронизировать профиль с удаленным доменом в случае ошибки
{'name': 'repl_profile:sync_remote',
'method': 'Client.syncLoginProfile(cl_replication_host,ur_uid,'
'ur_gid,ur_home_path,"remote_profile",'
'cl_client_profile_name)',
'depend':Tasks.failed_one_of('pack_remote','mount_local','sync_local',
'wait_archive','unpack_profile'),
'condition':lambda Select:isMount(
Select('cl_client_user_mount_path',
where='cl_client_user_mount_name',eq='remote_profile',
limit=1))
},
# если синхронизация с удаленным доменом прошла с ошибкой
# синхронизировать локальный профиль с локальным доменом
# как запасной профиль
{'name':'pack_remote:fallback_warning',
'warning':__("Error synchronizing with the "
'depend': Tasks.failed_one_of('pack_remote', 'mount_local',
'sync_local',
'wait_archive', 'unpack_profile'),
'condition': lambda Select: isMount(
Select('cl_client_user_mount_path',
where='cl_client_user_mount_name', eq='remote_profile',
limit=1))
},
# если синхронизация с удаленным доменом прошла с ошибкой
# синхронизировать локальный профиль с локальным доменом
# как запасной профиль
{'name': 'pack_remote:fallback_warning',
'warning': __("Error synchronizing with the "
"{cl_replication_host} remote server"),
'depend': ~Tasks.success_one_of('unpack_profile','sync_remote')
'depend': ~Tasks.success_one_of('unpack_profile', 'sync_remote')
},
{'name':'pack_remote:fallback_sync',
'method':'Client.syncLoginProfile(cl_remote_host,ur_uid,'
{'name': 'pack_remote:fallback_sync',
'method': 'Client.syncLoginProfile(cl_remote_host,ur_uid,'
'ur_gid,ur_home_path,"unix",cl_client_profile_name)',
'depend': ~Tasks.success_one_of('unpack_profile','sync_remote')
},
# отключить профиль на удаленном домене
{'name':'repl_profile!:umount_remote_profile',
'method':'Client.umountRemoteUserRes(True,"remote_profile")',
},
# сообщение о том, что будет использоваться запасной профиль
# с локального домена
{'name':'fallback_sync!:fallback_success',
'message': __("Got a user fallback profile from the "
"{cl_remote_host} domain")
},
# ошибка синхронизации профиль не готов! к использованию
{'name':'failed',
'error':__("Failed to get the user profile from the domain"),
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"error")',
'depend':Tasks.failed_all('sync_remote','sync_local','fallback_sync') |
'depend': ~Tasks.success_one_of('unpack_profile', 'sync_remote')
},
# отключить профиль на удаленном домене
{'name': 'repl_profile!:umount_remote_profile',
'method': 'Client.umountRemoteUserRes(True,"remote_profile")',
},
# сообщение о том, что будет использоваться запасной профиль
# с локального домена
{'name': 'fallback_sync!:fallback_success',
'message': __("Got a user fallback profile from the "
"{cl_remote_host} domain")
},
# ошибка синхронизации профиль не готов! к использованию
{'name': 'failed',
'error': __("Failed to get the user profile from the domain"),
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"error")',
'depend': Tasks.failed_all('sync_remote', 'sync_local',
'fallback_sync') |
(Tasks.hasnot('domain_sync') & Tasks.failed()) |
Tasks.failed_one_of('mount_resources','two_session')
},
# распаковать ссылки
{'name':'domain_sync:unpack_links',
'method':'Client.unpackLinks(ur_home_path)',
'failed_warning': __("Failed to unpack the links archive"),
'depend':Tasks.hasnot('failed')
},
# синхронизация профиля завершилась успешно
{'name':'domain_sync:success_sync',
'message':__("User profile fetched from the domain"),
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"success")',
'depend': Tasks.success_all('sync_remote','unpack_links') |
Tasks.success()
},
# во время синхронизации профиля произошли ошибки, которые не
# гарантируют целостность профиля
{'name':'domain_sync:error_sync',
'warning':__("User profile modifications will not "
"be saved to the domain"),
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"error")',
'depend': Tasks.hasnot('success_sync','failed')
},
# отключить ресурсы в случае ошибки
{'name':'umount_remote_res',
'message':__("Umounting user resources"),
'method':'Client.umountUserRes(desktop.ur_mount_dirs)',
'depend':Tasks.has('failed')
Tasks.failed_one_of('mount_resources', 'two_session')
},
# распаковать ссылки
{'name': 'domain_sync:unpack_links',
'method': 'Client.unpackLinks(ur_home_path)',
'failed_warning': __("Failed to unpack the links archive"),
'depend': Tasks.hasnot('failed')
},
# синхронизация профиля завершилась успешно
{'name': 'domain_sync:success_sync',
'message': __("User profile fetched from the domain"),
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"success")',
'depend': Tasks.success_all('sync_remote', 'unpack_links') |
Tasks.success()
},
# во время синхронизации профиля произошли ошибки, которые не
# гарантируют целостность профиля
{'name': 'domain_sync:error_sync',
'warning': __("User profile modifications will not "
"be saved to the domain"),
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"error")',
'depend': Tasks.hasnot('success_sync', 'failed')
},
# отключить ресурсы в случае ошибки
{'name': 'umount_remote_res',
'message': __("Umounting user resources"),
'method': 'Client.umountUserRes(desktop.ur_mount_dirs)',
'depend': Tasks.has('failed')
}
]
]
class ClClientSyncLogoutAction(Action):
@ -247,99 +254,100 @@ class ClClientSyncLogoutAction(Action):
Синхронизировать локальный профиль с удаленным, отключить удаленные
ресурсы пользователя
"""
native_error = (FilesError,ClientError,DesktopError,TemplatesError)
native_error = (FilesError, ClientError, DesktopError, TemplatesError)
successMessage = None
failedMessage = None
interruptMessage = __("Synchronization manually interrupted")
tasks = [
# проверка доменный ли пользователь
{'name':'domain_user',
'condition':lambda Get: (Get('os_remote_auth') and
Get('cl_remote_host') and
# проверка доменный ли пользователь
{'name': 'domain_user',
'condition': lambda Get: (Get('os_remote_auth') and
Get('cl_remote_host') and
Get('desktop.ur_domain_set') == 'on'),
'else_message':__("The local profile will be used")
},
# проверка на попытку отключить ресурсы пользователя в X сессии
{'name':'domain_user:in_xsession',
'error':__("User {ur_login} is already on the X session"),
'condition':lambda Get:Get('ur_login') in \
Get('desktop.cl_desktop_online_user'),
},
# проверить наличие домашней директории
{'name':'domain_user:check_homedir',
'condition':lambda Get:path.exists(Get('ur_home_path')),
'else_error':__("Home directory {ur_home_path} not found"),
},
# проверить наличие подключенных ресурсов
{'name':'domain_user:check_mount',
'condition':lambda Get:any(x and isMount(x)
for x in Get('cl_client_user_mount_path')),
'else_error':__("Remote user resources not found")
},
# установить время выхода из сеанса
{'name':'domain_user:set_logout_date',
'method':'Client.setLogoutDate(ur_home_path,ur_uid,ur_gid)'
},
# выполнять ли синхронизацию
{'name':'domain_user:domain_sync',
'condition':lambda Get:Get('cl_client_sync_status') == 'success' and
Get('cl_client_sync') == 'on',
'else_warning':__("The profile will not be uploaded to the domain")
},
# переместить файлы из профиля в Moved
{'name':'domain_user:move_home_dir',
'message':__("Moving non-profile files to the Home/Moved directory"),
'method':'Client.moveHomeDir(ur_home_path,"Moved","homes",'
'else_message': __("The local profile will be used")
},
# проверка на попытку отключить ресурсы пользователя в X сессии
{'name': 'domain_user:in_xsession',
'error': __("User {ur_login} is already on the X session"),
'condition': lambda Get: Get('ur_login') in
Get('desktop.cl_desktop_online_user'),
},
# проверить наличие домашней директории
{'name': 'domain_user:check_homedir',
'condition': lambda Get: path.exists(Get('ur_home_path')),
'else_error': __("Home directory {ur_home_path} not found"),
},
# проверить наличие подключенных ресурсов
{'name': 'domain_user:check_mount',
'condition': lambda Get: any(x and isMount(x)
for x in
Get('cl_client_user_mount_path')),
'else_error': __("Remote user resources not found")
},
# установить время выхода из сеанса
{'name': 'domain_user:set_logout_date',
'method': 'Client.setLogoutDate(ur_home_path,ur_uid,ur_gid)'
},
# выполнять ли синхронизацию
{'name': 'domain_user:domain_sync',
'condition': lambda Get: Get('cl_client_sync_status') == 'success' and
Get('cl_client_sync') == 'on',
'else_warning': __("The profile will not be uploaded to the domain")
},
# переместить файлы из профиля в Moved
{'name': 'domain_user:move_home_dir',
'message': __("Moving non-profile files to the Home/Moved directory"),
'method': 'Client.moveHomeDir(ur_home_path,"Moved","homes",'
'cl_moved_skip_path)',
},
# архивировать симлинки
{'name':'domain_sync:tar_symlinks',
'method':'Client.tarSymLinks(ur_uid,ur_gid,ur_home_path,'
'cl_sync_del_path,cl_sync_skip_path)',
'failed_error':_("Failed to make a links archive")
# архивировать симлинки
{'name': 'domain_sync:tar_symlinks',
'method': 'Client.tarSymLinks(ur_uid,ur_gid,ur_home_path,'
'cl_sync_del_path,cl_sync_skip_path)',
'failed_error': _("Failed to make a links archive")
},
# закачать профиль пользователя в домен
{'name':'domain_sync:sync_logout',
'method':'Client.syncLogoutProfile(cl_remote_host,ur_uid,'
# закачать профиль пользователя в домен
{'name': 'domain_sync:sync_logout',
'method': 'Client.syncLogoutProfile(cl_remote_host,ur_uid,'
'ur_gid,ur_home_path,"unix",cl_client_profile_name,'
'cl_client_symlinks)',
},
# удалить файлы, которые могут помешать следующему входу в сеанс
{'name':'domain_sync:remove_noise_files',
'message':__("Removing hindering files"),
'method':'Client.removeNoiseFiles(ur_home_path)'
},
# удалить "личные" файлы
{'name':'domain_sync:remove_private_files',
'message':__("Removing user private files"),
'method':'Client.removePrivateFiles(ur_home_path)'
},
# удалить пользовательские ключи ядра
{'name':'domain_user!:clear_user_key',
'message':__("Clearing user keys"),
'method':'Client.clearUserKey(ur_login)'
},
# отключить пользовательские ресурсы
{'name':'check_mount!:umount_user_res',
'message':__("Umounting user resources"),
'method':'Client.umountUserRes(desktop.ur_mount_dirs)',
},
# установить статус синхронизации
{'name':'domain_sync:success_sync',
'message':__("Modified user profile saved in the domain"),
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,'
'"success_logout")',
'depend': Tasks.success_all('sync_logout','check_mount')
},
{'name':'domain_sync:failed',
'error':__("Modified user profile saved in the domain with errors"),
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,'
'"error")',
'depend': Tasks.hasnot('success_sync')
},
{'name':'umount_allres',
'method':'Desktop.umountUserRes(ur_home_path)',
# удалить файлы, которые могут помешать следующему входу в сеанс
{'name': 'domain_sync:remove_noise_files',
'message': __("Removing hindering files"),
'method': 'Client.removeNoiseFiles(ur_home_path)'
},
# удалить "личные" файлы
{'name': 'domain_sync:remove_private_files',
'message': __("Removing user private files"),
'method': 'Client.removePrivateFiles(ur_home_path)'
},
# удалить пользовательские ключи ядра
{'name': 'domain_user!:clear_user_key',
'message': __("Clearing user keys"),
'method': 'Client.clearUserKey(ur_login)'
},
# отключить пользовательские ресурсы
{'name': 'check_mount!:umount_user_res',
'message': __("Umounting user resources"),
'method': 'Client.umountUserRes(desktop.ur_mount_dirs)',
},
# установить статус синхронизации
{'name': 'domain_sync:success_sync',
'message': __("Modified user profile saved in the domain"),
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,'
'"success_logout")',
'depend': Tasks.success_all('sync_logout', 'check_mount')
},
{'name': 'domain_sync:failed',
'error': __("Modified user profile saved in the domain with errors"),
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,'
'"error")',
'depend': Tasks.hasnot('success_sync')
},
{'name': 'umount_allres',
'method': 'Desktop.umountUserRes(ur_home_path)',
}
]
]

21
pym/client/utils/cl_passwd.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2013-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -15,23 +15,24 @@
# limitations under the License.
import sys
from os import path
from calculate.core.server.func import Action,Tasks
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
from calculate.core.server.func import Action
from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
from calculate.lib.utils.files import FilesError
from calculate.desktop.desktop import DesktopError
from calculate.client.client import ClientError
from calculate.lib.cl_template import TemplatesError
setLocalTranslate('cl_client3',sys.modules[__name__])
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])
__ = getLazyLocalTranslate(_)
class ClPasswdAction(Action):
"""
Изменить пароль доменного пользователя
"""
# ошибки, которые отображаются без подробностей
native_error = (FilesError,DesktopError,TemplatesError,ClientError)
native_error = (FilesError, DesktopError, TemplatesError, ClientError)
successMessage = (__("{cl_client_login}'s password changed\n"
"This modification will be applied when "
@ -41,7 +42,7 @@ class ClPasswdAction(Action):
# список задач для действия
tasks = [
{'name':'change_passwd',
'method':'Client.clientPasswd(cl_client_login,ur_uid,ur_gid,'
'ur_home_path,ur_user_new_pw,ur_user_pw)',
{'name': 'change_passwd',
'method': 'Client.clientPasswd(cl_client_login,ur_uid,ur_gid,'
'ur_home_path,ur_user_new_pw,ur_user_pw)',
}]

27
pym/client/variables/action.py
Unescape View File

@ -1,4 +1,4 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2008-2013 Calculate Ltd. http://www.calculate-linux.org
#
@ -14,14 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import os
import sys
from os import path
from calculate.lib.datavars import (Variable,VariableError,ReadonlyVariable,
ActionVariable)
from calculate.lib.datavars import ActionVariable
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_client3',sys.modules[__name__])
setLocalTranslate('cl_client3', sys.modules[__name__])
class VariableAcClientMerge(ActionVariable):
"""
@ -30,34 +29,36 @@ class VariableAcClientMerge(ActionVariable):
"""
nonchroot = True
def action(self,cl_action):
if cl_action in ("merge","domain","undomain"):
ret = "on"
def action(self, cl_action):
if cl_action in ("merge", "domain", "undomain"):
return "on"
return "off"
class VariableAcClientDomain(ActionVariable):
"""
Action variable which has value "on" for domain action
"""
nonchroot = True
def action(self,cl_action):
def action(self, cl_action):
remoteHost = self.Get("cl_remote_host")
remoteAuth = self.Get("os_remote_auth")
if cl_action == "domain":
return "on"
elif ((cl_action in ("merge",'sync') and self.Get('cl_merge_pkg'))
and remoteHost and remoteAuth):
elif ((cl_action in ("merge", 'sync') and self.Get('cl_merge_pkg'))
and remoteHost and remoteAuth):
return "on"
return "off"
class VariableAcClientUndomain(ActionVariable):
"""
Action variable which has value "on" for undomain action
"""
nonchroot = True
def action(self,cl_action):
def action(self, cl_action):
if cl_action in ("undomain",):
return "on"
return "off"

310
pym/client/variables/client.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2008-2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2008-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -18,12 +18,13 @@ import os
import sys
from os import path
import re
from calculate.lib.datavars import (Variable,VariableError,ReadonlyVariable,
ReadonlyTableVariable,FieldValue)
from calculate.lib.cl_template import iniParser
from calculate.lib.utils.files import (readLinesFile,isMount,readFile, find,
FindFileType)
from calculate.lib.utils.common import getValueFromCmdLine,cmpVersion
from calculate.lib.datavars import (Variable, VariableError, ReadonlyVariable,
ReadonlyTableVariable, FieldValue,
HumanReadable)
from calculate.lib.cl_ini_parser import iniParser
from calculate.lib.utils.files import (isMount, readFile, find,
FindFileType)
from calculate.lib.utils.common import getValueFromCmdLine
from calculate.lib.utils.portage import isPkgInstalled
from calculate.lib.variables.user import VariableUrLogin
from calculate.lib.convertenv import convertEnv
@ -37,7 +38,10 @@ import pwd
from calculate.client.client import Client
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_client3',sys.modules[__name__])
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])
class VariableClRemoteHost(Variable):
"""
@ -45,6 +49,7 @@ class VariableClRemoteHost(Variable):
"""
value = ""
class VariableClRemoteHostNew(Variable):
"""
IP or domain name of CDS
@ -59,22 +64,24 @@ class VariableClRemoteHostNew(Variable):
self.label = _("Domain IP")
self.help = _("domain")
def check(self,value):
def check(self, value):
if self.Get('cl_client_mount_set') == 'off':
if self.Get('cl_localhost_set') == 'off':
if self.Get('cl_remote_host') == '':
if not value:
raise VariableError(_("Please specify the domain"))
elif not isOpenPort(value,445):
elif not isOpenPort(value, 445):
raise VariableError(
_("The specified address is not available"))
class VariableClRemoteHostLive(ReadonlyVariable):
"""
Remote host from /proc/cmdline param domain
"""
def get(self):
return getValueFromCmdLine("calculate","domain") or ""
return getValueFromCmdLine("calculate", "domain") or ""
class VariableOsRemoteAuth(Variable):
@ -102,14 +109,16 @@ class VariableClRemotePw(Variable):
self.help = _("specify the domain password")
def get(self):
return getValueFromCmdLine("calculate","domain_pw") or ""
return getValueFromCmdLine("calculate", "domain_pw") or ""
class VariableClMovedSkipPath(Variable):
"""
Skip "Moved" path
"""
type = "list"
value = ['Disks','Home','Moved','FTP','Desktop', 'Share']
value = ['Disks', 'Home', 'Moved', 'FTP', 'Desktop', 'Share']
class VariableClSyncSkipPath(Variable):
"""
@ -117,12 +126,13 @@ class VariableClSyncSkipPath(Variable):
"""
type = "list"
value = [".googleearth", "Home", "Disks", "FTP",
'Share', ".local/share/akonadi/db_data", ".VirtualBox",
".mozilla/firefox/calculate.default/urlclassifier3.sqlite",
".local/share/mime/mime.cache", ".gvfs",
".kde4/share/apps/nepomuk/repository/main/data", ".logout",
".Xauthority", ".thumbnails", ".mozilla/firefox/*/Cache",
".kde4/socket-*", ".cache/", ".local/share/Trash"]
'Share', ".local/share/akonadi/db_data", ".VirtualBox",
".mozilla/firefox/calculate.default/urlclassifier3.sqlite",
".local/share/mime/mime.cache", ".gvfs",
".kde4/share/apps/nepomuk/repository/main/data", ".logout",
".Xauthority", ".thumbnails", ".mozilla/firefox/*/Cache",
".kde4/socket-*", ".cache/", ".local/share/Trash"]
class VariableClSyncDelPath(Variable):
"""
@ -132,10 +142,12 @@ class VariableClSyncDelPath(Variable):
value = [".kde4/share/config/phonondevicesrc",
".kde4/cache-*", ".kde4/tmp-*"]
class VariableClProfileAllSet(Variable):
type = "bool"
value = "off"
class VariableClClientSync(Variable):
type = "bool"
value = "on"
@ -147,6 +159,7 @@ class VariableClClientSync(Variable):
self.label = _("Synchronize the user profile")
self.help = _("synchronize user preferences")
class VariableClLocalhostSet(Variable):
"""
Using autopartition
@ -163,24 +176,26 @@ class VariableClLocalhostSet(Variable):
self.help = _("remove the domain connection settings")
def choice(self):
return [("off",_("Domain workstation")),
("on",_("Local workstation"))]
return [("off", _("Domain workstation")),
("on", _("Local workstation"))]
def check(self,value):
def check(self, value):
if self.Get('cl_client_mount_set') == 'off':
if self.Get('cl_remote_host') == '' and value == "on":
raise VariableError(_("The workstation is not in the domain"))
if self.Get('cl_remote_host') != '' and value == "off":
raise VariableError(_("The workstation is already in the domain %s")
%self.Get('cl_remote_host') + "\n" +
_("Before joining the domain, "
"you need to remove it from the previous domain"))
raise VariableError(
_("The workstation is already in the domain %s")
% self.Get('cl_remote_host') + "\n" +
_("Before joining the domain, "
"you need to remove it from the previous domain"))
# def get(self):
# if self.Get('cl_remote_host') == '':
# return "on"
# else:
# return "off"
#def get(self):
# if self.Get('cl_remote_host') == '':
# return "on"
# else:
# return "off"
class VariableClClientMountSet(Variable):
"""
@ -195,7 +210,8 @@ class VariableClClientMountSet(Variable):
self.label = _("Only mount the domain resource")
self.help = _("only mount the [remote] domain resource")
class VariableUrUserPw(Variable,LdapHelper):
class VariableUrUserPw(Variable, LdapHelper):
"""
Current user password
"""
@ -211,9 +227,8 @@ class VariableUrUserPw(Variable,LdapHelper):
def checkUserPwdLDAP(self, server, userDN, password):
"""Check unix user password on server"""
ldapInit = ldap.initialize("ldap://%s"%server)
errMessage = ""
try:
ldapInit = ldap.initialize("ldap://%s" % server)
try:
ldapInit.bind_s(userDN, password)
except ldap.INVALID_CREDENTIALS:
raise VariableError(_("Wrong password"))
@ -222,7 +237,7 @@ class VariableUrUserPw(Variable,LdapHelper):
raise VariableError(errMessage)
return True
def check(self,value):
def check(self, value):
if not value:
raise VariableError(_("Empty password"))
# читаем os_remote_auth, так как при смене пароля
@ -232,9 +247,10 @@ class VariableUrUserPw(Variable,LdapHelper):
ldapObj = self.getLdapUserObject()
if ldapObj:
usersDN = ldapObj.getUsersDN()
userDN = ldapObj.addDN("uid=%s"%self.Get('ur_login'),
usersDN)
self.checkUserPwdLDAP(server,userDN,value)
userDN = ldapObj.addDN("uid=%s" % self.Get('ur_login'),
usersDN)
self.checkUserPwdLDAP(server, userDN, value)
class VariableUrUserNewPw(Variable):
"""
@ -250,10 +266,11 @@ class VariableUrUserNewPw(Variable):
self.label = _("New password")
self.help = _("new user password")
def check(self,value):
def check(self, value):
if not value:
raise VariableError(_("Empty password"))
class VariableClClientLogin(VariableUrLogin):
"""
User Login
@ -264,30 +281,31 @@ class VariableClClientLogin(VariableUrLogin):
def choice(self):
loginChoice = VariableUrLogin.choice(self)
if self.Get('cl_action') == 'passwd':
return filter(lambda x:x != "root",loginChoice)
return filter(lambda x: x != "root", loginChoice)
else:
return loginChoice
def check(self,value):
def check(self, value):
"""Does user exist"""
if not value in self.choice() and self.Get('cl_action') == 'logout':
raise VariableError(_("X session users not found"))
if value == "":
raise VariableError(_("Please specify the user"))
if value == "root" and self.Get('cl_action') == 'passwd':
raise VariableError(\
raise VariableError(
_("This action can be executed by a non-root user only"))
try:
pwd.getpwnam(value).pw_gid
except:
raise VariableError(_("User %s does not exist")%value)
except (TypeError, KeyError):
raise VariableError(_("User %s does not exist") % value)
def get(self):
if (self.Get('cl_action') == 'passwd' and
self.Get('ur_login') != 'root'):
if (self.Get('cl_action') == 'passwd' and
self.Get('ur_login') != 'root'):
return self.Get('ur_login')
return ""
class VariableClClientRelevanceSet(ReadonlyVariable):
"""
Актуальны ли сейчас выполненные шаблоны
@ -296,32 +314,36 @@ class VariableClClientRelevanceSet(ReadonlyVariable):
def get(self):
# если происходят действия ввода или вывода из домена
if (self.Get('cl_action') in ("domain","undomain") and
self.Get('cl_client_mount_set') == 'off'):
if (self.Get('cl_action') in ("domain", "undomain") and
self.Get('cl_client_mount_set') == 'off'):
return "off"
# если изменился домен
if self.Get('cl_remote_host') != self.Get("os_remote_auth"):
return "off"
if (self.Get('cl_remote_host') and
not isMount(self.Get('cl_client_remote_path'))):
not isMount(self.Get('cl_client_remote_path'))):
return "off"
return "on"
class VariableClClientRemotePath(Variable):
"""
Путь для монитрования //domain/remote
"""
value = "/var/calculate/remote"
class VariableClClientProfileName(Variable):
"""
Название удаленного профиля (CLD,CLDX,all)
"""
def get(self):
return ("all" if self.Get('cl_profile_all_set') == 'on'
else self.Get('os_linux_shortname'))
class VariableClLdapData(ldapUser,ReadonlyVariable):
class VariableClLdapData(ldapUser, ReadonlyVariable):
"""
Внутренняя переменная, содержащая объект для доступа к данным LDAP
"""
@ -341,7 +363,7 @@ class VariableClLdapData(ldapUser,ReadonlyVariable):
if usersDN:
partDN = "ou=Worked,ou=Replication,ou=LDAP"
servicesDN = "ou=Services"
baseDN = usersDN.rpartition(servicesDN+",")[2]
baseDN = usersDN.rpartition(servicesDN + ",")[2]
replDN = self.addDN(partDN, servicesDN, baseDN)
return replDN
return False
@ -353,8 +375,8 @@ class VariableClLdapData(ldapUser,ReadonlyVariable):
bindDn, bindPw, host = connectData
replDN = self.getReplDN()
# find string for service replication branch
userAndOsName = "%s@%s"%(userName,osLinuxShort)
findAttr = "uid=%s"%userAndOsName
userAndOsName = "%s@%s" % (userName, osLinuxShort)
findAttr = "uid=%s" % userAndOsName
# connect to LDAP
if not self.ldapConnect(bindDn, bindPw, host):
return False
@ -363,14 +385,13 @@ class VariableClLdapData(ldapUser,ReadonlyVariable):
return resSearch
return False
def _gethostbyname(self,hostname):
def _gethostbyname(self, hostname):
try:
return gethostbyname(hostname)
except:
pass
return None
except Exception:
return None
def getNameRemoteServer(self,userName, osLinuxShort, curHost):
def getNameRemoteServer(self, userName, osLinuxShort, curHost):
"""
Get remote domain hostname or empty if profile is keeped on
current server
@ -399,7 +420,7 @@ class VariableClLdapData(ldapUser,ReadonlyVariable):
usersDN = self.getUsersDN()
partDN = "ou=Replication,ou=LDAP"
servicesDN = "ou=Services"
baseDN = usersDN.rpartition(servicesDN+",")[2]
baseDN = usersDN.rpartition(servicesDN + ",")[2]
replDN = self.addDN(partDN, servicesDN, baseDN)
findAttr = "ou=Worked"
# connect to LDAP
@ -417,11 +438,13 @@ class VariableClReplicationHost(ReadonlyVariable):
"""
Удаленный сервер при репликации, который содержит актуальный профиль
"""
def get(self):
return self.Get('cl_ldap_data').getNameRemoteServer(
self.Get('ur_login'),self.Get('cl_client_profile_name'),
self.Get('ur_login'), self.Get('cl_client_profile_name'),
self.Get('cl_remote_host'))
class VariableClClientUserMountData(ReadonlyTableVariable):
"""
Таблица монтирования ресурсов
@ -431,30 +454,36 @@ class VariableClClientUserMountData(ReadonlyTableVariable):
'cl_client_user_mount_path',
'cl_client_user_mount_host']
def get(self):
def get(self, hr=HumanReadable.No):
home = path.split(self.Get('ur_home_path'))[0]
envFile = self.Get('cl_env_server_path')
def generate():
yield ("share","share",path.join(self.Get('ur_home_path'),"Share"),
self.Get('cl_remote_host'))
yield ("unix","unix",path.join(home,".%s"%self.Get('ur_login')),
self.Get('cl_remote_host'))
yield ("homes","homes",path.join(self.Get('ur_home_path'),"Home"),
self.Get('cl_remote_host'))
if convertEnv().getVar("ftp","host"):
yield ("ftp","ftp",path.join(self.Get('ur_home_path'),"FTP"),
self.Get('cl_remote_host'))
yield (
"share", "share", path.join(self.Get('ur_home_path'), "Share"),
self.Get('cl_remote_host'))
yield (
"unix", "unix", path.join(home, ".%s" % self.Get('ur_login')),
self.Get('cl_remote_host'))
yield (
"homes", "homes", path.join(self.Get('ur_home_path'), "Home"),
self.Get('cl_remote_host'))
if convertEnv().getVar("ftp", "host"):
yield ("ftp", "ftp", path.join(self.Get('ur_home_path'), "FTP"),
self.Get('cl_remote_host'))
else:
yield ("ftp",'','','')
yield ("ftp", '', '', '')
if self.Get('cl_replication_host'):
yield ("remote_profile","unix",
path.join(home,".%s.remote"%self.Get('ur_login')),
yield ("remote_profile", "unix",
path.join(home, ".%s.remote" % self.Get('ur_login')),
self.Get('cl_replication_host'))
else:
yield ("remote_profile",'unix','','')
yield ("remote_profile", 'unix', '', '')
return list(generate())
class VariableClClientUserMountName(FieldValue,ReadonlyVariable):
class VariableClClientUserMountName(FieldValue, ReadonlyVariable):
"""
Название удаленного ресурса
"""
@ -463,7 +492,7 @@ class VariableClClientUserMountName(FieldValue,ReadonlyVariable):
column = 0
class VariableClClientUserMountResource(FieldValue,ReadonlyVariable):
class VariableClClientUserMountResource(FieldValue, ReadonlyVariable):
"""
Название удаленного ресурса
"""
@ -471,7 +500,8 @@ class VariableClClientUserMountResource(FieldValue,ReadonlyVariable):
source_variable = "cl_client_user_mount_data"
column = 1
class VariableClClientUserMountPath(FieldValue,ReadonlyVariable):
class VariableClClientUserMountPath(FieldValue, ReadonlyVariable):
"""
Путь подключения удаленного ресурса
"""
@ -479,7 +509,8 @@ class VariableClClientUserMountPath(FieldValue,ReadonlyVariable):
source_variable = "cl_client_user_mount_data"
column = 2
class VariableClClientUserMountHost(FieldValue,ReadonlyVariable):
class VariableClClientUserMountHost(FieldValue, ReadonlyVariable):
"""
Удаленный сервер
"""
@ -487,12 +518,14 @@ class VariableClClientUserMountHost(FieldValue,ReadonlyVariable):
source_variable = "cl_client_user_mount_data"
column = 3
class SyncHelper:
class SyncHelper(object):
"""
Вспомогательный объект для определения статуса синхронизации и времени
по конфигурационным файлам
"""
def getSyncStatus(self,rpath):
def getSyncStatus(self, rpath):
"""
Получить status_sync из desktop файла
"""
@ -501,9 +534,9 @@ class SyncHelper:
if os.path.exists(fileConfig):
objConfig = iniParser(fileConfig)
data = self.getDataInConfig("main", ["status_sync"],
objConfig)
objConfig)
if data:
return data.get("status_sync","")
return data.get("status_sync", "")
return ""
def getDataInConfig(self, section, listVars, objConfig):
@ -512,19 +545,18 @@ class SyncHelper:
"""
varsConfig = {}
for varName in listVars:
varsConfig[varName] = objConfig.getVar(section,varName)
varsConfig[varName] = objConfig.getVar(section, varName)
if objConfig.getError():
return False
return varsConfig
def convertDate(self,strdate,dateformat="%Y-%m-%d %H:%M:%S"):
def convertDate(self, strdate, dateformat="%Y-%m-%d %H:%M:%S"):
"""
Convert date from string format (dateformat) to stuct or None
"""
if strdate:
try:
return time.strptime(strdate,dateformat)
return time.strptime(strdate, dateformat)
except ValueError:
pass
return ""
@ -541,73 +573,83 @@ class SyncHelper:
timeLogout = data["date_logout"]
timeConfig = data["date"]
dates = filter(None,
[self.convertDate(timeLogout),
self.convertDate(timeConfig)])
[self.convertDate(timeLogout),
self.convertDate(timeConfig)])
if dates:
return dates[0]
return ""
def checkNeedSync(self,homeDir,rpath,curTimeObj,curStatusSync,osLinuxShort):
def checkNeedSync(self, homeDir, rpath, curTimeObj, curStatusSync,
osLinuxShort):
"""
Проверить необходимость синхронизации текущего профиля с удаленным
"""
# profile directory
#fileConfig = os.path.join(homeDir, Client.configFileServer)
# fileConfig = os.path.join(homeDir, Client.configFileServer)
pathProfile = os.path.join(rpath, osLinuxShort)
#if readFile(fileConfig).strip():
# if readFile(fileConfig).strip():
# return True
fileSoftConfigThis = os.path.join(pathProfile,
Client.configFileSoft)
Client.configFileSoft)
fileSoftConfigCur = os.path.join(homeDir,
Client.configFileSoft)
xSessionCur = iniParser(fileSoftConfigCur).getVar('main','xsession')
xSessionThis = iniParser(fileSoftConfigThis).getVar('main','xsession')
Client.configFileSoft)
xSessionCur = iniParser(fileSoftConfigCur).getVar('main', 'xsession')
xSessionThis = iniParser(fileSoftConfigThis).getVar('main', 'xsession')
# check profile date on current server
#fileConfigThis = os.path.join(pathProfile, Client.configFileDesktop)
#if iniParser(fileConfigThis).getVar('main','status_sync') == "success":
# fileConfigThis = os.path.join(pathProfile, Client.configFileDesktop)
# if iniParser(fileConfigThis).getVar('main','status_sync') == "success":
# self.setVarToConfig("main", {"status_sync":"success_mount"},
# fileConfigThis)
thisTimeObj = self.getDateObjClientConf(pathProfile)
if curStatusSync == "success_logout" and \
xSessionCur == xSessionThis and \
thisTimeObj and curTimeObj and \
curTimeObj >= thisTimeObj:
xSessionCur == xSessionThis and \
thisTimeObj and curTimeObj and \
curTimeObj >= thisTimeObj:
return False
return True
class VariableClClientSyncTime(SyncHelper,ReadonlyVariable):
class VariableClClientSyncTime(SyncHelper, ReadonlyVariable):
"""
Текущее время синхронизации профиля
"""
def get(self):
return self.getDateObjClientConf(self.Get('ur_home_path'))
class VariableClClientPackTime(SyncHelper,ReadonlyVariable):
class VariableClClientPackTime(SyncHelper, ReadonlyVariable):
"""
Время комады упаковки профиля
"""
def get(self):
return str(float(time.time()))
class VariableClClientSyncStatus(SyncHelper,ReadonlyVariable):
class VariableClClientSyncStatus(SyncHelper, ReadonlyVariable):
"""
Текущий статус синхронизации профиля
"""
def get(self):
return self.getSyncStatus(self.Get('ur_home_path'))
class VariableClClientLocalSyncTime(SyncHelper,ReadonlyVariable):
class VariableClClientLocalSyncTime(SyncHelper, ReadonlyVariable):
"""
Текущий статус синхронизации профиля
"""
def get(self):
return self.getDateObjClientConf(
path.join(
path.join(
self.Select('cl_client_user_mount_path',
where='cl_client_user_mount_name',eq='unix',
limit=1),self.Get('cl_client_profile_name')))
where='cl_client_user_mount_name', eq='unix',
limit=1), self.Get('cl_client_profile_name')))
class VariableClClientSyncReplicationSet(SyncHelper,ReadonlyVariable):
class VariableClClientSyncReplicationSet(SyncHelper, ReadonlyVariable):
"""
Нужно ли синхронизировать текущий профиль с удаленным доменом
"""
@ -617,16 +659,18 @@ class VariableClClientSyncReplicationSet(SyncHelper,ReadonlyVariable):
if not self.Get('cl_replication_host'):
return "off"
profilePath = self.Select('cl_client_user_mount_path',
where='cl_client_user_mount_name',
eq='remote_profile',limit=1)
where='cl_client_user_mount_name',
eq='remote_profile', limit=1)
if self.Get('cl_action') == 'login' and not isMount(profilePath):
raise VariableError(_("Remote profile not mounted"))
return "on" if self.checkNeedSync(self.Get('ur_home_path'),profilePath,
self.Get('cl_client_sync_time'),
self.Get('cl_client_sync_status'),
self.Get('cl_client_profile_name')) else "off"
return "on" if self.checkNeedSync(self.Get('ur_home_path'), profilePath,
self.Get('cl_client_sync_time'),
self.Get('cl_client_sync_status'),
self.Get(
'cl_client_profile_name')) else "off"
class VariableClClientSyncLocalSet(SyncHelper,ReadonlyVariable):
class VariableClClientSyncLocalSet(SyncHelper, ReadonlyVariable):
"""
Нужно ли синхронизировать текущий профиль с локальным доменом
"""
@ -636,44 +680,52 @@ class VariableClClientSyncLocalSet(SyncHelper,ReadonlyVariable):
if not self.Get('cl_remote_host'):
return "off"
profilePath = self.Select('cl_client_user_mount_path',
where='cl_client_user_mount_name',
eq='unix',limit=1)
where='cl_client_user_mount_name',
eq='unix', limit=1)
if self.Get('cl_action') == 'login' and not isMount(profilePath):
raise VariableError(_("Remote profile not mounted"))
return "on" if self.checkNeedSync(self.Get('ur_home_path'),profilePath,
self.Get('cl_client_sync_time'),
self.Get('cl_client_sync_status'),
self.Get('cl_client_profile_name')) else "off"
return "on" if self.checkNeedSync(self.Get('ur_home_path'), profilePath,
self.Get('cl_client_sync_time'),
self.Get('cl_client_sync_status'),
self.Get(
'cl_client_profile_name')) else "off"
class VariableClClientSymlinks(ReadonlyVariable):
"""
Список симлинков в пользовательском профиле
"""
def get(self):
skipFiles = (self.Get('cl_sync_del_path') +
self.Get('cl_sync_skip_path'))
reSkip = re.compile("|".join(map(lambda x:x.replace("*",".*"),
skipFiles))).search
return filter(lambda x:not reSkip(x),
find(self.Get('ur_home_path'),onefilesystem=True,
filetype=FindFileType.SymbolicLink))
self.Get('cl_sync_skip_path'))
reSkip = re.compile("|".join(map(lambda x: x.replace("*", ".*"),
skipFiles))).search
return filter(lambda x: not reSkip(x),
find(self.Get('ur_home_path'), onefilesystem=True,
filetype=FindFileType.SymbolicLink))
class VariableClClientNscdCache(Variable):
"""
Частота обновления кэша nscd при работе в домене в часах
"""
class VariableClCifsVer(ReadonlyVariable):
"""
Версия модуля CIFS
"""
def get(self):
return readFile("/sys/module/cifs/version")
class VariableClRsyncVer(ReadonlyVariable):
"""
Версия rsync
"""
def get(self):
data = isPkgInstalled('net-misc/rsync')
if data:

12
pym/client/wsdl_client.py
Unescape View File

@ -1,6 +1,6 @@
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Copyright 2012-2013 Calculate Ltd. http://www.calculate-linux.org
# Copyright 2012-2015 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -28,6 +28,7 @@ import calculate.client.client as client
from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])
__ = getLazyLocalTranslate(_)
@ -63,15 +64,16 @@ class Wsdl(WsdlBase):
ClientError, DesktopError),
# значения по умолчанию для переменных этого метода
'setvars': {'cl_action!': 'domain',
'cl_protect_use_set!':'off'
},
'cl_protect_use_set!': 'off'
},
'guivars': {'cl_localhost_set!': lambda dv: (
"on" if dv.Get('cl_remote_host') == '' else 'off')},
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Domain"),
normal=(
'cl_localhost_set', 'cl_remote_host_new',
'cl_localhost_set',
'cl_remote_host_new',
'cl_remote_pw'),
expert=('cl_client_mount_set',
'cl_templates_locate',

Write Preview
Loading…
Cancel
Save