unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
blob 56d6c5b5cf32ebaec4cc91f2f64baacd9d8e3967 3484 bytes (raw)
name: util/repair.c 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
 
/* notmuch - Not much of an email program, (just index and search)
 *
 * Copyright © 2019 Daniel Kahn Gillmor
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see https://www.gnu.org/licenses/ .
 *
 * Authors: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 */

#include <stdbool.h>
#include "repair.h"

/* see
 * https://tools.ietf.org/html/draft-dkg-openpgp-pgpmime-message-mangling-00#section-4.1.1 */
static bool
_notmuch_is_mixed_up_mangled (GMimeObject *part)
{
    GMimeMultipart *mpart = NULL;
    GMimeObject *first, *second, *third = NULL;
    char *prelude_string = NULL;
    bool prelude_is_empty;

    if (! g_mime_content_type_is_type (g_mime_object_get_content_type (part),
				       "multipart", "mixed"))
	return false;
    if (! GMIME_IS_MULTIPART (part))
	return false;
    mpart = GMIME_MULTIPART (part);
    if (mpart == NULL)
	return false;
    if (g_mime_multipart_get_count (mpart) != 3)
	return false;
    first = g_mime_multipart_get_part (mpart, 0);
    if (! g_mime_content_type_is_type (g_mime_object_get_content_type (first),
				       "text", "plain"))
	return false;
    if (! GMIME_IS_TEXT_PART (first))
	return false;
    second = g_mime_multipart_get_part (mpart, 1);
    if (! g_mime_content_type_is_type (g_mime_object_get_content_type (second),
				       "application", "pgp-encrypted"))
	return false;
    third = g_mime_multipart_get_part (mpart, 2);
    if (! g_mime_content_type_is_type (g_mime_object_get_content_type (third),
				       "application", "octet-stream"))
	return false;

    /* Is first subpart length 0? */
    prelude_string = g_mime_text_part_get_text (GMIME_TEXT_PART (first));
    prelude_is_empty = ! (strcmp ("", prelude_string));
    g_free (prelude_string);
    if (! prelude_is_empty)
	return false;

    /* FIXME: after decoding and stripping whitespace, is second
     * subpart just "Version: 1" ? */

    /* FIXME: can we determine that third subpart is *only* PGP
     * encrypted data?  I tried g_mime_part_get_openpgp_data () but
     * found https://github.com/jstedfast/gmime/issues/60 */

    return true;
}


/* see
 * https://tools.ietf.org/html/draft-dkg-openpgp-pgpmime-message-mangling-00#section-4.1.2 */
GMimeObject*
_notmuch_repair_mixed_up_mangled (GMimeObject *part)
{
    GMimeMultipart *mpart = NULL, *mpart_ret = NULL;
    GMimeObject *ret = NULL;

    if (! _notmuch_is_mixed_up_mangled (part))
	return NULL;
    mpart = GMIME_MULTIPART (part);
    ret = GMIME_OBJECT (g_mime_multipart_encrypted_new ());
    if (ret == NULL)
	return NULL;
    mpart_ret = GMIME_MULTIPART (ret);
    if (mpart_ret == NULL) {
	g_object_unref (ret);
	return NULL;
    }
    g_mime_object_set_content_type_parameter (ret, "protocol", "application/pgp-encrypted");

    g_mime_multipart_insert (mpart_ret, 0, g_mime_multipart_get_part (mpart, 1));
    g_mime_multipart_insert (mpart_ret, 1, g_mime_multipart_get_part (mpart, 2));
    return ret;
}

debug log:

solving 56d6c5b5 ...
found 56d6c5b5 in https://yhetil.org/notmuch/20190531074842.16789-3-dkg@fifthhorseman.net/ ||
	https://yhetil.org/notmuch/20190530172707.10378-3-dkg@fifthhorseman.net/
found f91c1244 in https://yhetil.org/notmuch.git/
preparing index
index prepared:
100644 f91c124415516139585b2b48ea00abe5875b7783	util/repair.c

applying [1/1] https://yhetil.org/notmuch/20190531074842.16789-3-dkg@fifthhorseman.net/
diff --git a/util/repair.c b/util/repair.c
index f91c1244..56d6c5b5 100644

Checking patch util/repair.c...
Applied patch util/repair.c cleanly.

skipping https://yhetil.org/notmuch/20190530172707.10378-3-dkg@fifthhorseman.net/ for 56d6c5b5
index at:
100644 56d6c5b5cf32ebaec4cc91f2f64baacd9d8e3967	util/repair.c

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).