f2/bd42da5550cc8bd5f59c0236310477b867393f

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 10C0C431FD5\r
   6         for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:13 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id CEJ4n+PJjDqO for <notmuch@notmuchmail.org>;\r
  16         Sat, 26 Jul 2014 20:53:05 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
  18         [18.9.25.15])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 7454C431FB6\r
  22         for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:05 -0700 (PDT)\r
  23 X-AuditID: 1209190f-f79f86d0000061c8-dd-53d4779fc9a2\r
  24 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 6E.91.25032.F9774D35; Sat, 26 Jul 2014 23:53:03 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r2BV004148; \r
  31         Sat, 26 Jul 2014 23:53:02 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6R3r012016412\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Sat, 26 Jul 2014 23:53:01 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1XBFW8-00051h-HJ; Sat, 26 Jul 2014 23:53:00 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 13/14] lib: Return an error from operations that require an\r
  45         upgrade\r
  46 Date: Sat, 26 Jul 2014 23:52:52 -0400\r
  47 Message-Id: <1406433173-19169-14-git-send-email-amdragon@mit.edu>\r
  48 X-Mailer: git-send-email 2.0.0\r
  49 In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
  50 References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
  51 X-Brightmail-Tracker:\r
  52  H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrTu//EqwwfMFKhbXb85kdmD0eLbq\r
  53         FnMAYxSXTUpqTmZZapG+XQJXxp7uXvaCG9oVZxpnszUwNqt0MXJwSAiYSCz4b9PFyAlkiklc\r
  54         uLeerYuRi0NIYDaTxJ9rHxghnI2MEq8+rWWFcO4wSTz48o4ZwpnLKPH0wzk2kH42AQ2JbfuX\r
  55         M4LYIgLSEjvvzmYFWcEsoCbxp0sFJCwsECwx++IfVhCbRUBV4sjbY0wgNq+Ao8TnmQdZIc6Q\r
  56         k2i48QlsJCdQ/PizE2wgY4QEHCRuXUqcwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5qka6J\r
  57         Xm5miV5qSukmRnDISPLvYPx2UOkQowAHoxIPbwbblWAh1sSy4srcQ4ySHExKorz7zYBCfEn5\r
  58         KZUZicUZ8UWlOanFhxglOJiVRHiFioFyvCmJlVWpRfkwKWkOFiVx3rfWVsFCAumJJanZqakF\r
  59         qUUwWRkODiUJ3htlQI2CRanpqRVpmTklCGkmDk6Q4TxAwzeUggwvLkjMLc5Mh8ifYlSUEuf9\r
  60         BZIQAElklObB9cJi+hWjONArwrysICt4gOkArvsV0GAmoMEs/pdBBpckIqSkGhhZDl+ddKBZ\r
  61         /vqhNdOzlmRKcyz3ux6wOT+wrNLo9orlbzmvcf2ubnyQ90tgZunKKO/KXepKL+b6HzVd88qS\r
  62         bUHCgqgV/gmVgUellF0cJyk1CyhvzWCPsFDIOBoQ1aw96Q9PUptIO+9HBRetXdeCfTi3fzFS\r
  63         ztlZo1StbXyF54PLjmrbHe8nX1NiKc5INNRiLipOBADn3u6ZxAIAAA==\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Sun, 27 Jul 2014 03:53:13 -0000\r
  77 \r
  78 Previously, there was no protection against a caller invoking an\r
  79 operation on an old database version that would effectively corrupt\r
  80 the database by treating it like a newer version.\r
  81 \r
  82 According to notmuch.h, any caller that opens the database in\r
  83 read/write mode is supposed to check if the database needs upgrading\r
  84 and perform an upgrade if it does.  This would protect against this,\r
  85 but nobody (even the CLI) actually does this.\r
  86 \r
  87 However, with features, it's easy to protect against incompatible\r
  88 operations on a fine-grained basis.  This lightweight change allows\r
  89 callers to safely operate on old database versions, while preventing\r
  90 specific operations that would corrupt the database with an\r
  91 informative error message.\r
  92 ---\r
  93  lib/database.cc  |  5 +++++\r
  94  lib/directory.cc |  5 +++++\r
  95  lib/message.cc   |  8 ++++++++\r
  96  lib/notmuch.h    | 16 ++++++++++++++++\r
  97  4 files changed, 34 insertions(+)\r
  98 \r
  99 diff --git a/lib/database.cc b/lib/database.cc\r
 100 index a93281c..f105e27 100644\r
 101 --- a/lib/database.cc\r
 102 +++ b/lib/database.cc\r
 103 @@ -311,6 +311,8 @@ notmuch_status_to_string (notmuch_status_t status)\r
 104         return "Unbalanced number of calls to notmuch_database_begin_atomic/end_atomic";\r
 105      case NOTMUCH_STATUS_UNSUPPORTED_OPERATION:\r
 106         return "Unsupported operation";\r
 107 +    case NOTMUCH_STATUS_UPGRADE_REQUIRED:\r
 108 +       return "Operation requires a database upgrade";\r
 109      default:\r
 110      case NOTMUCH_STATUS_LAST_STATUS:\r
 111         return "Unknown error status value";\r
 112 @@ -2223,6 +2225,9 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,\r
 113      if (message_ret == NULL)\r
 114         return NOTMUCH_STATUS_NULL_POINTER;\r
 115  \r
 116 +    if (! (notmuch->features & NOTMUCH_FEATURE_FILE_TERMS))\r
 117 +       return NOTMUCH_STATUS_UPGRADE_REQUIRED;\r
 118 +\r
 119      /* return NULL on any failure */\r
 120      *message_ret = NULL;\r
 121  \r
 122 diff --git a/lib/directory.cc b/lib/directory.cc\r
 123 index 6a3ffed..8daaec8 100644\r
 124 --- a/lib/directory.cc\r
 125 +++ b/lib/directory.cc\r
 126 @@ -105,6 +105,11 @@ _notmuch_directory_create (notmuch_database_t *notmuch,\r
 127      const char *db_path;\r
 128      notmuch_bool_t create = (flags & NOTMUCH_FIND_CREATE);\r
 129  \r
 130 +    if (! (notmuch->features & NOTMUCH_FEATURE_DIRECTORY_DOCS)) {\r
 131 +       *status_ret = NOTMUCH_STATUS_UPGRADE_REQUIRED;\r
 132 +       return NULL;\r
 133 +    }\r
 134 +\r
 135      *status_ret = NOTMUCH_STATUS_SUCCESS;\r
 136  \r
 137      path = _notmuch_database_relative_path (notmuch, path);\r
 138 diff --git a/lib/message.cc b/lib/message.cc\r
 139 index 4fc427f..1618e81 100644\r
 140 --- a/lib/message.cc\r
 141 +++ b/lib/message.cc\r
 142 @@ -653,6 +653,10 @@ _notmuch_message_add_filename (notmuch_message_t *message,\r
 143      if (filename == NULL)\r
 144         INTERNAL_ERROR ("Message filename cannot be NULL.");\r
 145  \r
 146 +    if (! (message->notmuch->features & NOTMUCH_FEATURE_FILE_TERMS) ||\r
 147 +       ! (message->notmuch->features & NOTMUCH_FEATURE_BOOL_FOLDER))\r
 148 +       return NOTMUCH_STATUS_UPGRADE_REQUIRED;\r
 149 +\r
 150      relative = _notmuch_database_relative_path (message->notmuch, filename);\r
 151  \r
 152      status = _notmuch_database_split_path (local, relative, &directory, NULL);\r
 153 @@ -697,6 +701,10 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
 154      notmuch_private_status_t private_status;\r
 155      notmuch_status_t status;\r
 156  \r
 157 +    if (! (message->notmuch->features & NOTMUCH_FEATURE_FILE_TERMS) ||\r
 158 +       ! (message->notmuch->features & NOTMUCH_FEATURE_BOOL_FOLDER))\r
 159 +       return NOTMUCH_STATUS_UPGRADE_REQUIRED;\r
 160 +\r
 161      status = _notmuch_database_filename_to_direntry (\r
 162         local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry);\r
 163      if (status || !direntry)\r
 164 diff --git a/lib/notmuch.h b/lib/notmuch.h\r
 165 index 3c5ec98..cbf2ba5 100644\r
 166 --- a/lib/notmuch.h\r
 167 +++ b/lib/notmuch.h\r
 168 @@ -160,6 +160,10 @@ typedef enum _notmuch_status {\r
 169       */\r
 170      NOTMUCH_STATUS_UNSUPPORTED_OPERATION,\r
 171      /**\r
 172 +     * The operation requires a database upgrade.\r
 173 +     */\r
 174 +    NOTMUCH_STATUS_UPGRADE_REQUIRED,\r
 175 +    /**\r
 176       * Not an actual status value. Just a way to find out how many\r
 177       * valid status values there are.\r
 178       */\r
 179 @@ -438,6 +442,9 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch);\r
 180   *\r
 181   * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred;\r
 182   *     directory not retrieved.\r
 183 + *\r
 184 + * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the\r
 185 + *     database to use this function.\r
 186   */\r
 187  notmuch_status_t\r
 188  notmuch_database_get_directory (notmuch_database_t *database,\r
 189 @@ -490,6 +497,9 @@ notmuch_database_get_directory (notmuch_database_t *database,\r
 190   *\r
 191   * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only\r
 192   *     mode so no message can be added.\r
 193 + *\r
 194 + * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the\r
 195 + *     database to use this function.\r
 196   */\r
 197  notmuch_status_t\r
 198  notmuch_database_add_message (notmuch_database_t *database,\r
 199 @@ -520,6 +530,9 @@ notmuch_database_add_message (notmuch_database_t *database,\r
 200   *\r
 201   * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only\r
 202   *     mode so no message can be removed.\r
 203 + *\r
 204 + * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the\r
 205 + *     database to use this function.\r
 206   */\r
 207  notmuch_status_t\r
 208  notmuch_database_remove_message (notmuch_database_t *database,\r
 209 @@ -575,6 +588,9 @@ notmuch_database_find_message (notmuch_database_t *database,\r
 210   * NOTMUCH_STATUS_OUT_OF_MEMORY: Out of memory, creating the message object\r
 211   *\r
 212   * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred\r
 213 + *\r
 214 + * NOTMUCH_STATUS_UPGRADE_REQUIRED: The caller must upgrade the\r
 215 + *     database to use this function.\r
 216   */\r
 217  notmuch_status_t\r
 218  notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,\r
 219 -- \r
 220 2.0.0\r
 221 \r