From 4dcd8e86e5ae0a9bfb3c5481cab77d752b9ff22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Fri, 21 Aug 2020 12:33:24 +0300
Subject: [PATCH] Fix genkey

---
 i18n/cl_server_ru.mo | Bin 130337 -> 130296 bytes
 pym/cl_ldap.py       |  27 ++++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/i18n/cl_server_ru.mo b/i18n/cl_server_ru.mo
index 8e63d980847dd271b2a1806c2440ae0f4376ff40..f671aea4a384c257d4e8aa15022969ec1b7b137e 100644
GIT binary patch
delta 8688
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

delta 8727
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
XrDjxAxu~j9Q4_qYTfD2@qul=o2ymlt

diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
index 5480365..00279a2 100644
--- a/pym/cl_ldap.py
+++ b/pym/cl_ldap.py
@@ -1862,7 +1862,7 @@ This command is not allowed."))
         # Создаем сертификат для Postfix
         if not self.createCertificate(sslOrganization="Postfix IMAP Server",
                                 userName="postfix", groupName="postfix",
-                                certFile="/etc/ssl/postfix/server.pem",
+                                certFile="/etc/ssl/postfix/server.crt",
                                 keyFile="/etc/ssl/postfix/server.key"):
             return False
         return True
@@ -1901,7 +1901,10 @@ This command is not allowed."))
                 if not os.path.exists(rndFile):
                     self.printERROR(_("Can not create %s")%rndFile)
                     return False
-                textLine = self.execProg("%s gendh -rand %s 512 >> %s"\
+                self.printOK(
+                    _("Generating DH. This is going to take a long time")
+                    + " ...", printBR=False)
+                textLine = self.execProg("%s dhparam -dsaparam -rand %s 4096 >> %s"\
                                          %(sslFile, rndFile, dhFile))
                 if textLine == False:
                     self.printERROR(_("Can not create DH certificate %s")%certFile)
@@ -1971,7 +1974,10 @@ nsCertType = %s
             return False
         # Создание DH
         if genDH:
-            textLine = self.execProg("%s gendh -rand %s 512 >> %s"\
+            self.printOK(
+                _("Generating DH. This is going to take a long time")
+                + " ...", printBR=False)
+            textLine = self.execProg("%s dhparam -dsaparam -rand %s 4096 >> %s"\
                                      %(sslFile, rndFile, certFile))
             if textLine == False:
                 self.printERROR(_("Can not create DH certificate %s")%certFile)
@@ -5284,6 +5290,7 @@ in Jabber service"))
         # Изменяемые аттрибуты пользователя
         modAttrs = []
         # Изменяем Jabber ID
+        jabber_hosts = self.get_jabber_hosts()
         if options.has_key('j'):
             # Изменяем JID
             jabberId = options['j']
@@ -5293,6 +5300,10 @@ in Jabber service"))
                 if len(jabberId.split("@")) != 2:
                     self.printERROR(_("JID %s incorrect") %jabberId)
                     return False 
+                if jabberId.rpartition('@')[2] not in jabber_hosts:
+                    self.printERROR(
+                        _("JID %s not supported on this jabber hosts") %jabberId)
+                    return False
             searchUser = self.searchUserToId(jabberId)
             if searchUser:
                 foundUserName = searchUser[0][0][1]['uid'][0]
@@ -5552,10 +5563,16 @@ in Unix service") %str(jabberId))
             return False
         return True
 
+    def get_jabber_hosts(self):
+        jabber_host = self.clVars.Get('sr_jabber_host')
+        jabber_hosts = self.clVars.Get('sr_jabber_hosts').split(',')
+        jabber_hosts.append(jabber_host)
+        return list(set(jabber_hosts))
 
     @adminConnectLdap
     def addUserJabberServer(self, userName, options, checkSetup=True):
         """Добавляет jabber пользователя"""
+        jabber_hosts = self.get_jabber_hosts()
         # Проверим установлен ли сервис jabber
         if checkSetup and not self.initialChecks("jabber"):
             return False
@@ -5570,6 +5587,10 @@ in Unix service") %str(jabberId))
                 if len(jabberId.split("@")) != 2:
                     self.printERROR(_("JID %s incorrect") %jabberId)
                     return False
+                if jabberId.rpartition('@')[2] not in jabber_hosts:
+                    self.printERROR(
+                        _("JID %s not supported on this jabber hosts") %jabberId)
+                    return False
         # добавляем jabberID в Unix
         if self.isServiceSetup("unix",False):
             if not self.servUnixObj.setUserJabberID(userName, jabberId):