Menu
▾
▴
[Selinux-commits] SF.net SVN: selinux: [2337] branches/policyrep
|
From: <ssm...@us...> - 2007-04-10 19:13:50
|
Revision: 2337
http://svn.sourceforge.net/selinux/?rev=2337&view=rev
Author: ssmalley
Date: 2007-04-10 12:13:48 -0700 (Tue, 10 Apr 2007)
Log Message:
-----------
Ported r2334 through r2336 (sepolgen parser and tool updates) from trunk.
Modified Paths:
--------------
branches/policyrep/policycoreutils/ChangeLog
branches/policyrep/policycoreutils/VERSION
branches/policyrep/policycoreutils/audit2allow/sepolgen-ifgen
branches/policyrep/sepolgen/ChangeLog
branches/policyrep/sepolgen/VERSION
branches/policyrep/sepolgen/src/sepolgen/interfaces.py
branches/policyrep/sepolgen/src/sepolgen/matching.py
branches/policyrep/sepolgen/src/sepolgen/refparser.py
branches/policyrep/sepolgen/src/sepolgen/refpolicy.py
Modified: branches/policyrep/policycoreutils/ChangeLog
===================================================================
--- branches/policyrep/policycoreutils/ChangeLog 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/policycoreutils/ChangeLog 2007-04-10 19:13:48 UTC (rev 2337)
@@ -1,3 +1,6 @@
+2.0.8 2007-04-10
+ * Merged updates to sepolgen-ifgen from Karl MacMillan.
+
2.0.7 2007-03-01
* Merged restorecond init script LSB compliance patch from Steve Grubb.
Modified: branches/policyrep/policycoreutils/VERSION
===================================================================
--- branches/policyrep/policycoreutils/VERSION 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/policycoreutils/VERSION 2007-04-10 19:13:48 UTC (rev 2337)
@@ -1 +1 @@
-2.0.7
+2.0.8
Modified: branches/policyrep/policycoreutils/audit2allow/sepolgen-ifgen
===================================================================
--- branches/policyrep/policycoreutils/audit2allow/sepolgen-ifgen 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/policycoreutils/audit2allow/sepolgen-ifgen 2007-04-10 19:13:48 UTC (rev 2337)
@@ -45,7 +45,9 @@
parser.add_option("-i", "--interfaces", dest="headers", default=defaults.headers(),
help="location of the interface header files")
parser.add_option("-v", "--verbose", action="store_true", default=False,
- help="print debuging output")
+ help="print debuging output")
+ parser.add_option("-d", "--debug", action="store_true", default=False,
+ help="extra debugging output")
options, args = parser.parse_args()
return options
@@ -67,7 +69,7 @@
log = None
try:
- headers = refparser.parse_headers(options.headers, output=log)
+ headers = refparser.parse_headers(options.headers, output=log, debug=options.debug)
except ValueError, e:
print "error parsing headers"
print str(e)
Modified: branches/policyrep/sepolgen/ChangeLog
===================================================================
--- branches/policyrep/sepolgen/ChangeLog 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/sepolgen/ChangeLog 2007-04-10 19:13:48 UTC (rev 2337)
@@ -1,3 +1,9 @@
+1.0.8 2007-04-10
+ * Merged updates to sepolgen parser and tools from Karl MacMillan.
+ This includes improved debugging support, handling of interface
+ calls with list parameters, support for role transition rules,
+ updated range transition rule support, and looser matching.
+
1.0.7 2007-03-26
* Merged patch to discard self from types when generating requires from Karl MacMillan.
Modified: branches/policyrep/sepolgen/VERSION
===================================================================
--- branches/policyrep/sepolgen/VERSION 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/sepolgen/VERSION 2007-04-10 19:13:48 UTC (rev 2337)
@@ -1 +1 @@
-1.0.7
+1.0.8
Modified: branches/policyrep/sepolgen/src/sepolgen/interfaces.py
===================================================================
--- branches/policyrep/sepolgen/src/sepolgen/interfaces.py 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/sepolgen/src/sepolgen/interfaces.py 2007-04-10 19:13:48 UTC (rev 2337)
@@ -365,21 +365,25 @@
# been generated from an optional param.
return None
else:
- return ifcall.args[num - 1]
+ arg = ifcall.args[num - 1]
+ if isinstance(arg, list):
+ return arg
+ else:
+ return [arg]
else:
- return id
+ return [id]
def map_add_av(self, ifv, av, ifcall):
- src_type = self.map_param(av.src_type, ifcall)
- if src_type is None:
+ src_types = self.map_param(av.src_type, ifcall)
+ if src_types is None:
return
- tgt_type = self.map_param(av.tgt_type, ifcall)
- if tgt_type is None:
+ tgt_types = self.map_param(av.tgt_type, ifcall)
+ if tgt_types is None:
return
- obj_class = self.map_param(av.obj_class, ifcall)
- if obj_class is None:
+ obj_classes = self.map_param(av.obj_class, ifcall)
+ if obj_classes is None:
return
new_perms = refpolicy.IdSet()
@@ -388,14 +392,15 @@
if p is None:
continue
else:
- new_perms.add(p)
+ new_perms.update(p)
if len(new_perms) == 0:
return
- ifv.access.add(src_type, tgt_type, obj_class, new_perms)
+ for src_type in src_types:
+ for tgt_type in tgt_types:
+ for obj_class in obj_classes:
+ ifv.access.add(src_type, tgt_type, obj_class, new_perms)
-
-
def do_expand_ifcalls(self, interface, if_by_name):
# Descend an interface call tree adding the access
# from each interface. This is a depth first walk
Modified: branches/policyrep/sepolgen/src/sepolgen/matching.py
===================================================================
--- branches/policyrep/sepolgen/src/sepolgen/matching.py 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/sepolgen/src/sepolgen/matching.py 2007-04-10 19:13:48 UTC (rev 2337)
@@ -50,7 +50,7 @@
return 1
class MatchList:
- DEFAULT_THRESHOLD = 100
+ DEFAULT_THRESHOLD = 120
def __init__(self):
# Match objects that pass the threshold
self.children = []
Modified: branches/policyrep/sepolgen/src/sepolgen/refparser.py
===================================================================
--- branches/policyrep/sepolgen/src/sepolgen/refparser.py 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/sepolgen/src/sepolgen/refparser.py 2007-04-10 19:13:48 UTC (rev 2337)
@@ -35,6 +35,7 @@
import refpolicy
import access
+import defaults
import lex
import yacc
@@ -59,7 +60,6 @@
'MINUS',
'TILDE',
'ASTERISK',
- 'PERIOD',
'AMP',
'BAR',
'EXPL',
@@ -89,13 +89,13 @@
'TYPE_CHANGE',
'TYPE_MEMBER',
'RANGE_TRANSITION',
+ 'ROLE_TRANSITION',
# refpolicy keywords
'OPT_POLICY',
'INTERFACE',
'TUNABLE_POLICY',
'GEN_REQ',
'TEMPLATE',
- 'REFPOLICYWARN',
# m4
'IFDEF',
'IFNDEF',
@@ -128,13 +128,13 @@
'type_change' : 'TYPE_CHANGE',
'type_member' : 'TYPE_MEMBER',
'range_transition' : 'RANGE_TRANSITION',
+ 'role_transition' : 'ROLE_TRANSITION',
# refpolicy keywords
'optional_policy' : 'OPT_POLICY',
'interface' : 'INTERFACE',
'tunable_policy' : 'TUNABLE_POLICY',
'gen_require' : 'GEN_REQ',
'template' : 'TEMPLATE',
- 'refpolicywarn' : 'REFPOLICYWARN',
# M4
'ifndef' : 'IFNDEF',
'ifdef' : 'IFDEF',
@@ -158,7 +158,6 @@
t_MINUS = r'\-'
t_TILDE = r'\~'
t_ASTERISK = r'\*'
-t_PERIOD = r'\.'
t_AMP = r'\&'
t_BAR = r'\|'
t_EXPL = r'\!'
@@ -175,8 +174,14 @@
# Ignore all comments
t.lineno += 1
+def t_refpolicywarn(t):
+ r'refpolicywarn\(.*\n'
+ # Ignore refpolicywarn statements - they sometimes
+ # contain text that we can't parse.
+ t.lineno += 1
+
def t_IDENTIFIER(t):
- r'[a-zA-Z_\$\-][a-zA-Z0-9_\.\$\*]*'
+ r'[a-zA-Z_\$][a-zA-Z0-9_\.\$\*]*'
# Handle any keywords
t.type = reserved.get(t.value,'IDENTIFIER')
return t
@@ -311,6 +316,28 @@
str = "-" + p[2]
p[0] = [str]
+def p_interface_call_param(p):
+ '''interface_call_param : IDENTIFIER
+ | IDENTIFIER MINUS IDENTIFIER
+ | nested_id_set
+ '''
+ # Intentionally let single identifiers pass through
+ # List means set, non-list identifier
+ if len(p) == 2:
+ p[0] = p[1]
+ else:
+ p[0] = [p[1], "-" + p[3]]
+
+def p_interface_call_param_list(p):
+ '''interface_call_param_list : interface_call_param
+ | interface_call_param_list COMMA interface_call_param
+ '''
+ if len(p) == 2:
+ p[0] = [p[1]]
+ else:
+ p[0] = p[1] + [p[3]]
+
+
def p_comma_list(p):
'''comma_list : nested_id_list
| comma_list COMMA nested_id_list
@@ -406,23 +433,8 @@
collect(p[12], x, val=False)
p[0] = [x]
-def p_refpolicywarn_stmts(p):
- '''refpolicywarn_stmts : names
- | refpolicywarn_stmts names
- | OPAREN
- | refpolicywarn_stmts OPAREN
- | CPAREN
- | refpolicywarn_stmts CPAREN
- | PERIOD
- | refpolicywarn_stmts PERIOD
- '''
-
-def p_refpolicywarn(p):
- '''refpolicywarn : REFPOLICYWARN OPAREN TICK refpolicywarn_stmts SQUOTE CPAREN'''
- pass
-
def p_interface_call(p):
- 'interface_call : IDENTIFIER OPAREN comma_list CPAREN'
+ 'interface_call : IDENTIFIER OPAREN interface_call_param_list CPAREN'
i = refpolicy.InterfaceCall(ifname=p[1])
i.args.extend(p[3])
@@ -455,9 +467,9 @@
| role_allow
| type_def
| typealias_def
- | refpolicywarn
| attribute_def
| range_transition_def
+ | role_transition_def
'''
p[0] = [p[1]]
@@ -592,9 +604,14 @@
def p_range_transition_def(p):
- '''range_transition_def : RANGE_TRANSITION names names COLON names mls_range_def SEMI'''
+ '''range_transition_def : RANGE_TRANSITION names names COLON names mls_range_def SEMI
+ | RANGE_TRANSITION names names names SEMI'''
pass
+def p_role_transition_def(p):
+ '''role_transition_def : ROLE_TRANSITION names names names SEMI'''
+ pass
+
def p_error(tok):
global error
error = "Syntax error on line %d %s [type=%s]" % (tok.lineno, tok.value, tok.type)
@@ -640,7 +657,6 @@
if error is not None:
msg = 'could not parse text: "%s"' % error
- print msg
raise ValueError(msg)
return m
@@ -684,7 +700,7 @@
raise ValueError("Invalid file name %s" % root)
modname = os.path.splitext(name)
modules.append((modname[0], root))
- all_modules, support_macros = list_headers(DEFAULT_HEADERS_ROOT)
+ all_modules, support_macros = list_headers(defaults.headers())
else:
modules, support_macros = list_headers(root)
@@ -741,7 +757,8 @@
parse_file(x[1], m, spt)
else:
parse_file(x[1], m)
- except ValueError:
+ except ValueError, e:
+ o(str(e) + "\n")
failures.append(x[1])
continue
Modified: branches/policyrep/sepolgen/src/sepolgen/refpolicy.py
===================================================================
--- branches/policyrep/sepolgen/src/sepolgen/refpolicy.py 2007-04-10 19:09:48 UTC (rev 2336)
+++ branches/policyrep/sepolgen/src/sepolgen/refpolicy.py 2007-04-10 19:13:48 UTC (rev 2337)
@@ -579,9 +579,6 @@
self.args = []
self.comments = []
- def to_string(self):
- return self.to_string()
-
def matches(self, other):
if self.ifname != other.ifname:
return False
@@ -596,10 +593,15 @@
s = "%s(" % self.ifname
i = 0
for a in self.args:
+ if isinstance(a, list):
+ str = list_to_space_str(a)
+ else:
+ str = a
+
if i != 0:
- s = s + ", %s" % a
+ s = s + ", %s" % str
else:
- s = s + a
+ s = s + str
i += 1
return s + ")"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
