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

add session_list method, add translate

Browse Source
develop
Спиридонов Денис 12 years ago
parent 4a138de7a0
commit 4b62454f85
7 changed files with 172 additions and 130 deletions
Show Stats Download Patch File Download Diff File

79
console/application/cert_func.py
Unescape View File

@ -280,43 +280,42 @@ def client_post_auth(client):
print e.value
sys.exit()
# show rights on requested certificated
def cert_right_inf(client, sid, cert_id):
s = client.service.view_cert_right(cert_id)
if s[0][0] == "-1":
print _("Certificate not found in server!")
return -1
if s[0][0] == "-2":
print _("Error input certificate ID!")
return -2
if s[0][0] == "Permission denied":
print _("Permission denied %s") % s[0][1]
return -3
print _("Certificate with ID %d can execute:") %cert_id
for meth in s[0]:
print " - %s" %meth
# Viewing rights of any certificate on server by its id
def client_view_cert_right(client):
cert_id = raw_input (_("Certificate ID: "))
try:
cert_id = int (cert_id)
except:
print _("Error certificate id")
return 1
try:
sid = get_sid(client.SID_FILE)
if cert_id > 0:
cert_right_inf(client, sid, cert_id)
else:
print _("Enter correctly cert id!")
except Exception, e:
if e[0][0] == 403:
print _('Permission denied')
else:
print e
#print _("Error get data")
return 1
return 0
## show rights on requested certificated
#def cert_right_inf(client, sid, cert_id):
# s = client.service.view_cert_right(cert_id, 'console')
# if s[0][0] == "-1":
# print _("Certificate not found in server!")
# return -1
# if s[0][0] == "-2":
# print _("Error input certificate ID!")
# return -2
# if s[0][0] == "Permission denied":
# print _("Permission denied %s") % s[0][1]
# return -3
#
# print _("Certificate with ID %d can execute:") %cert_id
# for meth in s[0]:
# print " - %s" %meth
#
## Viewing rights of any certificate on server by its id
#def client_view_cert_right(client):
# cert_id = raw_input (_("Certificate ID: "))
# try:
# cert_id = int (cert_id)
# except:
# print _("Error certificate id")
# return 1
# try:
# sid = get_sid(client.SID_FILE)
# if cert_id > 0:
# cert_right_inf(client, sid, cert_id)
# else:
# print _("Enter correctly cert id!")
# except Exception, e:
# if e[0][0] == 403:
# print _('Permission denied')
# else:
# print e
# #print _("Error get data")
# return 1
# return 0

38
console/application/cl_client.py
Unescape View File

@ -27,7 +27,7 @@ from function import create_obj, get_sid, analysis, clear, get_entire_frame
from pid_information import client_list_methods
from cert_func import client_post_auth, client_post_request, client_get_cert, \
client_post_cert
from sid_func import session_clean, client_session_info
from sid_func import session_clean, client_session_info, client_session_list
from cert_verify import get_CRL, VerifyError
import argparse, datetime
@ -164,10 +164,13 @@ def parse():
dest='pid_kill', help=_("kill selected process"))
parser.add_argument(
'--session-clean', action='store_true', default=False,
dest='session_clean', help=_('Clear cache session'))
dest='session_clean', help=_('clear cache session'))
parser.add_argument(
'--session-info', action='store_true', default=False,
dest='session_info', help=_("View session information"))
dest='session_info', help=_("view session information"))
parser.add_argument(
'--session-list', action='store_true', default=False,
dest='session_list', help=_("view list active session on server"))
parser.add_argument(
'--update-crl', action='store_true', default=False,
dest='update_crl', help=_("update the certificate revocation lists"))
@ -182,6 +185,9 @@ def https_server(client, args, unknown_args, url, clVarsCore):
if args.session_info:
client_session_info(client)
if args.session_list:
client_session_list(client)
if args.list_pid:
if args.dump:
from pid_information import client_pid_info
@ -216,18 +222,20 @@ def https_server(client, args, unknown_args, url, clVarsCore):
except:
client.frame_period = 2
method_result = call_method(client, args)
if method_result:
try:
analysis(client, client.sid, method_result)
except urllib2.URLError, e:
print e
try:
analysis(client, client.sid, method_result)
except urllib2.URLError, e:
print e
# Vars = DataVarsCore()
# Vars.importCore()
# Vars.flIniFile()
#
# signaling = threading.Thread(target=client_signal, args = (client, ))
# signaling.setDaemon(True)
# signaling.start()
try:
mess = method_result[0][0]
pid = int(mess.message)
except:
return 1
client.service.clear_pid_cache(client.sid, pid)
return 0
def main():
# now = datetime.datetime.now()
@ -349,7 +357,7 @@ def main():
client.port = port
# now = datetime.datetime.now()
# print '5 ===> %ds %dms' %(now.second, now.microsecond)
https_server(client, args, unknown_args, url, clVarsCore)
return https_server(client, args, unknown_args, url, clVarsCore)
# now = datetime.datetime.now()
# print 'END ===> %ds %dms' %(now.second, now.microsecond)
#----------------------------------------------------

2
console/application/function.py
Unescape View File

@ -419,7 +419,7 @@ def analysis(client, sid, s):
try:
pid = int(mess.message)
except:
show_error('server send pid = ' + pid)
show_error(_('server send pid = ') + pid)
return 1
get_messages(client, sid, pid)
elif mess.type == 'error':

4
console/application/methods_func.py
Unescape View File

@ -107,7 +107,7 @@ def call_method(client, args):
for error in method_result.ReturnedMessage:
red = '\033[31m * \033[0m'
print red + error.message
sys.exit(1)
return None
view_params = get_view_params(client, method + '_view', step = None, \
expert = True, brief = True)
@ -121,7 +121,7 @@ def call_method(client, args):
if ask.lower() in ['n', 'no']:
red = '\033[31m * \033[0m'
print red + _('Interrupted by user')
sys.exit(1)
return None
if ask.lower() in ['y', 'yes']:
break

9
console/application/pid_information.py
Unescape View File

@ -47,16 +47,18 @@ def client_list_pid(client):
""" get all process id for this session """
sid = get_sid(client.SID_FILE)
red = '\033[31m * \033[0m'
green = '\033[32m * \033[0m'
try:
list_pid = client.service.list_pid(sid = sid)
if list_pid[0][0] == 0:
print _("Not found pid for this session!")
print red + _("Not found pid for this session!")
return 0
else:
for i in list_pid[0]:
print "pid - %d" %i
print green + "pid - %d" %i
except:
print _("Server get pids error")
print red + _("Server get pids error")
return 1
return len(list_pid[0])
@ -107,7 +109,6 @@ def client_list_methods(client):
except:
pass
print _("You can execute:"), _('use key'), '--method'
for num in range (0, len(results[DAT])):
# command = results[DAT][num][RES][COM]
view_command = results[DAT][num][RES][METH]

38
console/application/sid_func.py
Unescape View File

@ -61,30 +61,33 @@ def client_del_sid(client):
return 0
def sid_inf(client, sid):
red = '\033[31m * \033[0m'
green = '\033[32m * \033[0m'
""" get information about selected session """
s = client.service.sid_info(sid)
if s[0][0] == "-1":
print _("This session not registered on server!")
print red + _("This session not registered on server!")
return -1
if s[0][0] == "-2":
print _("Failed to obtain certificate data!")
print red + _("Failed to obtain certificate data!")
return -2
if s[0][0] == "Permission denied":
print _("Permission denied %s") % s[0][1]
print red + _("Permission denied %s") % s[0][1]
return -3
print "============================"
print _(u"Session number - %s") %sid
print _('Session information: ')
# print "============================"
print green + _(u"Session number - %s") %sid
# if s[0][5] == "0":
# print _(u"session is active")
# else:
# print _(u"session is inactive")
print _(u"Certificate number - %s") %s[0][0]
print _(u"Date issue of certificate - %s") %s[0][1]
print "ip - %s" %s[0][2]
print "MAC - %s" %s[0][3]
print green + _(u"Certificate number - %s") %s[0][0]
print green + _(u"Date issue of certificate - %s") %s[0][1]
print green + "ip - %s" %s[0][2]
print green + "MAC - %s\n" %s[0][3]
# print _(u"Client type - %s") %s[0][4]
print "============================"
# print "============================"
return 0
def client_session_info(client):
@ -95,6 +98,19 @@ def client_session_info(client):
print e
return 1
def client_session_list(client):
red = '\033[31m * \033[0m'
green = '\033[32m * \033[0m'
res = client.service.get_sessions(client.sid)
if hasattr (res, 'string'):
if res.string:
print _('Active session on server: ')
for session_id in res.string:
print green + session_id
print
return 0
print red + _('No active session on server')
def session_clean(client):
try:
res = client.service.clear_session_cache(client.sid)

132
ru/calculate_console.po
Unescape View File

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: console_gui_translate\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-23 17:59+0300\n"
"PO-Revision-Date: 2012-05-23 17:59+0300\n"
"POT-Creation-Date: 2012-05-25 15:41+0300\n"
"PO-Revision-Date: 2012-05-25 15:41+0300\n"
"Last-Translator: Denis <ds@mail.ru>\n"
"Language-Team: \n"
"Language: \n"
@ -20,7 +20,6 @@ msgid "PID not found"
msgstr "Процесс не найден"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:32
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:316
msgid "Permission denied"
msgstr "Доступ запрещён"
@ -48,7 +47,7 @@ msgid "Process has been completed"
msgstr "Процесс завершён"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:43
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:137
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:136
msgid "Process killed"
msgstr "Процесс убит"
@ -75,27 +74,27 @@ msgstr "Вы можете запускать:"
msgid "use key"
msgstr "используйте ключ"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:125
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:124
msgid "Execute sessions:"
msgstr "Запущенные сессии:"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:135
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:134
msgid "Process is completed"
msgstr "Процесс завершён"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:139
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:138
msgid "Process not found"
msgstr "Процесс не найден"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:141
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:140
msgid "Certificate not found in server database"
msgstr "Сертификат не найден в БД сервера"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:143
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:142
msgid "Session doesn't belong to your certificate"
msgstr "Сессия не соответствует Вашему сертификату"
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:145
#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144
msgid "It was not possible to kill process"
msgstr "Не удалось завершить процесс"
@ -172,34 +171,45 @@ msgid "Clear Cache error! "
msgstr "Ошибка очистки кэша!"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:154
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:180
msgid "yes"
msgstr "да"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:156
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:182
msgid "no"
msgstr "нет"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:158
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:184
msgid "auto"
msgstr "авто"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:324
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:203
msgid "Not used"
msgstr "Не используется"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:346
msgid "Error"
msgstr "Ошибка"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:330
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:352
msgid "Warning"
msgstr "Предепреждение"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:368
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:390
msgid "Method not found: "
msgstr "Метод не найден: "
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:490
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:422
msgid "server send pid = "
msgstr "сервер послал идентификатор процесса = "
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:512
msgid "Process not exist or not belong to your session"
msgstr "Процесс не существует или принадлежит не вашей сессии"
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:542
#: /var/calculate/mydir/git/calculate-console/console/application/function.py:564
#, python-format
msgid "Error task by %s"
msgstr "Ошибка задачи на %s"
@ -257,35 +267,39 @@ msgid "kill selected process"
msgstr "завершить выбранный процесс"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:167
msgid "Clear cache session"
msgstr "Очистить кэш сессии"
msgid "clear cache session"
msgstr "очистить кэш сессии"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:170
msgid "View session information"
msgstr "Просмотр информации о сессии"
msgid "view session information"
msgstr "просмотр информации о сессии"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:173
msgid "view list active session on server"
msgstr "просмотр списка активных сессий на сервере"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:176
msgid "update the certificate revocation lists"
msgstr "обновить список отзыва сертификатов"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:298
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:332
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:306
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:340
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:28
msgid "Failed to connect"
msgstr "Не удалось подключиться"
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:357
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:360
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:362
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:365
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:368
#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:370
#, python-format
msgid "Exception: %s"
msgstr "Исключение: %s"
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:115
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:118
msgid "Run process? (yes/no): "
msgstr "Запустить процесс? (yes/no): "
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:118
#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:123
msgid "Interrupted by user"
msgstr "Прервано пользователем"
@ -313,7 +327,6 @@ msgstr "Не удалось получить данные сертификата
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:50
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:73
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:293
#, python-format
msgid "Permission denied %s"
msgstr "Доступ запрещён %s"
@ -330,26 +343,38 @@ msgstr "Ошибка удаления сессии на сервере"
msgid "This session not registered on server!"
msgstr "Данная сессия не зарегистрирована на сервере!"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:77
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:76
msgid "Session information: "
msgstr "Информация о сессии: "
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:78
#, python-format
msgid "Session number - %s"
msgstr "Серийный номер = %s"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:82
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:83
#, python-format
msgid "Certificate number - %s"
msgstr "Номер сертификата - %s"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:83
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:84
#, python-format
msgid "Date issue of certificate - %s"
msgstr "Дата подписания сертификата - %s"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:104
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:103
msgid "Active session on server: "
msgstr "Активные сессии на сервере:"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:107
msgid "No active session on server"
msgstr "нет активных сессий на сервере"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:115
msgid "Error clearing session cache"
msgstr "Ошибка очистки кэша сессии"
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:106
#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:117
msgid "Session cache is cleared"
msgstr "Кэш сессии очищен"
@ -488,31 +513,6 @@ msgstr "Файл с сертификатом удостоверяющего це
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 чтобы забрать сертификат с сервера."
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:287
msgid "Certificate not found in server!"
msgstr "Сертификат не найден на сервере!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:290
msgid "Error input certificate ID!"
msgstr "Ошибка ввода идентификатора сертификата!"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:296
#, python-format
msgid "Certificate with ID %d can execute:"
msgstr "Сертификат номер %d может запускать:"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:302
msgid "Certificate ID: "
msgstr "Номер сертификата:"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:306
msgid "Error certificate id"
msgstr "Ошибка номера сертификата"
#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:313
msgid "Enter correctly cert id!"
msgstr "Введите корректный идентичикатор сертификата!"
#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:100
msgid "Certificate not found in client"
msgstr "Сертификат не найден на стороне клиента"
@ -591,6 +591,24 @@ msgstr ""
"\n"
"Внимание! %s пытается подменить сертификат!\n"
#~ msgid "Certificate not found in server!"
#~ msgstr "Сертификат не найден на сервере!"
#~ msgid "Error input certificate ID!"
#~ msgstr "Ошибка ввода идентификатора сертификата!"
#~ msgid "Certificate with ID %d can execute:"
#~ msgstr "Сертификат номер %d может запускать:"
#~ msgid "Certificate ID: "
#~ msgstr "Номер сертификата:"
#~ msgid "Error certificate id"
#~ msgstr "Ошибка номера сертификата"
#~ msgid "Enter correctly cert id!"
#~ msgstr "Введите корректный идентичикатор сертификата!"
#~ msgid "session is active"
#~ msgstr "сессия активна"

Write Preview
Loading…
Cancel
Save