summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-02-02 20:25:20 +0100
committerRuben Pollan <meskio@sindominio.net>2017-02-02 23:58:37 +0100
commitbb9cc1216873604459724860d606283c398ea06b (patch)
tree877eb31a32e52619092e90ab83241986bdd475ef /src
parenta55df58db59d38d7d320f51fa760f20cf1f69312 (diff)
[feat] add support for the blob interfacedevelop
Pysqlcipher support for the sqlite blob interface: https://sqlite.org/c3ref/blob_open.html Copying the code from the PR in pysqlite: https://github.com/ghaering/pysqlite/pull/93
Diffstat (limited to 'src')
-rw-r--r--src/blob.c346
-rw-r--r--src/blob.h24
-rw-r--r--src/connection.c90
-rw-r--r--src/connection.h3
-rw-r--r--src/module.c2
5 files changed, 462 insertions, 3 deletions
diff --git a/src/blob.c b/src/blob.c
new file mode 100644
index 0000000..b5ef5b2
--- /dev/null
+++ b/src/blob.c
@@ -0,0 +1,346 @@
+#include "blob.h"
+#include "util.h"
+
+
+int pysqlite_blob_init(pysqlite_Blob *self, pysqlite_Connection* connection, sqlite3_blob *blob)
+{
+ Py_INCREF(connection);
+ self->connection = connection;
+ self->offset=0;
+ self->blob = blob;
+ self->in_weakreflist = NULL;
+
+ if (!pysqlite_check_thread(self->connection)){
+ return -1;
+ }
+ return 0;
+}
+
+static void remove_blob_from_connection_blob_list(pysqlite_Blob* self)
+{
+ Py_ssize_t i;
+
+ for(i=0;i<PyList_GET_SIZE(self->connection->blobs);i++)
+ {
+ if(PyWeakref_GetObject(PyList_GET_ITEM(self->connection->blobs, i))==(PyObject *)self)
+ {
+ PyList_SetSlice(self->connection->blobs, i, i+1, NULL);
+ break;
+ }
+ }
+}
+
+
+
+static void pysqlite_blob_dealloc(pysqlite_Blob* self)
+{
+ /* close the blob */
+ if (self->blob) {
+ Py_BEGIN_ALLOW_THREADS
+ sqlite3_blob_close(self->blob);
+ Py_END_ALLOW_THREADS
+ }
+
+ // remove from connection weaklist
+ remove_blob_from_connection_blob_list(self);
+ if (self->in_weakreflist != NULL) {
+ PyObject_ClearWeakRefs((PyObject*)self);
+ }
+
+ Py_XDECREF(self->connection);
+
+ self->blob = NULL;
+
+ self->ob_type->tp_free((PyObject*)self);
+}
+
+
+/*
+ * Checks if a blob object is usable (i. e. not closed).
+ *
+ * 0 => error; 1 => ok
+ */
+int pysqlite_check_blob(pysqlite_Blob* blob)
+{
+
+ if (!blob->blob) {
+ PyErr_SetString(pysqlite_ProgrammingError, "Cannot operate on a closed blob.");
+ return 0;
+ } else if (!pysqlite_check_connection(blob->connection) || !pysqlite_check_thread(blob->connection)) {
+ return 0;
+ } else {
+ return 1;
+ }
+}
+
+
+PyObject* pysqlite_blob_close(pysqlite_Blob *self){
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+ /* close the blob */
+ if (self->blob) {
+ Py_BEGIN_ALLOW_THREADS
+ sqlite3_blob_close(self->blob);
+ Py_END_ALLOW_THREADS
+ }
+
+ self->blob = NULL;
+
+ // remove from connection weaklist
+ remove_blob_from_connection_blob_list(self);
+ if (self->in_weakreflist != NULL) {
+ PyObject_ClearWeakRefs((PyObject*)self);
+ }
+
+ Py_RETURN_NONE;
+};
+
+
+PyObject* pysqlite_blob_length(pysqlite_Blob *self){
+ int blob_length;
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+ Py_BEGIN_ALLOW_THREADS
+ blob_length = sqlite3_blob_bytes(self->blob);
+ Py_END_ALLOW_THREADS
+
+ return PyInt_FromLong(blob_length);
+};
+
+
+PyObject* pysqlite_blob_read(pysqlite_Blob *self, PyObject *args){
+ int read_length = -1;
+ int blob_length = 0;
+ PyObject* buffer;
+ char* raw_buffer;
+ int rc;
+
+ if (!PyArg_ParseTuple(args, "|i", &read_length)) {
+ return NULL;
+ }
+
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+
+
+ //TODO: make this multithreaded and safe!
+ Py_BEGIN_ALLOW_THREADS
+ blob_length = sqlite3_blob_bytes(self->blob);
+ Py_END_ALLOW_THREADS
+
+ if (read_length < 0) {
+ // same as file read.
+ read_length = blob_length;
+ }
+
+ // making sure we don't read more then blob size
+ if (self->offset + read_length > blob_length){
+ read_length = blob_length - self->offset;
+ }
+
+ buffer = PyBytes_FromStringAndSize(NULL, read_length);
+ if (!buffer) {
+ return NULL;
+ }
+ raw_buffer = PyBytes_AS_STRING(buffer);
+
+ Py_BEGIN_ALLOW_THREADS
+ rc = sqlite3_blob_read(self->blob, raw_buffer, read_length, self->offset);
+ Py_END_ALLOW_THREADS
+
+ if (rc != SQLITE_OK){
+ Py_DECREF(buffer);
+ // For some reasone after modifieng blob the error is not set on the connection db.
+ if (rc == SQLITE_ABORT){
+ PyErr_SetString(pysqlite_OperationalError, "Cannot operate on modified blob");
+ } else {
+ _pysqlite_seterror(self->connection->db, NULL);
+ }
+ return NULL;
+ }
+
+ // update offset.
+ self->offset += read_length;
+
+ return buffer;
+};
+
+
+PyObject* pysqlite_blob_write(pysqlite_Blob *self, PyObject *data){
+ Py_ssize_t data_size;
+ char *data_buffer;
+ int rc;
+
+ if (PyBytes_AsStringAndSize(data, &data_buffer, &data_size)){
+ return NULL;
+ }
+
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+
+ //TODO: throw better error on data bigger then blob.
+
+ Py_BEGIN_ALLOW_THREADS
+ rc = sqlite3_blob_write(self->blob, data_buffer, data_size, self->offset);
+ Py_END_ALLOW_THREADS
+ if (rc != SQLITE_OK) {
+ // For some reasone after modifieng blob the error is not set on the connection db.
+ if (rc == SQLITE_ABORT){
+ PyErr_SetString(pysqlite_OperationalError, "Cannot operate on modified blob");
+ } else {
+ _pysqlite_seterror(self->connection->db, NULL);
+ }
+ return NULL;
+ }
+
+ self->offset += (int)data_size;
+ Py_RETURN_NONE;
+}
+
+
+PyObject* pysqlite_blob_seek(pysqlite_Blob *self, PyObject *args){
+ int blob_length, offset, from_what=0;
+
+ if(!PyArg_ParseTuple(args, "i|i", &offset, &from_what)){
+ return NULL;
+ }
+
+
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+
+ Py_BEGIN_ALLOW_THREADS
+ blob_length = sqlite3_blob_bytes(self->blob);
+ Py_END_ALLOW_THREADS
+
+ switch(from_what){
+ case 0: //realtive to blob begin
+ break;
+ case 1: //realtive to current position
+ offset = self->offset + offset;
+ break;
+ case 2: //realtive to blob end
+ offset = blob_length + offset;
+ break;
+ default:
+ return PyErr_Format(PyExc_ValueError, "from_what should be 0, 1 or 2");
+ }
+
+ if (offset < 0 || offset > blob_length){
+ return PyErr_Format(PyExc_ValueError, "offset out of blob range");
+ }
+
+ self->offset = offset;
+ Py_RETURN_NONE;
+};
+
+
+PyObject* pysqlite_blob_tell(pysqlite_Blob *self){
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+
+ return PyInt_FromLong(self->offset);
+}
+
+
+PyObject* pysqlite_blob_enter(pysqlite_Blob *self){
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+
+ Py_INCREF(self);
+ return (PyObject *)self;
+}
+
+
+PyObject* pysqlite_blob_exit(pysqlite_Blob *self, PyObject *args){
+ PyObject *res;
+ if (!pysqlite_check_blob(self)){
+ return NULL;
+ }
+
+ res = pysqlite_blob_close(self);
+ Py_XDECREF(res);
+ if (!res) {
+ return NULL;
+ }
+
+ Py_RETURN_FALSE;
+}
+
+
+static PyMethodDef blob_methods[] = {
+ {"length", (PyCFunction)pysqlite_blob_length, METH_NOARGS,
+ PyDoc_STR("return blob length")},
+ {"read", (PyCFunction)pysqlite_blob_read, METH_VARARGS,
+ PyDoc_STR("read data from blob")},
+ {"write", (PyCFunction)pysqlite_blob_write, METH_O,
+ PyDoc_STR("write data to blob")},
+ {"close", (PyCFunction)pysqlite_blob_close, METH_NOARGS,
+ PyDoc_STR("close blob")},
+ {"seek", (PyCFunction)pysqlite_blob_seek, METH_VARARGS,
+ PyDoc_STR("change blob current offset")},
+ {"tell", (PyCFunction)pysqlite_blob_tell, METH_NOARGS,
+ PyDoc_STR("return blob current offset")},
+ {"__enter__", (PyCFunction)pysqlite_blob_enter, METH_NOARGS,
+ PyDoc_STR("blob context manager enter")},
+ {"__exit__", (PyCFunction)pysqlite_blob_exit, METH_VARARGS,
+ PyDoc_STR("blob context manager exit")},
+ {NULL, NULL}
+};
+
+
+PyTypeObject pysqlite_BlobType = {
+ PyVarObject_HEAD_INIT(NULL, 0)
+ MODULE_NAME ".Blob", /* tp_name */
+ sizeof(pysqlite_Blob), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ (destructor)pysqlite_blob_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
+ 0, /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ offsetof(pysqlite_Blob, in_weakreflist), /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ blob_methods, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ (initproc)pysqlite_blob_init, /* tp_init */
+ 0, /* tp_alloc */
+ 0, /* tp_new */
+ 0 /* tp_free */
+};
+
+extern int pysqlite_blob_setup_types(void)
+{
+ pysqlite_BlobType.tp_new = PyType_GenericNew;
+ return PyType_Ready(&pysqlite_BlobType);
+}
+
diff --git a/src/blob.h b/src/blob.h
new file mode 100644
index 0000000..faaef64
--- /dev/null
+++ b/src/blob.h
@@ -0,0 +1,24 @@
+#ifndef PYSQLITE_BLOB_H
+#define PYSQLITE_BLOB_H
+#include "Python.h"
+#include "sqlite3.h"
+#include "connection.h"
+
+typedef struct
+{
+ PyObject_HEAD
+ pysqlite_Connection* connection;
+ sqlite3_blob *blob;
+ unsigned int offset;
+
+ PyObject* in_weakreflist; /* List of weak references */
+} pysqlite_Blob;
+
+extern PyTypeObject pysqlite_BlobType;
+
+int pysqlite_blob_init(pysqlite_Blob* self, pysqlite_Connection* connection, sqlite3_blob *blob);
+PyObject* pysqlite_blob_close(pysqlite_Blob *self);
+
+int pysqlite_blob_setup_types(void);
+
+#endif
diff --git a/src/connection.c b/src/connection.c
index 7e4e96c..115d15a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -30,6 +30,8 @@
#include "util.h"
#include "sqlitecompat.h"
+#include "blob.h"
+
#ifdef PYSQLITE_EXPERIMENTAL
#include "backup.h"
#endif
@@ -91,6 +93,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
self->statement_cache = NULL;
self->statements = NULL;
self->cursors = NULL;
+ self->blobs = NULL;
Py_INCREF(Py_None);
self->row_factory = Py_None;
@@ -167,10 +170,12 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
self->created_statements = 0;
self->created_cursors = 0;
- /* Create lists of weak references to statements/cursors */
+ /* Create lists of weak references to statements/cursors/blobs */
self->statements = PyList_New(0);
self->cursors = PyList_New(0);
- if (!self->statements || !self->cursors) {
+ self->blobs = PyList_New(0);
+
+ if (!self->statements || !self->cursors || !self->blobs) {
return -1;
}
@@ -293,6 +298,7 @@ void pysqlite_connection_dealloc(pysqlite_Connection* self)
Py_XDECREF(self->collations);
Py_XDECREF(self->statements);
Py_XDECREF(self->cursors);
+ Py_XDECREF(self->blobs);
self->ob_type->tp_free((PyObject*)self);
}
@@ -390,6 +396,82 @@ PyObject* pysqlite_connection_backup(pysqlite_Connection* self, PyObject* args,
}
#endif
+PyObject* pysqlite_connection_blob(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
+{
+ static char *kwlist[] = {"table", "column", "row", "flags", "dbname", NULL, NULL};
+ int rc;
+ const char *dbname = "main", *table, *column;
+ sqlite3_int64 row;
+ int flags = 0;
+ sqlite3_blob* blob;
+ pysqlite_Blob *pyblob=0;
+ PyObject *weakref;
+
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ssL|is", kwlist,
+ &table, &column, &row, &flags, &dbname)) {
+ return NULL;
+ }
+
+ Py_BEGIN_ALLOW_THREADS
+ rc = sqlite3_blob_open(self->db, dbname, table, column, row, flags, &blob);
+ Py_END_ALLOW_THREADS
+
+ if (rc != SQLITE_OK) {
+ _pysqlite_seterror(self->db, NULL);
+ return NULL;
+ }
+
+ pyblob = PyObject_New(pysqlite_Blob, &pysqlite_BlobType);
+ if (!pyblob){
+ goto error;
+ }
+
+ rc = pysqlite_blob_init(pyblob, self, blob);
+ if (rc) {
+ Py_CLEAR(pyblob);
+ goto error;
+ }
+
+ // Add our blob to connection blobs list
+ weakref=PyWeakref_NewRef((PyObject*)pyblob, NULL);
+ if (!weakref){
+ Py_CLEAR(pyblob);
+ goto error;
+ }
+ if (PyList_Append(self->blobs, weakref) != 0) {
+ Py_CLEAR(pyblob);
+ Py_CLEAR(weakref);
+ goto error;
+ }
+ Py_DECREF(weakref);
+
+ return (PyObject*)pyblob;
+
+error:
+ Py_BEGIN_ALLOW_THREADS
+ sqlite3_blob_close(blob);
+ Py_END_ALLOW_THREADS
+ return NULL;
+}
+
+
+void pysqlite_close_all_blobs(pysqlite_Connection* self)
+{
+ int i;
+ PyObject* weakref;
+ PyObject* blob;
+
+ for (i = 0; i < PyList_Size(self->blobs); i++) {
+ weakref = PyList_GetItem(self->blobs, i);
+ blob = PyWeakref_GetObject(weakref);
+ if (blob != Py_None) {
+ pysqlite_blob_close((pysqlite_Blob*)blob);
+ }
+ }
+}
+
+
PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
{
PyObject* ret;
@@ -401,6 +483,8 @@ PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
+ pysqlite_close_all_blobs(self);
+
if (self->db) {
if (self->apsw_connection) {
ret = PyObject_CallMethod(self->apsw_connection, "close", "");
@@ -1597,6 +1681,8 @@ static PyMethodDef connection_methods[] = {
{"backup", (PyCFunction)pysqlite_connection_backup, METH_VARARGS|METH_KEYWORDS,
PyDoc_STR("Backup database.")},
#endif
+ {"blob", (PyCFunction)pysqlite_connection_blob, METH_VARARGS|METH_KEYWORDS,
+ PyDoc_STR("return a blob object")},
{"cursor", (PyCFunction)pysqlite_connection_cursor, METH_VARARGS|METH_KEYWORDS,
PyDoc_STR("Return a cursor for the connection.")},
{"close", (PyCFunction)pysqlite_connection_close, METH_NOARGS,
diff --git a/src/connection.h b/src/connection.h
index 3fc5a70..a110ea2 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -70,9 +70,10 @@ typedef struct
pysqlite_Cache* statement_cache;
- /* Lists of weak references to statements and cursors used within this connection */
+ /* Lists of weak references to statements, blobs and cursors used within this connection */
PyObject* statements;
PyObject* cursors;
+ PyObject* blobs;
/* Counters for how many statements/cursors were created in the connection. May be
* reset to 0 at certain intervals */
diff --git a/src/module.c b/src/module.c
index dbc015c..7a26498 100644
--- a/src/module.c
+++ b/src/module.c
@@ -28,6 +28,7 @@
#include "prepare_protocol.h"
#include "microprotocols.h"
#include "row.h"
+#include "blob.h"
#ifdef PYSQLITE_EXPERIMENTAL
#include "backup.h"
@@ -321,6 +322,7 @@ PyMODINIT_FUNC init_sqlite(void)
#ifdef PYSQLITE_EXPERIMENTAL
(pysqlite_backup_setup_types() < 0) ||
#endif
+ (pysqlite_blob_setup_types() < 0) ||
(pysqlite_prepare_protocol_setup_types() < 0)
) {
return;