Changeset e101506

Timestamp:

2006-09-24T17:22:08Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cfbb3a6

Parents:

42127dc

Message:

Better handling of user tls setting.

File:

• protocols/jabber/io.c (modified) (3 diffs)

protocols/jabber/io.c

@@ -247 +247 @@
         struct jabber_data *jd = gc->proto_data;
         struct xt_node *c, *reply;
-        
+        int trytls;
+        
+        trytls = g_strcasecmp( set_getstr( &gc->acc->set, "tls" ), "try" ) == 0;
         c = xt_find_node( node->children, "starttls" );
         if( c && !jd->ssl )
@@ -254 +256 @@
                    not in a secure connection already: */
                 
-                int try;
-                
-                try = g_strcasecmp( set_getstr( &gc->acc->set, "tls" ), "try" ) == 0;
                 c = xt_find_node( c->children, "required" );
                 
+                if( c && ( !trytls && !set_getbool( &gc->acc->set, "tls" ) ) )
+                {
+                        hide_login_progress( gc, "Server requires TLS connections, but TLS is turned off for this account" );
+                        signoff( gc );
+                        
+                        return XT_ABORT;
+                }
+                
                 /* Only run this if the tls setting is set to true or try: */
-                if( ( try | set_getbool( &gc->acc->set, "tls" ) ) )
+                if( ( trytls || set_getbool( &gc->acc->set, "tls" ) ) )
                 {
                         reply = xt_new_node( "starttls", NULL, NULL );
@@ -274 +281 @@
                 }
         }
-        else
-        {
-                /* TODO: Abort if TLS is required by the user. */
+        else if( !c && !jd->ssl )
+        {
+                /* If the server does not advertise the STARTTLS feature and
+                   we're not in a secure connection already: (Servers have a
+                   habit of not advertising <starttls/> anymore when already
+                   using SSL/TLS. */
+                
+                if( !trytls && set_getbool( &gc->acc->set, "tls" ) )
+                {
+                        hide_login_progress( gc, "TLS is turned on for this account, but is not supported by this server" );
+                        signoff( gc );
+                        
+                        return XT_ABORT;
+                }
         }