Add binding for apt_pkg.maybe_open_clear_signed_file()

2 files changed, 46 insertions, 0 deletions

diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index e00ce0ca..0d84f468 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -27,6 +27,7 @@
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/gpgv.h>
 
 #include <sys/stat.h>
 #include <libintl.h>
@@ -472,6 +473,25 @@ static PyObject *InitSystem(PyObject *Self,PyObject *Args)
    return HandleErrors(Py_None);
 }
 									/*}}}*/
+// gpgv.cc:OpenMaybeClearSignedFile					/*{{{*/
+// ---------------------------------------------------------------------
+static char *doc_OpenMaybeClearSignedFile =
+"open_maybe_clear_signed_file(file: str) -> int\n\n"
+"Open a file and ignore a PGP clear signature.\n"
+"Return a open file descriptor or a error.";
+static PyObject *PyOpenMaybeClearSignedFile(PyObject *Self,PyObject *Args)
+{
+   PyApt_Filename file;
+   char errors = false;
+   if (PyArg_ParseTuple(Args,"O&",PyApt_Filename::Converter, &file,&errors) == 0)
+      return 0;
+
+   FileFd Fd;
+   if (OpenMaybeClearSignedFile(file, Fd) == false)
+      return HandleErrors(MkPyNumber(-1));
+
+   return HandleErrors(MkPyNumber(dup(Fd.Fd())));
+}
 
 // fileutils.cc: GetLock						/*{{{*/
 // ---------------------------------------------------------------------
@@ -546,6 +566,9 @@ static PyMethodDef methods[] =
    // Tag File
    {"rewrite_section",RewriteSection,METH_VARARGS,doc_RewriteSection},
 
+   {"open_maybe_clear_signed_file",PyOpenMaybeClearSignedFile,METH_VARARGS,
+    doc_OpenMaybeClearSignedFile},
+
    // Locking
    {"get_lock",GetLock,METH_VARARGS,doc_GetLock},
    {"pkgsystem_lock",PkgSystemLock,METH_VARARGS,doc_PkgSystemLock},
diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py
index 6ff6a32a..986ddfbc 100644
--- a/tests/test_tagfile.py
+++ b/tests/test_tagfile.py
@@ -28,6 +28,29 @@ if libdir:
 import apt_pkg
 
 
+class TestOpenMaybeClearSigned(unittest.TestCase):
+
+    def test_open_trivial(self):
+        basepath = os.path.dirname(__file__)
+        fd = apt_pkg.open_maybe_clear_signed_file(
+            os.path.join(basepath, "./data/test_debs/hello_2.5-1.dsc"))
+        f = os.fdopen(fd)
+        data = f.read().encode("utf-8")
+        self.assertTrue(data.startswith("Format: 1.0\n"))
+
+    def test_open_normal(self):
+        basepath = os.path.dirname(__file__)
+        fd = apt_pkg.open_maybe_clear_signed_file(
+            os.path.join(basepath, "./data/misc/foo_Release"))
+        f = os.fdopen(fd)
+        data = f.read().encode("utf-8")
+        self.assertTrue(data.startswith("Origin: Ubuntu\n"))
+
+    def xtest_open_does_not_exit(self):
+        with self.assertRaises(SystemError):
+            apt_pkg.open_maybe_clear_signed_file("does-not-exists")
+
+
 class TestTagFile(unittest.TestCase):
     """ test the apt_pkg.TagFile """