Skip to content

each iteration returns internal exception + trace #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjancewicz merged 1 commit into from
Jul 22, 2014
+43 −9
Merged

each iteration returns internal exception + trace #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 43 additions & 9 deletions PyKAdminObject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ static PyKAdminIterator *PyKAdminObject_principal_iter(PyKAdminObject *self, PyO
return NULL;

return PyKAdminIterator_principal_iterator(self, match);
//PyKAdminIterator_create(self, iterate_principals, match);
}


Expand All @@ -177,12 +176,43 @@ static PyKAdminIterator *PyKAdminObject_policy_iter(PyKAdminObject *self, PyObje
return NULL;

return PyKAdminIterator_policy_iterator(self, match);
//return PyKAdminIterator_create(self, iterate_policies, match);
}


#ifdef KADMIN_LOCAL

static void _pykadmin_each_encapsulate_error(PyObject **store) {

PyObject *ptype = NULL;
PyObject *pvalue = NULL;
PyObject *ptraceback = NULL;

if (PyErr_Occurred()) {
PyErr_Fetch(&ptype, &pvalue, &ptraceback);
*store = PyTuple_Pack(3, ptype, pvalue, ptraceback);
} else {
*store = PyExc_RuntimeError;
}
}

static void _pykadmin_each_restore_error(PyObject *store) {

if (PyTuple_CheckExact(store)) {

PyObject *ptype = PyTuple_GetItem(store, 0);
PyObject *pvalue = PyTuple_GetItem(store, 1);
PyObject *ptraceback = PyTuple_GetItem(store, 2);

PyErr_Restore(ptype, pvalue, ptraceback);
Py_DECREF(store);

} else {

PyErr_SetString(PyExc_RuntimeError, "Internal Fatal Iteration Exception");
}
}


static int kdb_iter_princs(void *data, krb5_db_entry *kdb) {

PyKAdminObject *self = (PyKAdminObject *)data;
Expand All @@ -199,8 +229,7 @@ static int kdb_iter_princs(void *data, krb5_db_entry *kdb) {
if (self->each_principal.callback) {

result = PyObject_CallFunctionObjArgs(self->each_principal.callback, principal, self->each_principal.data, NULL);
if (!result) { self->each_principal.error = PyExc_RuntimeError; }

if (!result) { _pykadmin_each_encapsulate_error(&self->each_principal.error); }
}

Py_DECREF(principal);
Expand Down Expand Up @@ -247,11 +276,14 @@ static PyObject *PyKAdminObject_each_principal(PyKAdminObject *self, PyObject *a
Py_DECREF(self->each_principal.callback);
Py_DECREF(self->each_principal.data);

if (code || self->each_principal.error) {
PyErr_SetString(PyExc_RuntimeError, "Fatal Iteration Exception");
if (code) { PyKAdmin_RETURN_ERROR(code, "krb5_db_iterate"); }

if (self->each_principal.error) {
_pykadmin_each_restore_error(self->each_principal.error);
return NULL;
}


Py_RETURN_TRUE;

}
Expand All @@ -273,7 +305,7 @@ static void kdb_iter_pols(void *data, osa_policy_ent_rec *entry) {
if (self->each_policy.callback) {

result = PyObject_CallFunctionObjArgs(self->each_policy.callback, policy, self->each_policy.data, NULL);
if (!result) { self->each_policy.error = PyExc_RuntimeError; }
if (!result) { _pykadmin_each_encapsulate_error(&self->each_policy.error); }

}

Expand Down Expand Up @@ -315,8 +347,10 @@ static PyObject *PyKAdminObject_each_policy(PyKAdminObject *self, PyObject *args
Py_DECREF(self->each_policy.callback);
Py_DECREF(self->each_policy.data);

if (code || self->each_policy.error) {
PyErr_SetString(PyExc_RuntimeError, "Fatal Iteration Exception");
if (code) { PyKAdmin_RETURN_ERROR(code, "krb5_db_iter_policy"); }

if (self->each_policy.error) {
_pykadmin_each_restore_error(self->each_policy.error);
return NULL;
}

Expand Down