|
|
|
|
@ -1399,6 +1399,51 @@ class blocText:
|
|
|
|
|
else:
|
|
|
|
|
return []
|
|
|
|
|
|
|
|
|
|
def findArea(self, text, reTextHeader, reTextArea, numGroupArea=0):
|
|
|
|
|
""" Делит текст на области (с заголовками)
|
|
|
|
|
|
|
|
|
|
reTextHeader - регулярное выражение для заголовка области
|
|
|
|
|
reTextArea - регулярное выражение для всей области
|
|
|
|
|
numGroupArea - номер групы результата поиска по регулярному выражению
|
|
|
|
|
по всей области
|
|
|
|
|
возвращает два списка: первый - заголовки, второй - тела областей без
|
|
|
|
|
заголоков
|
|
|
|
|
"""
|
|
|
|
|
# Заголовки областей
|
|
|
|
|
headersArea = []
|
|
|
|
|
# Тексты областей без заголовков
|
|
|
|
|
textBodyArea = []
|
|
|
|
|
r = reTextArea.search(text)
|
|
|
|
|
if not r:
|
|
|
|
|
headersArea.append("")
|
|
|
|
|
textBodyArea.append(text)
|
|
|
|
|
return (headersArea, textBodyArea)
|
|
|
|
|
|
|
|
|
|
txtWr = text
|
|
|
|
|
while r:
|
|
|
|
|
textArea = r.group(numGroupArea)
|
|
|
|
|
txtSpl = txtWr.split(textArea)
|
|
|
|
|
area = txtSpl[0]
|
|
|
|
|
txtWr = txtSpl[1]
|
|
|
|
|
if area:
|
|
|
|
|
headersArea.append("")
|
|
|
|
|
textBodyArea.append(area)
|
|
|
|
|
res = reTextHeader.search(textArea)
|
|
|
|
|
header = textArea[:res.end()]
|
|
|
|
|
body = textArea[res.end():]
|
|
|
|
|
|
|
|
|
|
headersArea.append(header)
|
|
|
|
|
textBodyArea.append(body)
|
|
|
|
|
|
|
|
|
|
if txtWr:
|
|
|
|
|
r = reTextArea.search(txtWr)
|
|
|
|
|
else:
|
|
|
|
|
r = False
|
|
|
|
|
if txtWr:
|
|
|
|
|
headersArea.append("")
|
|
|
|
|
textBodyArea.append(txtWr)
|
|
|
|
|
return (headersArea, textBodyArea)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def findBloc(self, text, captionTxtBloc, bodyTxtBloc):
|
|
|
|
|
""" Делит текст на блоки (с заголовками)
|
|
|
|
|
@ -1407,10 +1452,10 @@ class blocText:
|
|
|
|
|
bodyTxtBloc - регулярное выражение для тела блока
|
|
|
|
|
возвращает два списка: первый - заголовки, второй - тела блоков
|
|
|
|
|
"""
|
|
|
|
|
headersTxt = []
|
|
|
|
|
# Заголовки блоков
|
|
|
|
|
blocsTxt = []
|
|
|
|
|
headersTxt = []
|
|
|
|
|
# Тексты блоков
|
|
|
|
|
blocsTxt = []
|
|
|
|
|
r = captionTxtBloc.search(text)
|
|
|
|
|
if r:
|
|
|
|
|
headersTxt.append(r.group(0))
|
|
|
|
|
@ -1665,10 +1710,7 @@ class profile(_file, _terms):
|
|
|
|
|
def __init__(self, objVar, servDir=False):
|
|
|
|
|
_file.__init__(self)
|
|
|
|
|
# Словарь для создания объектов новых классов по образцу
|
|
|
|
|
self.newObjProt = {'proftpd':(apache,),
|
|
|
|
|
#'ldap':(apache,),
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
self.newObjProt = {'proftpd':(apache,),}
|
|
|
|
|
# Заголовок title
|
|
|
|
|
self.__titleHead = "--------------------------------------\
|
|
|
|
|
----------------------------------------"
|
|
|
|
|
@ -2935,18 +2977,162 @@ class postfix(apache):
|
|
|
|
|
field = fieldData()
|
|
|
|
|
return fields
|
|
|
|
|
|
|
|
|
|
class ldap(objShare):
|
|
|
|
|
class ldap(samba):
|
|
|
|
|
"""Класс для обработки конфигурационного файла типа ldap
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
_comment = "#"
|
|
|
|
|
configName = "ldap"
|
|
|
|
|
configVersion = "0.1"
|
|
|
|
|
reHeader = re.compile("access[^ \t]*to.*\n",re.M)
|
|
|
|
|
reBody = re.compile(".+",re.M|re.S)
|
|
|
|
|
reComment = re.compile("\s*%s.*|\s*;.*"%(_comment))
|
|
|
|
|
reSeparator = re.compile("\s*=\s*")
|
|
|
|
|
# Регулярное выражение для заголовка области
|
|
|
|
|
reHeader = re.compile("^[\t ]*access.*\n?")
|
|
|
|
|
# Регулярное выражения для области
|
|
|
|
|
reArea = re.compile("^[\t ]*access[^\n]+\n(([\t ]*\
|
|
|
|
|
((by|#)[^\n]*)?\n)+[\t ]*by[^\n]+\n?)",re.M|re.S)
|
|
|
|
|
reComment = re.compile("\s*%s.*"%(_comment))
|
|
|
|
|
# разделитель между переменной и значением переменной
|
|
|
|
|
reSeparator = re.compile("\s*")
|
|
|
|
|
# разделитель полей
|
|
|
|
|
sepFields = "\n"
|
|
|
|
|
# регулярное выражение для разделителя полей
|
|
|
|
|
reSepFields = re.compile(sepFields)
|
|
|
|
|
"""res = re.compile("(?:[\t ]*access[^\n]+\n)(([\t ]*((by|#)[^\n]*)?\n)+[\t
|
|
|
|
|
]*by[^\n]+\n?)",re.M|re.S)"""
|
|
|
|
|
|
|
|
|
|
def __init__(self,text):
|
|
|
|
|
self.text = text
|
|
|
|
|
self.blocTextObj = blocText()
|
|
|
|
|
self._splitToFields = self.splitToFields
|
|
|
|
|
# Объект документ
|
|
|
|
|
self.docObj = self._textToXML()
|
|
|
|
|
# Создаем поля-массивы
|
|
|
|
|
self.docObj.postParserList()
|
|
|
|
|
# Создаем поля разделенные массивы
|
|
|
|
|
self.docObj.postParserListSeplist(self.docObj.body)
|
|
|
|
|
# XML документ
|
|
|
|
|
self.doc = self.docObj.doc
|
|
|
|
|
|
|
|
|
|
def join(self, ldapObj):
|
|
|
|
|
"""Объединяем конфигурации"""
|
|
|
|
|
if isinstance(ldapObj, ldap):
|
|
|
|
|
self.docObj.joinDoc(ldapObj.doc)
|
|
|
|
|
|
|
|
|
|
def setDataField(self, txtLines, endtxtLines):
|
|
|
|
|
"""Создаем список объектов с переменными"""
|
|
|
|
|
class fieldData:
|
|
|
|
|
def __init__(self):
|
|
|
|
|
self.name = False
|
|
|
|
|
self.value = False
|
|
|
|
|
self.comment = False
|
|
|
|
|
self.br = False
|
|
|
|
|
fields = []
|
|
|
|
|
field = fieldData()
|
|
|
|
|
z = 0
|
|
|
|
|
for k in txtLines:
|
|
|
|
|
textLine = k + endtxtLines[z]
|
|
|
|
|
z += 1
|
|
|
|
|
findComment = self.reComment.search(textLine)
|
|
|
|
|
if not textLine.strip():
|
|
|
|
|
field.br = textLine
|
|
|
|
|
fields.append(field)
|
|
|
|
|
field = fieldData()
|
|
|
|
|
elif findComment:
|
|
|
|
|
field.comment = textLine
|
|
|
|
|
fields.append(field)
|
|
|
|
|
field = fieldData()
|
|
|
|
|
else:
|
|
|
|
|
pars = textLine.strip()
|
|
|
|
|
nameValue = self.reSeparator.split(pars)
|
|
|
|
|
if len(nameValue) > 2:
|
|
|
|
|
valueList = nameValue[2:]
|
|
|
|
|
nameValue =[nameValue[0]+nameValue[1]," ".join(valueList)]
|
|
|
|
|
if len(nameValue) == 2:
|
|
|
|
|
name = nameValue[0]
|
|
|
|
|
value = nameValue[1].replace(self.sepFields,"")
|
|
|
|
|
field.name = name.replace(" ","").replace("\t","")
|
|
|
|
|
field.value = value
|
|
|
|
|
field.br = textLine
|
|
|
|
|
fields.append(field)
|
|
|
|
|
field = fieldData()
|
|
|
|
|
return fields
|
|
|
|
|
|
|
|
|
|
def _textToXML(self):
|
|
|
|
|
"""Преобразует текст в XML"""
|
|
|
|
|
blTmp = self.blocTextObj.findArea(self.text,self.reHeader,self.reArea)
|
|
|
|
|
blocs = self.getFullAreas(blTmp)
|
|
|
|
|
headers = []
|
|
|
|
|
startHeaders = []
|
|
|
|
|
finHeaders = []
|
|
|
|
|
docObj = xmlDoc()
|
|
|
|
|
docObj.createDoc(self.configName, self.configVersion)
|
|
|
|
|
rootNode = docObj.getNodeBody()
|
|
|
|
|
# Если пустой текст то создаем пустой документ
|
|
|
|
|
if not blocs:
|
|
|
|
|
return docObj
|
|
|
|
|
|
|
|
|
|
for h in blocs[0]:
|
|
|
|
|
headers.append(h.rstrip())
|
|
|
|
|
bodys = blocs[1]
|
|
|
|
|
|
|
|
|
|
z = 0
|
|
|
|
|
for h in headers:
|
|
|
|
|
if not bodys[z]:
|
|
|
|
|
z += 1
|
|
|
|
|
continue
|
|
|
|
|
areaAction = False
|
|
|
|
|
if h:
|
|
|
|
|
if h[0] == "!":
|
|
|
|
|
header = self.removeSymbolTerm(h.strip())
|
|
|
|
|
headerQuote = self.removeSymbolTerm(h)
|
|
|
|
|
docObj.createCaption(header,[headerQuote,""])
|
|
|
|
|
areaAction = "drop"
|
|
|
|
|
elif h[0] == "-":
|
|
|
|
|
header = self.removeSymbolTerm(h.strip())
|
|
|
|
|
headerQuote = self.removeSymbolTerm(h)
|
|
|
|
|
docObj.createCaption(header,[headerQuote,""])
|
|
|
|
|
areaAction = "replace"
|
|
|
|
|
else:
|
|
|
|
|
docObj.createCaption(h.strip(), [h.rstrip(),""])
|
|
|
|
|
else:
|
|
|
|
|
docObj.createCaption(h.strip(), [h.rstrip(),""])
|
|
|
|
|
|
|
|
|
|
if "\n" in blocs[0][z]:
|
|
|
|
|
resHead = self.reComment.search(h)
|
|
|
|
|
if resHead:
|
|
|
|
|
docObj.createField('comment',
|
|
|
|
|
blocs[0][z][resHead.start():])
|
|
|
|
|
else:
|
|
|
|
|
docObj.createField('br')
|
|
|
|
|
|
|
|
|
|
fields = self._splitToFields(bodys[z])
|
|
|
|
|
for f in fields:
|
|
|
|
|
if f.name != False and f.value!=False and f.br!=False:
|
|
|
|
|
# Обработка условий для samba
|
|
|
|
|
if f.name[0] == "!" or f.name[0] == "-" or\
|
|
|
|
|
f.name[0] == "+":
|
|
|
|
|
qns = self.removeSymbolTerm(f.br)
|
|
|
|
|
xmlField = docObj.createField("var",
|
|
|
|
|
[qns],
|
|
|
|
|
f.name[1:], [f.value])
|
|
|
|
|
if f.name[0] == "!":
|
|
|
|
|
# Удаляемое в дальнейшем поле
|
|
|
|
|
docObj.setActionField(xmlField, "drop")
|
|
|
|
|
else:
|
|
|
|
|
docObj.createField("var",[f.br.replace("\n","")],
|
|
|
|
|
f.name, [f.value])
|
|
|
|
|
docObj.createField('br')
|
|
|
|
|
elif f.comment != False:
|
|
|
|
|
docObj.createField('comment', [f.comment])
|
|
|
|
|
elif f.br != False:
|
|
|
|
|
docObj.createField('br', [f.br.replace("\n","")])
|
|
|
|
|
if h.strip():
|
|
|
|
|
area = docObj.createArea()
|
|
|
|
|
if areaAction:
|
|
|
|
|
docObj.setActionArea(area, areaAction)
|
|
|
|
|
rootNode.appendChild(area)
|
|
|
|
|
else:
|
|
|
|
|
fieldsNodes = docObj.tmpFields.getFields()
|
|
|
|
|
for fieldNode in fieldsNodes:
|
|
|
|
|
rootNode.appendChild(fieldNode)
|
|
|
|
|
docObj.clearTmpFields()
|
|
|
|
|
z += 1
|
|
|
|
|
#print docObj.doc.toprettyxml()
|
|
|
|
|
return docObj
|
asamoukin
16 years ago