Changeset ad46e4d

Timestamp:

2011-12-22T11:23:18Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d6ddff0

Parents:

f1c870a

Message:

Use initgroups() as well when dropping privileges. Closes bug #852.

Files:

• protocols/jabber/io.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (2 diffs)
• unix.c (modified) (2 diffs)

protocols/jabber/io.c

@@ -173 +173 @@
         if( st > 0 )
         {
+                if( jd->flags & JFLAG_MOCK )
+                        return TRUE;
+                
                 /* Parse. */
                 if( xt_feed( jd->xt, buf, st ) < 0 )

protocols/jabber/jabber.c

@@ -336 +336 @@
         if( g_strcasecmp( who, JABBER_XMLCONSOLE_HANDLE ) == 0 )
                 return jabber_write( ic, message, strlen( message ) );
+
+        if( g_strcasecmp( who, JABBER_MOCK_HANDLE ) == 0 )
+        {
+                /* Parse. */
+                if( xt_feed( jd->xt, message, strlen( message ) ) < 0 )
+                {
+                        imcb_error( ic, "XML stream error" );
+                        imc_logout( ic, TRUE );
+                        return FALSE;
+                }
+                
+                /* Execute all handlers. */
+                if( !xt_handle( jd->xt, NULL, 1 ) )
+                {
+                        /* Don't do anything, the handlers should have
+                           aborted the connection already. */
+                        return FALSE;
+                }
+        }
         
         if( ( s = strchr( who, '=' ) ) && jabber_chat_by_jid( ic, s + 1 ) )
@@ -426 +445 @@
         {
                 jd->flags |= JFLAG_XMLCONSOLE;
-                imcb_add_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
+                imcb_add_buddy( ic, who, NULL );
+                return;
+        }
+        else if( g_strcasecmp( who, JABBER_MOCK_HANDLE ) == 0 )
+        {
+                jd->flags |= JFLAG_MOCK;
+                imcb_add_buddy( ic, who, NULL );
                 return;
         }
@@ -446 +471 @@
                 imcb_remove_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
                 */
+                return;
+        }
+        else if( g_strcasecmp( who, JABBER_MOCK_HANDLE ) == 0 )
+        {
+                jd->flags &= ~JFLAG_MOCK;
                 return;
         }

protocols/jabber/jabber.h

@@ -47 +47 @@
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
         JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
+        JFLAG_MOCK = 256,               /* If the user added a mock buddy. */
 } jabber_flags_t;
 
@@ -188 +189 @@
 
 #define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
+#define JABBER_MOCK_HANDLE "mock"
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the

unix.c

@@ -41 +41 @@
 #include <pwd.h>
 #include <locale.h>
+#include <grp.h>
 
 #if defined(OTR_BI) || defined(OTR_PI)
@@ -152 +153 @@
                 if( pw )
                 {
+                        initgroups( global.conf->user, pw->pw_gid );
                         setgid( pw->pw_gid );
                         setuid( pw->pw_uid );
+                }
+                else
+                {
+                        log_message( LOGLVL_WARNING, "Failed to look up user %s.", global.conf->user );
                 }
         }