X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/ae5cafdbfe349f25afdc289ab79a6b32d47f2213..49915b4a09cc89ccd426b29f7113b380828361d3:/key.c diff --git a/key.c b/key.c index 38d3024..cd330c7 100644 --- a/key.c +++ b/key.c @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -287,7 +287,7 @@ static PyObject *meth__KeyData_readflags(PyObject *me, PyObject *arg) goto end; if ((err = key_readflags(p, &end, &f, &m)) != 0) KEYERR(err); - rc = Py_BuildValue("(NNs)", getu32(f), getu32(m), end); + rc = Py_BuildValue("(NNs)", getulong(f), getulong(m), end); end: return (rc); } @@ -336,7 +336,7 @@ static void keydata_pydealloc(PyObject *me) static PyObject *kdmeth_matchp(PyObject *me, PyObject *arg) { key_filter f; - + if (!PyArg_ParseTuple(arg, "O&:matchp", convfilter, &f)) return (0); return (getbool(KEY_MATCH(KEYDATA_KD(me), &f))); @@ -388,7 +388,7 @@ static PyObject *kdmeth_plock(PyObject *me, PyObject *arg) int err; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s:plock", &tag)) goto end; if ((err = key_plock(&kd, KEYDATA_KD(me), tag)) != 0) @@ -404,7 +404,7 @@ static PyObject *kdmeth_lock(PyObject *me, PyObject *arg) int n; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s#:lock", &p, &n)) goto end; key_lock(&kd, KEYDATA_KD(me), p, n); @@ -440,13 +440,13 @@ static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg) goto end; if ((kd = key_decode(p, n)) == 0) KEYERR(KERR_MALFORMED); - rc = keydata_pywrap(kd); + rc = keydata_pywrap(kd); end: return (rc); } static PyObject *kdget_flags(PyObject *me, void *hunoz) - { return (getu32(KEYDATA_KD(me)->e)); } + { return (getulong(KEYDATA_KD(me)->e)); } static PyMethodDef keydata_pymethods[] = { #define METHNAME(func) kdmeth_##func @@ -499,7 +499,7 @@ static PyTypeObject keydata_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ keydata_pymethods, /* @tp_methods@ */ 0, /* @tp_members@ */ keydata_pygetset, /* @tp_getset@ */ @@ -576,7 +576,7 @@ static PyTypeObject keydatabin_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ keydatabin_pygetset, /* @tp_getset@ */ @@ -635,7 +635,7 @@ static PyObject *kdemeth_punlock(PyObject *me, PyObject *arg) int err; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s:punlock", &tag)) goto end; if ((err = key_punlock(&kd, KEYDATA_KD(me), tag)) != 0) @@ -652,7 +652,7 @@ static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg) int err; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s#:unlock", &p, &n)) goto end; if ((err = key_unlock(&kd, KEYDATA_KD(me), p, n)) != 0) @@ -713,7 +713,7 @@ static PyTypeObject keydataenc_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ keydataenc_pymethods, /* @tp_methods@ */ 0, /* @tp_members@ */ keydataenc_pygetset, /* @tp_getset@ */ @@ -789,7 +789,7 @@ static PyTypeObject keydatamp_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ keydatamp_pygetset, /* @tp_getset@ */ @@ -864,7 +864,7 @@ static PyTypeObject keydatastr_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ keydatastr_pygetset, /* @tp_getset@ */ @@ -944,7 +944,7 @@ static PyTypeObject keydataec_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ keydataec_pygetset, /* @tp_getset@ */ @@ -969,7 +969,7 @@ static PyObject *subkeyiter_make(PyObject *kdobj) return ((PyObject *)me); } -static PyObject *subkeyiter_next(PyObject *me) +static PyObject *subkeyiter_pynext(PyObject *me) { const char *tag; if (!key_nextsubkey(SUBKEYITER_I(me), &tag, 0)) @@ -1015,7 +1015,7 @@ static PyTypeObject subkeyiter_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ PyObject_SelfIter, /* @tp_iter@ */ - subkeyiter_next, /* @tp_iternexr@ */ + subkeyiter_pynext, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ 0, /* @tp_getset@ */ @@ -1041,7 +1041,7 @@ static PyObject *keydatastruct_pynew(PyTypeObject *ty, key_data *kd = 0; static char *kwlist[] = { "subkeys", 0 }; - Py_INCREF(arg); Py_INCREF(kw); + Py_XINCREF(arg); Py_XINCREF(kw); if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:new", kwlist, &sub)) goto end; kd = key_newstruct(); @@ -1112,9 +1112,9 @@ end: } static PyMappingMethods keydatastruct_pymapping = { - 0, /* @mp_length@ */ + gmap_pysize, /* @mp_length@ */ keydatastruct_pylookup, /* @mp_subscript@ */ - keydatastruct_pystore, /* @mp_ass_subscript@ */ + keydatastruct_pystore /* @mp_ass_subscript@ */ }; static PyTypeObject keydatastruct_pytype_skel = { @@ -1149,8 +1149,8 @@ static PyTypeObject keydatastruct_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ subkeyiter_make, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ - 0, /* @tp_methods@ */ + 0, /* @tp_iternext@ */ + gmap_pymethods, /* @tp_methods@ */ 0, /* @tp_members@ */ 0, /* @tp_getset@ */ 0, /* @tp_base@ */ @@ -1178,7 +1178,7 @@ static PyObject *keyattriter_make(PyObject *kaobj) return ((PyObject *)me); } -static PyObject *keyattriter_next(PyObject *me) +static PyObject *keyattriter_pynext(PyObject *me) { const char *name; @@ -1225,7 +1225,7 @@ static PyTypeObject keyattriter_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ PyObject_SelfIter, /* @tp_iter@ */ - keyattriter_next, /* @tp_iternexr@ */ + keyattriter_pynext, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ 0, /* @tp_getset@ */ @@ -1298,9 +1298,9 @@ static void keyattrs_pydealloc(PyObject *me) } static PyMappingMethods keyattrs_pymapping = { - 0, - keyattrs_pylookup, - keyattrs_pystore + gmap_pysize, /* @mp_length@ */ + keyattrs_pylookup, /* @mp_subscript@ */ + keyattrs_pystore /* @mp_ass_subscript@ */ }; static PyTypeObject keyattrs_pytype_skel = { @@ -1316,7 +1316,7 @@ static PyTypeObject keyattrs_pytype_skel = { 0, /* @tp_compare@ */ 0, /* @tp_repr@ */ 0, /* @tp_as_number@ */ - 0, /* @tp_as_sequence@ */ + &gmap_pysequence, /* @tp_as_sequence@ */ &keyattrs_pymapping, /* @tp_as_mapping@ */ 0, /* @tp_hash@ */ 0, /* @tp_call@ */ @@ -1335,8 +1335,8 @@ static PyTypeObject keyattrs_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ keyattriter_make, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ - 0, /* @tp_methods@ */ + 0, /* @tp_iternext@ */ + gmap_pymethods, /* @tp_methods@ */ 0, /* @tp_members@ */ 0, /* @tp_getset@ */ 0, /* @tp_base@ */ @@ -1395,7 +1395,7 @@ static void key_pydealloc(PyObject *me) static PyObject *kmeth_delete(PyObject *me, PyObject *arg) { int err; - + if (!PyArg_ParseTuple(arg, ":delete")) goto end; if ((err = key_delete(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err); RETURN_ME; @@ -1406,7 +1406,7 @@ end: static PyObject *kmeth_expire(PyObject *me, PyObject *arg) { int err; - + if (!PyArg_ParseTuple(arg, ":expire")) goto end; if ((err = key_expire(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err); RETURN_ME; @@ -1418,7 +1418,7 @@ static PyObject *kmeth_used(PyObject *me, PyObject *arg) { long t; int err; - + if (!PyArg_ParseTuple(arg, "l:used", &t)) goto end; if ((err = key_used(KEY_KF(me), KEY_K(me), t)) != 0) KEYERR(err); RETURN_ME; @@ -1463,18 +1463,54 @@ static PyObject *kmeth_fingerprint(PyObject *me, } static PyObject *kget_id(PyObject *me, void *hunoz) - { return (getu32(KEY_K(me)->id)); } + { return (getulong(KEY_K(me)->id)); } +static PyObject *kget_file(PyObject *me, void *hunoz) + { RETURN_OBJ(KEY_KFOBJ(me)); } static PyObject *kget_type(PyObject *me, void *hunoz) { return (PyString_FromString(KEY_K(me)->type)); } static PyObject *kget_exptime(PyObject *me, void *hunoz) - { return (PyInt_FromLong(KEY_K(me)->exp)); } + { return (getulong(KEY_K(me)->exp)); } static PyObject *kget_deltime(PyObject *me, void *hunoz) - { return (PyInt_FromLong(KEY_K(me)->del)); } + { return (getulong(KEY_K(me)->del)); } static PyObject *kget_expiredp(PyObject *me, void *hunoz) { return (getbool(key_expired(KEY_K(me)))); } static PyObject *kget_attr(PyObject *me, void *hunoz) { return (keyattrs_make(me)); } +static int kset_exptime(PyObject *me, PyObject *x, void *hunoz) +{ + key *k = KEY_K(me); + unsigned long et; + + if (!convulong(x, &et)) + goto end; + if (!(KEY_KF(me)->f & KF_WRITE)) + KEYERR(KERR_READONLY); + k->exp = et; + KEY_KF(me)->f |= KF_MODIFIED; + return (0); +end: + return (-1); +} + +static int kset_deltime(PyObject *me, PyObject *x, void *hunoz) +{ + key *k = KEY_K(me); + unsigned long dt; + + if (!convulong(x, &dt)) + goto end; + if (dt == KEXP_FOREVER && k->exp != KEXP_FOREVER) + VALERR("key will eventually expire"); + if (!(KEY_KF(me)->f & KF_WRITE)) + KEYERR(KERR_READONLY); + k->del = dt; + KEY_KF(me)->f |= KF_MODIFIED; + return (0); +end: + return (-1); +} + static PyObject *kget_data(PyObject *me, void *hunoz) { key_data *kd = KEY_K(me)->k; @@ -1484,6 +1520,8 @@ static PyObject *kget_data(PyObject *me, void *hunoz) static int kset_data(PyObject *me, PyObject *x, void *hunoz) { int err; + + if (!x) NIERR("__del__"); if (!KEYDATA_PYCHECK(x)) TYERR("expected KeyData object"); if ((err = key_setkeydata(KEY_KF(me), KEY_K(me), KEYDATA_KD(x))) != 0) KEYERR(err); @@ -1513,7 +1551,7 @@ static int kset_tag(PyObject *me, PyObject *x, void *hunoz) int err; char *tag; - if (x == Py_None) tag = 0; + if (!x || x == Py_None) tag = 0; else if ((tag = PyString_AsString(x)) == 0) goto end; if ((err = key_settag(KEY_KF(me), KEY_K(me), tag)) != 0) KEYERR(err); return (0); @@ -1531,7 +1569,7 @@ static int kset_comment(PyObject *me, PyObject *x, void *hunoz) int err; char *c; - if (x == Py_None) c = 0; + if (!x || x == Py_None) c = 0; else if ((c = PyString_AsString(x)) == 0) goto end; if ((err = key_setcomment(KEY_KF(me), KEY_K(me), c)) != 0) KEYERR(err); return (0); @@ -1552,11 +1590,12 @@ static PyMethodDef key_pymethods[] = { static PyGetSetDef key_pygetset[] = { #define GETSETNAME(op, name) k##op##_##name + GET (file, "KEY.file -> KF") GET (id, "KEY.id -> ID") GETSET(tag, "KEY.tag -> TAG") GET (type, "KEY.type -> TYPE") - GET (exptime, "KEY.exptime -> TIME") - GET (deltime, "KEY.deltime -> TIME") + GETSET(exptime, "KEY.exptime -> TIME") + GETSET(deltime, "KEY.deltime -> TIME") GET (expiredp, "KEY.expiredp -> BOOL") GET (attr, "KEY.attr -> ATTRIBUTES") GETSET(data, "KEY.data -> KD") @@ -1598,7 +1637,7 @@ static PyTypeObject key_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ key_pymethods, /* @tp_methods@ */ 0, /* @tp_members@ */ key_pygetset, /* @tp_getset@ */ @@ -1625,13 +1664,13 @@ static PyObject *keyiter_new(PyObject *kfobj) return ((PyObject *)me); } -static PyObject *keyiter_next(PyObject *me) +static PyObject *keyiter_pynext(PyObject *me) { key *k; if ((k = key_next(KEYITER_I(me))) == 0) return (0); - return (key_pywrap(KEYITER_KFOBJ(me), k)); + return (getulong(k->id)); } static void keyiter_pydealloc(PyObject *me) @@ -1672,7 +1711,7 @@ static PyTypeObject keyiter_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ PyObject_SelfIter, /* @tp_iter@ */ - keyiter_next, /* @tp_iternexr@ */ + keyiter_pynext, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ 0, /* @tp_getset@ */ @@ -1870,7 +1909,7 @@ static PyObject *keyfile_pylookup(PyObject *me, PyObject *key) } end: return (rc); -} +} static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw) { @@ -1881,10 +1920,10 @@ static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw) key *k; int err; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&sl:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&s|l:newkey", kwlist, convu32, &id, &type, &exptime)) goto end; - if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) == 0) + if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) != 0) KEYERR(err); return (key_pywrap(me, k)); end: @@ -1940,6 +1979,7 @@ static PyMethodDef keyfile_pymethods[] = { METH (bytype, "KF.bytype(TYPE) -> KEY|None") METH (bytag, "KF.bytag(TAG) -> KEY|None") KWMETH(qtag, "KF.qtag(TAG, new = KD) -> FULLTAG, KEY, OLDKD") + GMAP_ROMETHODS #undef METHNAME { 0 } }; @@ -1955,7 +1995,7 @@ static PyGetSetDef keyfile_pygetset[] = { }; static PyMappingMethods keyfile_pymapping = { - 0, + gmap_pysize, keyfile_pylookup, 0 }; @@ -1973,7 +2013,7 @@ static PyTypeObject keyfile_pytype_skel = { 0, /* @tp_compare@ */ 0, /* @tp_repr@ */ 0, /* @tp_as_number@ */ - 0, /* @tp_as_sequence@ */ + &gmap_pysequence, /* @tp_as_sequence@ */ &keyfile_pymapping, /* @tp_as_mapping@ */ 0, /* @tp_hash@ */ 0, /* @tp_call@ */ @@ -1992,7 +2032,7 @@ static PyTypeObject keyfile_pytype_skel = { 0, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ keyiter_new, /* @tp_iter@ */ - 0, /* @tp_iternexr@ */ + 0, /* @tp_iternext@ */ keyfile_pymethods, /* @tp_methods@ */ 0, /* @tp_members@ */ keyfile_pygetset, /* @tp_getset@ */