add edit-group module

master3.3
Спиридонов Денис 12 years ago
parent 70af9fed6d
commit 07a6d66849

@ -0,0 +1,565 @@
#-*- coding: utf-8 -*-
# Copyright 2010-2012 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.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import sys, os
import subprocess
from soaplib.serializers.primitive import String, Integer, Boolean
from soaplib.serializers.clazz import Array, ClassSerializer
from soaplib.service import rpc
from calculate.api.server.api_types import ReturnedMessage, getViewForVariables
from calculate.api.server.api_types import Field, GroupField, ViewInfo
from calculate.lib.datavars import VariableError
from calculate.api import datavars
import traceback
class GroupInfo(ClassSerializer):
"""Parameters for method install"""
cl_page_count = String
cl_page_offset = String
class DetailGroupInfo(ClassSerializer):
"""Parameters for method install"""
cl_group_name = String
cl_group_rights = Array(String)
def catchExcept():
class wrapper:
def __init__(self,f):
self.f = f
self.func_name = f.func_name
self.func_code = f.func_code
self.__doc__ = f.__doc__
self.__name__ = f.__name__
def __call__(self,selfobj,*args,**kwargs):
try:
return self.f(selfobj,*args,**kwargs)
except BaseException as e:
view = ViewInfo(groups=[])
group = GroupField(name=_("Error"),last=True)
group.fields = []
group.fields.append(Field(
name = "error",
label = str(e),
default = 'color:red;',
element = "error"))
view.groups.append(group)
print "!!!!EXCEPTION!!!!"
for i in apply(traceback.format_exception, sys.exc_info()):
print i
return view
return wrapper
class ApiWsdl:
#def create_req_table(self, )
def show_groups_meth (self, dv) :
try:
page_count = int(dv.Get('cl_page_count'))
page_offset = int(dv.Get('cl_page_offset'))
#self.printSUCCESS('Current offset = %d' %page_offset)
if not page_offset:
page_offset = 0
list_group_name = dv.Choice('cl_group_name')
if not len(list_group_name):
self.printSUCCESS('No groups')
return True
dict_group_name = {}
list_group_name.sort()
for i in range(len(list_group_name)):
dict_group_name[i] = list_group_name[i]
max_id = len(list_group_name)
self.printSUCCESS('Current offset = %d' %page_offset)
if not page_count:
page_count = len(list_group_name)
head = ['Group','Rights']
body = []
fields = ['cl_group_name','']
num_id = len(list_group_name)
print 'num_id = ', num_id
if page_offset > num_id - 1:
i = num_id - 1
else:
i = page_offset
while True:
if len(body) == page_count or i >= max_id:
break
#if not i in list_req_id:
#i+=1
#continue
dv.Set('cl_group_name', dict_group_name[i])
group_rights = ', '.join(dv.Get('cl_group_rights'))
body.append([dict_group_name[i],group_rights])
i+=1
if body:
self.printTable(head, body, "Groups Table", fields = fields, \
onClick = 'detail_group')
except Exception,e:
for i in apply(traceback.format_exception, sys.exc_info()):
print i
print 'EXCEPT!!!!!!!!!!', e
return True
def check_req_params (self, dv, info,allvars=False,ordered=None):
errors = []
keys = sorted(filter(lambda x:x.lower() == x,
info._type_info.keys()))
if ordered:
keys = ordered + filter(lambda x:not x in ordered,
keys)
for var in keys:
# get value of variable from info
val = info.__getattribute__(var)
# check value if value send of check allvariables
if val != None or allvars:
try:
# if value not send, then get from datavars
if val == None:
val = dv.Get(var)
else:
uncomperr = dv.Uncompatible(var)
if uncomperr:
raise VariableError(uncomperr)
if not dv.Uncompatible(var):
dv.Set(var, val)
except VariableError, e:
mess = ''
messages = e.message if type(e.message) == list else [e.message]
for error in messages:
mess += str(error) + '\n'
errors.append(ReturnedMessage(type = 'error', field = var,
message = mess))
return errors
from calculate.api.server.baseClass import Basic
from calculate.api.server.decorators import Dec
def groupCommon(self,sid,info,methodname):
"""
Install common method
"""
try:
dv = self.get_cache(sid,methodname,"vars")
if not dv:
#reload(cl_install)
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
errors = self.check_req_params(dv, info,
ordered=['cl_page_count',
'cl_page_offset'],
allvars=True)
if errors:
return errors
request_meth = type("requestCommon",(self.Common,
ApiWsdl, object), {})
pid = self.startprocess(sid, target=request_meth,
method="show_groups_meth",
auto_delete = True,
args_proc = (dv,))
returnmess = ReturnedMessage(type = 'pid', message = pid, expert = True)
returnmess.type = "pid"
returnmess.message = pid
dv = self.clear_cache(sid,methodname)
return [returnmess]
finally:
if dv:
self.set_cache(sid,methodname,"vars",dv,smart=False)
return []
@rpc(Integer, GroupInfo, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["edit-group"])
@Dec.console('cl-show-groups')
@Dec.gui('Api',_('View Groups'),'user-group-properties,' \
'view-certificate-import,application-certificate')
def show_groups ( self, sid, info):
if not info:
mess = 'Field must be int!'
errors = []
for field in ['cl_page_count', 'cl_page_offset']:
errors.append(ReturnedMessage(type = 'error', field = field,
message = mess, expert = True))
return errors
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.Set('cl_page_count', info.cl_page_count)
dv.Set('cl_page_offset', info.cl_page_offset)
self.set_cache(sid, 'show_groups', "vars", dv, smart=False)
return self.groupCommon(sid,info,'show_groups')
@rpc(Integer, Integer, Boolean,_returns = ViewInfo)
@catchExcept()
def show_groups_view (self, sid, step,expert):
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.addGroup(_("Groups"),
normal=('cl_page_count','cl_page_offset'),
next_label=_("Next"))
view = getViewForVariables (dv,step,expert)
self.set_cache(sid, 'show_groups', "vars", dv, smart=False)
return view
##################### BEGIN DETAIL GROUP METHOD ##############################
@rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["edit-group"])
@Dec.console('cl-show-group')
#@Dec.gui(_('Api'),_('Detail Request'),'view-certificate-import')
def detail_group ( self, sid, info):
if not info:
mess = 'Field must be in list!'
errors = []
errors.append(ReturnedMessage(type = 'error', field = 'cl_group_name',
message = mess))
return errors
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.Set('cl_group_name', info.cl_group_name)
self.set_cache(sid, 'detail_request', 'dv', dv, smart = False)
return []
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@catchExcept()
def detail_group_view (self, sid, step, expert):
dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv:
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.Get('cl_group_name')
dv.addGroup(_("Requests detail"),
normal=('cl_group_name', 'cl_group_rights',
'cl_page_count','cl_page_offset'))
view = getViewForVariables (dv,step,expert)
group = GroupField(name='',last=True)
group.fields = []
group.fields.append(Field(
name = "but0",
label = _("Back"),
value = "show_groups",
element = "button"))
group.fields.append(Field(
name = "but1",
label = _("Change"),
value = "change_group",
element = "button"))
group.fields.append(Field(
name = "but2",
label = _("Delete"),
value = "delete_group",
element = "button"))
view.groups.append(group)
self.set_cache(sid, 'show_groups', "vars", dv, smart=False)
return view
############## END DETAIL GROUP METHOD #######################################
############### BEGIN CONFIRM GROUP METHODS ###################################
#def changeGroupCommon(self,sid,info,methodname):
#try:
#dv = self.get_cache(sid,methodname,"vars")
#errors = self.check_req_params(dv, info,
#ordered=['cl_req_id'],
#allvars=True)
#if errors:
#return errors
#request_meth = type("delRequestCommon",(self.Common,
#ApiWsdl, object), {})
#pid = self.startprocess(sid, target=request_meth,
#method="confirm_request_meth",\
#args_proc = (dv,))
#returnmess = ReturnedMessage(type = 'pid', message = pid)
#returnmess.type = "pid"
#returnmess.message = pid
#dv = self.clear_cache(sid,methodname)
#return [returnmess]
#finally:
#if dv:
#self.set_cache(sid,methodname,"vars",dv,smart=False)
#return []
#def confirm_request_meth(self, dv):
#try:
#data_path = dv.Get('cl_api_data')
#cert_path = dv.Get('cl_api_cert_path')
#cl_req_id = str(dv.Get('cl_req_id'))
#cl_req_group = str(dv.Get('cl_req_group'))
##self.startTask('Confirm Request')
#self.printSUCCESS ('<b>'+_('Confirm Request')+'</b>')
#self.printSUCCESS ("cl_req_id = %s" %cl_req_id)
#self.printSUCCESS ("cl_req_group = %s" %cl_req_group)
#server_cert = cert_path + '/root.crt'
#server_key = cert_path + '/root.key'
#cl_req = data_path + '/client_certs/%s.csr' %cl_req_id
#cl_cert = data_path + '/client_certs/%s.crt' %cl_req_id
#if not os.path.exists(cl_req):
#self.printERROR (_("Signing Request %s not found") %cl_req)
#return False
#if os.path.exists(cl_cert):
#self.printERROR (_("certificate %s already exists") %cl_cert)
#return False
#group = "group:%s" %cl_req_group
#config = data_path + '/client_certs/ssl-client.cfg'
#if os.path.exists(config):
#os.unlink(config)
#cfg_text = ("[ ssl_client ]\n"
#"basicConstraints = CA:FALSE\n"
#"nsCertType = client\n"
#"keyUsage = digitalSignature, keyEncipherment\n"
#"extendedKeyUsage = clientAuth\n"
#"nsComment = %s") %group
#fc = open(config, 'w')
#fc.write(cfg_text)
#fc.close()
#cmd = ("openssl x509 -req -days 11000 -CA %s -CAkey %s -CAcreateserial "
#"-extfile %s -extensions ssl_client -in %s -out %s") \
#%(server_cert, server_key, config, cl_req, cl_cert)
#print cmd
#PIPE = subprocess.PIPE
#p = subprocess.Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE,
#stderr=subprocess.STDOUT, close_fds=True)
#p.wait()
#self.printSUCCESS ('<b>' + _("certificate %s is signed") %cl_cert \
#+ '</b>')
##self.endTask()
#return True
#except (KeyboardInterrupt,):
#self.printERROR('Process is interrupted!')
#return False
#@rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
#@Dec.check_permissions(["edit-group"])
##@Dec.console('cl-show-request')
##@Dec.gui(_('Api'),_('Confirm Request'),'view-certificate-import')
#@catchExcept()
#def change_group ( self, sid, info):
#dv = self.get_cache(sid,'confirm_request',"vars")
#if not dv:
#dv = datavars.DataVarsApi()
#dv.importApi()
#dv.flIniFile()
#try:
#dv.Set('cl_req_id', info.cl_req_id)
#dv.Set('cl_req_group', info.cl_req_group)
#except VariableError, e:
#errors = []
#mess = ''
#messages = e.message if type(e.message) == list else [e.message]
#for error in messages:
#mess += str(error) + '\n'
#errors.append(ReturnedMessage(type = 'error',
#field = 'cl_req_group', message = mess))
#return errors
#self.set_cache(sid, 'confirm_request', "vars", dv, smart=False)
#return self.changeGroupCommon(sid,info,'change_group')
#@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
#@catchExcept()
#def change_group_view (self, sid, step, expert):
#dv = self.get_cache(sid, 'confirm_request', 'dv')
#if not dv:
#dv = datavars.DataVarsApi()
#dv.importApi()
#dv.flIniFile()
#dv.Get('cl_req_id')
#dv.addGroup(_("Change group"),
#normal=('cl_req_id', 'cl_req_user_name', 'cl_req_ip', 'cl_req_mac',
#'cl_req_date', 'cl_req_location', 'cl_req_group'),
#next_label=_("Done"))
#view = getViewForVariables (dv,step,expert)
#group = GroupField(name=_("Change group"),nextlabel=_("Done"),last=True)
#group.fields = []
#group.fields.append(Field(
#name = "but2",
#label = "Confirm",
#value = "confirm_request",
#element = "button"))
#view.groups.append(group)
#self.set_cache(sid, 'delete_request', "vars", dv, smart=False)
#return view
############### END CONFIRM GROUP METHODS ###################################
#def delRequestCommon(self,sid,info,methodname):
#"""
#Install common method
#"""
#try:
#dv = self.get_cache(sid,methodname,"vars")
##if not dv:
##reload(cl_install)
##dv = cl_install.DataVarsInstall()
##dv.importInstall()
##dv.flIniFile()
##initfunc(dv)
#errors = self.check_req_params(dv, info,
#ordered=['cl_req_id'],
#allvars=True)
#if errors:
#return errors
#request_meth = type("delRequestCommon",(self.Common,
#ApiWsdl, object), {})
#pid = self.startprocess(sid, target=request_meth,
#method="del_request_meth",\
#args_proc = (dv,))
#returnmess = ReturnedMessage(type = 'pid', message = pid)
#returnmess.type = "pid"
#returnmess.message = pid
#dv = self.clear_cache(sid,methodname)
#return [returnmess]
#finally:
#if dv:
#self.set_cache(sid,methodname,"vars",dv,smart=False)
#return []
#def del_request_meth(self, dv):
##ob = datavars.DataVarsApi()
##ob.importApi()
## set var env
##ob.flIniFile()
#try:
#data_path = dv.Get('cl_api_data')
#certbase = dv.Get('cl_api_database')
#id_del_req = str(dv.Get('cl_req_id'))
#self.startTask("id_del_req = %s" %id_del_req)
#print "id_del_req = ", id_del_req
#request = data_path + '/client_certs/%s.csr' %id_del_req
#cert = data_path + '/client_certs/%s.crt' %id_del_req
## chect exists request and certificate files
#if not os.path.exists(request) and not os.path.exists(cert):
#self.printERROR (_("Request and certificate with id = %s not found!") \
#%id_del_req)
#return False
#if not os.path.exists(request):
#self.printERROR (_("request %s not found!") %request)
#if os.path.exists(cert):
#self.printERROR (_("This request has already been signed"))
## create temp file
#ft = open(certbase + '_temp', 'w')
#with open(certbase) as fd:
#t = fd.read()
## See each line
#for line in t.splitlines():
## and each word in line
#words = line.split()
## if in line present certificate id
#if not words[0] == id_del_req:
#ft.write(line + '\n')
#ft.close()
#fd.close()
#ft = open(certbase + '_temp', 'rb')
#fc = open(certbase, 'wb')
#ft.seek(0)
#fc.write(ft.read())
#ft.close()
#fc.close()
#os.unlink(certbase + '_temp')
#try:
#if os.path.exists(request):
#os.unlink (request)
#self.printSUCCESS (_("request deleted"))
#if os.path.exists(cert):
#os.unlink (cert)
#self.printSUCCESS (_("certificate deleted"))
#except:
#self.printERROR (_("delete file error!"))
#self.endTask()
#except KeyboardInterrupt:
#self.endTask()
#return False
#except Exception, e:
#msg = e.message
#if not msg:
#msg = e.reason
#self.printERROR (_("Exception!%s") %msg)
#return False
#@rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
#@Dec.check_permissions(["request"])
#@Dec.console('cl-show-request')
##@Dec.gui(_('Api'),_('Delete Request'),'view-certificate-import')
#@catchExcept()
#def delete_request ( self, sid, info):
##dv = self.get_cache(sid,'delete_request',"vars")
##if not dv:
#dv = datavars.DataVarsApi()
#dv.importApi()
#dv.flIniFile()
#dv.Set('cl_req_id', info.cl_req_id)
#self.set_cache(sid, 'delete_request', "vars", dv, smart=False)
#return self.delRequestCommon(sid,info,'delete_request')
#@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
#@catchExcept()
#def delete_request_view (self, sid, step, expert):
#dv = self.get_cache(sid, 'detail_request', 'dv')
#if not dv:
#dv = datavars.DataVarsApi()
#dv.importApi()
#dv.flIniFile()
#dv.Get('cl_req_id')
#dv.addGroup(_("Requests delete"),
#normal=('cl_req_id', 'cl_req_user_name', 'cl_req_ip', 'cl_req_mac',
#'cl_req_date', 'cl_req_location', 'cl_req_group'),
#next_label=_("Done"))
#view = getViewForVariables (dv,step,expert)
#group = GroupField(name=_("Requests detail"),nextlabel=_("Done"),last=True)
#group.fields = []
#group.fields.append(Field(
#name = "but2",
#label = "Delete",
#value = "delete_request",
#element = "button"))
#view.groups.append(group)
#self.set_cache(sid, 'delete_request', "vars", dv, smart=False)
#return view

@ -421,7 +421,7 @@ class ApiWsdl () :
if not line:
continue
try:
words = line.split()
words = line.split(' ',1)
if len(words) < 2:
continue
# first word in line equal name input method

@ -41,7 +41,7 @@ class Table (ClassSerializer):
list_module = ["clean", "gen_pid", "check_rights", "cl_template", \
"sid_pid_file", "gen_sid", "func", "api_types", 'test', 'test2', \
'system_update', 'request', 'certificate']
'system_update', 'request', 'certificate', 'edit_groups']
imported_modules = []
pack = "calculate.api.server"

@ -117,6 +117,8 @@ class ApiWsdl:
location = dv.Get('cl_req_location')
#self.printSUCCESS ('page number = %d' %i)
group = dv.Get('cl_req_group')
if not group:
group = 'Not signed'
body.append([str(i),username,ip,mac,date,location,group])
i+=1
@ -524,7 +526,6 @@ class ApiWsdl:
if os.path.exists(cert):
os.unlink (cert)
self.printSUCCESS (_("certificate deleted"))
self.printSUCCESS (_("successfully removed"))
except:
self.printERROR (_("delete file error!"))
self.endTask()
@ -545,11 +546,11 @@ class ApiWsdl:
#@Dec.gui(_('Api'),_('Delete Request'),'view-certificate-import')
@catchExcept()
def delete_request ( self, sid, info):
dv = self.get_cache(sid,'delete_request',"vars")
if not dv:
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
#dv = self.get_cache(sid,'delete_request',"vars")
#if not dv:
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.Set('cl_req_id', info.cl_req_id)
self.set_cache(sid, 'delete_request', "vars", dv, smart=False)
return self.delRequestCommon(sid,info,'delete_request')

@ -179,7 +179,9 @@ class ApiWsdl:
errors = []
errors.append(ReturnedMessage(type = 'error', field = 'name', \
message = 'Do not input "qqq"vvv ddddddd dddddd!' + \
'input not @@@@@# $$$$$$$$ ^^^^^^^^^'))
'input not @@@@@# $$$$$$$$ ^^^^^^^^^ ' + \
'input not @@@@@# $$$$$$$$ ^^^^^^^^^ ' + \
'input not @@@@@# $$$$$$$$ 44444444'))
errors.append(ReturnedMessage(type = 'error', field = 'boolvariable', \
message = 'Choose this!'))
return errors

@ -20,6 +20,7 @@ from calculate.api.datavars import __version__,__app__
import api
import request
import certificate
import edit_groups
section = "api"

@ -0,0 +1,137 @@
#-*- coding: utf-8 -*-
# Copyright 2010-2012 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.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0 #
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# mode - read only or writeable variable
# value - default variable value
# select - list of posible values for variable
# hide - flag, if it is True, then the variable is not printable
# printval - print value of variable
from calculate.lib.datavars import Variable,ReadonlyVariable,VariableError
import os, glob, sys
from os import path
import OpenSSL
from calculate.lib.cl_lang import setLocalTranslate
from calculate.lib.utils.files import readLinesFile
from calculate.api.server.decorators import Dec
#from calculate.api.cert_cmd import find_id_cert
setLocalTranslate('cl_api',sys.modules[__name__])
class VariableClGroupName(Variable):
"""
Certificate Group
"""
type = "choice"
opt = ["--group-name"]
metavalue = "GROUP_NAME"
def init(self):
self.help = _("set certificate group")
self.label = _("Group name")
def choice(self):
group_rights = self.Get('cl_api_group_rights')
t = open(group_rights, 'r').read()
result = []
for line in t.splitlines():
words = line.split()
if not words[0].startswith('#'):
result.append(words[0])
if not 'all' in result:
result.append('all')
return result
#def get(self):
#req_id = self.Get('cl_req_id')
#data_path = self.Get('cl_api_data')
#cert_file = data_path + '/client_certs/%s.crt' %req_id
#if os.path.exists(cert_file):
#fp = open(cert_file, 'r')
#cert = fp.read()
#fp.close()
#certobj = OpenSSL.crypto.load_certificate \
#(OpenSSL.SSL.FILETYPE_PEM, cert)
#com = certobj.get_extension(certobj.get_extension_count()-1).get_data()
#return com.split(':')[1]
#return ''
def check(self, group):
group_rights = self.Get('cl_api_group_rights')
if group == 'all':
return
t = open(group_rights, 'r').read()
for line in t.splitlines():
words = line.split()
if words[0].startswith('#'):
continue
if group == words[0]:
return
raise VariableError(_("Group %s does not exist") %group)
def uniq(seq):
seen = set()
seen_add = seen.add
return [ x for x in seq if x not in seen and not seen_add(x)]
class VariableClGroupRights(Variable):
"""
Certificate Group
"""
type = "choice-list"
opt = ["-g"]
metavalue = "REQ_GROUP"
def init(self):
self.help = _("set certificate group")
self.label = _("Group rights")
def choice(self):
right_list = []
for key in Dec.rightsMethods.keys():
right_list += Dec.rightsMethods[key]
uniq_right_list = uniq(right_list)
uniq_right_list.sort()
return uniq_right_list
def get(self):
group_name = self.Get('cl_group_name')
group_rights = self.Get('cl_api_group_rights')
t = open(group_rights, 'r').read()
results = []
for line in t.splitlines():
words = line.split(' ',1)
if words[0] == group_name:
methods = words[1].split(',')
for i in methods:
results.append(i.strip())
if group_name == 'all' and results == []:
right_list = []
for key in Dec.rightsMethods.keys():
right_list += Dec.rightsMethods[key]
uniq_right_list = uniq(right_list)
uniq_right_list.sort()
return uniq_right_list
return results

@ -244,7 +244,7 @@ class VariableClReqGroup(Variable):
"""
Certificate Group
"""
type = "choiceedit"
type = "choice"
opt = ["-g"]
metavalue = "REQ_GROUP"
@ -264,6 +264,7 @@ class VariableClReqGroup(Variable):
result.append(words[0])
if not 'all' in result:
result.append('all')
print "group list = ", result
return result
def get(self):
@ -279,7 +280,7 @@ class VariableClReqGroup(Variable):
(OpenSSL.SSL.FILETYPE_PEM, cert)
com = certobj.get_extension(certobj.get_extension_count()-1).get_data()
return com.split(':')[1]
return 'not signed'
return ''
def check(self, group):
group_rights = self.Get('cl_api_group_rights')

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: calculate-api\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-13 13:13+0300\n"
"PO-Revision-Date: 2012-04-13 13:13+0300\n"
"POT-Creation-Date: 2012-04-16 10:50+0300\n"
"PO-Revision-Date: 2012-04-16 10:52+0300\n"
"Last-Translator: Denis <ds@mail.ru>\n"
"Language-Team: \n"
"Language: \n"
@ -91,6 +91,8 @@ msgid "Request Location"
msgstr "Расположение"
#: /var/calculate/mydir/git/calculate-api/api/variables/request.py:252
#: /var/calculate/mydir/git/calculate-api/api/variables/edit_groups.py:42
#: /var/calculate/mydir/git/calculate-api/api/variables/edit_groups.py:103
msgid "set certificate group"
msgstr "выберите группу сертификата"
@ -98,11 +100,29 @@ msgstr "выберите группу сертификата"
msgid "Certificate group"
msgstr "Группа сертификата"
#: /var/calculate/mydir/git/calculate-api/api/variables/request.py:296
#: /var/calculate/mydir/git/calculate-api/api/variables/request.py:297
#: /var/calculate/mydir/git/calculate-api/api/variables/edit_groups.py:86
#, python-format
msgid "Group %s does not exist"
msgstr "Группа %s не существует"
#: /var/calculate/mydir/git/calculate-api/api/variables/certificate.py:57
#: /var/calculate/mydir/git/calculate-api/api/variables/certificate.py:58
msgid "Certificate Identification"
msgstr "Идентификатор сертификата"
#: /var/calculate/mydir/git/calculate-api/api/variables/certificate.py:71
msgid "Certificate id must be int"
msgstr "Номер сертификата должен быть целочисленным"
#: /var/calculate/mydir/git/calculate-api/api/variables/edit_groups.py:43
msgid "Group name"
msgstr "Имя группы"
#: /var/calculate/mydir/git/calculate-api/api/variables/edit_groups.py:104
msgid "Group rights"
msgstr "Права группы"
#: /var/calculate/mydir/git/calculate-api/api/client/pid_information.py:27
msgid "PID not found"
msgstr "ID процесса не найден"
@ -228,7 +248,6 @@ msgstr "Дата отзыва"
#: /var/calculate/mydir/git/calculate-api/api/client/cert_verify.py:94
#: /var/calculate/mydir/git/calculate-api/api/client/cert_verify.py:99
#: /var/calculate/mydir/git/calculate-api/api/client/client_class.py:346
#, python-format
msgid "error creating directory %s"
msgstr "ошибка создания директории %s"
@ -604,22 +623,18 @@ msgid "Request was sent from another ip."
msgstr "Запрос был послан с другого ip."
#: /var/calculate/mydir/git/calculate-api/api/client/cert_func.py:248
#: /var/calculate/mydir/git/calculate-api/api/client/client_class.py:164
msgid "Not found field \"CN\" in certificate!"
msgstr "Нет поля \"CN\" в сертификате!"
#: /var/calculate/mydir/git/calculate-api/api/client/cert_func.py:261
#: /var/calculate/mydir/git/calculate-api/api/client/client_class.py:174
msgid "filename = "
msgstr "имя файла = "
#: /var/calculate/mydir/git/calculate-api/api/client/cert_func.py:262
#: /var/calculate/mydir/git/calculate-api/api/client/client_class.py:175
msgid "CERTIFICATE ADD"
msgstr "Сертификат добавлен"
#: /var/calculate/mydir/git/calculate-api/api/client/cert_func.py:264
#: /var/calculate/mydir/git/calculate-api/api/client/client_class.py:177
msgid "file with ca certificates exists"
msgstr "файл с сертификатом центра авторизации создан"
@ -774,61 +789,19 @@ msgstr "Завершаю все процессы"
msgid "All processes are closed."
msgstr "Все процессы закрыты."
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:480
#, python-format
msgid "Certificate %d can run all methods!"
msgstr "Сертификат %d может запускать все методы!"
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:529
#, python-format
msgid "Certificate %d can run: "
msgstr "Сертификат %d может запускать: "
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:534
msgid "Certificate groups"
msgstr "Группы сертификата"
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:536
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:485
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:760
msgid "Fingerprint = "
msgstr "Отпечаток = "
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:583
msgid "View rights certificate"
msgstr "Просмотр прав сертификата"
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:583
#: /var/calculate/mydir/git/calculate-api/api/server/test2.py:222
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:430
msgid "Next"
msgstr "Далее"
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:588
msgid "Certificate id: "
msgstr "Номер сертификата: "
#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:593
msgid "Enter Certificate id"
msgstr "Введите номер сертификата"
#: /var/calculate/mydir/git/calculate-api/api/server/create_cert.py:40
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:50
msgid "Enter certificate data by hand? [y]/n: "
msgstr "Ввести данные сертификата вручную? [y]/n: "
#: /var/calculate/mydir/git/calculate-api/api/server/create_cert.py:49
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:65
msgid "Do not use space characters and tabs"
msgstr "Не используйте символы пробела и табуляции"
#: /var/calculate/mydir/git/calculate-api/api/server/create_cert.py:68
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:70
msgid "Organization Unit: "
msgstr "Название отдела: "
#: /var/calculate/mydir/git/calculate-api/api/server/create_cert.py:78
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:80
msgid "Full network address (host:port)"
msgstr "Полный сетевой адрес (хост:порт)"
@ -871,12 +844,17 @@ msgstr "Версия %s"
msgid "First group"
msgstr "Первая группа"
#: /var/calculate/mydir/git/calculate-api/api/server/test2.py:222
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:432
msgid "Next"
msgstr "Далее"
#: /var/calculate/mydir/git/calculate-api/api/server/test2.py:223
msgid "Secound group"
msgstr "Вторая группа"
#: /var/calculate/mydir/git/calculate-api/api/server/test2.py:225
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:520
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:522
msgid "Done"
msgstr "Готово"
@ -884,56 +862,56 @@ msgstr "Готово"
msgid "Interrupted by user"
msgstr "Прервано пользователем"
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:236
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:430
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:238
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:432
msgid "TEST_METHOD"
msgstr "Тестовый метод"
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:241
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:243
msgid "YOUR NAME: "
msgstr "Ваше имя: "
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:248
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:250
msgid "Please, enter your name"
msgstr "Пожалуйста, введите Ваше имя"
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:252
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:254
msgid "TIMES: "
msgstr "Время: "
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:259
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:271
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:284
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:261
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:273
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:286
msgid "Enter times"
msgstr "Введите время"
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:264
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:275
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:266
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:277
msgid "select ISO"
msgstr "Выберите ISO образ"
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:288
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:290
msgid "Mount Points: "
msgstr "Точки монтирования: "
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:334
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:379
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:336
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:381
msgid "Press for advanced settings..."
msgstr "Нажмите для дополнительных настроек..."
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:470
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:481
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:493
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:472
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:483
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:495
msgid "check population: "
msgstr "Количество населения: "
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:477
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:489
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:500
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:479
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:491
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:502
msgid "you not human? This is a anti-bot test"
msgstr "Анти-бот тест"
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:520
#: /var/calculate/mydir/git/calculate-api/api/server/test.py:522
msgid "Gratulations!"
msgstr "Поздравляю!"
@ -981,6 +959,12 @@ msgstr "для изменения прав сертификата использ
msgid "file %s not found!"
msgstr "файл %s не найден!"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:485
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:760
#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:166
msgid "Fingerprint = "
msgstr "Отпечаток = "
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:496
msgid ""
"\n"
@ -1022,12 +1006,14 @@ msgstr "Номер сертификата должен быть целочисл
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:657
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:712
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:347
#, python-format
msgid "Signing Request %s not found"
msgstr "Запрос на подпись %s не найден"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:661
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:716
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:351
#, python-format
msgid "certificate %s already exists"
msgstr "Сертификат %s успешно создан"
@ -1038,6 +1024,7 @@ msgstr "Введите группу нового сертификата: "
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:690
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:744
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:377
#, python-format
msgid "certificate %s is signed"
msgstr "Сертификат %s подписан"
@ -1109,11 +1096,13 @@ msgid "Request or certificate with id = %s not found!"
msgstr "Запрос или сертификат с идентификатором = %s не найден!"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:930
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:496
#, python-format
msgid "request %s not found!"
msgstr "запрос %s не найден!"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:933
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:499
msgid "This request has already been signed"
msgstr "Запрос успешно подписан"
@ -1126,10 +1115,12 @@ msgid "Not deleted"
msgstr "Не удалён"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:963
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:525
msgid "request deleted"
msgstr "запрос на подпись сертификата удалён"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:966
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:528
msgid "certificate deleted"
msgstr "сертификат удалён"
@ -1138,6 +1129,7 @@ msgid "successfully removed"
msgstr "успешно удалено"
#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:969
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:530
msgid "delete file error!"
msgstr "ошибка удаления файла!"
@ -1236,51 +1228,88 @@ msgstr "Ошибка чтения файла с идентификаторами
msgid "Unable import %s"
msgstr "Невозможно импортировать %s"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:202
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:204
msgid "View Requests"
msgstr "Просмотр запросов"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:226
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:228
msgid "Requests"
msgstr "Запросы"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:263
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:419
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:426
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:574
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:265
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:421
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:428
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:575
#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:258
msgid "Requests detail"
msgstr "Подробности запроса на подпись сертификата"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:274
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:276
#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:268
msgid "Back"
msgstr "Назад"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:279
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:281
msgid "Confirm"
msgstr "Подтвердить"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:284
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:286
#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:278
msgid "Delete"
msgstr "Удалено"
msgstr "Удалить"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:335
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:337
msgid "Confirm Request"
msgstr "Подтверждение запроса"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:489
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:491
#, python-format
msgid "Request and certificate with id = %s not found!"
msgstr "Запрос или сертификат с идентификатором = %s не найден!"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:538
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:539
#, python-format
msgid "Exception!%s"
msgstr "Исключение: %s"
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:567
#: /var/calculate/mydir/git/calculate-api/api/server/request.py:568
msgid "Requests delete"
msgstr "Запрос на подпись сертификата удалён"
#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:110
#, python-format
msgid "Certificate %d can run all methods!"
msgstr "Сертификат %d может запускать все методы!"
#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:159
#, python-format
msgid "Certificate %d can run: "
msgstr "Сертификат %d может запускать: "
#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:164
msgid "Certificate groups"
msgstr "Группы сертификата"
#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:279
msgid "Certificate View"
msgstr "Просмотр сертификата"
#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:281
msgid "View"
msgstr "Просмотр"
#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:197
msgid "View Groups"
msgstr "Просмотр групп"
#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:221
msgid "Groups"
msgstr "Группы"
#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:273
msgid "Change"
msgstr "Изменить"
#: /var/calculate/mydir/git/calculate-api/api/server/clean.py:54
#, python-format
msgid "watcher process pid %d error"
@ -1357,6 +1386,15 @@ msgstr "Сертификат сервера не найден"
msgid "use cl-api-server with key --gen-cert-by HOST (--get-cert-from HOST) or --use-root-as-server)"
msgstr "используйте cl-api-server с ключом --gen-cert-by HOST (--get-cert-from HOST) или --use-root-as-server)"
#~ msgid "View rights certificate"
#~ msgstr "Просмотр прав сертификата"
#~ msgid "Certificate id: "
#~ msgstr "Номер сертификата: "
#~ msgid "Enter Certificate id"
#~ msgstr "Введите номер сертификата"
#, fuzzy
#~ msgid "Serial Number = </b>"
#~ msgstr "Серийный номер = "

Loading…
Cancel
Save