|
|
|
@ -293,6 +293,42 @@ class objShare:
|
|
|
|
|
"""Общий клас для объектов, наследуем
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def createFieldTerm(self, name, value, quote, docObj):
|
|
|
|
|
"""Создание поля переменная - значение
|
|
|
|
|
|
|
|
|
|
при создании поля проверяется первый символ названия переменной
|
|
|
|
|
и добавляется тег action
|
|
|
|
|
"!" - <action>drop</action> удаляет
|
|
|
|
|
"+" - <action>join</action> добавляет
|
|
|
|
|
"-" - <action>replace</action> заменяет
|
|
|
|
|
"""
|
|
|
|
|
fieldAction = False
|
|
|
|
|
if name:
|
|
|
|
|
if name[0] == "!" or name[0] == "-" or name[0] == "+":
|
|
|
|
|
qnt = self.removeSymbolTerm(quote)
|
|
|
|
|
fieldXML = docObj.createField("var",[qnt],
|
|
|
|
|
name[1:], [value],
|
|
|
|
|
False, False)
|
|
|
|
|
if name[0] == "!":
|
|
|
|
|
fieldAction = "drop"
|
|
|
|
|
elif name[0] == "+":
|
|
|
|
|
fieldXML.setAttribute("type", "seplist")
|
|
|
|
|
fieldAction = "join"
|
|
|
|
|
else:
|
|
|
|
|
fieldXML = docObj.createField("var",
|
|
|
|
|
[quote.replace("\n","")],
|
|
|
|
|
name, [value],
|
|
|
|
|
False, False)
|
|
|
|
|
else:
|
|
|
|
|
fieldXML = docObj.createField("var",
|
|
|
|
|
[quote.replace("\n","")],
|
|
|
|
|
name, [value],
|
|
|
|
|
False, False)
|
|
|
|
|
if fieldAction:
|
|
|
|
|
docObj.setActionField(fieldXML, fieldAction)
|
|
|
|
|
return fieldXML
|
|
|
|
|
|
|
|
|
|
def removeSymbolTerm(self, text):
|
|
|
|
|
"""Удаляет первый символ названия переменной в строке
|
|
|
|
|
|
|
|
|
@ -1180,7 +1216,8 @@ class xmlDoc:
|
|
|
|
|
xmlValues = xpath.Evaluate('child::value',xmlField)
|
|
|
|
|
if xmlValues:
|
|
|
|
|
for node in xmlValues:
|
|
|
|
|
vals.append(node.firstChild.nodeValue)
|
|
|
|
|
if node.firstChild:
|
|
|
|
|
vals.append(node.firstChild.nodeValue)
|
|
|
|
|
return vals
|
|
|
|
|
|
|
|
|
|
def getActionArea(self, xmlArea):
|
|
|
|
@ -2130,8 +2167,8 @@ class profile(_file, _terms):
|
|
|
|
|
if (objHeadNew.typeAppend == "replace" or\
|
|
|
|
|
objHeadNew.typeAppend == "before" or\
|
|
|
|
|
objHeadNew.typeAppend == "after") and\
|
|
|
|
|
(objHeadNew.fileType != "bin" or\
|
|
|
|
|
objHeadNew.fileType != "raw"):
|
|
|
|
|
not (objHeadNew.fileType == "bin" or\
|
|
|
|
|
objHeadNew.fileType == "raw"):
|
|
|
|
|
try:
|
|
|
|
|
exec ("objProfNew=%s(self.newProfile)"%\
|
|
|
|
|
(objHeadNew.fileType))
|
|
|
|
@ -2694,42 +2731,6 @@ class named(objShare):
|
|
|
|
|
docObj.setActionArea(areaXML, areaAction)
|
|
|
|
|
return areaXML
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def createFieldTerm(self, name, value, quote, docObj):
|
|
|
|
|
"""Создание поля переменная - значение
|
|
|
|
|
|
|
|
|
|
при создании поля проверяется первый символ названия переменной
|
|
|
|
|
и добавляется тег action
|
|
|
|
|
"!" - <action>drop</action> удаляет
|
|
|
|
|
"+" - <action>join</action> добавляет
|
|
|
|
|
"-" - <action>replace</action> заменяет
|
|
|
|
|
"""
|
|
|
|
|
fieldAction = False
|
|
|
|
|
if name:
|
|
|
|
|
if name[0] == "!" or name[0] == "-" or name[0] == "+":
|
|
|
|
|
qnt = self.removeSymbolTerm(quote)
|
|
|
|
|
fieldXML = docObj.createField("var",[qnt],
|
|
|
|
|
name[1:], [value],
|
|
|
|
|
False, False)
|
|
|
|
|
if name[0] == "!":
|
|
|
|
|
fieldAction = "drop"
|
|
|
|
|
elif name[0] == "+":
|
|
|
|
|
fieldXML.setAttribute("type", "seplist")
|
|
|
|
|
fieldAction = "join"
|
|
|
|
|
else:
|
|
|
|
|
fieldXML = docObj.createField("var",
|
|
|
|
|
[quote.replace("\n","")],
|
|
|
|
|
name, [value],
|
|
|
|
|
False, False)
|
|
|
|
|
else:
|
|
|
|
|
fieldXML = docObj.createField("var",
|
|
|
|
|
[quote.replace("\n","")],
|
|
|
|
|
name, [value],
|
|
|
|
|
False, False)
|
|
|
|
|
if fieldAction:
|
|
|
|
|
docObj.setActionField(fieldXML, fieldAction)
|
|
|
|
|
return fieldXML
|
|
|
|
|
|
|
|
|
|
def createXML(self, areas, rootNode, docObj):
|
|
|
|
|
"""Создаем из массивов областей XML"""
|
|
|
|
|
for i in areas:
|
|
|
|
@ -2759,6 +2760,8 @@ class named(objShare):
|
|
|
|
|
False, False)
|
|
|
|
|
areaXML.appendChild(fieldXMLBr)
|
|
|
|
|
else:
|
|
|
|
|
if not f:
|
|
|
|
|
continue
|
|
|
|
|
fields = self.splitToFields(f)
|
|
|
|
|
for field in fields:
|
|
|
|
|
if field.name != False:
|
|
|
|
@ -3298,3 +3301,146 @@ class ldap(samba):
|
|
|
|
|
z += 1
|
|
|
|
|
#print docObj.doc.toprettyxml()
|
|
|
|
|
return docObj
|
|
|
|
|
|
|
|
|
|
class dovecot(named):
|
|
|
|
|
"""Класс для обработки конфигурационного файла типа dovecot
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
_comment = "#"
|
|
|
|
|
configName = "dovecot"
|
|
|
|
|
configVersion = "0.1"
|
|
|
|
|
__openArea = "{"
|
|
|
|
|
__closeArea = "[ \t]*\}[ \t]*"
|
|
|
|
|
sepFields = "\n"
|
|
|
|
|
reOpen = re.compile(__openArea)
|
|
|
|
|
reClose = re.compile(__closeArea)
|
|
|
|
|
reCloseArea = re.compile(__closeArea + "\s*\Z")
|
|
|
|
|
reComment = re.compile("[ \t]*%s" %(_comment))
|
|
|
|
|
reSepFields = re.compile(sepFields)
|
|
|
|
|
# разделитель названия и значения переменной
|
|
|
|
|
reSeparator = re.compile("\s*=\s*")
|
|
|
|
|
|
|
|
|
|
def __init__(self, text):
|
|
|
|
|
named.__init__(self,text)
|
|
|
|
|
|
|
|
|
|
def addBrArea(self, xmlArea):
|
|
|
|
|
"""Добавляем перевод строки если его нет в конец области"""
|
|
|
|
|
xmlFields = xpath.Evaluate("child::field", xmlArea)
|
|
|
|
|
if xmlFields and not (\
|
|
|
|
|
self.docObj.getTypeField(xmlFields[-1]) == "br" or\
|
|
|
|
|
self.docObj.getTypeField(xmlFields[-1]) == "comment"
|
|
|
|
|
):
|
|
|
|
|
xmlArea.appendChild(self.docObj.createField("br",
|
|
|
|
|
[],"",[],
|
|
|
|
|
False,False))
|
|
|
|
|
xmlAreas = xpath.Evaluate("child::area", xmlArea)
|
|
|
|
|
for area in xmlAreas:
|
|
|
|
|
self.addBrArea(area)
|
|
|
|
|
|
|
|
|
|
def join(self, dovecotObj):
|
|
|
|
|
"""Объединяем конфигурации"""
|
|
|
|
|
if isinstance(dovecotObj, dovecot):
|
|
|
|
|
#print self.docObj.doc.toprettyxml()
|
|
|
|
|
self.docObj.joinDoc(dovecotObj.doc)
|
|
|
|
|
# Для добавления перевода строки перед закрывающим тегом
|
|
|
|
|
# конфигурационного файла
|
|
|
|
|
self.addBrArea(self.docObj.body)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class procmail(objShare):
|
|
|
|
|
"""Класс для обработки конфигурационного файла типа procmail
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
_comment = "#"
|
|
|
|
|
configName = "procmail"
|
|
|
|
|
configVersion = "0.1"
|
|
|
|
|
sepFields = "\n"
|
|
|
|
|
reComment = re.compile("[ \t]*%s" %(_comment))
|
|
|
|
|
reSepFields = re.compile(sepFields)
|
|
|
|
|
# разделитель названия и значения переменной
|
|
|
|
|
reSeparator = re.compile("=")
|
|
|
|
|
def __init__(self, text):
|
|
|
|
|
self.text = text
|
|
|
|
|
self.docObj = self.textToXML()
|
|
|
|
|
# Создаем поля-массивы
|
|
|
|
|
self.doc = self.docObj.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:
|
|
|
|
|
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):
|
|
|
|
|
docObj = xmlDoc()
|
|
|
|
|
docObj.createDoc(self.configName, self.configVersion)
|
|
|
|
|
if self.text:
|
|
|
|
|
nodeBody = docObj.getNodeBody()
|
|
|
|
|
fields = self.splitToFields(self.text)
|
|
|
|
|
for field in fields:
|
|
|
|
|
if field.name != False:
|
|
|
|
|
fieldXML = self.createFieldTerm(field.name,
|
|
|
|
|
field.value,
|
|
|
|
|
field.br, docObj)
|
|
|
|
|
nodeBody.appendChild(fieldXML)
|
|
|
|
|
if field.br[-1] == "\n":
|
|
|
|
|
fieldXMLBr = docObj.createField("br",[],
|
|
|
|
|
"",[],
|
|
|
|
|
False, False)
|
|
|
|
|
nodeBody.appendChild(fieldXMLBr)
|
|
|
|
|
elif field.comment != False:
|
|
|
|
|
fieldXML = docObj.createField("comment",
|
|
|
|
|
[field.comment],
|
|
|
|
|
"", [],
|
|
|
|
|
False, False)
|
|
|
|
|
nodeBody.appendChild(fieldXML)
|
|
|
|
|
elif field.br != False:
|
|
|
|
|
brText = field.br.replace("\n","")
|
|
|
|
|
if brText:
|
|
|
|
|
fieldXML = docObj.createField('br',
|
|
|
|
|
[brText],
|
|
|
|
|
"", [],
|
|
|
|
|
False, False)
|
|
|
|
|
else:
|
|
|
|
|
fieldXML = docObj.createField('br',
|
|
|
|
|
[],
|
|
|
|
|
"", [],
|
|
|
|
|
False, False)
|
|
|
|
|
nodeBody.appendChild(fieldXML)
|
|
|
|
|
return docObj
|
|
|
|
|
|
|
|
|
|
def join(self, procmailObj):
|
|
|
|
|
"""Объединяем конфигурации"""
|
|
|
|
|
if isinstance(procmailObj, procmail):
|
|
|
|
|
#print self.docObj.doc.toprettyxml()
|
|
|
|
|
self.docObj.joinDoc(procmailObj.doc)
|