/tools/python/xen Updated setpolicy to support loading of flask policy
PATCH 1/1 /tools/python/xen Updated setpolicy to support loading of flask policy
Updated xm setpolicy command to support the loading of flask security policies.
Signed-off-by Machon Gregory <[email protected]>
Signed-off-by George S. Coker, II <[email protected]>
---
tools/python/xen/lowlevel/flask/flask.c | 36 +++++++++ tools/python/xen/util/xsconstants.py | 1 tools/python/xen/util/xsm/acm/acm.py | 1 tools/python/xen/util/xsm/flask/flask.py | 11 ++ tools/python/xen/xend/XendXSPolicy.py | 12 ++- tools/python/xen/xend/XendXSPolicyAdmin.py | 3 tools/python/xen/xm/setpolicy.py | 111 +++++++++++++++-------------- 7 files changed, 120 insertions(+), 55 deletions(-)
Signature · 2 lines
Machon Gregory National Information Assurance Research Lab (NIARL)
tools/python/xen/lowlevel/flask/flask.c +36 -0
@@ -106,6 +106,35 @@return Py_BuildValue ("s" , ctx, ctx_len); } +static PyObject *pyflask_load (PyObject *self,PyObject *args,PyObject *kwds) +{ +int xc_handle; +char *policy; +uint32_t len; +int ret; + +static char *kwd_list[] = {"policy" ,NULL }; + +if ( !PyArg_ParseTupleAndKeywords (args, kwds,"s#" , kwd_list, &policy, &len) ) +return NULL ; + + xc_handle =xc_interface_open (); +if (xc_handle <0 ) { + errno = xc_handle; +return PyErr_SetFromErrno (xc_error_obj); + } + + ret =flask_load (xc_handle, policy, len); + +xc_interface_close (xc_handle); + +if ( ret !=0 ) { + errno = -ret; +return PyErr_SetFromErrno (xc_error_obj); + } + +return Py_BuildValue ("i" , ret); +}static PyMethodDef pyflask_methods[] = { {"flask_context_to_sid" ,
@@ -122,6 +151,13 @@ " context [int]: SID to be converted\n" "Returns: [str]: Numeric SID on success; -1 on error.\n" }, + {"flask_load" , + (PyCFunction )pyflask_load, +METH_KEYWORDS ,"\n" +"Loads a policy into the hypervisor.\n" +" policy [str]: policy to be load\n" + "Returns: [int]: 0 on success; -1 on failure.\n" }, + { NULL, NULL, 0, NULL } };
tools/python/xen/util/xsconstants.py +1 -0
@@ -106,6 +106,7 @@ # Policy identifiers used in labels ACM_POLICY_ID = 'ACM' +FLASK_POLICY_ID = 'FLASK' INVALID_POLICY_PREFIX = 'INV_'
tools/python/xen/util/xsm/acm/acm.py +1 -0
@@ -82,6 +82,7 @@ #Functions exported through XML-RPC xmlrpc_exports = [ + 'on', 'set_resource_label', 'get_resource_label', 'list_labels',
tools/python/xen/util/xsm/flask/flask.py +10 -1
@@ -1,10 +1,15 @@ import sys +import base64 from xen.lowlevel import flask from xen.util import xsconstants from xen.xend import sxp #Functions exported through XML-RPC -xmlrpc_exports = [ ] +xmlrpc_exports = [ + 'on', + 'set_policy' +] + def err(msg): """Raise XSM-Flask exception.
@@ -47,3 +52,7 @@ def get_security_label(self, xspol=None): label = self.info['security_label'] return label + +def set_policy(xs_type, policy_b64, flags=None, overwrite=None): + policy = base64.b64decode(policy_b64); + return flask.flask_load(policy), ""
tools/python/xen/xend/XendXSPolicy.py +10 -2
@@ -73,7 +73,7 @@ def get_xstype(self): return XSPolicyAdminInstance().isXSEnabled() - def set_xspolicy(self, xstype, xml, flags, overwrite): + def set_xspolicy(self, xstype, policy, flags, overwrite): ref = "" xstype = int(xstype) flags = int(flags)
@@ -84,7 +84,7 @@ poladmin = XSPolicyAdminInstance() try: (xspol, rc, errors) = poladmin.add_acmpolicy_to_system( - xml, flags, + policy, flags, overwrite) if rc != 0: polstate.update( { 'xserr' : rc,
@@ -102,6 +102,14 @@ } except Exception, e: raise + elif xstype == xsconstants.XS_POLICY_FLASK: + rc, errors = security.set_policy(xstype, policy); + if rc != 0: + polstate.update( { 'xserr' : -xsconstants.XSERR_POLICY_LOAD_FAILED, + 'errors': errors } ) + else: + polstate.update( { 'xserr' : xsconstants.XSERR_SUCCESS, + 'errors': errors } ) else: raise SecurityError(-xsconstants.XSERR_POLICY_TYPE_UNSUPPORTED) return polstate
tools/python/xen/xend/XendXSPolicyAdmin.py +2 -1
@@ -75,11 +75,12 @@ def isXSEnabled(self): """ Check whether 'security' is enabled on this system. - This currently only checks for ACM-enablement. """ rc = 0 if security.on() == xsconstants.XS_POLICY_ACM: rc |= xsconstants.XS_POLICY_ACM + else: + rc |= xsconstants.XS_POLICY_FLASK return rc def add_acmpolicy_to_system(self, xmltext, flags, overwrite):
tools/python/xen/xm/setpolicy.py +60 -51
128 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel