sesman: env_set_user, fix potential bof issues

Conflicts: common/os_calls.h
Merge pull request #237 from spali/neutrinolabs/xrdp/v0.8_fix_ch_kb
2016-10-04 02:38:07 -04:00 · 2015-04-19 16:37:02 -07:00 · 2015-04-19 11:47:27 +02:00 · 2015-03-24 03:42:28 +00:00 · 2015-01-07 20:46:38 -08:00 · 2014-11-26 13:04:57 -08:00
12 changed files with 96 additions and 44 deletions
--- a/common/os_calls.c
+++ b/common/os_calls.c
@ -253,14 +253,17 @@ g_sprintf(char *dest, const char *format, ...)
 }

 /*****************************************************************************/
-void DEFAULT_CC
+int DEFAULT_CC
 g_snprintf(char *dest, int len, const char *format, ...)
 {
+    int err;
    va_list ap;

    va_start(ap, format);
-    vsnprintf(dest, len, format, ap);
+    err = vsnprintf(dest, len, format, ap);
    va_end(ap);
+
+    return err;
 }

 /*****************************************************************************/
@ -3017,10 +3020,11 @@ g_sigterm(int pid)

 /*****************************************************************************/
 /* returns 0 if ok */
+/* the caller is responsible to free the buffs */
 /* does not work in win32 */
 int APP_CC
-g_getuser_info(const char *username, int *gid, int *uid, char *shell,
-               char *dir, char *gecos)
+g_getuser_info(const char *username, int *gid, int *uid, char **shell,
+               char **dir, char **gecos)
 {
 #if defined(_WIN32)
    return 1;
@ -3043,17 +3047,17 @@ g_getuser_info(const char *username, int *gid, int *uid, char *shell,

        if (dir != 0)
        {
-            g_strcpy(dir, pwd_1->pw_dir);
+            *dir = g_strdup(pwd_1->pw_dir);
        }

        if (shell != 0)
        {
-            g_strcpy(shell, pwd_1->pw_shell);
+            *shell = g_strdup(pwd_1->pw_shell);
        }

        if (gecos != 0)
        {
-            g_strcpy(gecos, pwd_1->pw_gecos);
+            *gecos = g_strdup(pwd_1->pw_gecos);
        }

        return 0;
--- a/common/os_calls.h
+++ b/common/os_calls.h
@ -35,7 +35,7 @@ void* APP_CC    g_malloc(int size, int zero);
 void APP_CC     g_free(void* ptr);
 void DEFAULT_CC g_printf(const char *format, ...);
 void DEFAULT_CC g_sprintf(char* dest, const char* format, ...);
-void DEFAULT_CC g_snprintf(char* dest, int len, const char* format, ...);
+int  DEFAULT_CC g_snprintf(char* dest, int len, const char* format, ...);
 void DEFAULT_CC g_writeln(const char* format, ...);
 void DEFAULT_CC g_write(const char* format, ...);
 void APP_CC     g_hexdump(char* p, int len);
@ -154,8 +154,8 @@ char* APP_CC    g_getenv(const char* name);
 int APP_CC      g_exit(int exit_code);
 int APP_CC      g_getpid(void);
 int APP_CC      g_sigterm(int pid);
-int APP_CC      g_getuser_info(const char* username, int* gid, int* uid, char* shell,
-                               char* dir, char* gecos);
+int APP_CC      g_getuser_info(const char* username, int* gid, int* uid, char** shell,
+                               char** dir, char** gecos);
 int APP_CC      g_getgroup_info(const char* groupname, int* gid);
 int APP_CC      g_check_user_in_group(const char* username, int gid, int* ok);
 int APP_CC      g_time1(void);
--- a/configure.ac
+++ b/configure.ac
@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script

 AC_PREREQ(2.59)
-AC_INIT([xrdp], [0.9.0], [xrdp-devel@lists.sourceforge.net])
+AC_INIT([xrdp], [0.8.1], [xrdp-devel@lists.sourceforge.net])
 AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
 AM_INIT_AUTOMAKE([1.6 foreign])
 AC_PROG_CC
--- a/instfiles/Makefile.am
+++ b/instfiles/Makefile.am
@ -26,6 +26,7 @@ startscript_DATA = \
  km-0415.ini \
  km-0419.ini \
  km-041d.ini \
+  km-0807.ini \
  km-0816.ini \
  km-e0010411.ini \
  km-e0200411.ini \
--- a/readme.txt
+++ b/readme.txt
@ -1,5 +1,5 @@

-xrdp 0.9.0
+xrdp 0.8.1

 Credits
  This project is very much dependent on NeutrinoRDP, FreeRDP, rdesktop, and
--- a/sesman/env.c
+++ b/sesman/env.c
@ -61,8 +61,9 @@ env_check_password_file(char *filename, char *password)
 }

 /******************************************************************************/
+/*  its the responsibility of the caller to free passwd_file                  */
 int DEFAULT_CC
-env_set_user(char *username, char *passwd_file, int display,
+env_set_user(char *username, char **passwd_file, int display,
             struct list *env_names, struct list* env_values)
 {
    int error;
@ -70,15 +71,17 @@ env_set_user(char *username, char *passwd_file, int display,
    int pw_gid;
    int uid;
    int index;
+    int len;
    char *name;
    char *value;
-    char pw_shell[256];
-    char pw_dir[256];
-    char pw_gecos[256];
+    char *pw_shell;
+    char *pw_dir;
    char text[256];

-    error = g_getuser_info(username, &pw_gid, &pw_uid, pw_shell, pw_dir,
-                           pw_gecos);
+    pw_shell = 0;
+    pw_dir = 0;
+
+    error = g_getuser_info(username, &pw_gid, &pw_uid, &pw_shell, &pw_dir, 0);

    if (error == 0)
    {
@ -128,28 +131,48 @@ env_set_user(char *username, char *passwd_file, int display,
                if (0 == g_cfg->auth_file_path)
                {
                    /* if no auth_file_path is set, then we go for
-                       $HOME/.vnc/sesman_username_passwd */
+                     $HOME/.vnc/sesman_username_passwd */
                    if (g_mkdir(".vnc") < 0)
                    {
                        log_message(LOG_LEVEL_ERROR,
-                            "env_set_user: error creating .vnc dir");
+                                    "env_set_user: error creating .vnc dir");
+                    }
+
+                    len = g_snprintf(NULL, 0, "%s/.vnc/sesman_%s_passwd", pw_dir, username);
+
+                    *passwd_file = (char *) g_malloc(len + 1, 1);
+                    if (*passwd_file != NULL)
+                    {
+                        g_sprintf(*passwd_file, "%s/.vnc/sesman_%s_passwd", pw_dir, username);
                    }
-                    g_sprintf(passwd_file, "%s/.vnc/sesman_%s_passwd", pw_dir, username);
                }
                else
                {
                    /* we use auth_file_path as requested */
-                    g_sprintf(passwd_file, g_cfg->auth_file_path, username);
+                    len = g_snprintf(NULL, 0, g_cfg->auth_file_path, username);
+
+                    *passwd_file = (char *) g_malloc(len + 1, 1);
+                    if (*passwd_file != NULL)
+                    {
+                        g_sprintf(*passwd_file, g_cfg->auth_file_path, username);
+                    }
                }

-                LOG_DBG("pass file: %s", passwd_file);
+                if (*passwd_file != NULL)
+                {
+                    LOG_DBG("pass file: %s", *passwd_file);
+                }
            }
+
+            g_free(pw_dir);
+            g_free(pw_shell);
        }
    }
    else
    {
        log_message(LOG_LEVEL_ERROR,
-                    "error getting user info for user %s", username);
+                    "error getting user info for user %s",
+                    username);
    }

    return error;
--- a/sesman/env.h
+++ b/sesman/env.h
@ -50,7 +50,7 @@ env_check_password_file(char* filename, char* password);
 *
 */
 int DEFAULT_CC
-env_set_user(char* username, char* passwd_file, int display,
+env_set_user(char* username, char** passwd_file, int display,
             struct list *env_names, struct list* env_values);

 #endif
--- a/sesman/sesman.ini
+++ b/sesman/sesman.ini
@ -94,3 +94,4 @@ FuseMountName=thinclient_drives

 [SessionVariables]
 PULSE_SCRIPT=/etc/xrdp/pulse/default.pa
+
--- a/sesman/session.c
+++ b/sesman/session.c
@ -324,8 +324,11 @@ session_start_sessvc(int xpid, int wmpid, long data, char *username, int display
    list_add_item(sessvc_params, (long)g_strdup(wmpid_str));
    list_add_item(sessvc_params, 0); /* mandatory */

-    env_set_user(username, 0, display,
-                 g_cfg->session_variables1, g_cfg->session_variables2);
+    env_set_user(username,
+                 0,
+                 display,
+                 g_cfg->session_variables1,
+                 g_cfg->session_variables2);

    /* executing sessvc */
    g_execvp(exe_path, ((char **)sessvc_params->items));
@ -459,14 +462,14 @@ session_start_fork(int width, int height, int bpp, char *username,
    char depth[32];
    char screen[32];
    char text[256];
-    char passwd_file[256];
-    char *pfile;
+    char execvpparams[2048];
+    char *xserver; /* absolute/relative path to Xorg/X11rdp/Xvnc */
+    char *passwd_file;
    char **pp1 = (char **)NULL;
    struct session_chain *temp = (struct session_chain *)NULL;
    struct list *xserver_params = (struct list *)NULL;
-    time_t ltime;
    struct tm stime;
-    char execvpparams[2048];
+    time_t ltime;

    /* initialize (zero out) local variables: */
    g_memset(&ltime, 0, sizeof(time_t));
@ -475,7 +478,8 @@ session_start_fork(int width, int height, int bpp, char *username,
    g_memset(depth, 0, sizeof(char) * 32);
    g_memset(screen, 0, sizeof(char) * 32);
    g_memset(text, 0, sizeof(char) * 256);
-    g_memset(passwd_file, 0, sizeof(char) * 256);
+
+    passwd_file = 0;

    /* check to limit concurrent sessions */
    if (g_session_count >= g_cfg->sess.max_sessions)
@ -539,7 +543,9 @@ session_start_fork(int width, int height, int bpp, char *username,
            }
            else if (pampid == 0) /* child: X11/client */
            {
-                env_set_user(username, 0, display,
+                env_set_user(username,
+                             0,
+                             display,
                             g_cfg->session_variables1,
                             g_cfg->session_variables2);
                if (x_server_running(display))
@ -634,14 +640,23 @@ session_start_fork(int width, int height, int bpp, char *username,
            }
            else if (xpid == 0) /* child */
            {
-                pfile = 0;
                if (type == SESMAN_SESSION_TYPE_XVNC)
                {
-                    pfile = passwd_file;
+                    env_set_user(username,
+                                 &passwd_file,
+                                 display,
+                                 g_cfg->session_variables1,
+                                 g_cfg->session_variables2);
                }
-                env_set_user(username, pfile, display,
-                             g_cfg->session_variables1,
-                             g_cfg->session_variables2);
+                else
+                {
+                    env_set_user(username,
+                                 0,
+                                 display,
+                                 g_cfg->session_variables1,
+                                 g_cfg->session_variables2);
+                }
+

                g_snprintf(text, 255, "%d", g_cfg->sess.max_idle_time);
                g_setenv("XRDP_SESMAN_MAX_IDLE_TIME", text, 1);
@ -695,6 +710,8 @@ session_start_fork(int width, int height, int bpp, char *username,
                    list_add_item(xserver_params, (long)g_strdup("-rfbauth"));
                    list_add_item(xserver_params, (long)g_strdup(passwd_file));

+                    g_free(passwd_file);
+
                    /* additional parameters from sesman.ini file */
                    //config_read_xserver_params(SESMAN_SESSION_TYPE_XVNC,
                    //                           xserver_params);
@ -825,8 +842,11 @@ session_reconnect_fork(int display, char *username)
    }
    else if (pid == 0)
    {
-        env_set_user(username, 0, display,
-                     g_cfg->session_variables1, g_cfg->session_variables2);
+        env_set_user(username,
+                     0,
+                     display,
+                     g_cfg->session_variables1,
+                     g_cfg->session_variables2);
        g_snprintf(text, 255, "%s/%s", XRDP_CFG_PATH, "reconnectwm.sh");

        if (g_file_exist(text))
--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@ -90,7 +90,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #  endif
 #endif

-#define X11RDPVER "0.7.0"
+#define X11RDPVER "0.8.0"

 #define PixelDPI 100
 #define PixelToMM(_size) (((_size) * 254 + (PixelDPI) * 5) / ((PixelDPI) * 10))
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@ -297,8 +297,8 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
    ErrorF("\n");
    ErrorF("X11rdp, an X server for xrdp\n");
    ErrorF("Version %s\n", X11RDPVER);
-    ErrorF("Copyright (C) 2005-2012 Jay Sorg\n");
-    ErrorF("See http://xrdp.sf.net for information on xrdp.\n");
+    ErrorF("Copyright (C) 2005-2015 Jay Sorg\n");
+    ErrorF("See http://www.xrdp.org for information on xrdp.\n");
 #if defined(XORG_VERSION_CURRENT) && defined (XVENDORNAME)
    ErrorF("Underlying X server release %d, %s\n",
           XORG_VERSION_CURRENT, XVENDORNAME);
--- a/xrdp/xrdp_keyboard.ini
+++ b/xrdp/xrdp_keyboard.ini
@ -67,6 +67,7 @@ rdp_layout_jp3=0xe0200411
 rdp_layout_jp4=0xe0210411
 rdp_layout_ru=0x00000419
 rdp_layout_se=0x0000041D
+rdp_layout_ch=0x00000807
 rdp_layout_pt=0x00000816
 rdp_layout_br=0x00000416
 rdp_layout_pl=0x00000415
@ -83,6 +84,7 @@ rdp_layout_jp3=jp
 rdp_layout_jp4=jp
 rdp_layout_ru=ru
 rdp_layout_se=se
+rdp_layout_ch=ch
 rdp_layout_pt=pt
 rdp_layout_br=br(abnt2)
 rdp_layout_pl=pl
@ -113,6 +115,7 @@ rdp_layout_jp4=jp
 rdp_layout_it=it
 rdp_layout_ru=ru
 rdp_layout_se=se
+rdp_layout_ch=ch
 rdp_layout_pt=pt
 rdp_layout_br=br(abnt2)
 rdp_layout_pl=pl
Author	SHA1	Message	Date
speidy	709c626c6a	sesman: env_set_user, fix potential bof issues Conflicts: common/os_calls.h	2016-10-04 02:38:07 -04:00
jsorg71	8f2fe73b32	Merge pull request #237 from spali/neutrinolabs/xrdp/v0.8_fix_ch_kb finish for supporting swiss german keyboard	2015-04-19 16:37:02 -07:00
Thomas Spalinger	21ed6864da	finish for supporting swiss german keyboard	2015-04-19 11:47:27 +02:00
Jay Sorg	6420aa01d0	X11rdp: update version	2015-03-24 03:42:28 +00:00
Jay Sorg	6390cee2d8	Merge branch 'master' into v0.8	2015-01-07 20:46:38 -08:00
Jay Sorg	10cd6df739	Merge branch 'master' into v0.8	2014-11-26 13:04:57 -08:00
Jay Sorg	8625ba1aa2	set package version	2014-11-13 22:27:09 -08:00
Jay Sorg	08e69cda85	Merge branch 'master' into v0.8 Conflicts: sesman/chansrv/Makefile.am sesman/chansrv/sound.c sesman/chansrv/sound.h sesman/sesman.ini xrdp/xrdp.ini xrdp/xrdp_mm.c	2014-11-13 22:16:00 -08:00
Jay Sorg	0987feb42f	opps, cherry pick fix	2014-05-19 22:41:42 -07:00
Jay Sorg	123347cd5c	xrdp: update web site Conflicts: xrdp/xrdp.c	2014-05-19 22:39:25 -07:00
Jay Sorg	20124043a6	xrdp: don't show connection log unless there is a problem	2014-05-18 23:12:14 -07:00
Jay Sorg	954ed3d681	xup: don't need to clear on connect	2014-05-18 23:11:07 -07:00
Jay Sorg	c8f1d6cac4	turn on bulk compressor by default	2014-05-04 23:58:41 -07:00
speidy	2305e6de59	chansrv: sound: zero out ack flags when sound_send_close called, to avoid deadloop when chunk is sent and not acked back by the client.	2014-05-01 14:49:15 -07:00
Jay Sorg	0db5bdbf69	chansrv: make fuse mount directory configurable	2014-04-19 17:08:55 -07:00
Jay Sorg	f85dc68c5d	common: fix for clearing environment vars in BSD	2014-04-17 21:47:09 -07:00
Laxmikant Rashinkar	27b7541044	we now load pulse modules by invoking pacmd	2014-04-12 15:25:17 -07:00