From: Jo Sutton <josutton@catalyst.net.nz>
Date: Fri, 1 Mar 2024 03:23:53 +0000 (+1300)
Subject: ldb: Update ldb.set_opaque() to accept only supported types
X-Git-Tag: tdb-1.4.11~1531
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=256320532a45e1e8ff94d2c7b246797a5f8291b6;p=thirdparty%2Fsamba.git

ldb: Update ldb.set_opaque() to accept only supported types

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 4768e905a78..6f273cfd2d5 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -2423,13 +2423,76 @@ static PyObject *py_ldb_set_opaque(PyLdbObject *self, PyObject *args)
 {
 	char *name;
 	PyObject *data;
+	void *value = NULL;
+	int ret;
 
 	if (!PyArg_ParseTuple(args, "sO", &name, &data))
 		return NULL;
 
-	/* FIXME: More interpretation */
+	if (data == Py_None) {
+		value = NULL;
+	} else if (PyBool_Check(data)) {
+		bool *opaque = NULL;
+		bool b;
+		{
+			const int is_true = PyObject_IsTrue(data);
+			if (is_true == -1) {
+				return NULL;
+			}
+			b = is_true;
+		}
+
+		opaque = talloc(self->mem_ctx, bool);
+		if (opaque == NULL) {
+			return PyErr_NoMemory();
+		}
+		*opaque = b;
+		value = opaque;
+	} else if (PyLong_Check(data)) {
+		unsigned long long *opaque = NULL;
+		const unsigned long long n = PyLong_AsUnsignedLongLong(data);
+		if (n == -1 && PyErr_Occurred()) {
+			return NULL;
+		}
+
+		opaque = talloc(self->mem_ctx, unsigned long long);
+		if (opaque == NULL) {
+			return PyErr_NoMemory();
+		}
+		*opaque = n;
+		value = opaque;
+	} else if (PyUnicode_Check(data)) {
+		char *opaque = NULL;
+		const char *s = PyUnicode_AsUTF8(data);
+		if (s == NULL) {
+			return NULL;
+		}
+
+		opaque = talloc_strdup(self->mem_ctx, s);
+		if (opaque == NULL) {
+			return PyErr_NoMemory();
+		}
+
+		/*
+		 * Assign the right type to the talloc pointer, so that
+		 * py_ldb_get_opaque() can recognize it.
+		 */
+		talloc_set_name_const(opaque, "char");
 
-	ldb_set_opaque(pyldb_Ldb_AS_LDBCONTEXT(self), name, data);
+		value = opaque;
+	} else {
+		PyErr_SetString(PyExc_ValueError,
+				"Unsupported type for opaque");
+		return NULL;
+	}
+
+	ret = ldb_set_opaque(pyldb_Ldb_AS_LDBCONTEXT(self), name, value);
+	if (ret) {
+		PyErr_SetLdbError(PyExc_LdbError,
+				  ret,
+				  pyldb_Ldb_AS_LDBCONTEXT(self));
+		return NULL;
+	}
 
 	Py_RETURN_NONE;
 }
diff --git a/selftest/knownfail.d/pyldb-opaque b/selftest/knownfail.d/pyldb-opaque
index b42afac8d94..23d639d1cd9 100644
--- a/selftest/knownfail.d/pyldb-opaque
+++ b/selftest/knownfail.d/pyldb-opaque
@@ -2,9 +2,7 @@
 ^ldb\.python\.api\.SimpleLdb\.test_opaque_int\(none\)$
 ^ldb\.python\.api\.SimpleLdb\.test_opaque_none\(none\)$
 ^ldb\.python\.api\.SimpleLdb\.test_opaque_string\(none\)$
-^ldb\.python\.api\.SimpleLdb\.test_opaque_unsupported\(none\)$
 ^ldb\.python\.api\.SimpleLdbLmdb\.test_opaque_bool\(none\)$
 ^ldb\.python\.api\.SimpleLdbLmdb\.test_opaque_int\(none\)$
 ^ldb\.python\.api\.SimpleLdbLmdb\.test_opaque_none\(none\)$
 ^ldb\.python\.api\.SimpleLdbLmdb\.test_opaque_string\(none\)$
-^ldb\.python\.api\.SimpleLdbLmdb\.test_opaque_unsupported\(none\)$