[git] GPGME - branch, master, updated. gpgme-1.6.0-117-g0d4e956
by Justus Winter
cvs at cvs.gnupg.org
Thu May 19 16:09:36 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, master has been updated
via 0d4e95621e05d50cd454049a424bb9ee098a5db6 (commit)
via d90857a08c4fe5b73b6d6d46fd6200efdd72db44 (commit)
from 2f748b5a2d162be4f23b18782219771ead54cb51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0d4e95621e05d50cd454049a424bb9ee098a5db6
Author: Justus Winter <justus at gnupg.org>
Date: Thu May 19 15:53:19 2016 +0200
python: Improve progress callbacks.
* lang/python/helpers.c (pyProgressCb): Stash python errors, convert
'what' to Unicode object.
* lang/python/pyme/core.py (Context.set_progress_cb): Hand in 'self'.
* lang/python/tests/t-callbacks.py: Test progress callbacks.
Signed-off-by: Justus Winter <justus at gnupg.org>
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index c3cf3b3..7ced04a 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -229,17 +229,25 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
int total) {
PyObject *func = NULL, *dataarg = NULL, *args = NULL, *retval = NULL;
PyObject *pyhook = (PyObject *) hook;
+ PyObject *self = NULL;
- if (PyTuple_Check(pyhook)) {
- func = PyTuple_GetItem(pyhook, 0);
+ assert (PyTuple_Check(pyhook));
+ self = PyTuple_GetItem(pyhook, 0);
+ func = PyTuple_GetItem(pyhook, 1);
+ if (PyTuple_Size(pyhook) == 3) {
dataarg = PyTuple_GetItem(pyhook, 1);
args = PyTuple_New(5);
} else {
- func = pyhook;
args = PyTuple_New(4);
}
- PyTuple_SetItem(args, 0, PyBytes_FromString(what));
+ PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(what, strlen (what),
+ "strict"));
+ if (PyErr_Occurred()) {
+ pygpgme_stash_callback_exception(self);
+ Py_DECREF(args);
+ return;
+ }
PyTuple_SetItem(args, 1, PyLong_FromLong((long) type));
PyTuple_SetItem(args, 2, PyLong_FromLong((long) current));
PyTuple_SetItem(args, 3, PyLong_FromLong((long) total));
@@ -249,6 +257,8 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
}
retval = PyObject_CallObject(func, args);
+ if (PyErr_Occurred())
+ pygpgme_stash_callback_exception(self);
Py_DECREF(args);
Py_XDECREF(retval);
}
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 8a4c197..9e7faf7 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -185,9 +185,9 @@ class Context(GpgmeWrapper):
else:
self.last_progresscb = pygpgme.new_PyObject_p_p()
if hook == None:
- hookdata = func
+ hookdata = (self, func)
else:
- hookdata = (func, hook)
+ hookdata = (self, func, hook)
pygpgme.pygpgme_set_progress_cb(self.wrapped, hookdata, self.last_progresscb)
def get_engine_info(self):
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index e89fcb8..bd88d86 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -75,3 +75,41 @@ except Exception as e:
assert type(e) == TypeError
else:
assert False, "Expected an error, got none"
+
+
+
+# Test the progress callback.
+parms = """<GnupgKeyParms format="internal">
+Key-Type: RSA
+Key-Length: 1024
+Name-Real: Joe Tester
+Name-Comment: with stupid passphrase
+Name-Email: joe+pyme at example.org
+Passphrase: Crypt0R0cks
+Expire-Date: 2020-12-31
+</GnupgKeyParms>
+"""
+
+messages = []
+def progress_cb(what, typ, current, total, hook=None):
+ messages.append(
+ "PROGRESS UPDATE: what = {}, type = {}, current = {}, total = {}"
+ .format(what, typ, current, total))
+
+c = core.Context()
+c.set_progress_cb(progress_cb, None)
+c.op_genkey(parms, None, None)
+assert len(messages) > 0
+
+# Test exception handling.
+def progress_cb(what, typ, current, total, hook=None):
+ raise myException
+
+c = core.Context()
+c.set_progress_cb(progress_cb, None)
+try:
+ c.op_genkey(parms, None, None)
+except Exception as e:
+ assert e == myException
+else:
+ assert False, "Expected an error, got none"
commit d90857a08c4fe5b73b6d6d46fd6200efdd72db44
Author: Justus Winter <justus at gnupg.org>
Date: Thu May 19 11:03:27 2016 +0200
python: Robust exception handling in callbacks.
* lang/python/helpers.c (pygpgme_stash_callback_exception): New
function.
(pygpgme_raise_callback_exception): Likewise.
(pyPassphraseCb): Stash python errors.
* lang/python/helpers.h (pygpgme_raise_callback_exception): New
prototype.
* lang/python/pyme/core.py ({Context,Data}.__init__): Move common
initialization to superclass.
(Context.set_progress_cb): Hand in 'self'.
* lang/python/pyme/util.py (GpgmeWrapper.__init__): New function.
(GpgmeWrapper.__getattr__): Raise stashed exceptions.
* lang/python/tests/Makefile.am (py_tests): Add new test.
* lang/python/tests/t-callbacks.py: New file.
Signed-off-by: Justus Winter <justus at gnupg.org>
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 447a29f..c3cf3b3 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -17,6 +17,8 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+#include <assert.h>
#include <stdio.h>
#include <gpgme.h>
#include <stdlib.h>
@@ -59,12 +61,84 @@ void pygpgme_clear_generic_cb(PyObject **cb) {
Py_DECREF(*cb);
}
+/* Exception support for callbacks. */
+#define EXCINFO "_callback_excinfo"
+
+static void pygpgme_stash_callback_exception(PyObject *self)
+{
+ PyObject *ptype, *pvalue, *ptraceback, *excinfo;
+
+ PyErr_Fetch(&ptype, &pvalue, &ptraceback);
+ excinfo = PyTuple_New(3);
+ PyTuple_SetItem(excinfo, 0, ptype);
+
+ if (pvalue)
+ PyTuple_SetItem(excinfo, 1, pvalue);
+ else {
+ Py_INCREF(Py_None);
+ PyTuple_SetItem(excinfo, 1, Py_None);
+ }
+
+ if (ptraceback)
+ PyTuple_SetItem(excinfo, 2, ptraceback);
+ else {
+ Py_INCREF(Py_None);
+ PyTuple_SetItem(excinfo, 2, Py_None);
+ }
+
+ PyObject_SetAttrString(self, EXCINFO, excinfo);
+}
+
+PyObject *pygpgme_raise_callback_exception(PyObject *self)
+{
+ PyObject *ptype, *pvalue, *ptraceback, *excinfo;
+
+ if (! PyObject_HasAttrString(self, EXCINFO))
+ goto leave;
+
+ excinfo = PyObject_GetAttrString(self, EXCINFO);
+ if (! PyTuple_Check(excinfo))
+ {
+ Py_DECREF(excinfo);
+ goto leave;
+ }
+
+ ptype = PyTuple_GetItem(excinfo, 0);
+ Py_INCREF(excinfo);
+
+ pvalue = PyTuple_GetItem(excinfo, 1);
+ if (pvalue == Py_None)
+ pvalue = NULL;
+ else
+ Py_INCREF(pvalue);
+
+ ptraceback = PyTuple_GetItem(excinfo, 2);
+ if (ptraceback == Py_None)
+ ptraceback = NULL;
+ else
+ Py_INCREF(ptraceback);
+
+ Py_DECREF(excinfo);
+ PyErr_Restore(ptype, pvalue, ptraceback);
+
+ Py_INCREF(Py_None);
+ PyObject_SetAttrString(self, EXCINFO, Py_None);
+
+ return NULL; /* Raise exception. */
+
+ leave:
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+#undef EXCINFO
+
static gpgme_error_t pyPassphraseCb(void *hook,
const char *uid_hint,
const char *passphrase_info,
int prev_was_bad,
int fd) {
PyObject *pyhook = (PyObject *) hook;
+ PyObject *self = NULL;
PyObject *func = NULL;
PyObject *args = NULL;
PyObject *retval = NULL;
@@ -73,12 +147,13 @@ static gpgme_error_t pyPassphraseCb(void *hook,
pygpgme_exception_init();
- if (PyTuple_Check(pyhook)) {
- func = PyTuple_GetItem(pyhook, 0);
- dataarg = PyTuple_GetItem(pyhook, 1);
+ assert (PyTuple_Check(pyhook));
+ self = PyTuple_GetItem(pyhook, 0);
+ func = PyTuple_GetItem(pyhook, 1);
+ if (PyTuple_Size(pyhook) == 3) {
+ dataarg = PyTuple_GetItem(pyhook, 2);
args = PyTuple_New(4);
} else {
- func = pyhook;
args = PyTuple_New(3);
}
@@ -90,6 +165,11 @@ static gpgme_error_t pyPassphraseCb(void *hook,
else
PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(uid_hint, strlen (uid_hint),
"strict"));
+ if (PyErr_Occurred()) {
+ Py_DECREF(args);
+ err_status = gpg_error(GPG_ERR_GENERAL);
+ goto leave;
+ }
PyTuple_SetItem(args, 1, PyBytes_FromString(passphrase_info));
PyTuple_SetItem(args, 2, PyBool_FromLong((long)prev_was_bad));
@@ -117,7 +197,8 @@ static gpgme_error_t pyPassphraseCb(void *hook,
PyErr_Format(PyExc_TypeError,
"expected str or bytes from passphrase callback, got %s",
retval->ob_type->tp_name);
- return gpg_error(GPG_ERR_GENERAL);
+ err_status = gpg_error(GPG_ERR_GENERAL);
+ goto leave;
}
write(fd, buf, len);
@@ -126,6 +207,10 @@ static gpgme_error_t pyPassphraseCb(void *hook,
}
}
+ leave:
+ if (err_status)
+ pygpgme_stash_callback_exception(self);
+
return err_status;
}
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
index 12d7cfa..81d17ff 100644
--- a/lang/python/helpers.h
+++ b/lang/python/helpers.h
@@ -30,6 +30,7 @@ void pygpgme_exception_init(void);
gpgme_error_t pygpgme_exception2code(void);
void pygpgme_clear_generic_cb(PyObject **cb);
+PyObject *pygpgme_raise_callback_exception(PyObject *self);
void pygpgme_set_passphrase_cb(gpgme_ctx_t ctx, PyObject *cb,
PyObject **freelater);
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 2a0ca07..8a4c197 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -54,14 +54,14 @@ class Context(GpgmeWrapper):
def __init__(self, wrapped=None):
if wrapped:
- self.wrapped = wrapped
self.own = False
else:
tmp = pygpgme.new_gpgme_ctx_t_p()
errorcheck(pygpgme.gpgme_new(tmp))
- self.wrapped = pygpgme.gpgme_ctx_t_p_value(tmp)
+ wrapped = pygpgme.gpgme_ctx_t_p_value(tmp)
pygpgme.delete_gpgme_ctx_t_p(tmp)
self.own = True
+ super().__init__(wrapped)
self.last_passcb = None
self.last_progresscb = None
@@ -167,9 +167,9 @@ class Context(GpgmeWrapper):
else:
self.last_passcb = pygpgme.new_PyObject_p_p()
if hook == None:
- hookdata = func
+ hookdata = (self, func)
else:
- hookdata = (func, hook)
+ hookdata = (self, func, hook)
pygpgme.pygpgme_set_passphrase_cb(self.wrapped, hookdata, self.last_passcb)
def set_progress_cb(self, func, hook=None):
@@ -282,7 +282,7 @@ class Data(GpgmeWrapper):
that file.
Any other use will result in undefined or erroneous behavior."""
- self.wrapped = None
+ super().__init__(None)
self.last_readcb = None
if cbs != None:
diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index 3c34c79..b54cd4d 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -32,6 +32,11 @@ def process_constants(starttext, dict):
class GpgmeWrapper(object):
"""Base class all Pyme wrappers for GPGME functionality. Not to be
instantiated directly."""
+
+ def __init__(self, wrapped):
+ self._callback_excinfo = None
+ self.wrapped = wrapped
+
def __repr__(self):
return '<instance of %s.%s with GPG object at %s>' % \
(__name__, self.__class__.__name__,
@@ -78,11 +83,16 @@ class GpgmeWrapper(object):
if self._errorcheck(name):
def _funcwrap(slf, *args, **kwargs):
- return errorcheck(func(slf.wrapped, *args, **kwargs),
- "Invocation of " + name)
+ result = func(slf.wrapped, *args, **kwargs)
+ if slf._callback_excinfo:
+ pygpgme.pygpgme_raise_callback_exception(slf)
+ return errorcheck(result, "Invocation of " + name)
else:
def _funcwrap(slf, *args, **kwargs):
- return func(slf.wrapped, *args, **kwargs)
+ result = func(slf.wrapped, *args, **kwargs)
+ if slf._callback_excinfo:
+ pygpgme.pygpgme_raise_callback_exception(slf)
+ return result
_funcwrap.__doc__ = getattr(func, "__doc__")
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index c4fc602..30f1aec 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -29,6 +29,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
py_tests = t-wrapper.py \
+ t-callbacks.py \
t-data.py \
t-encrypt.py \
t-encrypt-sym.py \
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
new file mode 100755
index 0000000..e89fcb8
--- /dev/null
+++ b/lang/python/tests/t-callbacks.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify 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.
+#
+# GPGME 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 Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+
+c = core.Context()
+c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+
+source = core.Data("Hallo Leute\n")
+sink = core.Data()
+
+# Valid passphrases, both as string and bytes.
+for passphrase in ('foo', b'foo'):
+ def passphrase_cb(hint, desc, prev_bad, hook=None):
+ assert hook == passphrase
+ return hook
+
+ c.set_passphrase_cb(passphrase_cb, passphrase)
+ c.op_encrypt([], 0, source, sink)
+
+# Returning an invalid type.
+def passphrase_cb(hint, desc, prev_bad, hook=None):
+ return 0
+
+c.set_passphrase_cb(passphrase_cb, None)
+try:
+ c.op_encrypt([], 0, source, sink)
+except Exception as e:
+ assert type(e) == TypeError
+ assert str(e) == "expected str or bytes from passphrase callback, got int"
+else:
+ assert False, "Expected an error, got none"
+
+# Raising an exception inside callback.
+myException = Exception()
+def passphrase_cb(hint, desc, prev_bad, hook=None):
+ raise myException
+
+c.set_passphrase_cb(passphrase_cb, None)
+try:
+ c.op_encrypt([], 0, source, sink)
+except Exception as e:
+ assert e == myException
+else:
+ assert False, "Expected an error, got none"
+
+# Wrong kind of callback function.
+def bad_passphrase_cb():
+ pass
+
+c.set_passphrase_cb(bad_passphrase_cb, None)
+try:
+ c.op_encrypt([], 0, source, sink)
+except Exception as e:
+ assert type(e) == TypeError
+else:
+ assert False, "Expected an error, got none"
-----------------------------------------------------------------------
Summary of changes:
lang/python/helpers.c | 113 +++++++++++++++++++++++++++++++++++---
lang/python/helpers.h | 1 +
lang/python/pyme/core.py | 14 ++---
lang/python/pyme/util.py | 16 +++++-
lang/python/tests/Makefile.am | 1 +
lang/python/tests/t-callbacks.py | 115 +++++++++++++++++++++++++++++++++++++++
6 files changed, 241 insertions(+), 19 deletions(-)
create mode 100755 lang/python/tests/t-callbacks.py
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list