projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2011-01-06 [colin] 3.7.8cvs30
[claws.git] / src / plugins / pgpinline / pgpinline.c
diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index 9ee4ca8dcaed6d088f61617c2a06a24568028352..52df2610fbc673bcaac340c69c4184af1378f731 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
+ * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -122,7 +122,7 @@ static gchar *get_part_as_string(MimeInfo *mimeinfo)
        gchar *filename = NULL;
        FILE *fp;
 
-       g_return_val_if_fail(mimeinfo != NULL, 0);
+       cm_return_val_if_fail(mimeinfo != NULL, 0);
        procmime_decode_content(mimeinfo);
        
        if (mimeinfo->content == MIMECONTENT_MEM)
@@ -133,7 +133,7 @@ static gchar *get_part_as_string(MimeInfo *mimeinfo)
                        printf("error dumping file\n");
                        return NULL;
                }
-               fp = fopen(filename,"rb");
+               fp = g_fopen(filename,"rb");
                if (!fp) {
                        printf("error reading file\n");
                        return NULL;
@@ -178,7 +178,7 @@ static gboolean pgpinline_is_signed(MimeInfo *mimeinfo)
        const gchar *sig_indicator = "-----BEGIN PGP SIGNED MESSAGE-----";
        gchar *textdata, *sigpos;
        
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
        
        if (procmime_mimeinfo_parent(mimeinfo) == NULL)
                return FALSE; /* not parent */
@@ -235,7 +235,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
        gpgme_data_t plain = NULL, cipher = NULL;
        gpgme_error_t err;
 
-       g_return_val_if_fail(mimeinfo != NULL, 0);
+       cm_return_val_if_fail(mimeinfo != NULL, 0);
 
        if (procmime_mimeinfo_parent(mimeinfo) == NULL) {
                privacy_set_error(_("Incorrect part"));
@@ -246,7 +246,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
                debug_print("type %d\n", mimeinfo->type);
                return 0;
        }
-       g_return_val_if_fail(mimeinfo->privacy != NULL, 0);
+       cm_return_val_if_fail(mimeinfo->privacy != NULL, 0);
        data = (PrivacyDataPGP *) mimeinfo->privacy;
 
        textdata = get_part_as_string(mimeinfo);
@@ -280,6 +280,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
        if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
                debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
                privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+               g_free(textdata);
                return 0;
        }
        gpgme_set_textmode(data->ctx, 1);
@@ -302,7 +303,7 @@ static SignatureStatus pgpinline_get_sig_status(MimeInfo *mimeinfo)
 {
        PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
        
-       g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
+       cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
 
        if (data->sigstatus == NULL && 
            prefs_gpg_get_config()->auto_check_signatures)
@@ -315,7 +316,7 @@ static gchar *pgpinline_get_sig_info_short(MimeInfo *mimeinfo)
 {
        PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
        
-       g_return_val_if_fail(data != NULL, g_strdup("Error"));
+       cm_return_val_if_fail(data != NULL, g_strdup("Error"));
 
        if (data->sigstatus == NULL && 
            prefs_gpg_get_config()->auto_check_signatures)
@@ -328,7 +329,7 @@ static gchar *pgpinline_get_sig_info_full(MimeInfo *mimeinfo)
 {
        PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
        
-       g_return_val_if_fail(data != NULL, g_strdup("Error"));
+       cm_return_val_if_fail(data != NULL, g_strdup("Error"));
 
        return sgpgme_sigstat_info_full(data->ctx, data->sigstatus);
 }
@@ -340,7 +341,7 @@ static gboolean pgpinline_is_encrypted(MimeInfo *mimeinfo)
        const gchar *enc_indicator = "-----BEGIN PGP MESSAGE-----";
        gchar *textdata;
        
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
        
        if (procmime_mimeinfo_parent(mimeinfo) == NULL)
                return FALSE; /* not parent */
@@ -396,8 +397,8 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
        gpgme_set_textmode(ctx, 1);
        gpgme_set_armor(ctx, 1);
 
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
-       g_return_val_if_fail(pgpinline_is_encrypted(mimeinfo), NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(pgpinline_is_encrypted(mimeinfo), NULL);
        
        if (procmime_mimeinfo_parent(mimeinfo) == NULL ||
            mimeinfo->type != MIMETYPE_TEXT) {
@@ -450,10 +451,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                        src_codeset) < 0) {
                FILE_OP_ERROR(fname, "fprintf");
                privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
-               g_free(fname);
-               gpgme_data_release(plain);
-               gpgme_release(ctx);
-               return NULL;
+               goto FILE_ERROR;
        }
 
        /* Store any part before encrypted text */
@@ -462,10 +460,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
            if (fwrite(textdata, 1, pos - textdata, dstfp) < pos - textdata) {
                FILE_OP_ERROR(fname, "fwrite");
                privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
-               g_free(fname);
-               gpgme_data_release(plain);
-               gpgme_release(ctx);
-               return NULL;
+               goto FILE_ERROR;
            }
        }
        
@@ -474,20 +469,14 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                dstfp) < strlen(_("\n--- Start of PGP/Inline encrypted data ---\n"))) {
                FILE_OP_ERROR(fname, "fwrite");
                privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
-               g_free(fname);
-               gpgme_data_release(plain);
-               gpgme_release(ctx);
-               return NULL;
+               goto FILE_ERROR;
        }
        chars = sgpgme_data_release_and_get_mem(plain, &len);
        if (len > 0) {
                if (fwrite(chars, 1, len, dstfp) < len) {
                        FILE_OP_ERROR(fname, "fwrite");
                        privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
-                       g_free(fname);
-                       gpgme_data_release(plain);
-                       gpgme_release(ctx);
-                       return NULL;
+                       goto FILE_ERROR;
                }
        }
        /* Store any part after encrypted text */
@@ -496,10 +485,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                dstfp) < strlen(_("--- End of PGP/Inline encrypted data ---\n"))) {
                        FILE_OP_ERROR(fname, "fwrite");
                        privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
-                       g_free(fname);
-                       gpgme_data_release(plain);
-                       gpgme_release(ctx);
-                       return NULL;
+                       goto FILE_ERROR;
        }
        if (pos != NULL) {
            pos = strstr(pos, end_indicator);
@@ -508,10 +494,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                if (fwrite(pos, 1, strlen(pos), dstfp) < strlen(pos)) {
                        FILE_OP_ERROR(fname, "fwrite");
                        privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
-                       g_free(fname);
-                       gpgme_data_release(plain);
-                       gpgme_release(ctx);
-                       return NULL;
+                       goto FILE_ERROR;
                }
            }
        }
@@ -564,9 +547,16 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                gpgme_release(ctx);
 
        return decinfo;
+
+FILE_ERROR:
+       fclose(dstfp);
+       g_free(fname);
+       gpgme_data_release(plain);
+       gpgme_release(ctx);
+       return NULL;
 }
 
-static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
+static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *from_addr)
 {
        MimeInfo *msgcontent;
        gchar *textstr, *tmp;
@@ -583,9 +573,14 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
 
        /* get content node from message */
        msgcontent = (MimeInfo *) mimeinfo->node->children->data;
-       if (msgcontent->type == MIMETYPE_MULTIPART)
+       if (msgcontent->type == MIMETYPE_MULTIPART) {
+               if (!msgcontent->node->children) {
+                       debug_print("msgcontent->node->children NULL, bailing\n");
+                       privacy_set_error(_("Malformed message"));
+                       return FALSE;
+               }
                msgcontent = (MimeInfo *) msgcontent->node->children->data;
-
+       }
        /* get rid of quoted-printable or anything */
        procmime_decode_content(msgcontent);
 
@@ -613,7 +608,7 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        gpgme_set_textmode(ctx, 1);
        gpgme_set_armor(ctx, 1);
 
-       if (!sgpgme_setup_signers(ctx, account)) {
+       if (!sgpgme_setup_signers(ctx, account, from_addr)) {
                gpgme_release(ctx);
                return FALSE;
        }
@@ -747,6 +742,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
                debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
                privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+               g_free(kset);
                return FALSE;
        }
        i = 0;
@@ -756,6 +752,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
                if (err) {
                        debug_print("can't add key '%s'[%d] (%s)\n", fprs[i],i, gpgme_strerror(err));
                        privacy_set_error(_("Couldn't add GPG key %s, %s"), fprs[i], gpgme_strerror(err));
+                       g_free(kset);
                        return FALSE;
                }
                debug_print("found %s at %d\n", fprs[i], i);
@@ -768,9 +765,15 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 
        /* get content node from message */
        msgcontent = (MimeInfo *) mimeinfo->node->children->data;
-       if (msgcontent->type == MIMETYPE_MULTIPART)
+       if (msgcontent->type == MIMETYPE_MULTIPART) {
+               if (!msgcontent->node->children) {
+                       debug_print("msgcontent->node->children NULL, bailing\n");
+                       privacy_set_error(_("Malformed message"));
+                       g_free(kset);
+                       return FALSE;
+               }
                msgcontent = (MimeInfo *) msgcontent->node->children->data;
-
+       }
        /* get rid of quoted-printable or anything */
        procmime_decode_content(msgcontent);
 
@@ -778,6 +781,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        if (fp == NULL) {
                privacy_set_error(_("Couldn't create temporary file, %s"), strerror(errno));
                perror("my_tmpfile");
+               g_free(kset);
                return FALSE;
        }
        procmime_write_mimeinfo(msgcontent, fp);
@@ -794,6 +798,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
                debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
                privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+               g_free(kset);
                return FALSE;
        }
        gpgme_set_armor(ctx, 1);
@@ -801,6 +806,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        err = gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
 
        enccontent = sgpgme_data_release_and_get_mem(gpgenc, &len);
+       g_free(kset);
 
        if (enccontent == NULL || len <= 0) {
                g_warning("sgpgme_data_release_and_get_mem failed");
Claws Mail