RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-04-01 22:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

qpol.i: throw exceptions when getting the conditional block on unconditional rules

Browse Source 
Standardize on AttributeError for the exception type.
This commit is contained in:
Chris PeBenito 2016-03-11 09:14:32 -05:00
parent 3434618aef
commit fcfba569cc
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
setools/policyrep/qpol.i
View File

@ -2514,16 +2514,13 @@ typedef struct qpol_avrule {} qpol_avrule_t;
%exception cond {
$action
if (!result) {
PyErr_SetString(PyExc_ValueError, "Rule is not conditional.");
PyErr_SetString(PyExc_AttributeError, "Rule is not conditional.");
return NULL;
}
}
const qpol_cond_t *cond(qpol_policy_t *p) {
const qpol_cond_t *c;
if (qpol_avrule_get_cond(p, self, &c)) {
SWIG_exception(SWIG_ValueError, "Could not get conditional for av rule");
}
fail:
qpol_avrule_get_cond(p, self, &c);
return c;
};
int is_enabled(qpol_policy_t *p) {
@ -2534,14 +2531,22 @@ typedef struct qpol_avrule {} qpol_avrule_t;
fail:
return (int) e;
};
%exception which_list {
$action
if (result < 0) {
PyErr_SetString(PyExc_AttributeError, "Rule is not conditional.");
return NULL;
}
}
int which_list(qpol_policy_t *p) {
const qpol_cond_t *c;
uint32_t which = 0;
qpol_avrule_get_cond(p, self, &c);
if (c == NULL) {
SWIG_exception(SWIG_TypeError, "Rule is not conditional");
return -1;
} else if (qpol_avrule_get_which_list(p, self, &which)) {
SWIG_exception(SWIG_ValueError, "Could not get conditional list for av rule");
return -1;
}
fail:
return (int) which;
@ -2626,16 +2631,13 @@ typedef struct qpol_terule {} qpol_terule_t;
%exception cond {
$action
if (!result) {
PyErr_SetString(PyExc_ValueError, "Rule is not conditional.");
PyErr_SetString(PyExc_AttributeError, "Rule is not conditional.");
return NULL;
}
}
const qpol_cond_t *cond(qpol_policy_t *p) {
const qpol_cond_t *c;
if (qpol_terule_get_cond(p, self, &c)) {
SWIG_exception(SWIG_ValueError, "Could not get conditional for te rule");
}
fail:
qpol_terule_get_cond(p, self, &c);
return c;
};
int is_enabled(qpol_policy_t *p) {
@ -2646,18 +2648,27 @@ typedef struct qpol_terule {} qpol_terule_t;
fail:
return (int) e;
};
%exception which_list {
$action
if (result < 0) {
PyErr_SetString(PyExc_AttributeError, "Rule is not conditional.");
return NULL;
}
}
int which_list(qpol_policy_t *p) {
const qpol_cond_t *c;
uint32_t which = 0;
qpol_terule_get_cond(p, self, &c);
if (c == NULL) {
SWIG_exception(SWIG_TypeError, "Rule is not conditional");
return -1;
} else if (qpol_terule_get_which_list(p, self, &which)) {
SWIG_exception(SWIG_ValueError, "Could not get conditional list for te rule");
return -1;
}
fail:
return (int) which;
};
%newobject syn_terule_iter(qpol_policy_t*);
qpol_iterator_t *syn_terule_iter(qpol_policy_t *p) {
qpol_iterator_t *iter;

10
setools/policyrep/terule.py
View File

@ -92,10 +92,7 @@ class BaseTERule(rule.PolicyRule):
"""The rule's conditional expression."""
try:
return boolcond.condexpr_factory(self.policy, self.qpol_symbol.cond(self.policy))
except (AttributeError, ValueError):
# AttributeError: name filetrans rules cannot be conditional
# so no member function
# ValueError: The rule is not conditional
except AttributeError:
raise exception.RuleNotConditional
@property
@ -103,10 +100,7 @@ class BaseTERule(rule.PolicyRule):
"""The conditional block of the rule (T/F)"""
try:
return bool(self.qpol_symbol.which_list(self.policy))
except (AttributeError, ValueError):
# AttributeError: name filetrans rules cannot be conditional
# so no member function
# ValueError: The rule is not conditional
except AttributeError:
raise exception.RuleNotConditional
def expand(self):

4
tests/policyrep/terule.py
View File

@ -48,7 +48,7 @@ class AVRuleTest(unittest.TestCase):
else:
# this actually comes out of condexpr_factory
# but it's simpler to have here
mock_rule.cond.side_effect = ValueError
mock_rule.cond.side_effect = AttributeError
return te_rule_factory(self.p, mock_rule)
@ -173,7 +173,7 @@ class TERuleTest(unittest.TestCase):
else:
# this actually comes out of condexpr_factory
# but it's simpler to have here
mock_rule.cond.side_effect = ValueError
mock_rule.cond.side_effect = AttributeError
mock_rule.rule_type.return_value = ruletype
mock_rule.source_type.return_value = source