RepoMirrors
/
selinux-refpolicy
mirror of https://github.com/SELinuxProject/refpolicy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add line number and file name to xml, from selide people

This commit is contained in:
Chris PeBenito 2006-01-27 15:47:52 +00:00
parent 9b3756bfa8
commit 5850761393
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refpolicy/Changelog
View File

@ -1,3 +1,5 @@
- Add filename attribute to module XML tag and lineno attribute to
interface XML tag.
- Changed QUIET build option to a yes or no option. - Changed QUIET build option to a yes or no option.
- Add a Makefile used for compiling loadable modules in a - Add a Makefile used for compiling loadable modules in a
user's development environment, building against policy headers. user's development environment, building against policy headers.

7
refpolicy/doc/policy.dtd
View File

@ -6,7 +6,8 @@
name CDATA #REQUIRED> name CDATA #REQUIRED>
<!ELEMENT module (summary,desc?,required?,(interface|template)*)> <!ELEMENT module (summary,desc?,required?,(interface|template)*)>
<!ATTLIST module <!ATTLIST module
name CDATA #REQUIRED> name CDATA #REQUIRED
filename CDATA #REQUIRED>
<!ELEMENT required (#PCDATA)> <!ELEMENT required (#PCDATA)>
<!ATTLIST required <!ATTLIST required
val (true|false) "false"> val (true|false) "false">
@ -20,9 +21,9 @@
dftval CDATA #REQUIRED> dftval CDATA #REQUIRED>
<!ELEMENT summary (#PCDATA)> <!ELEMENT summary (#PCDATA)>
<!ELEMENT interface (summary,desc?,param+,infoflow?)> <!ELEMENT interface (summary,desc?,param+,infoflow?)>
<!ATTLIST interface name CDATA #REQUIRED> <!ATTLIST interface name CDATA #REQUIRED lineno CDATA #REQUIRED>
<!ELEMENT template (summary,desc?,param+)> <!ELEMENT template (summary,desc?,param+)>
<!ATTLIST template name CDATA #REQUIRED> <!ATTLIST template name CDATA #REQUIRED lineno CDATA #REQUIRED>
<!ELEMENT desc (#PCDATA|%inline.class;)*> <!ELEMENT desc (#PCDATA|%inline.class;)*>
<!ELEMENT param (#PCDATA)> <!ELEMENT param (#PCDATA)>
<!ATTLIST param <!ATTLIST param

13
refpolicy/support/segenxml.py
View File

@ -36,7 +36,7 @@ bool_files = []
# -> ("interface", "kernel_read_system_state") # -> ("interface", "kernel_read_system_state")
# "template(`base_user_template',`" # "template(`base_user_template',`"
# -> ("template", "base_user_template") # -> ("template", "base_user_template")
INTERFACE = re.compile("^\s*(interface|template)\(`([A-Za-z0-9_]*)'") INTERFACE = re.compile("^\s*(interface|template)\(`(\w*)'")
# Matches either a gen_bool or a gen_tunable statement. Will give the tuple: # Matches either a gen_bool or a gen_tunable statement. Will give the tuple:
# ("tunable" or "bool", name, "true" or "false") # ("tunable" or "bool", name, "true" or "false")
@ -45,7 +45,7 @@ INTERFACE = re.compile("^\s*(interface|template)\(`([A-Za-z0-9_]*)'")
# -> ("bool", "secure_mode", "false") # -> ("bool", "secure_mode", "false")
# "gen_tunable(allow_kerberos, false)" # "gen_tunable(allow_kerberos, false)"
# -> ("tunable", "allow_kerberos", "false") # -> ("tunable", "allow_kerberos", "false")
BOOLEAN = re.compile("^\s*gen_(tunable|bool)\(\s*([A-Za-z0-9_]*)\s*,\s*(true|false)\s*\)") BOOLEAN = re.compile("^\s*gen_(tunable|bool)\(\s*(\w*)\s*,\s*(true|false)\s*\)")
# Matches a XML comment in the policy, which is defined as any line starting # Matches a XML comment in the policy, which is defined as any line starting
# with two # and at least one character of white space. Will give the single # with two # and at least one character of white space. Will give the single
@ -77,8 +77,8 @@ def getModuleXML(file_name):
module_buf = [] module_buf = []
# Infer the module name, which is the base of the file name. # Infer the module name, which is the base of the file name.
module_buf.append("<module name=\"%s\">\n" module_buf.append("<module name=\"%s\" filename=\"%s\">\n"
% os.path.splitext(os.path.split(file_name)[-1])[0]) % (os.path.splitext(os.path.split(file_name)[-1])[0], file_name))
temp_buf = [] temp_buf = []
interface = None interface = None
@ -92,7 +92,9 @@ def getModuleXML(file_name):
module_code = module_code[1:] module_code = module_code[1:]
# Go line by line and figure out what to do with it. # Go line by line and figure out what to do with it.
line_num = 0
for line in module_code: for line in module_code:
line_num += 1
if finding_header: if finding_header:
# If there is a XML comment, add it to the temp buffer. # If there is a XML comment, add it to the temp buffer.
comment = XML_COMMENT.match(line) comment = XML_COMMENT.match(line)
@ -130,7 +132,8 @@ def getModuleXML(file_name):
interface = INTERFACE.match(line) interface = INTERFACE.match(line)
if interface: if interface:
# Add the opening tag for the interface/template # Add the opening tag for the interface/template
module_buf.append("<%s name=\"%s\">\n" % interface.groups()) groups = interface.groups()
module_buf.append("<%s name=\"%s\" lineno=\"%s\">\n" % (groups[0], groups[1], line_num))
# Add all the comments attributed to this interface to # Add all the comments attributed to this interface to
# the module buffer. # the module buffer.