2007-12-19 10:40:23 +00:00
|
|
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.32/sepolgen-1.0.10/src/sepolgen/refparser.py
|
|
|
|
|
--- nsasepolgen/src/sepolgen/refparser.py 2007-09-13 08:21:11.000000000 -0400
|
|
|
|
|
+++ policycoreutils-2.0.32/sepolgen-1.0.10/src/sepolgen/refparser.py 2007-12-19 05:21:44.000000000 -0500
|
|
|
|
|
@@ -118,6 +118,7 @@
|
|
|
|
|
'TEMPLATE',
|
|
|
|
|
'GEN_CONTEXT',
|
|
|
|
|
# m4
|
|
|
|
|
+ 'IFELSE',
|
|
|
|
|
'IFDEF',
|
|
|
|
|
'IFNDEF',
|
|
|
|
|
'DEFINE'
|
|
|
|
|
@@ -174,6 +175,7 @@
|
|
|
|
|
'template' : 'TEMPLATE',
|
|
|
|
|
'gen_context' : 'GEN_CONTEXT',
|
|
|
|
|
# M4
|
|
|
|
|
+ 'ifelse' : 'IFELSE',
|
|
|
|
|
'ifndef' : 'IFNDEF',
|
|
|
|
|
'ifdef' : 'IFDEF',
|
|
|
|
|
'define' : 'DEFINE'
|
|
|
|
|
@@ -220,6 +222,12 @@
|
|
|
|
|
# Ignore all comments
|
|
|
|
|
t.lexer.lineno += 1
|
|
|
|
|
|
|
|
|
|
+def t_refpolicywarn1(t):
|
|
|
|
|
+ r'define.*refpolicywarn\(.*\n'
|
|
|
|
|
+ # Ignore refpolicywarn statements - they sometimes
|
|
|
|
|
+ # contain text that we can't parse.
|
|
|
|
|
+ t.skip(1)
|
|
|
|
|
+
|
|
|
|
|
def t_refpolicywarn(t):
|
|
|
|
|
r'refpolicywarn\(.*\n'
|
|
|
|
|
# Ignore refpolicywarn statements - they sometimes
|
|
|
|
|
@@ -258,6 +266,7 @@
|
|
|
|
|
m = None
|
|
|
|
|
# error is either None (indicating no error) or a string error message.
|
|
|
|
|
error = None
|
|
|
|
|
+parse_file = ""
|
|
|
|
|
# spt is the support macros (e.g., obj/perm sets) - it is an instance of
|
|
|
|
|
# refpolicy.SupportMacros and should always be present during parsing
|
|
|
|
|
# though it may not contain any macros.
|
|
|
|
|
@@ -382,6 +391,19 @@
|
|
|
|
|
collect(p[12], x, val=False)
|
|
|
|
|
p[0] = [x]
|
|
|
|
|
|
|
|
|
|
+def p_ifelse(p):
|
|
|
|
|
+ '''ifelse : IFELSE OPAREN TICK IDENTIFIER SQUOTE COMMA COMMA TICK IDENTIFIER SQUOTE COMMA TICK interface_stmts SQUOTE CPAREN optional_semi
|
|
|
|
|
+ | IFELSE OPAREN TICK IDENTIFIER SQUOTE COMMA TICK IDENTIFIER SQUOTE COMMA TICK interface_stmts SQUOTE COMMA TICK interface_stmts SQUOTE CPAREN optional_semi
|
|
|
|
|
+ '''
|
|
|
|
|
+# x = refpolicy.IfDef(p[4])
|
|
|
|
|
+# v = True
|
|
|
|
|
+# collect(p[8], x, val=v)
|
|
|
|
|
+# if len(p) > 12:
|
|
|
|
|
+# collect(p[12], x, val=False)
|
|
|
|
|
+# p[0] = [x]
|
|
|
|
|
+ pass
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
def p_ifdef(p):
|
|
|
|
|
'''ifdef : IFDEF OPAREN TICK IDENTIFIER SQUOTE COMMA TICK interface_stmts SQUOTE CPAREN optional_semi
|
|
|
|
|
| IFNDEF OPAREN TICK IDENTIFIER SQUOTE COMMA TICK interface_stmts SQUOTE CPAREN optional_semi
|
|
|
|
|
@@ -446,6 +468,7 @@
|
|
|
|
|
| optional_policy
|
|
|
|
|
| tunable_policy
|
|
|
|
|
| ifdef
|
|
|
|
|
+ | ifelse
|
|
|
|
|
| conditional
|
|
|
|
|
'''
|
|
|
|
|
p[0] = p[1]
|
|
|
|
|
@@ -844,7 +867,8 @@
|
|
|
|
|
|
|
|
|
|
def p_error(tok):
|
|
|
|
|
global error
|
|
|
|
|
- error = "Syntax error on line %d %s [type=%s]" % (tok.lineno, tok.value, tok.type)
|
|
|
|
|
+ global parse_file
|
|
|
|
|
+ error = "%s: Syntax error on line %d %s [type=%s]" % (parse_file, tok.lineno, tok.value, tok.type)
|
|
|
|
|
print error
|
|
|
|
|
|
|
|
|
|
def prep_spt(spt):
|
|
|
|
|
@@ -892,7 +916,7 @@
|
|
|
|
|
def list_headers(root):
|
|
|
|
|
modules = []
|
|
|
|
|
support_macros = None
|
|
|
|
|
- blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
|
|
|
|
|
+ blacklist = ["uml.if", "thunderbird.if"]
|
|
|
|
|
|
|
|
|
|
for dirpath, dirnames, filenames in os.walk(root):
|
|
|
|
|
for name in filenames:
|
|
|
|
|
@@ -941,12 +965,14 @@
|
|
|
|
|
output.write(msg)
|
|
|
|
|
|
|
|
|
|
def parse_file(f, module, spt=None):
|
|
|
|
|
+ global parse_file
|
|
|
|
|
if debug:
|
|
|
|
|
o("parsing file %s\n" % f)
|
|
|
|
|
try:
|
|
|
|
|
fd = open(f)
|
|
|
|
|
txt = fd.read()
|
|
|
|
|
fd.close()
|
|
|
|
|
+ parse_file = f
|
|
|
|
|
parse(txt, module, spt, debug)
|
|
|
|
|
except IOError, e:
|
|
|
|
|
return
|
