Fix bug #3105, "vCal plugin via https does not check SSL peer certificates or host"

Add a preference to disable SSL certificate verification.

diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 63245b06bac87bd847e0b6b0ab6dcc15731ac55e..59718b6de7dc9938e8ac4c6b82a48b02d6119a0b 100644 (file)
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1567,8 +1567,10 @@ void *url_read_thread(void *data)
        curl_easy_setopt(curl_ctx, CURLOPT_TIMEOUT, prefs_common_get_prefs()->io_timeout_secs);
        curl_easy_setopt(curl_ctx, CURLOPT_NOSIGNAL, 1);
 #if LIBCURL_VERSION_NUM >= 0x070a00
        curl_easy_setopt(curl_ctx, CURLOPT_TIMEOUT, prefs_common_get_prefs()->io_timeout_secs);
        curl_easy_setopt(curl_ctx, CURLOPT_NOSIGNAL, 1);
 #if LIBCURL_VERSION_NUM >= 0x070a00

-       curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYPEER, 0);
-       curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYHOST, 0);
+       if(vcalprefs.ssl_verify_peer == FALSE) {
+               curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYPEER, 0);
+               curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYHOST, 0);
+       }

 #endif
        curl_easy_setopt(curl_ctx, CURLOPT_USERAGENT, 
                "Claws Mail vCalendar plugin "
 #endif
        curl_easy_setopt(curl_ctx, CURLOPT_USERAGENT, 
                "Claws Mail vCalendar plugin "


@@ -1694,8 +1696,10 @@ gboolean vcal_curl_put(gchar *url, FILE *fp, gint filesize, const gchar *user, c
        curl_easy_setopt(curl_ctx, CURLOPT_READDATA, fp);
        curl_easy_setopt(curl_ctx, CURLOPT_HTTPHEADER, headers);
 #if LIBCURL_VERSION_NUM >= 0x070a00
        curl_easy_setopt(curl_ctx, CURLOPT_READDATA, fp);
        curl_easy_setopt(curl_ctx, CURLOPT_HTTPHEADER, headers);
 #if LIBCURL_VERSION_NUM >= 0x070a00

-       curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYPEER, 0);
-       curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYHOST, 0);
+       if(vcalprefs.ssl_verify_peer == FALSE) {
+               curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYPEER, 0);
+               curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYHOST, 0);
+       }

 #endif
        curl_easy_setopt(curl_ctx, CURLOPT_USERAGENT, 
                "Claws Mail vCalendar plugin "
 #endif
        curl_easy_setopt(curl_ctx, CURLOPT_USERAGENT, 
                "Claws Mail vCalendar plugin "

diff --git a/src/plugins/vcalendar/vcal_prefs.c b/src/plugins/vcalendar/vcal_prefs.c
index 936c820c919a0352d98d05eec57254021f9a6645..554c3bc0f4d45ce62f61c4acae85c5f087efaab1 100644 (file)
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -68,6 +68,8 @@ struct VcalendarPage
        GtkWidget *export_freebusy_pass_entry;
 
        GtkWidget *freebusy_get_url_entry;
        GtkWidget *export_freebusy_pass_entry;
 
        GtkWidget *freebusy_get_url_entry;

+       
+       GtkWidget *ssl_verify_peer_checkbtn;

 };
 
 VcalendarPrefs vcalprefs;
 };
 
 VcalendarPrefs vcalprefs;


@@ -110,6 +112,9 @@ static PrefParam param[] = {
        {"export_freebusy_pass", "", &vcalprefs.export_freebusy_pass, P_PASSWORD,
         NULL, NULL, NULL},
 
        {"export_freebusy_pass", "", &vcalprefs.export_freebusy_pass, P_PASSWORD,
         NULL, NULL, NULL},
 

+       {"ssl_verify_peer", "TRUE", &vcalprefs.ssl_verify_peer, P_BOOL,
+        NULL, NULL, NULL},
+

        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 


@@ -245,6 +250,9 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
        GtkWidget *freebusy_get_url_label;
        GtkWidget *freebusy_get_url_entry;
 
        GtkWidget *freebusy_get_url_label;
        GtkWidget *freebusy_get_url_entry;
 

+       GtkWidget *frame_ssl_options;
+       GtkWidget *ssl_verify_peer_checkbtn;
+

        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);


@@ -494,6 +502,25 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
        gtk_entry_set_text(GTK_ENTRY(freebusy_get_url_entry), 
                        vcalprefs.freebusy_get_url);
 
        gtk_entry_set_text(GTK_ENTRY(freebusy_get_url_entry), 
                        vcalprefs.freebusy_get_url);
 

+/* SSL frame */
+       PACK_FRAME(vbox2, frame_ssl_options, _("SSL options"));
+       vbox3 = gtk_vbox_new (FALSE, 8);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (frame_ssl_options), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
+
+/* SSL peer verification */
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
+
+       ssl_verify_peer_checkbtn = gtk_check_button_new_with_label(
+               _("Verify SSL certificate validity"));
+       gtk_widget_show(ssl_verify_peer_checkbtn);
+       gtk_box_pack_start(GTK_BOX (hbox2), ssl_verify_peer_checkbtn, FALSE, FALSE, 0);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ssl_verify_peer_checkbtn), 
+                       vcalprefs.ssl_verify_peer);
+

        if (!vcalprefs.export_user)
                vcalprefs.export_user = g_strdup("");
        if (!vcalprefs.export_pass)
        if (!vcalprefs.export_user)
                vcalprefs.export_user = g_strdup("");
        if (!vcalprefs.export_pass)


@@ -539,6 +566,8 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
        page->export_freebusy_pass_label = export_freebusy_pass_label;
        page->export_freebusy_pass_entry = export_freebusy_pass_entry;
 
        page->export_freebusy_pass_label = export_freebusy_pass_label;
        page->export_freebusy_pass_entry = export_freebusy_pass_entry;
 

+       page->ssl_verify_peer_checkbtn = ssl_verify_peer_checkbtn;
+

        set_auth_sensitivity(page);
 
        page->freebusy_get_url_entry = freebusy_get_url_entry;
        set_auth_sensitivity(page);
 
        page->freebusy_get_url_entry = freebusy_get_url_entry;


@@ -634,6 +663,10 @@ static void vcal_prefs_save_func(PrefsPage * _page)
        vcalprefs.freebusy_get_url =
            gtk_editable_get_chars(GTK_EDITABLE(page->freebusy_get_url_entry), 0, -1);
 
        vcalprefs.freebusy_get_url =
            gtk_editable_get_chars(GTK_EDITABLE(page->freebusy_get_url_entry), 0, -1);
 

+/* SSL */
+       vcalprefs.ssl_verify_peer = 
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
+                                        (page->ssl_verify_peer_checkbtn));

 
        vcal_prefs_save();
        vcal_folder_export(NULL);
 
        vcal_prefs_save();
        vcal_folder_export(NULL);

diff --git a/src/plugins/vcalendar/vcal_prefs.h b/src/plugins/vcalendar/vcal_prefs.h
index 66b493f20b58ffef9a3a46b8c58b07cd5c5fc795..fd4637a2e91a94c67e43246e8ee87aa0e2b38d4d 100644 (file)
--- a/src/plugins/vcalendar/vcal_prefs.h
+++ b/src/plugins/vcalendar/vcal_prefs.h
@@ -42,6 +42,7 @@ struct _VcalendarPrefs
        gchar           *export_freebusy_user;
        gchar           *export_freebusy_pass;
        gboolean         orage_registered;
        gchar           *export_freebusy_user;
        gchar           *export_freebusy_pass;
        gboolean         orage_registered;

+       gboolean         ssl_verify_peer;

 };
 
 extern VcalendarPrefs vcalprefs;
 };
 
 extern VcalendarPrefs vcalprefs;