From: Austin Clements Date: Fri, 1 Aug 2014 02:10:02 +0000 (+2000) Subject: [PATCH v3 12/13] lib: Return an error from operations that require an upgrade X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03bfe7239520c328f05a2f53ffb5d3a3ca5eec56;p=notmuch-archives.git [PATCH v3 12/13] lib: Return an error from operations that require an upgrade --- diff --git a/e8/542ee627d43532d6a7667ffaf105da52995cc9 b/e8/542ee627d43532d6a7667ffaf105da52995cc9 new file mode 100644 index 000000000..34d93db21 --- /dev/null +++ b/e8/542ee627d43532d6a7667ffaf105da52995cc9 @@ -0,0 +1,221 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id D8D26431FAE + for ; Thu, 31 Jul 2014 19:10:29 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id FRi3YozE78Vc for ; + Thu, 31 Jul 2014 19:10:23 -0700 (PDT) +Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu + [18.7.68.35]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AC54A431FC0 + for ; Thu, 31 Jul 2014 19:10:12 -0700 (PDT) +X-AuditID: 12074423-f79bf6d000007580-d8-53daf7042ee8 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP + id D1.55.30080.407FAD35; Thu, 31 Jul 2014 22:10:12 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s712A98o007827; + Thu, 31 Jul 2014 22:10:10 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s712A74O029993 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Thu, 31 Jul 2014 22:10:09 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1XD2II-00033y-8R; Thu, 31 Jul 2014 22:10:06 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v3 12/13] lib: Return an error from operations that require an + upgrade +Date: Thu, 31 Jul 2014 22:10:02 -0400 +Message-Id: <1406859003-11561-13-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 2.0.0 +In-Reply-To: <1406859003-11561-1-git-send-email-amdragon@mit.edu> +References: <1406859003-11561-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixG6nosvy/VawwYyJMhar5/JYXL85k9mB + yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyjj7eBtrwQ3tisYna5gbGJtVuhg5OSQETCQu + zjnPCmGLSVy4t54NxBYSmM0k8eqUWxcjF5C9kVGiYedWNgjnDpPE3R1HWSGcuYwSizd/BGth + E9CQ2LZ/OSOILSIgLbHz7mywscwCjhKf9y8CqxEWCJPo+vWZvYuRg4NFQFXi/lpbEJMXqOTV + KgeII+QkGm58AqvmBAr//7eAFeIgB4nW01uZJzDyL2BkWMUom5JbpZubmJlTnJqsW5ycmJeX + WqRrppebWaKXmlK6iREcRC7KOxj/HFQ6xCjAwajEwzsj/FawEGtiWXFl7iFGSQ4mJVFem49A + Ib6k/JTKjMTijPii0pzU4kOMEhzMSiK8Lz8A5XhTEiurUovyYVLSHCxK4rxvra2ChQTSE0tS + s1NTC1KLYLIyHBxKErxnvgI1ChalpqdWpGXmlCCkmTg4QYbzAA2/BlLDW1yQmFucmQ6RP8Wo + KCXOuwckIQCSyCjNg+uFRfkrRnGgV4R5H4JU8QATBFz3K6DBTECDn9+6DjK4JBEhJdXAaOiW + d33xoZiC4A+PT6hb/TjwzmR3V/nMA7+eRxlvj4jde5uPt4R3slGeqamPUdHU10cfrvj07vuZ + +fV30sJlWeWea6yW++rw2+zc5wONoStMDm5aackq+Px50rKYVbULzLUXvZ6xPdvbr0Hez0kk + Y8Kcltldi9XTkktOsRcz2lwo49w+YVO6sBJLcUaioRZzUXEiAG+P/3bNAgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 01 Aug 2014 02:10:30 -0000 + +Previously, there was no protection against a caller invoking an +operation on an old database version that would effectively corrupt +the database by treating it like a newer version. + +According to notmuch.h, any caller that opens the database in +read/write mode is supposed to check if the database needs upgrading +and perform an upgrade if it does. This would protect against this, +but nobody (even the CLI) actually does this. + +However, with features, it's easy to protect against incompatible +operations on a fine-grained basis. This lightweight change allows +callers to safely operate on old database versions, while preventing +specific operations that would corrupt the database with an +informative error message. +--- + lib/database.cc | 5 +++++ + lib/directory.cc | 5 +++++ + lib/message.cc | 8 ++++++++ + lib/notmuch.h | 16 ++++++++++++++++ + 4 files changed, 34 insertions(+) + +diff --git a/lib/database.cc b/lib/database.cc +index 04b3790..d90a924 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -310,6 +310,8 @@ notmuch_status_to_string (notmuch_status_t status) + return "Unbalanced number of calls to notmuch_database_begin_atomic/end_atomic"; + case NOTMUCH_STATUS_UNSUPPORTED_OPERATION: + return "Unsupported operation"; ++ case NOTMUCH_STATUS_UPGRADE_REQUIRED: ++ return "Operation requires a database upgrade"; + default: + case NOTMUCH_STATUS_LAST_STATUS: + return "Unknown error status value"; +@@ -2219,6 +2221,9 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch, + if (message_ret == NULL) + return NOTMUCH_STATUS_NULL_POINTER; + ++ if (! (notmuch->features & NOTMUCH_FEATURE_FILE_TERMS)) ++ return NOTMUCH_STATUS_UPGRADE_REQUIRED; ++ + /* return NULL on any failure */ + *message_ret = NULL; + +diff --git a/lib/directory.cc b/lib/directory.cc +index 6a3ffed..8daaec8 100644 +--- a/lib/directory.cc ++++ b/lib/directory.cc +@@ -105,6 +105,11 @@ _notmuch_directory_create (notmuch_database_t *notmuch, + const char *db_path; + notmuch_bool_t create = (flags & NOTMUCH_FIND_CREATE); + ++ if (! (notmuch->features & NOTMUCH_FEATURE_DIRECTORY_DOCS)) { ++ *status_ret = NOTMUCH_STATUS_UPGRADE_REQUIRED; ++ return NULL; ++ } ++ + *status_ret = NOTMUCH_STATUS_SUCCESS; + + path = _notmuch_database_relative_path (notmuch, path); +diff --git a/lib/message.cc b/lib/message.cc +index 4fc427f..1618e81 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -653,6 +653,10 @@ _notmuch_message_add_filename (notmuch_message_t *message, + if (filename == NULL) + INTERNAL_ERROR ("Message filename cannot be NULL."); + ++ if (! (message->notmuch->features & NOTMUCH_FEATURE_FILE_TERMS) || ++ ! (message->notmuch->features & NOTMUCH_FEATURE_BOOL_FOLDER)) ++ return NOTMUCH_STATUS_UPGRADE_REQUIRED; ++ + relative = _notmuch_database_relative_path (message->notmuch, filename); + + status = _notmuch_database_split_path (local, relative, &directory, NULL); +@@ -697,6 +701,10 @@ _notmuch_message_remove_filename (notmuch_message_t *message, + notmuch_private_status_t private_status; + notmuch_status_t status; + ++ if (! (message->notmuch->features & NOTMUCH_FEATURE_FILE_TERMS) || ++ ! (message->notmuch->features & NOTMUCH_FEATURE_BOOL_FOLDER)) ++ return NOTMUCH_STATUS_UPGRADE_REQUIRED; ++ + status = _notmuch_database_filename_to_direntry ( + local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry); + if (status || !direntry) +diff --git a/lib/notmuch.h b/lib/notmuch.h +index 3c5ec98..cbf2ba5 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -160,6 +160,10 @@ typedef enum _notmuch_status { + */ + NOTMUCH_STATUS_UNSUPPORTED_OPERATION, + /** ++ * The operation requires a database upgrade. ++ */ ++ NOTMUCH_STATUS_UPGRADE_REQUIRED, ++ /** + * Not an actual status value. Just a way to find out how many + * valid status values there are. + */ +@@ -438,6 +442,9 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch); + * + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred; + * directory not retrieved. ++ * ++ * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the ++ * database to use this function. + */ + notmuch_status_t + notmuch_database_get_directory (notmuch_database_t *database, +@@ -490,6 +497,9 @@ notmuch_database_get_directory (notmuch_database_t *database, + * + * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only + * mode so no message can be added. ++ * ++ * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the ++ * database to use this function. + */ + notmuch_status_t + notmuch_database_add_message (notmuch_database_t *database, +@@ -520,6 +530,9 @@ notmuch_database_add_message (notmuch_database_t *database, + * + * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only + * mode so no message can be removed. ++ * ++ * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the ++ * database to use this function. + */ + notmuch_status_t + notmuch_database_remove_message (notmuch_database_t *database, +@@ -575,6 +588,9 @@ notmuch_database_find_message (notmuch_database_t *database, + * NOTMUCH_STATUS_OUT_OF_MEMORY: Out of memory, creating the message object + * + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred ++ * ++ * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the ++ * database to use this function. + */ + notmuch_status_t + notmuch_database_find_message_by_filename (notmuch_database_t *notmuch, +-- +2.0.0 +