Changeset 2081

Timestamp:

06/06/07 12:58:10

Author:

pvanhoof

Message:

The use_ssl option

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/README (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (39 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (11 diffs)
• trunk/libtinymail-camel/camel-lite/configure.ac (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (1 diff)
• trunk/libtinymail/tny-account.c (modified) (1 diff)
• trunk/tests/shared/account-store.c (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
-        * Added the option --with-ssl=nss,openssl,none to the build to assist
-        the SSL library availability detection
+        * Changed the use_ssl options to "wrapped", "tls", "when-possible" and
+        "never" for both POP3 and IMAP
+        * Some connection fixes in the IMAP and POP3 connection procedures
-
-2007-06-05  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/README

@@ -108 +108 @@
-To use SSL (other values are "never" and "when-possible"):
-
-always
+wrapped
-
-Distribution specific: also check out requirements.txt

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -671 +671 @@
-
-static gboolean
-
+int must_tls, 
-{
-        CamelImapStore *store = (CamelImapStore *) service;
@@ -682 +682 @@
-        gboolean not_ssl = TRUE;
-
-
+
+
-                not_ssl = FALSE;
+
-#ifdef HAVE_SSL
- {
+
-                        tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS);
-} else {
+else 
-                        tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);
-                }
-#else
+
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-      
-      service->url->host, _("SSL unavailable
-
+
+service->url->host, _("SSL unavailable in this build
+
-                return FALSE;
+
-#endif /* HAVE_SSL */
- {
+
-                tcp_stream = camel_tcp_stream_raw_new ();
-
-
-if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai) == -1) 
+
+if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai) == -1) 
+
-                if (errno == EINTR)
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
@@ -710 +713 @@
-                                              service->url->host,
-                                              g_strerror (errno));
-                
-                camel_object_unref (tcp_stream);
-                
-                return FALSE;
-        }
@@ -738 +739 @@
-        if (camel_imap_store_readline (store, &buf, ex) < 0) 
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        if (!strncmp(buf, "* PREAUTH", 9))
-                store->preauthed = TRUE;
-
-
+
+
+
-                /* Courier-IMAP is braindamaged. So far this flag only
-                 * works around the fact that Courier-IMAP is known to
@@ -767 +757 @@
-                 * rather than getting individual parts. */
-                store->braindamaged = TRUE;
-
+
+
-                /* This is a workaround for servers which advertise
-                 * IMAP4rev1 but which can sometimes subtly break in
@@ -786 +777 @@
-                force_imap4 = TRUE;
-        }
-        
-
-        /* Tinymail hack: always use IMAP4, not IMAP4rev1 (sorry) */
-
-        /* force_imap4 = TRUE; */
-        store->braindamaged = TRUE;
-
-        /* end of hack :) */
-
-        g_free (buf);
-
+
-        /* get the imap server capabilities */
-        if (!imap_get_capability (service, ex)) 
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                store->capabilities &= ~IMAP_CAPABILITY_IMAP4REV1;
-                store->server_level = IMAP_LEVEL_IMAP4;
-        }
-
-not_ssl || ssl_mode != MODE_TLS) {
-
+
+!must_tls && (not_ssl || ssl_mode != MODE_TLS)) 
+
-                /* we're done */
-
-                return TRUE;
-
-
-
+
+
+
-#ifdef HAVE_SSL
-
+
+
+
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-                                      _("Failed to connect to IMAP server %s in secure mode: %s"),
-                                      service->url->host, _("STARTTLS not supported"));
-                
-                goto exception;
-        }
-
+
-        /* as soon as we send a STARTTLS command, all hope is lost of a clean QUIT if problems arise */
-        clean_quit = FALSE;
-
+
-        response = camel_imap_command (store, NULL, ex, "STARTTLS");
-        if (!response) 
@@ -850 +837 @@
-                store->ostream = NULL;
-                g_mutex_unlock (store->stream_lock);
-
-
-
-
+
+
+
+
+
+
+
-        camel_imap_response_free_without_processing (store, response);
-
+
-        /* Okay, now toggle SSL/TLS mode */
-
+
+
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-      
-      
+
+
-                goto exception;
-        }
+
-#else
-        camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
@@ -869 +861 @@
-        goto exception;
-#endif /* HAVE_SSL */
-
+
+
-        /* rfc2595, section 4 states that after a successful STLS
-
+
+
-        if (!imap_get_capability (service, ex)) 
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-
-        if (store->capabilities & IMAP_CAPABILITY_LOGINDISABLED ) { 
-                clean_quit = TRUE;
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-
+
+
-                goto exception;
-        }
-
-        return TRUE;
-
-
-
-
+
+
+
+
+
-                /* try to disconnect cleanly */
-                response = camel_imap_command (store, NULL, ex, "LOGOUT");
@@ -915 +898 @@
-                store->istream = NULL;
-        }
-        
-        if (store->ostream) {
-                camel_object_unref (store->ostream);
@@ -921 +903 @@
-        }
-        g_mutex_unlock (store->stream_lock);
-
-        store->connected = FALSE;
-
+
-        return FALSE;
-}
@@ -1012 +993 @@
-        while (i)
-                g_free(child_env[--i]);
-
+
-        if (ret == -1) {
-                if (errno == EINTR)
@@ -1036 +1017 @@
-        store->preauthed = FALSE;
-        store->command = 0;
-
+
-        /* Read the greeting, if any, and deal with PREAUTH */
-        if (camel_imap_store_readline (store, &buf, ex) < 0) 
@@ -1055 +1036 @@
-                return FALSE;
-        }
+
-        if (!strncmp(buf, "* PREAUTH", 9))
-                store->preauthed = TRUE;
-        g_free (buf);
-
+
-        /* get the imap server capabilities */
-        if (!imap_get_capability (service, ex)) 
@@ -1067 +1049 @@
-                        store->istream = NULL;
-                }
-                
-                if (store->ostream) {
-                        camel_object_unref (store->ostream);
@@ -1077 +1058 @@
-                return FALSE;
-        }
-
+
-        return TRUE;
-        
@@ -1089 +1070 @@
-        char *port;
-        int mode;
+        int must_tls;
-} ssl_options[] = {
-
-
-
-
-
+
+
+
+
+
+
-};
-
@@ -1103 +1086 @@
-        const char *ssl_mode;
-        struct addrinfo hints, *ai;
-
+, must_tls = 0
-        char *serv;
-        const char *port;
@@ -1113 +1096 @@
-            && (command = camel_url_get_param(service->url, "command")))
-                return connect_to_server_process(service, command, ex);
-
-
+
+
+
+
-                for (i = 0; ssl_options[i].value; i++)
-                        if (!strcmp (ssl_options[i].value, ssl_mode))
@@ -1121 +1106 @@
-                serv = ssl_options[i].serv;
-                port = ssl_options[i].port;
-
+
+
+
-                mode = MODE_CLEAR;
-                serv = "imap";
-                port = IMAP_PORT;
-
-
-
+
+
+
+
+
-                serv = g_alloca (16);
-                sprintf (serv, "%d", service->url->port);
-                port = NULL;
-        }
-
+
-        memset (&hints, 0, sizeof (hints));
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_family = PF_UNSPEC;
+
-        ai = camel_getaddrinfo(service->url->host, serv, &hints, ex);
-
+
+
+
-                camel_exception_clear (ex);
-                ai = camel_getaddrinfo(service->url->host, port, &hints, ex);
-        }
-
+
-        if (ai == NULL)
-                return FALSE;
-
-
-
+
+
-        camel_freeaddrinfo (ai);
-
+
-        return ret;
-}
@@ -1469 +1460 @@
-
-        auth_domain = camel_url_get_param (service->url, "auth-domain");
-
-
+
+
+
-                if (camel_verbose_debug)
-                        fprintf(stderr, "Server %s has preauthenticated us.\n",
@@ -1477 +1469 @@
-        }
-
-
+
+
-                if (!g_hash_table_lookup (store->authtypes, service->url->authmech)) {
-                        camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-      
-       
-      
-      
+
+
+
+
-                        return FALSE;
-                }
-
+
-                authtype = camel_sasl_authtype (service->url->authmech);
-                if (!authtype) {
@@ -1494 +1487 @@
-                        return FALSE;
-                }
-
-
+
+
+
-                        authenticated = try_auth (store, authtype->authproto, ex);
-                        if (!authenticated)
@@ -1501 +1495 @@
-                }
-        }
-
-
-
+
+
+
+
+
-                        /* We need to un-cache the password before prompting again */
-                        camel_session_forget_password (session, service, auth_domain, "password", ex);
@@ -1509 +1505 @@
-                        service->url->passwd = NULL;
-                }
-
-
+
+
+
-                        char *prompt;
-                        
-                        prompt = g_strdup_printf (_("%sPlease enter the IMAP "
-  
-  
-  
-  
+
+
+
+
-                        service->url->passwd =
-                                camel_session_get_password (session, service, auth_domain,
-                   
+
-                        g_free (prompt);
-                        g_free (errbuf);
-                        errbuf = NULL;
-
+
-                        if (!service->url->passwd) {
-                                camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-     
+
-                                return FALSE;
-                        }
-                }
-                
-
+
+
-                        /* Some servers (eg, courier) will disconnect on
-
-
+
-                        if (!connect_to_server_wrapper (service, ex))
-                                return FALSE;
-                }
-
+
-                if (authtype)
-                        authenticated = try_auth (store, authtype->authproto, ex);
@@ -1572 +1569 @@
-                        {
-                                errbuf = g_strdup_printf (_("Unable to authenticate "
-    
-  
+
+
-                                camel_exception_clear (ex);
-                                return FALSE;
@@ -1586 +1583 @@
-{
-        CamelImapStore *store = CAMEL_IMAP_STORE (disco_store);
-
+
-        return camel_store_summary_count((CamelStoreSummary *)store->summary) != 0;
-}
@@ -1604 +1601 @@
-        CAMEL_SERVICE_REC_LOCK (store, connect_lock);
-
-
-    !imap_auth_loop (service, ex)) 
+ !imap_auth_loop (service, ex)) 
+
-                CAMEL_DISCO_STORE (store)->status = CAMEL_DISCO_STORE_OFFLINE;
-                CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
@@ -1614 +1611 @@
-        /* Get namespace and hierarchy separator */
-        if ((store->capabilities & IMAP_CAPABILITY_NAMESPACE) &&
-
+
+
-                response = camel_imap_command (store, NULL, ex, "NAMESPACE");
-                if (!response)
-                        goto done;
-
+
-                result = camel_imap_response_extract (store, response, "NAMESPACE", ex);
-                if (!result)
-                        goto done;
-
+
-#if 0
-                /* new code... */
@@ -1629 +1627 @@
-                /* end new code */
-#endif
-
+
-                name = camel_strstrcase (result, "NAMESPACE ((");
-
+
+
-                        char *sep;
-                        
-                        name += 12;
-                        store->namespace = imap_parse_string ((const char **) &name, &len);
@@ -1646 +1644 @@
-                g_free (result);
-        }
-
+
-        if (!store->namespace)
-                store->namespace = g_strdup ("");
-
+
-        if (!store->dir_sep) {
-
+
+
-                        /* This idiom means "tell me the hierarchy separator
-                         * for the given path, even if that path doesn't exist.
@@ -1667 +1666 @@
-                                                       store->namespace);
-                }
+
-                if (!response)
-                        goto done;
-
+
-                result = camel_imap_response_extract (store, response, "LIST", NULL);
-
+
+
-                        imap_parse_list_response (store, result, NULL, &store->dir_sep, NULL);
-                        g_free (result);
-                }
- {
+
-                        store->dir_sep = '/';   /* Guess */
-
-
-
+
+
-        /* canonicalize the namespace to end with dir_sep */
-        len = strlen (store->namespace);
-
-
-
-
+
+
+
-                g_free (store->namespace);
-                store->namespace = tmp;
-        }
-
+
-        ns = camel_imap_store_summary_namespace_new(store->summary, store->namespace, store->dir_sep);
-        camel_imap_store_summary_namespace_set(store->summary, ns);
-        
-        if ((store->parameters & IMAP_PARAM_SUBSCRIPTIONS)
-
+
+
-                CamelStoreInfo *si;
-                char *pattern;
-
+
-                get_folders_sync(store, store->namespace, ex);
-                if (camel_exception_is_set(ex))
@@ -1709 +1709 @@
-                /* Make sure INBOX is present/subscribed */
-                si = camel_store_summary_path((CamelStoreSummary *)store->summary, "INBOX");
-
+
+
+
-                        response = camel_imap_command (store, NULL, ex, "SUBSCRIBE INBOX");
-                        if (response != NULL) {
@@ -1720 +1722 @@
-                        get_folders_sync(store, "INBOX", ex);
-                }
+
-                store->refresh_stamp = time(0);
-        }
-
-
+
- done:
-
@@ -1730 +1732 @@
-
-        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
-        
-        if (camel_exception_is_set (ex))
-                camel_service_disconnect (service, TRUE, NULL);
@@ -1767 +1768 @@
-                store->istream = NULL;
-        }
-
+
-        if (store->ostream) {
-                camel_stream_close(store->ostream);
@@ -1786 +1787 @@
-                store->authtypes = NULL;
-        }
-
+
-        if (store->namespace && !(store->parameters & IMAP_PARAM_OVERRIDE_NAMESPACE)) {
-                g_free (store->namespace);
-                store->namespace = NULL;
-        }
-
+
-        return TRUE;
-}
@@ -1807 +1808 @@
-                camel_imap_response_free (store, response);
-        }
-
+
-        imap_disconnect_offline (service, clean, ex);
-
+
-        return TRUE;
-}
@@ -1829 +1830 @@
-                }
-        }
-
+
-        return FALSE;
-}
@@ -1839 +1840 @@
-        CamelImapResponse *response;
-        CamelFolder *current_folder;
-
+
-        CAMEL_SERVICE_REC_LOCK (imap_store, connect_lock);
-

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c

@@ -251 +251 @@
-
-static gboolean
-
+int must_tls, 
-{
-        CamelPOP3Store *store = CAMEL_POP3_STORE (service);
@@ -263 +263 @@
-        store->connected = FALSE;
-
-
+
+
+
-#ifdef HAVE_SSL
- {
+
-                        tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS);
-} else {
+else 
-                        tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);
-                }
-#else
+
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-      
-      
-
+
+
+
-                return FALSE;
+
-#endif /* HAVE_SSL */
-{
+
-                tcp_stream = camel_tcp_stream_raw_new ();
-
-
-if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) 
+
+if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) 
+
-                if (errno == EINTR)
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-            
+
-                else
-                        camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-             
-             
-             
+
+
+
-                
-                camel_object_unref (tcp_stream);
@@ -295 +298 @@
-                return FALSE;
-        }
-
+
-        /* parent class connect initialization */
-        /*if (CAMEL_SERVICE_CLASS (parent_class)->connect (service, ex) == FALSE) {
@@ -301 +304 @@
-                return FALSE;
-        }*/
-
+
-        if (camel_url_get_param (service->url, "disable_extensions"))
-                flags |= CAMEL_POP3_ENGINE_DISABLE_EXTENSIONS;
-
+
-        if ((delete_days = (gchar *) camel_url_get_param(service->url,"delete_after"))) 
-                store->delete_after =  atoi(delete_days);
-
+
-        if (!(store->engine = camel_pop3_engine_new (tcp_stream, flags))) {
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-             
-             
+
+
-                camel_object_unref (tcp_stream);
-                return FALSE;
@@ -319 +322 @@
-        store->engine->partial_happening = FALSE;
-
-
+
+
-