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

fix wait_thread, del cert_add

Browse Source
develop
Спиридонов Денис 12 years ago
parent d4c3c50f0e
commit 1261e792a6
3 changed files with 235 additions and 208 deletions
Show Stats Download Patch File Download Diff File

10
console/application/cert_func.py
Unescape View File

@ -40,12 +40,10 @@ def client_post_cert (client, clVars, show_info = False):
if result_post_cert[0] == -4: if result_post_cert[0] == -4:
print _("Certificate not found in Server Database!") print _("Certificate not found in Server Database!")
print _('Add certificate to server Database...') print _('client use certificate %s') %client.CERT_FILE
ip, mac, client_type = get_ip_mac_type() print _('You can generate a new certificate using the keys '
_print (ip, mac, client_type) '--gen-cert-by and --get-cert-from')
cert_id = client.service.cert_add(mac, client_type) raise Exception(3)
print _("Your certificate ID = %s") %cert_id
raise Exception(1)
# client_sid(sid, client, cert_id = results[0][0], clVars = clVars) # client_sid(sid, client, cert_id = results[0][0], clVars = clVars)
if result_post_cert[0] == -3: if result_post_cert[0] == -3:

212
console/application/cl_client.py
Unescape View File

@ -62,6 +62,114 @@ def client_signal(client):
raise Exception(1) raise Exception(1)
time.sleep(float(client_active)) time.sleep(float(client_active))
class StoppableThread(threading.Thread):
def __init__(self):
super(StoppableThread, self).__init__()
self._stop = threading.Event()
def run(self):
l = ['|','/','-','\\','|','/','-','\\']
i = 0
while True:
for i in l:
sys.stdout.write("\r\r" + i)
sys.stdout.flush()
time.sleep(.1)
if self.stopped():
sys.stdout.write("\b")
sys.stdout.flush()
return 0
def stop(self):
self._stop.set()
def stopped(self):
return self._stop.isSet()
def connect_with_cert(cert, path_to_cert, url, args, wait_thread, clVarsCore,
crypto_Error, Connect_Error):
flag_thread_start = False
cert_name = cert
CERT_FILE = os.path.join(path_to_cert, cert_name + '.crt')
CERT_KEY = os.path.join(path_to_cert, cert_name + '.key')
client = None
bio = M2Crypto.BIO.openfile(CERT_KEY)
rsa = M2Crypto.m2.rsa_read_key(bio._ptr(),lambda *unused: None)
if not rsa:
store_passwd = get_password_from_daemon(args.host, args.port,
wait_thread)
if 'store_passwd' in locals():
key_passwd = store_passwd
else:
key_passwd = None
try:
client = Client_suds(url, transport=HTTPSClientCertTransport \
(CERT_KEY, CERT_FILE, path_to_cert, password=key_passwd,
wait_thread = wait_thread))
if not wait_thread.isAlive():
wait_thread = StoppableThread()
flag_thread_start = True
wait_thread.start()
client.wsdl.services[0].setlocation(url)
client.set_parameters (path_to_cert, CERT_FILE, CERT_KEY)
wait_thread.stop()
client_post_cert(client, clVarsCore)
Connect_Error = 0
except VerifyError, e:
Connect_Error = 1
except OpenSSL.crypto.Error, e:
Connect_Error = 1
crypto_Error = 1
except urllib2.URLError, e:
Connect_Error = 1
except Exception, e:
if e.message == 3:
wait_thread.stop()
sys.exit(1)
Connect_Error = 1
if flag_thread_start:
wait_thread.stop()
return (client, Connect_Error, crypto_Error,
True if 'store_passwd' in locals() else False,
e if 'e' in locals() else None)
def get_server_hostname(host, path_to_cert):
compliance_file = os.path.join(path_to_cert, 'compliance_server_names')
if not os.path.isfile(compliance_file):
fd = open(compliance_file, 'w')
fd.close()
for line in readLinesFile(compliance_file):
adress, server_hostname = line.split(' ',1)
if adress == host:
return server_hostname
return None
def add_server_hostname(host, path_to_cert, server_hostname):
try:
compliance_file = os.path.join(path_to_cert, 'compliance_server_names')
if not os.path.isfile(compliance_file):
fd = open(compliance_file, 'w')
fd.close()
temp_file = ''
find_flag = False
for line in readLinesFile(compliance_file):
adress, server_hostname = line.split(' ',1)
if adress == host:
temp_file += "%s %s\n" %(adress, server_hostname)
find_flag = True
else:
temp_file += line+'\n'
if not find_flag:
temp_file += "%s %s\n" %(host, server_hostname)
fd = open(compliance_file, 'w')
fd.write(temp_file)
fd.close()
return True
except Exception, e:
print e
return False
def https_server(client, args, unknown_args, url, clVarsCore, wait_thread): def https_server(client, args, unknown_args, url, clVarsCore, wait_thread):
client_post_auth(client) client_post_auth(client)
@ -77,7 +185,7 @@ def https_server(client, args, unknown_args, url, clVarsCore, wait_thread):
find_flag = True find_flag = True
break break
if not find_flag: if not find_flag:
_print (_('Not found method for symlink %s') %sym_link) _print (_('Not found method for %s') %sym_link)
if args.stop_consoled: if args.stop_consoled:
wait_thread.stop() wait_thread.stop()
@ -168,103 +276,6 @@ def https_server(client, args, unknown_args, url, clVarsCore, wait_thread):
wait_thread.stop() wait_thread.stop()
return 0 return 0
class StoppableThread(threading.Thread):
def __init__(self):
super(StoppableThread, self).__init__()
self._stop = threading.Event()
def run(self):
l = ['|','/','-','\\','|','/','-','\\']
i = 0
while True:
for i in l:
sys.stdout.write("\r\r" + i)
sys.stdout.flush()
time.sleep(.1)
if self.stopped():
sys.stdout.write("\b")
sys.stdout.flush()
return 0
def stop(self):
self._stop.set()
def stopped(self):
return self._stop.isSet()
def connect_with_cert(cert, path_to_cert, url, args, wait_thread, clVarsCore,
crypto_Error, Connect_Error):
cert_name = cert
CERT_FILE = os.path.join(path_to_cert, cert_name + '.crt')
CERT_KEY = os.path.join(path_to_cert, cert_name + '.key')
client = None
bio = M2Crypto.BIO.openfile(CERT_KEY)
rsa = M2Crypto.m2.rsa_read_key(bio._ptr(),lambda *unused: None)
if not rsa:
store_passwd = get_password_from_daemon(args.host, args.port,
wait_thread)
if 'store_passwd' in locals():
key_passwd = store_passwd
else:
key_passwd = None
try:
client = Client_suds(url, transport=HTTPSClientCertTransport \
(CERT_KEY, CERT_FILE, path_to_cert, password=key_passwd,
wait_thread = wait_thread))
client.wsdl.services[0].setlocation(url)
client.set_parameters (path_to_cert, CERT_FILE, CERT_KEY)
client_post_cert(client, clVarsCore)
Connect_Error = 0
except VerifyError, e:
Connect_Error = 1
except OpenSSL.crypto.Error, e:
Connect_Error = 1
crypto_Error = 1
except urllib2.URLError, e:
Connect_Error = 1
except Exception, e:
Connect_Error = 1
return (client, Connect_Error, crypto_Error,
True if 'store_passwd' in locals() else False,
e if 'e' in locals() else None)
def get_server_hostname(host, path_to_cert):
compliance_file = os.path.join(path_to_cert, 'compliance_server_names')
if not os.path.isfile(compliance_file):
fd = open(compliance_file, 'w')
fd.close()
for line in readLinesFile(compliance_file):
adress, server_hostname = line.split(' ',1)
if adress == host:
return server_hostname
return None
def add_server_hostname(host, path_to_cert, server_hostname):
try:
compliance_file = os.path.join(path_to_cert, 'compliance_server_names')
if not os.path.isfile(compliance_file):
fd = open(compliance_file, 'w')
fd.close()
temp_file = ''
find_flag = False
for line in readLinesFile(compliance_file):
adress, server_hostname = line.split(' ',1)
if adress == host:
temp_file += "%s %s\n" %(adress, server_hostname)
find_flag = True
else:
temp_file += line+'\n'
if not find_flag:
temp_file += "%s %s\n" %(host, server_hostname)
fd = open(compliance_file, 'w')
fd.write(temp_file)
fd.close()
return True
except Exception, e:
print e
return False
def main(): def main():
parser = parse() parser = parse()
args, unknown_args = parser.parse_known_args() args, unknown_args = parser.parse_known_args()
@ -357,12 +368,10 @@ def main():
# delete password from daemon list # delete password from daemon list
clear_password(host, port) clear_password(host, port)
get_name_flag = False get_name_flag = False
# return 1
if e: if e:
wait_thread.stop() wait_thread.stop()
print _('Error: '), e print _('Error: '), e
get_name_flag = False get_name_flag = False
# return 1
if get_name_flag: if get_name_flag:
try: try:
@ -392,6 +401,7 @@ def main():
print _("Exception: %s") %e print _("Exception: %s") %e
tb.print_exc() tb.print_exc()
wait_thread.stop() wait_thread.stop()
try: try:
client = Client_suds(url, \ client = Client_suds(url, \
transport = HTTPSClientCertTransport(None,None, path_to_cert)) transport = HTTPSClientCertTransport(None,None, path_to_cert))
@ -404,7 +414,7 @@ def main():
wait_thread.stop() wait_thread.stop()
print '\b' + _('Failed to connect')+':', e print '\b' + _('Failed to connect')+':', e
return 1 return 1
print server_host_name
try: try:
import glob import glob
all_cert_list = glob.glob(os.path.join(path_to_cert, '*.crt')) all_cert_list = glob.glob(os.path.join(path_to_cert, '*.crt'))

221
ru/calculate_console.po
Unescape View File

@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: console_gui_translate\n" "Project-Id-Version: console_gui_translate\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-14 10:03+0300\n" "POT-Creation-Date: 2012-06-15 15:51+0300\n"
"PO-Revision-Date: 2012-06-14 10:03+0300\n" "PO-Revision-Date: 2012-06-15 16:12+0300\n"
"Last-Translator: Denis <ds@mail.ru>\n" "Last-Translator: Denis <ds@mail.ru>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: \n" "Language: \n"
@ -16,8 +16,7 @@ msgstr ""
"X-Poedit-SearchPath-0: /var/calculate/mydir/git/calculate-console/console/application\n" "X-Poedit-SearchPath-0: /var/calculate/mydir/git/calculate-console/console/application\n"
#: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:25 #: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:25
#: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:27 #: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:28
#: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:30
msgid "Time" msgid "Time"
msgstr "Время" msgstr "Время"
@ -93,17 +92,17 @@ msgid "Process not found"
msgstr "Процесс не найден" msgstr "Процесс не найден"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:142 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:142
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:138 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:258
msgid "Certificate not found in server database" msgid "Certificate not found in server database"
msgstr "Сертификат не найден в БД сервера" msgstr "Сертификат не найден в базе сервера"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:140 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:260
msgid "Session doesn't belong to your certificate" msgid "Session doesn't belong to your certificate"
msgstr "Сессия не соответствует Вашему сертификату" msgstr "Сессия не соответствует Вашему сертификату"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:146 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:146
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:142 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:262
msgid "It was not possible to kill process" msgid "It was not possible to kill process"
msgstr "Не удалось завершить процесс" msgstr "Не удалось завершить процесс"
@ -126,7 +125,7 @@ msgstr "Дата отзыва"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:98 #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:98
#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:103 #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:103
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:282 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:286
#, python-format #, python-format
msgid "error creating directory %s" msgid "error creating directory %s"
msgstr "Ошибка при создании директории %s" msgstr "Ошибка при создании директории %s"
@ -218,7 +217,7 @@ msgstr "сервер послал идентификатор процесса =
msgid "Process not exist or not belong to your session" msgid "Process not exist or not belong to your session"
msgstr "Процесс не существует или принадлежит не вашей сессии" msgstr "Процесс не существует или принадлежит не вашей сессии"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:533 #: /var/calculate/mydir/git/calculate-console/console/application/function.py:535
#, python-format #, python-format
msgid "Error task by %s" msgid "Error task by %s"
msgstr "Ошибка задачи на %s" msgstr "Ошибка задачи на %s"
@ -227,36 +226,47 @@ msgstr "Ошибка задачи на %s"
msgid "no connection to server!" msgid "no connection to server!"
msgstr "нет соединения с сервером!" msgstr "нет соединения с сервером!"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:136 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:188
#, python-format
msgid "Not found method for %s"
msgstr "Не найден метод для %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:256
msgid "Process is terminated" msgid "Process is terminated"
msgstr "Процесс завершён" msgstr "Процесс завершён"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:240 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:328
#, python-format #, python-format
msgid "cannot create directory %s" msgid "cannot create directory %s"
msgstr "Не удалось создать директорию %s" msgstr "Не удалось создать директорию %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:279 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:367
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:88 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:447
msgid "Failed to connect"
msgstr "Не удалось подключиться"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:341
msgid "Password is invalid" msgid "Password is invalid"
msgstr "Неверный пароль" msgstr "Неверный пароль"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:347 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:373
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:365 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:384
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:453
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:469
msgid "Error: " msgid "Error: "
msgstr "Ошибка: " msgstr "Ошибка: "
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:380 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:396
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:383 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:399
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:385 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:401
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:482
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:485
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:487
#, python-format #, python-format
msgid "Exception: %s" msgid "Exception: %s"
msgstr "Исключение: %s" msgstr "Исключение: %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:415
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:88
msgid "Failed to connect"
msgstr "Не удалось подключиться"
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:29 #: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:29
msgid "show this help message and exit" msgid "show this help message and exit"
msgstr "просмотр данной справки и выход" msgstr "просмотр данной справки и выход"
@ -361,19 +371,6 @@ msgstr "Пароль для %s: "
msgid "Repeat password for %s: " msgid "Repeat password for %s: "
msgstr "Повтор пароля для %s: " msgstr "Повтор пароля для %s: "
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:33
msgid " New Session"
msgstr "Новая сессия"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:34
msgid " Old Session"
msgstr "Старая сессия"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:35
#, python-format
msgid " Your session id = %s"
msgstr "Номер Вашей сессии = %s"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:44 #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:44
msgid "No access to file!" msgid "No access to file!"
msgstr "Нет доступа к файлу!" msgstr "Нет доступа к файлу!"
@ -436,218 +433,240 @@ msgstr "Ошибка очистки кэша сессии"
msgid "Session cache is cleared" msgid "Session cache is cleared"
msgstr "Кэш сессии очищен" msgstr "Кэш сессии очищен"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:40 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:42
msgid "Certificate not found in Server Database!" msgid "Certificate not found in Server Database!"
msgstr "Сертификат не найден в БД сервера!" msgstr "Сертификат не найден в базе сервера!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:41
msgid "Add certificate to server Database..."
msgstr "Добавление сертификата в БД сервера..."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:45 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:43
#, python-format #, python-format
msgid "Your certificate ID = %s" msgid "client use certificate %s"
msgstr "Номер Вашего сертификата = %s" msgstr "клиент использует сертификат %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:44
msgid "You can generate a new certificate using the keys --gen-cert-by and --get-cert-from"
msgstr "Вы можете сгенерировать новый сертификат, используя ключи --gen-cert-by и --get-cert-from"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:49 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:50
msgid "Certificate not send!" msgid "Certificate not send!"
msgstr "Сертификат не отправлен!" msgstr "Сертификат не отправлен!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:52 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:53
#, python-format #, python-format
msgid " Your certifitate id = %d" msgid " Your certifitate id = %d"
msgstr "Номер Вашего сертификата = %d" msgstr "Номер Вашего сертификата = %d"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:55 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:56
msgid "expiry date certificate has passed" msgid "expiry date certificate has passed"
msgstr "Время жизни сертификата истекло" msgstr "Время жизни сертификата истекло"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:58 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:59
#, python-format #, python-format
msgid "shelf life expires after %d days" msgid "shelf life expires after %d days"
msgstr "Время жизни сертификата истекает через %d дней" msgstr "Время жизни сертификата истекает через %d дней"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:107 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:71
msgid " New Session"
msgstr "Новая сессия"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:72
msgid " Old Session"
msgstr "Старая сессия"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:73
#, python-format
msgid " Your session id = %s"
msgstr "Номер Вашей сессии = %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:119
msgid "Password: " msgid "Password: "
msgstr "Пароль: " msgstr "Пароль: "
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:109 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121
msgid "Repeat: " msgid "Repeat: "
msgstr "Повтор: " msgstr "Повтор: "
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:117 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:129
msgid "Passwords do not match" msgid "Passwords do not match"
msgstr "Пароли не совпадают" msgstr "Пароли не совпадают"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:125 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:137
msgid "You have sent a request to sign the certificate." msgid "You have sent a request to sign the certificate."
msgstr "У Вас уже есть отправленный запрос на подписание сертификата." msgstr "У Вас уже есть отправленный запрос на подписание сертификата."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:126 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:138
#, python-format #, python-format
msgid "request id = %s" msgid "request id = %s"
msgstr "Номер запроса = %s" msgstr "Номер запроса = %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:127 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:139
msgid "Send new request? y/[n]: " msgid "Send new request? y/[n]: "
msgstr "Отправить навый запрос на подпись сертификата? y/[n]: " msgstr "Отправить навый запрос на подпись сертификата? y/[n]: "
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:132 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:182 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:194
msgid "connect..." msgid "connect..."
msgstr "подключение..." msgstr "подключение..."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:138 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:150
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:189 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:201
msgid "Close. Connecting Error." msgid "Close. Connecting Error."
msgstr "Ошибка соединения. Закрываюсь." msgstr "Ошибка соединения. Закрываюсь."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:139 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:151
#, python-format #, python-format
msgid "Error: %s" msgid "Error: %s"
msgstr "Ошибка: %s" msgstr "Ошибка: %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:148 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:160
msgid "secret key and request exists" msgid "secret key and request exists"
msgstr "секретный ключ и запрос на подпись сертификата созданы" msgstr "секретный ключ и запрос на подпись сертификата созданы"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:149 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:161
msgid "Create new secret key and request? y/[n]: " msgid "Create new secret key and request? y/[n]: "
msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: " msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: "
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:176
msgid "This server can not sign certificate!" msgid "This server can not sign certificate!"
msgstr "Сервер не подписал сертификат!" msgstr "Сервер не подписал сертификат!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:169 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:181
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:211 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:223
#, python-format #, python-format
msgid "Your request id = %s" msgid "Your request id = %s"
msgstr "Номер Вашего запроса = %s" msgstr "Номер Вашего запроса = %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:174 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:186
#, python-format #, python-format
msgid "request was not sent or deleted file %s" msgid "request was not sent or deleted file %s"
msgstr "Запрос не был послан или удалён файл %s" msgstr "Запрос не был послан или удалён файл %s"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:195 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:207
#, python-format #, python-format
msgid "Request %s not found on client side" msgid "Request %s not found on client side"
msgstr "Запрос %s не найден на стороне клиента" msgstr "Запрос %s не найден на стороне клиента"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:207 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:219
msgid "Request to sign is rejected!" msgid "Request to sign is rejected!"
msgstr "Запрос на подпись сертификата отвергнут!" msgstr "Запрос на подпись сертификата отвергнут!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:210 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:222
msgid "Request for the signing has not yet reviewed." msgid "Request for the signing has not yet reviewed."
msgstr "Запрос на подписание сертификата ещё не рассмотрен." msgstr "Запрос на подписание сертификата ещё не рассмотрен."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:214 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:226
msgid "Request on signature does not match sent earlier." msgid "Request on signature does not match sent earlier."
msgstr "Запрос или подпись не соответствуют отправленным ранее." msgstr "Запрос или подпись не соответствуют отправленным ранее."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:217 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:229
msgid "Request was sent from another ip." msgid "Request was sent from another ip."
msgstr "Запрос был послан с другого адреса." msgstr "Запрос был послан с другого адреса."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:284 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:296
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:166 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:169
msgid "Not found field \"CN\" in certificate!" msgid "Not found field \"CN\" in certificate!"
msgstr "Не найдено поле \"CN\" в сертификате!" msgstr "Не найдено поле \"CN\" в сертификате!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:297 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:309
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:176 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:179
msgid "filename = " msgid "filename = "
msgstr "Имя файла =" msgstr "Имя файла ="
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:298 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:310
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:177 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:180
msgid "CERTIFICATE ADD" msgid "CERTIFICATE ADD"
msgstr "Сертификат добавлен" msgstr "Сертификат добавлен"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:300 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:312
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:179 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:182
msgid "file with ca certificates exists" msgid "file with ca certificates exists"
msgstr "Файл с сертификатом удостоверяющего центра создан" msgstr "Файл с сертификатом удостоверяющего центра создан"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:312 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:324
msgid "You do not have a certificate. Use key --gen-cert-by HOST for generate new request or key --get-cert-from HOST for get new certificate from server." msgid "You do not have a certificate. Use key --gen-cert-by HOST for generate new request or key --get-cert-from HOST for get new certificate from server."
msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертитфикат или ключ --get-cert-from HOST чтобы забрать сертификат с сервера." msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертитфикат или ключ --get-cert-from HOST чтобы забрать сертификат с сервера."
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:94 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:97
msgid "Certificate not found in client" msgid "Certificate not found in client"
msgstr "Сертификат не найден на стороне клиента" msgstr "Сертификат не найден на стороне клиента"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:103 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:106
msgid "Error open file" msgid "Error open file"
msgstr "Ошибка при открытии файла" msgstr "Ошибка при открытии файла"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:189 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:192
msgid "Server certificate is not valid" msgid "Server certificate is not valid"
msgstr "Сертификат сервера недействителен!" msgstr "Сертификат сервера недействителен!"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:193 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:196
msgid "CA not found on server" msgid "CA not found on server"
msgstr "Сертификат Центра Авторизации не найден на сервере" msgstr "Сертификат Центра Авторизации не найден на сервере"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:200 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:203
msgid "Error. Certificate not added to trusted" msgid "Error. Certificate not added to trusted"
msgstr "Ошибка! Сертификат не добавлен в доверенные" msgstr "Ошибка! Сертификат не добавлен в доверенные"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:202 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:205
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:224 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:228
#, python-format #, python-format
msgid "Fingerprint = %s" msgid "Fingerprint = %s"
msgstr "Отпечаток = %s" msgstr "Отпечаток = %s"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:203 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:206
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:225 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:229
msgid "Serial Number = " msgid "Serial Number = "
msgstr "Серийный номер = " msgstr "Серийный номер = "
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:205 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:208
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:227 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:231
msgid "Issuer" msgid "Issuer"
msgstr "Подписчик" msgstr "Подписчик"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:209 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:212
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:231 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:235
msgid "Subject" msgid "Subject"
msgstr "Субъект" msgstr "Субъект"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:212 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:215
msgid "Add CA certificates to trusted? y/[n]:" msgid "Add CA certificates to trusted? y/[n]:"
msgstr "Добавить сертификат Центра Авторизации в доверенные? y/[n]:" msgstr "Добавить сертификат Центра Авторизации в доверенные? y/[n]:"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:217 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:220
msgid "Certificate not added to trusted" msgid "Certificate not added to trusted"
msgstr "Сертификат не добавлен в доверенные" msgstr "Сертификат не добавлен в доверенные"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:221 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:225
msgid "Untrusted Server Certificate!" msgid "Untrusted Server Certificate!"
msgstr "Недоверенный сертификат сервера!" msgstr "Недоверенный сертификат сервера!"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:235 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:239
msgid "Add this Servers certificate to trusted (s) or" msgid "Add this Servers certificate to trusted (s) or"
msgstr "Добавить сертификат этого сервера в доверенные (s) или" msgstr "Добавить сертификат этого сервера в доверенные (s) или"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:236 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:240
msgid "Try add CA and ROOT certificates to trusted (c) or" msgid "Try add CA and ROOT certificates to trusted (c) or"
msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или" msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:237 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:241
msgid "Quit (q)? s/c/[q]: " msgid "Quit (q)? s/c/[q]: "
msgstr "Выйти (q)? s/c/[q]: " msgstr "Выйти (q)? s/c/[q]: "
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:285 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:289
msgid "Try add CA and ROOT certificates" msgid "Try add CA and ROOT certificates"
msgstr "Добавить Корневой и сертификат ЦА" msgstr "Добавить Корневой и сертификат ЦА"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:410 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:414
msgid "This server is not trusted" msgid "This server is not trusted"
msgstr "Сервер не является доверенным" msgstr "Сервер не является доверенным"
#~ msgid "client use %s"
#~ msgstr "клиент использует %s"
#~ msgid "Add certificate to server Database..."
#~ msgstr "Добавление сертификата в БД сервера..."
#~ msgid "Your certificate ID = %s"
#~ msgstr "Номер Вашего сертификата = %s"
#~ msgid "Certificate not found in server database!" #~ msgid "Certificate not found in server database!"
#~ msgstr "Сертификат не найден в БД сервера!" #~ msgstr "Сертификат не найден в БД сервера!"

Write Preview
Loading…
Cancel
Save