Skip to content

Commit

Permalink
pysss_nss_idmap: add python bindings for new sss_nss_idmap calls
Browse files Browse the repository at this point in the history 
Related to https://pagure.io/SSSD/sssd/issue/3629

Reviewed-by: Jakub Hrozek <[email protected]>
  • Loading branch information
@sumit-bose @jhrozek
sumit-bose authored and jhrozek committed Jun 8, 2018
1 parent 54c040c commit b8da03b
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 5 deletions.
65 changes: 60 additions & 5 deletions src/python/pysss_nss_idmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
enum lookup_type {
SIDBYNAME,
SIDBYID,
SIDBYUID,
SIDBYGID,
NAMEBYSID,
IDBYSID,
NAMEBYCERT,
Expand Down Expand Up @@ -155,7 +157,8 @@ static int do_getnamebysid(PyObject *py_result, PyObject *py_sid)
return ret;
}

static int do_getsidbyid(PyObject *py_result, PyObject *py_id)
static int do_getsidbyid(enum lookup_type type, PyObject *py_result,
PyObject *py_id)
{
long id;
const char *id_str;
Expand Down Expand Up @@ -187,7 +190,19 @@ static int do_getsidbyid(PyObject *py_result, PyObject *py_id)
return EINVAL;
}

ret = sss_nss_getsidbyid((uint32_t) id, &sid, &id_type);
switch (type) {
case SIDBYID:
ret = sss_nss_getsidbyid((uint32_t) id, &sid, &id_type);
break;
case SIDBYUID:
ret = sss_nss_getsidbyuid((uint32_t) id, &sid, &id_type);
break;
case SIDBYGID:
ret = sss_nss_getsidbygid((uint32_t) id, &sid, &id_type);
break;
default:
return EINVAL;
}
if (ret == 0) {
ret = add_dict(py_result, py_id, PyUnicode_FromString(SSS_SID_KEY),
PyUnicode_FromString(sid), PYNUMBER_FROMLONG(id_type));
Expand Down Expand Up @@ -302,7 +317,9 @@ static int do_lookup(enum lookup_type type, PyObject *py_result,
return do_getnamebysid(py_result, py_inp);
break;
case SIDBYID:
return do_getsidbyid(py_result, py_inp);
case SIDBYUID:
case SIDBYGID:
return do_getsidbyid(type, py_result, py_inp);
break;
case IDBYSID:
return do_getidbysid(py_result, py_inp);
Expand Down Expand Up @@ -334,7 +351,9 @@ static PyObject *check_args(enum lookup_type type, PyObject *args)

if (!(PyList_Check(obj) || PyTuple_Check(obj) ||
PyBytes_Check(obj) || PyUnicode_Check(obj) ||
(type == SIDBYID && (PYNUMBER_CHECK(obj))))) {
((type == SIDBYID
|| type == SIDBYUID
|| type == SIDBYGID) && (PYNUMBER_CHECK(obj))))) {
PyErr_Format(PyExc_ValueError,
"Only string, long or list or tuples of them " \
"are accepted\n");
Expand All @@ -355,7 +374,9 @@ static PyObject *check_args(enum lookup_type type, PyObject *args)
py_value = PySequence_GetItem(obj, i);
if ((py_value != NULL) &&
(PyBytes_Check(py_value) || PyUnicode_Check(py_value) ||
(type == SIDBYID && PYNUMBER_CHECK(py_value)))) {
((type == SIDBYID
|| type == SIDBYUID
|| type == SIDBYGID) && PYNUMBER_CHECK(py_value)))) {
ret = do_lookup(type, py_result, py_value);
if (ret != 0) {
/* Skip this name */
Expand Down Expand Up @@ -418,6 +439,36 @@ static PyObject * py_getsidbyid(PyObject *module, PyObject *args)
return check_args(SIDBYID, args);
}

PyDoc_STRVAR(getsidbyuid_doc,
"getsidbyuid(uid or list/tuple of uid) -> dict(uid => dict(results))\n\
\n\
Returns a dictionary with a dictionary of results for each given POSIX UID.\n\
The result dictionary contain the SID and the type of the object which can be\n\
accessed with the key constants SID_KEY and TYPE_KEY, respectively. Since \n\
given ID is assumed to be a user ID is is not expected that group objects are\n\
returned."
);

static PyObject * py_getsidbyuid(PyObject *module, PyObject *args)
{
return check_args(SIDBYUID, args);
}

PyDoc_STRVAR(getsidbygid_doc,
"getsidbygid(gid or list/tuple of gid) -> dict(gid => dict(results))\n\
\n\
Returns a dictionary with a dictionary of results for each given POSIX GID.\n\
The result dictionary contain the SID and the type of the object which can be\n\
accessed with the key constants SID_KEY and TYPE_KEY, respectively. Since \n\
given ID is assumed to be a group ID is is not expected that user objects are\n\
returned."
);

static PyObject * py_getsidbygid(PyObject *module, PyObject *args)
{
return check_args(SIDBYGID, args);
}

PyDoc_STRVAR(getnamebysid_doc,
"getnamebysid(sid or list/tuple of sid) -> dict(sid => dict(results))\n\
\n\
Expand Down Expand Up @@ -484,6 +535,10 @@ static PyMethodDef methods[] = {
METH_VARARGS, getsidbyname_doc },
{ sss_py_const_p(char, "getsidbyid"), (PyCFunction) py_getsidbyid,
METH_VARARGS, getsidbyid_doc },
{ sss_py_const_p(char, "getsidbyuid"), (PyCFunction) py_getsidbyuid,
METH_VARARGS, getsidbyuid_doc },
{ sss_py_const_p(char, "getsidbygid"), (PyCFunction) py_getsidbygid,
METH_VARARGS, getsidbygid_doc },
{ sss_py_const_p(char, "getnamebysid"), (PyCFunction) py_getnamebysid,
METH_VARARGS, getnamebysid_doc },
{ sss_py_const_p(char, "getidbysid"), (PyCFunction) py_getidbysid,
Expand Down
21 changes: 21 additions & 0 deletions src/tests/intg/test_pysss_nss_idmap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ def test_user_operations(ldap_conn, simple_ad):
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_USER
assert output[pysss_nss_idmap.SID_KEY] == user_sid

output = pysss_nss_idmap.getsidbyuid(user_id)[user_id]
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_USER
assert output[pysss_nss_idmap.SID_KEY] == user_sid

output = pysss_nss_idmap.getsidbygid(user_id)
assert len(output) == 0

output = pysss_nss_idmap.getidbysid(user_sid)[user_sid]
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_USER
assert output[pysss_nss_idmap.ID_KEY] == user_id
Expand All @@ -237,6 +244,13 @@ def test_group_operations(ldap_conn, simple_ad):
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_GROUP
assert output[pysss_nss_idmap.SID_KEY] == group_sid

output = pysss_nss_idmap.getsidbygid(group_id)[group_id]
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_GROUP
assert output[pysss_nss_idmap.SID_KEY] == group_sid

output = pysss_nss_idmap.getsidbyuid(group_id)
assert len(output) == 0

output = pysss_nss_idmap.getidbysid(group_sid)[group_sid]
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_GROUP
assert output[pysss_nss_idmap.ID_KEY] == group_id
Expand All @@ -260,6 +274,13 @@ def test_case_insensitive(ldap_conn, simple_ad):
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_GROUP
assert output[pysss_nss_idmap.SID_KEY] == group_sid

output = pysss_nss_idmap.getsidbygid(group_id)[group_id]
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_GROUP
assert output[pysss_nss_idmap.SID_KEY] == group_sid

output = pysss_nss_idmap.getsidbyuid(group_id)
assert len(output) == 0

output = pysss_nss_idmap.getidbysid(group_sid)[group_sid]
assert output[pysss_nss_idmap.TYPE_KEY] == pysss_nss_idmap.ID_GROUP
assert output[pysss_nss_idmap.ID_KEY] == group_id
Expand Down

0 comments on commit b8da03b

Please sign in to comment.