|
|
|
|
@ -36,8 +36,7 @@ import time
|
|
|
|
|
# Для ввода символа
|
|
|
|
|
import tty
|
|
|
|
|
import termios
|
|
|
|
|
# Для ldif
|
|
|
|
|
import base64
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Version = "calculate-server 0.0.1"
|
|
|
|
|
|
|
|
|
|
@ -140,6 +139,9 @@ class ldapFunction(cl_profile._error):
|
|
|
|
|
except ldap.LDAPError, e:
|
|
|
|
|
self.setError(e[0]['desc'])
|
|
|
|
|
return False
|
|
|
|
|
except:
|
|
|
|
|
self.setError("Error in ldif file")
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
else:
|
|
|
|
|
self.setError(_("No connect to LDAP server"))
|
|
|
|
|
@ -231,8 +233,11 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
if os.path.isdir(os.path.join(profilePath, fileData)):
|
|
|
|
|
service.append(fileData)
|
|
|
|
|
if service:
|
|
|
|
|
# После добавления сервисов в класс необходимо удалить
|
|
|
|
|
# apache и jabber
|
|
|
|
|
service.remove('backup')
|
|
|
|
|
service.remove('apache')
|
|
|
|
|
service.remove('jabber')
|
|
|
|
|
return service
|
|
|
|
|
|
|
|
|
|
def applyProfilesFromService(self, service):
|
|
|
|
|
@ -281,6 +286,14 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
continue
|
|
|
|
|
elif service == "jabber":
|
|
|
|
|
if self.getRunService("jabber"):
|
|
|
|
|
textLine = self.execProg("/etc/init.d/ejabberd stop")
|
|
|
|
|
if not ("ok" in textLine):
|
|
|
|
|
self.printERROR( "Ejabberd" + " " +
|
|
|
|
|
_("service is not stopped"))
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
elif self.getRunService(service):
|
|
|
|
|
stopService = service
|
|
|
|
|
textLine = self.execProg("/etc/init.d/%s stop" %(stopService))
|
|
|
|
|
@ -351,8 +364,12 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
continue
|
|
|
|
|
addDirDict = {"slapd":("openldap","slapd.pid"),
|
|
|
|
|
"samba":("samba","smbd.pid"),
|
|
|
|
|
"dovecot":("dovecot","master.pid")}
|
|
|
|
|
pidDir = baseDir + "/" + addDirDict[daemon][0]
|
|
|
|
|
"dovecot":("dovecot","master.pid"),
|
|
|
|
|
"ejabberd":("/var/lib/init.d/daemons","ejabberd")}
|
|
|
|
|
if addDirDict[daemon][0][:1] == "/":
|
|
|
|
|
pidDir = addDirDict[daemon][0]
|
|
|
|
|
else:
|
|
|
|
|
pidDir = baseDir + "/" + addDirDict[daemon][0]
|
|
|
|
|
if os.access(pidDir, os.F_OK) and os.listdir(pidDir) and\
|
|
|
|
|
os.path.exists(os.path.join(pidDir,addDirDict[daemon][1])):
|
|
|
|
|
runDaemons[daemon] = True
|
|
|
|
|
@ -377,8 +394,11 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
elif nameService == "ldap":
|
|
|
|
|
if not self.getRunDaemons(['slapd'],printError):
|
|
|
|
|
flagError = True
|
|
|
|
|
elif nameService == "jabber":
|
|
|
|
|
if not self.getRunDaemons(['ejabberd'],printError):
|
|
|
|
|
flagError = True
|
|
|
|
|
else:
|
|
|
|
|
if not self.getRunDaemons([nameService],printError):
|
|
|
|
|
if not self.getRunDaemons([nameService],printError):
|
|
|
|
|
flagError = True
|
|
|
|
|
if flagError:
|
|
|
|
|
if printError:
|
|
|
|
|
@ -389,7 +409,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
|
|
|
|
|
def unicList(self, lst):
|
|
|
|
|
"""Список уникальных элементов из списка не уникальных"""
|
|
|
|
|
return list(set(lst)|set([]))
|
|
|
|
|
return list(set(lst))
|
|
|
|
|
|
|
|
|
|
def addDN(self, *arg):
|
|
|
|
|
"""Складывает текстовые элементы DN"""
|
|
|
|
|
@ -578,10 +598,18 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
|
adminDn = ldapParser.getVar(part,"DN")
|
|
|
|
|
adminPw = ldapParser.getVar(part,"PASS")
|
|
|
|
|
if not (adminDn or adminPw):
|
|
|
|
|
if part == "admin":
|
|
|
|
|
service = "LDAP"
|
|
|
|
|
else:
|
|
|
|
|
service = part
|
|
|
|
|
self.printERROR(service.capitalize() + " " +\
|
|
|
|
|
_("not installed ..."))
|
|
|
|
|
return False
|
|
|
|
|
ldapObj = ldapFunction(adminDn, adminPw)
|
|
|
|
|
if ldapObj.getError():
|
|
|
|
|
self.printERROR (_("LDAP connect error") + ": " +\
|
|
|
|
|
ldapObj.getError())
|
|
|
|
|
ldapObj.getError().strip())
|
|
|
|
|
return False
|
|
|
|
|
# Устанавливаем у объекта соединение и объект LDAP функций
|
|
|
|
|
self.ldapObj = ldapObj
|
|
|
|
|
@ -990,7 +1018,7 @@ class servUnix(shareLdap):
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(groupLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("Unix Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
if options.has_key('p'):
|
|
|
|
|
sys.stdout.write(gid)
|
|
|
|
|
@ -1041,7 +1069,7 @@ class servUnix(shareLdap):
|
|
|
|
|
#Добавляем пользователя в LDAP
|
|
|
|
|
self.ldapObj.ldapAdd(userLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("Unix Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
#clVars.Write("soft_ldap_user_id",str(int(userId)+1))
|
|
|
|
|
self.printSUCCESS(_("Added machine") + "...")
|
|
|
|
|
@ -1186,7 +1214,7 @@ class servUnix(shareLdap):
|
|
|
|
|
self.addUsersGroupUnix([userName],group)
|
|
|
|
|
# не переделывать на else
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("Unix Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
# Изменим время последнего измения пароля пользователя
|
|
|
|
|
if not self.setShadowLastChange(userName):
|
|
|
|
|
@ -1799,9 +1827,8 @@ class servUnix(shareLdap):
|
|
|
|
|
# Запускаем LDAP сервер
|
|
|
|
|
if not self.runLdapServer():
|
|
|
|
|
return False
|
|
|
|
|
#Cоединение с Ldap (администратор)
|
|
|
|
|
shareLdap.getLdapObjInFile(self)
|
|
|
|
|
#self.setParamIniFile("setup_LDAP","no")
|
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","unix")
|
|
|
|
|
self.clVars.Write("soft_unix_setup","no")
|
|
|
|
|
# Для тестовых целей устанавливаем директорию инсталяции
|
|
|
|
|
#clVars.Set("setup_path_install","/tmp/test1/")
|
|
|
|
|
@ -1809,6 +1836,10 @@ class servUnix(shareLdap):
|
|
|
|
|
# файлов профилей
|
|
|
|
|
if not self.applyProfilesFromService('unix'):
|
|
|
|
|
return False
|
|
|
|
|
# Рестартуем LDAP
|
|
|
|
|
self.restartLdapServer()
|
|
|
|
|
#Cоединение с Ldap (администратор)
|
|
|
|
|
shareLdap.getLdapObjInFile(self)
|
|
|
|
|
# Удаляем предыдущую ветку сервиса Unix
|
|
|
|
|
servicesDN = self.relDN
|
|
|
|
|
resSearch = self.searchService()
|
|
|
|
|
@ -1828,7 +1859,7 @@ class servUnix(shareLdap):
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(baseLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
|
# Записываем данные администратора сервиса Unix
|
|
|
|
|
@ -1872,8 +1903,7 @@ class servMail(shareLdap):
|
|
|
|
|
"/usr/lib/calculate/calculate-server/ldif/mail_group.ldif"
|
|
|
|
|
# Алгоритм шифрования пароля для Mail пользователя
|
|
|
|
|
self.userCrypt = "{SSHA}"
|
|
|
|
|
# Директория где хранятся письма
|
|
|
|
|
self.mailLocation = "/var/calculate/mail"
|
|
|
|
|
# Директория хранения писем
|
|
|
|
|
if unixObj:
|
|
|
|
|
# получаем объект сервиса Unix
|
|
|
|
|
self.servUnixObj = unixObj
|
|
|
|
|
@ -1936,7 +1966,8 @@ class servMail(shareLdap):
|
|
|
|
|
# Удаляем почтовую папку
|
|
|
|
|
if options.has_key('r'):
|
|
|
|
|
#почтовая директория пользователя
|
|
|
|
|
mailDir = os.path.join(self.mailLocation,userName)
|
|
|
|
|
mailDir = os.path.join(self.clVars.Get("soft_ldap_mail_path"),
|
|
|
|
|
userName)
|
|
|
|
|
if self.servUnixObj.removeHomeDir(mailDir):
|
|
|
|
|
self.printSUCCESS(\
|
|
|
|
|
_("Mail user directory %s is removed")% str(mailDir) +\
|
|
|
|
|
@ -2315,7 +2346,7 @@ class servMail(shareLdap):
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(groupLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
#Добавляем альтернативные почтовые адреса
|
|
|
|
|
if options.has_key('e') and modAttrs:
|
|
|
|
|
@ -2373,9 +2404,11 @@ class servMail(shareLdap):
|
|
|
|
|
|
|
|
|
|
def createMailDir(self, userName, uid, gid):
|
|
|
|
|
"""Создание пользовательской директории для почты"""
|
|
|
|
|
mailDir = os.path.join(self.mailLocation,userName)
|
|
|
|
|
mailDir = os.path.join(self.clVars.Get("soft_ldap_mail_path"),
|
|
|
|
|
userName)
|
|
|
|
|
if not os.path.exists(mailDir):
|
|
|
|
|
os.makedirs(mailDir)
|
|
|
|
|
os.chmod(mailDir,0600)
|
|
|
|
|
os.chown(mailDir,uid,gid)
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@ -2551,7 +2584,7 @@ class servMail(shareLdap):
|
|
|
|
|
#ldapObj.ldapAdd(userLdif1)
|
|
|
|
|
# не переделывать на else
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
if resUnix:
|
|
|
|
|
uid = int(resUnix[0][0][1]['uidNumber'][0])
|
|
|
|
|
@ -2600,7 +2633,7 @@ class servMail(shareLdap):
|
|
|
|
|
# конфигурационные файлы сервиса Mail (программы Postfix и Dovecot)
|
|
|
|
|
self.printWARNING (_("WARNING") + ": " +
|
|
|
|
|
_("Executing of the program will change") + " " +
|
|
|
|
|
_("the configuration files of Mail service") +"("+
|
|
|
|
|
_("the configuration files of Mail service") +" ("+
|
|
|
|
|
_("programs Postfix and Dovecot") + ")." )
|
|
|
|
|
# если вы ранее использовали программу cl-setup то в дальнейшем
|
|
|
|
|
# можете использовать cl-backup для резервного копирования
|
|
|
|
|
@ -2625,6 +2658,8 @@ class servMail(shareLdap):
|
|
|
|
|
# Подключаемся к LDAP cерверу
|
|
|
|
|
if not shareLdap.getLdapObjInFile(self):
|
|
|
|
|
return False
|
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","mail")
|
|
|
|
|
self.clVars.Write("soft_mail_setup","no")
|
|
|
|
|
# Находим в LDAP Mail сервис
|
|
|
|
|
resSearch = self.searchService()
|
|
|
|
|
@ -2645,9 +2680,8 @@ class servMail(shareLdap):
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(baseLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
self.clVars.Write("soft_samba_setup","no")
|
|
|
|
|
# Cоздаем объект профиль устанавливая директорию samba для
|
|
|
|
|
# файлов профилей
|
|
|
|
|
if not self.applyProfilesFromService('mail'):
|
|
|
|
|
@ -2691,6 +2725,223 @@ class servMail(shareLdap):
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class servJabber(shareLdap):
|
|
|
|
|
"""Методы сервиса Jabber"""
|
|
|
|
|
def __init__(self, unixObj=False):
|
|
|
|
|
shareLdap.__init__(self)
|
|
|
|
|
self.relGrDN = 'ou=Groups'
|
|
|
|
|
self.relUsDN = 'ou=Users'
|
|
|
|
|
self.relServDN = 'ou=Jabber'
|
|
|
|
|
# DN сервиса
|
|
|
|
|
self.relDN = self.addDN(self.relServDN,self.ServicesDN)
|
|
|
|
|
# DN пользователей, относительно базового DN
|
|
|
|
|
self.relUsersDN = self.addDN(self.relUsDN, self.relDN)
|
|
|
|
|
# DN групп пользователей, относительно базового DN
|
|
|
|
|
self.relGroupsDN = self.addDN(self.relGrDN, self.relDN)
|
|
|
|
|
self.ldifFileBase =\
|
|
|
|
|
"/usr/lib/calculate/calculate-server/ldif/jabber_base.ldif"
|
|
|
|
|
self.ldifFileUser =\
|
|
|
|
|
"/usr/lib/calculate/calculate-server/ldif/jabber_user.ldif"
|
|
|
|
|
self.ldifFileGroup =\
|
|
|
|
|
"/usr/lib/calculate/calculate-server/ldif/jabber_group.ldif"
|
|
|
|
|
if unixObj:
|
|
|
|
|
# получаем объект сервиса Unix
|
|
|
|
|
self.servUnixObj = unixObj
|
|
|
|
|
else:
|
|
|
|
|
# создаем объект сервиса Unix
|
|
|
|
|
self.servUnixObj = servUnix()
|
|
|
|
|
|
|
|
|
|
def searchGroupName(self, groupName):
|
|
|
|
|
"""Находит группу сервиса Unix по её имени"""
|
|
|
|
|
resSearch = self.searchLdapDN(groupName, self.relGroupsDN, "cn")
|
|
|
|
|
return resSearch
|
|
|
|
|
|
|
|
|
|
def searchUserToMail(self, mail):
|
|
|
|
|
"""Находит пользователя по почтовому адресу в сервисе Jabber"""
|
|
|
|
|
resSearch = self.searchLdapDN(mail, self.relUsersDN, "mail")
|
|
|
|
|
return resSearch
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def addGroupJabberServer(self, groupName, options):
|
|
|
|
|
"""Добавляет группу пользователей Jabber"""
|
|
|
|
|
# Если группа существует выходим без ошибки
|
|
|
|
|
if self.searchGroupName(groupName):
|
|
|
|
|
self.printERROR(\
|
|
|
|
|
_("group name %s is found in Jabber service") %\
|
|
|
|
|
str(groupName) + " ...")
|
|
|
|
|
return False
|
|
|
|
|
self.clVars.Set("soft_ldap_group_name",groupName)
|
|
|
|
|
# Коментарий к группе
|
|
|
|
|
gecos = self.servUnixObj.groupGecos
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
|
gecos = options['c']
|
|
|
|
|
self.clVars.Set("soft_ldap_group_desc",gecos)
|
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
|
groupLdif = self.createLdif(ldifFile)
|
|
|
|
|
if not groupLdif:
|
|
|
|
|
print self.getError()
|
|
|
|
|
return False
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(groupLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
self.printSUCCESS(_("Added group in Jabber service") + " ...")
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def addUserJabberServer(self, userName, options):
|
|
|
|
|
"""Добавляет jabber пользователя"""
|
|
|
|
|
#jabber id
|
|
|
|
|
mail = "%s@%s.%s" %(userName,
|
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
|
if self.searchUserToMail(mail):
|
|
|
|
|
self.printERROR(_("User exists in Jabber service"))
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
# Пароль пользователя Jabber
|
|
|
|
|
userPwd = self.getUserPassword(options, "p", "P")
|
|
|
|
|
if userPwd == False:
|
|
|
|
|
return False
|
|
|
|
|
if not userPwd:
|
|
|
|
|
userPwd = "crypt{xxx}"
|
|
|
|
|
self.clVars.Set("soft_ldap_user_pw_hash",userPwd)
|
|
|
|
|
|
|
|
|
|
self.clVars.Set("soft_ldap_user_login", userName)
|
|
|
|
|
#Полное имя пользователя
|
|
|
|
|
fullNameUser = self.servUnixObj.fullNameUser
|
|
|
|
|
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
|
fullNameUser = options['c']
|
|
|
|
|
self.clVars.Set("soft_ldap_user_full_name",fullNameUser)
|
|
|
|
|
|
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
#Добавляем пользователя в LDAP
|
|
|
|
|
self.ldapObj.ldapAdd(userLdif)
|
|
|
|
|
#ldapObj.ldapAdd(userLdif1)
|
|
|
|
|
# не переделывать на else
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
self.printSUCCESS(_("Added user in Jabber service") + " ...")
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def setupJabberServer(self, options):
|
|
|
|
|
"""Начальная настройка Jabber сервиса"""
|
|
|
|
|
# Принудительная установка
|
|
|
|
|
forceOptions = False
|
|
|
|
|
if options.has_key("f"):
|
|
|
|
|
forceOptions = True
|
|
|
|
|
# Создаем объект переменных
|
|
|
|
|
self.createClVars()
|
|
|
|
|
#self.clVars.printVars()
|
|
|
|
|
#return True
|
|
|
|
|
if self.clVars.Get("soft_ldap_setup") != "yes":
|
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
|
self.printWARNING(_("LDAP service is not setuped"))
|
|
|
|
|
self.printWARNING(_("Setup LDAP service"))
|
|
|
|
|
self.printWARNING(" cl-setup ldap")
|
|
|
|
|
return False
|
|
|
|
|
# В случае если сервер установлен
|
|
|
|
|
if self.clVars.Get("soft_jabber_setup") == "yes" and\
|
|
|
|
|
not forceOptions:
|
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
|
_("Jabber server is configured")+ ".")
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
if not forceOptions:
|
|
|
|
|
# предупреждение при выполнении этой программы будут изменены
|
|
|
|
|
# конфигурационные файлы сервиса Mail (программы Postfix и Dovecot)
|
|
|
|
|
self.printWARNING (_("WARNING") + ": " +
|
|
|
|
|
_("Executing of the program will change") + " " +
|
|
|
|
|
_("the configuration files of Jabber service") +" ("+
|
|
|
|
|
_("program Ejabberd") + ")." )
|
|
|
|
|
# если вы ранее использовали программу cl-setup то в дальнейшем
|
|
|
|
|
# можете использовать cl-backup для резервного копирования
|
|
|
|
|
self.printWARNING (
|
|
|
|
|
_("If cl-setup program was used previously") + ", " +
|
|
|
|
|
_("you may execute cl-backup program for backup services"))
|
|
|
|
|
# если вы готовы продолжить работу программы нажмите Y если нет n
|
|
|
|
|
messDialog = \
|
|
|
|
|
_("If you are ready to continue executing the program") + ", "+\
|
|
|
|
|
_("press Y") +", "+ _("if not n")
|
|
|
|
|
if not self.dialogYesNo(messDialog):
|
|
|
|
|
return True
|
|
|
|
|
# Удаляем из автозапуска демона
|
|
|
|
|
if not self.delDaemonAutostart("ejabberd"):
|
|
|
|
|
return False
|
|
|
|
|
# останавливаем сервис Jabber
|
|
|
|
|
if not self.stopServices(["jabber"]):
|
|
|
|
|
return False
|
|
|
|
|
# Подключаемся к LDAP cерверу
|
|
|
|
|
if not shareLdap.getLdapObjInFile(self):
|
|
|
|
|
return False
|
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","jabber")
|
|
|
|
|
self.clVars.Write("soft_jabber_setup","no")
|
|
|
|
|
# Находим в LDAP Jabber сервис
|
|
|
|
|
resSearch = self.searchService()
|
|
|
|
|
ret = True
|
|
|
|
|
if resSearch:
|
|
|
|
|
delDN = self.relDN
|
|
|
|
|
ret = self.deleteDN(delDN)
|
|
|
|
|
if ret:
|
|
|
|
|
self.printOK(_("Remove Jabber DN from LDAP Database") +" ...")
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(\
|
|
|
|
|
_("Can not remove Jabber DN from LDAP Database")+\
|
|
|
|
|
" ...")
|
|
|
|
|
if not ret:
|
|
|
|
|
return False
|
|
|
|
|
ldifFile = self.ldifFileBase
|
|
|
|
|
baseLdif = self.createLdif(ldifFile)
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(baseLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
# Cоздаем объект профиль устанавливая директорию jabber для
|
|
|
|
|
# файлов профилей
|
|
|
|
|
if not self.applyProfilesFromService('jabber'):
|
|
|
|
|
return False
|
|
|
|
|
# Администратор сервиса
|
|
|
|
|
adminName = "admin"
|
|
|
|
|
adminFullName = "%s@%s.%s" %(adminName,
|
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
|
print _("Enter the %s password" % adminFullName)
|
|
|
|
|
if not self.addUserJabberServer(adminName,{'p':""}):
|
|
|
|
|
return False
|
|
|
|
|
# Записываем данные администратора сервиса Jabber
|
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
|
ldapParser.setVar("jabber",
|
|
|
|
|
{"DN":self.clVars.Get("soft_ldap_admin_jabber"),
|
|
|
|
|
"PASS":self.clVars.Get("soft_ldap_admin_jabberpw")})
|
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
|
# создаем сертификат если есть используем прежний
|
|
|
|
|
self.execProg("/bin/bash /etc/jabber/self-cert.sh")
|
|
|
|
|
if not os.path.exists("/etc/jabber/ssl.pem"):
|
|
|
|
|
self.printERROR(_("Can not create Jabber certificate") + " ...")
|
|
|
|
|
return False
|
|
|
|
|
textLine = self.execProg("/etc/init.d/ejabberd start")
|
|
|
|
|
if "ok" in textLine:
|
|
|
|
|
self.printOK(_("Starting") + " " + "Ejabberd" + " ...")
|
|
|
|
|
else:
|
|
|
|
|
self.printNotOK(_("Starting") + " " + "Ejabberd" + " ...")
|
|
|
|
|
return False
|
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
|
if not self.setDaemonAutostart("ejabberd"):
|
|
|
|
|
return False
|
|
|
|
|
self.clVars.Write("soft_jabber_setup","yes")
|
|
|
|
|
self.printOK(_("Jabber service configured") + " ...")
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
class servSamba(shareLdap):
|
|
|
|
|
"""Методы севисa Samba"""
|
|
|
|
|
def __init__(self, unixObj=False):
|
|
|
|
|
@ -2762,7 +3013,7 @@ class servSamba(shareLdap):
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def addUserSambaServer(self, userName, options):
|
|
|
|
|
def addUserSambaServer(self, userName, options, pwDialog=False):
|
|
|
|
|
"""Добавляет LDAP пользователя в LDAP-сервер"""
|
|
|
|
|
# Добавление машины samba
|
|
|
|
|
if options.has_key('w'):
|
|
|
|
|
@ -2785,7 +3036,8 @@ class servSamba(shareLdap):
|
|
|
|
|
#пароль пользователя
|
|
|
|
|
userPwd = ""
|
|
|
|
|
#диалог ввода пароля
|
|
|
|
|
pwDialog = [_("New SMB password"),
|
|
|
|
|
if not pwDialog:
|
|
|
|
|
pwDialog = [_("New SMB password"),
|
|
|
|
|
_("Retype new SMB password")]
|
|
|
|
|
userPwd = self.getUserPassword(options, "p", "P", pwDialog)
|
|
|
|
|
if userPwd == False:
|
|
|
|
|
@ -2901,8 +3153,8 @@ class servSamba(shareLdap):
|
|
|
|
|
if not self.stopServices(["samba"]):
|
|
|
|
|
return False
|
|
|
|
|
# Установим права 777 на директории
|
|
|
|
|
dirs = ["/var/calculate/winnt/profiles",
|
|
|
|
|
"/var/calculate/share"]
|
|
|
|
|
dirs = [self.clVars.Get("soft_ldap_samba_profile_path"),
|
|
|
|
|
self.clVars.Get("soft_ldap_samba_share_path")]
|
|
|
|
|
for mDir in dirs:
|
|
|
|
|
if os.path.exists(mDir):
|
|
|
|
|
fd = os.open(mDir, os.O_RDONLY)
|
|
|
|
|
@ -2911,7 +3163,8 @@ class servSamba(shareLdap):
|
|
|
|
|
os.close(fd)
|
|
|
|
|
if not mode == 0777:
|
|
|
|
|
os.chmod(mDir, 0777)
|
|
|
|
|
|
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","samba")
|
|
|
|
|
self.clVars.Write("soft_samba_setup","no")
|
|
|
|
|
# Cоздаем объект профиль устанавливая директорию samba для
|
|
|
|
|
# файлов профилей
|
|
|
|
|
@ -2934,13 +3187,11 @@ class servSamba(shareLdap):
|
|
|
|
|
_("Can not add Samba admin password"))
|
|
|
|
|
return False
|
|
|
|
|
textLine = self.execProg("/etc/init.d/slapd restart")
|
|
|
|
|
|
|
|
|
|
#Cоединение с Ldap (администратор)
|
|
|
|
|
shareLdap.getLdapObjInFile(self)
|
|
|
|
|
|
|
|
|
|
if not "ok" in textLine:
|
|
|
|
|
self.printNotOK(_("LDAP restart") + " ...")
|
|
|
|
|
return False
|
|
|
|
|
#Cоединение с Ldap (администратор)
|
|
|
|
|
shareLdap.getLdapObjInFile(self)
|
|
|
|
|
resSearch = self.searchService()
|
|
|
|
|
ret = True
|
|
|
|
|
if resSearch:
|
|
|
|
|
@ -2958,7 +3209,7 @@ class servSamba(shareLdap):
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(baseLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
|
textLine = self.execProg("/etc/init.d/samba start")
|
|
|
|
|
@ -2967,8 +3218,10 @@ class servSamba(shareLdap):
|
|
|
|
|
else:
|
|
|
|
|
self.printNotOK(_("Starting") + " Samba ...")
|
|
|
|
|
return False
|
|
|
|
|
print _("Enter the ROOT password")
|
|
|
|
|
if not self.addUserSambaServer('root',{'p':""}):
|
|
|
|
|
print _("Enter existing ROOT password")
|
|
|
|
|
pwDialog = [_("ROOT password"),
|
|
|
|
|
_("Retype ROOT password")]
|
|
|
|
|
if not self.addUserSambaServer('root',{'p':""},pwDialog):
|
|
|
|
|
return False
|
|
|
|
|
if not self.setDaemonAutostart("slapd"):
|
|
|
|
|
return False
|
|
|
|
|
@ -3355,7 +3608,7 @@ class servLdap(shareLdap):
|
|
|
|
|
# Добавляем в базу из ldif
|
|
|
|
|
self.ldapObj.ldapAdd(ldif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
# Останавливаем LDAP сервер
|
|
|
|
|
if not self.stopLdapServer():
|
|
|
|
|
@ -3473,6 +3726,8 @@ class servLdap(shareLdap):
|
|
|
|
|
# Удаляем ldap файл
|
|
|
|
|
if os.path.exists(ldapFile):
|
|
|
|
|
os.remove(ldapFile)
|
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","ldap")
|
|
|
|
|
self.clVars.Write("soft_ldap_setup","no")
|
|
|
|
|
# Первый проход
|
|
|
|
|
self.clVars.Set("setup_pass_parser","1",True)
|
|
|
|
|
@ -3493,7 +3748,7 @@ class servLdap(shareLdap):
|
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
|
self.ldapObj.ldapAdd(baseLdif)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError()
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
|
# Второй проход,
|
|
|
|
|
@ -3547,6 +3802,7 @@ class cl_ldap(shareLdap):
|
|
|
|
|
(_("Unix service options"),True,1,1,"options"),
|
|
|
|
|
(_("Samba service options"),True,1,1,"options"),
|
|
|
|
|
(_("Mail service options"),True,1,1,"options"),
|
|
|
|
|
(_("Jabber service options"),True,1,1,"options"),
|
|
|
|
|
(_("Services"),True,1,0,"")
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
@ -3571,6 +3827,8 @@ class cl_ldap(shareLdap):
|
|
|
|
|
_("Unix service options")],
|
|
|
|
|
"mail":[_("Common options"),
|
|
|
|
|
_("Mail service options")],
|
|
|
|
|
"jabber":[_("Common options"),
|
|
|
|
|
_("Jabber service options")],
|
|
|
|
|
}
|
|
|
|
|
# Cвязь длинных опций помощи и выводимых разделов помощи с опциями
|
|
|
|
|
self.relOptions = {"h":[_("Common options")],
|
|
|
|
|
@ -3580,13 +3838,16 @@ class cl_ldap(shareLdap):
|
|
|
|
|
_("Unix service options")],
|
|
|
|
|
"help-samba":[_("Common options"),
|
|
|
|
|
_("Samba service options")],
|
|
|
|
|
"help-mail":[_("Common options"),
|
|
|
|
|
"help-mail": [_("Common options"),
|
|
|
|
|
_("Mail service options")],
|
|
|
|
|
"help-jabber":[_("Common options"),
|
|
|
|
|
_("Jabber service options")],
|
|
|
|
|
"help-all":[_("Common options"),
|
|
|
|
|
_("Samba service options"),
|
|
|
|
|
_("LDAP service options"),
|
|
|
|
|
_("Unix service options"),
|
|
|
|
|
_("Mail service options")
|
|
|
|
|
_("Mail service options"),
|
|
|
|
|
_("Jabber service options")
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -3625,6 +3886,10 @@ class cl_ldap(shareLdap):
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'help':_("display help for Mail service options")
|
|
|
|
|
},
|
|
|
|
|
{'longOption':"help-jabber",
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'help':_("display help for Jabber service options")
|
|
|
|
|
},
|
|
|
|
|
{'longOption':"help-all",
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'help':_("display help for all services options")
|
|
|
|
|
@ -3657,6 +3922,13 @@ class cl_ldap(shareLdap):
|
|
|
|
|
'helpChapter':_("Mail service options"),
|
|
|
|
|
'help':_("set the description field for the new group")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(0,),
|
|
|
|
|
'shortOption':"c",
|
|
|
|
|
'longOption':"comment",
|
|
|
|
|
'optVal':"COMMENT",
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("set the description field for the new group")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(0,),
|
|
|
|
|
'shortOption':"p",
|
|
|
|
|
'helpChapter':_("Unix service options"),
|
|
|
|
|
@ -3730,7 +4002,14 @@ class cl_ldap(shareLdap):
|
|
|
|
|
'longOption':"comment",
|
|
|
|
|
'optVal':_("COMMENT"),
|
|
|
|
|
'helpChapter':_("Mail service options"),
|
|
|
|
|
'help':_("set the COMMENT field for the new unix account")
|
|
|
|
|
'help':_("set the COMMENT field for the new account")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(3,),
|
|
|
|
|
'shortOption':"c",
|
|
|
|
|
'longOption':"comment",
|
|
|
|
|
'optVal':_("COMMENT"),
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("set the COMMENT field for the new account")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(3,),
|
|
|
|
|
'shortOption':"d",
|
|
|
|
|
@ -3831,6 +4110,19 @@ class cl_ldap(shareLdap):
|
|
|
|
|
'help':_("use password for the user account")+\
|
|
|
|
|
" (" + _("from standard input") + ")"
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(3,),
|
|
|
|
|
'shortOption':"p",
|
|
|
|
|
'longOption':"password",
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("use password for the user account")+\
|
|
|
|
|
" (" + _("from dialog") + ")"
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(3,),
|
|
|
|
|
'shortOption':"P",
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("use password for the user account")+\
|
|
|
|
|
" (" + _("from standard input") + ")"
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(3,),
|
|
|
|
|
'shortOption':"w",
|
|
|
|
|
'helpChapter':_("Samba service options"),
|
|
|
|
|
@ -4028,25 +4320,30 @@ class cl_ldap(shareLdap):
|
|
|
|
|
# Services
|
|
|
|
|
{'progAccess':(6,),
|
|
|
|
|
'helpChapter':_("Services"),
|
|
|
|
|
'help':pcs(" ldap", self.column_width,
|
|
|
|
|
'help':pcs(" ldap", self.column_width,
|
|
|
|
|
"ldap " + servName, self.consolewidth-self.column_width)
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
{'progAccess':(0,1,2,3,4,5,6,7,),
|
|
|
|
|
'helpChapter':_("Services"),
|
|
|
|
|
'help':pcs(" unix", self.column_width,
|
|
|
|
|
'help':pcs(" unix", self.column_width,
|
|
|
|
|
"unix " + servName, self.consolewidth-self.column_width)
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(3,4,5,6,7,),
|
|
|
|
|
'helpChapter':_("Services"),
|
|
|
|
|
'help':pcs(" samba", self.column_width,
|
|
|
|
|
'help':pcs(" samba", self.column_width,
|
|
|
|
|
"samba " + servName, self.consolewidth-self.column_width)
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(0,1,2,3,4,5,6,7,),
|
|
|
|
|
'helpChapter':_("Services"),
|
|
|
|
|
'help':pcs(" mail", self.column_width,
|
|
|
|
|
'help':pcs(" mail", self.column_width,
|
|
|
|
|
"mail " + servName, self.consolewidth-self.column_width)
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(0,3,6,),
|
|
|
|
|
'helpChapter':_("Services"),
|
|
|
|
|
'help':pcs(" jabber", self.column_width,
|
|
|
|
|
"jabber " + servName, self.consolewidth-self.column_width)
|
|
|
|
|
},
|
|
|
|
|
##{'helpChapter':_("Services"),
|
|
|
|
|
##'help':" mail \t\t\tmail " + servName + "\n"
|
|
|
|
|
##},
|
|
|
|
|
|
asamoukin
16 years ago