--- sourceforge.net/trunk/rdesktop/rdesktop.c 2002/07/29 20:35:13 79 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/02/09 01:38:07 315 @@ -1,102 +1,158 @@ /* rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2001 - + Copyright (C) Matthew Chapman 1999-2003 + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include /* malloc realloc free */ #include /* va_list va_start va_end */ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ +#include /* save licence uses it. */ #include /* getpwuid */ -#include /* PATH_MAX */ +#include /* tcgetattr tcsetattr */ #include /* stat */ #include /* gettimeofday */ #include /* times */ #include "rdesktop.h" +#ifdef EGD_SOCKET +#include /* socket connect */ +#include /* sockaddr_un */ +#endif + +#ifdef WITH_OPENSSL +#include +#else +#include "crypto/md5.h" +#endif + +char title[32] = ""; char username[16]; char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int width; -int height; +int width = 800; /* If width or height are reset to zero, the geometry will + be fetched from _NET_WORKAREA */ +int height = 600; int tcp_port_rdp = TCP_PORT_RDP; +int server_bpp = 8; BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; -BOOL licence = True; BOOL encryption = True; BOOL desktop_save = True; BOOL fullscreen = False; BOOL grab_keyboard = True; +BOOL hide_decorations = False; +extern BOOL owncolmap; /* Display usage information */ static void usage(char *program) { - printf("Usage: %s [options] server\n", program); - printf(" -u: user name\n"); - printf(" -d: domain\n"); - printf(" -s: shell\n"); - printf(" -c: working directory\n"); - printf(" -p: password (autologon)\n"); - printf(" -n: client hostname\n"); - printf(" -k: keyboard layout on terminal server (us,sv,gr etc.)\n"); - printf(" -g: desktop geometry (WxH)\n"); - printf(" -f: full-screen mode\n"); - printf(" -b: force bitmap updates\n"); - printf(" -e: disable encryption (French TS)\n"); - printf(" -m: do not send motion events\n"); - printf(" -l: do not request licence\n"); - printf(" -t: rdp tcp port\n"); - printf(" -K: keep window manager key bindings\n"); + fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); + fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2003 Matt Chapman.\n"); + fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); + + fprintf(stderr, "Usage: %s [options] server[:port]\n", program); + fprintf(stderr, " -u: user name\n"); + fprintf(stderr, " -d: domain\n"); + fprintf(stderr, " -s: shell\n"); + fprintf(stderr, " -c: working directory\n"); + fprintf(stderr, " -p: password (- to prompt)\n"); + fprintf(stderr, " -n: client hostname\n"); + fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr,etc.)\n"); + fprintf(stderr, " -g: desktop geometry (WxH)\n"); + fprintf(stderr, " -f: full-screen mode\n"); + fprintf(stderr, " -b: force bitmap updates\n"); + fprintf(stderr, " -e: disable encryption (French TS)\n"); + fprintf(stderr, " -m: do not send motion events\n"); + fprintf(stderr, " -C: use private colour map\n"); + fprintf(stderr, " -K: keep window manager key bindings\n"); + fprintf(stderr, " -T: window title\n"); + fprintf(stderr, " -D: hide window manager decorations\n"); + fprintf(stderr, " -a: server bpp\n"); +} + +static BOOL +read_password(char *password, int size) +{ + struct termios tios; + BOOL ret = False; + int istty = 0; + char *p; + + if (tcgetattr(STDIN_FILENO, &tios) == 0) + { + fprintf(stderr, "Password: "); + tios.c_lflag &= ~ECHO; + tcsetattr(STDIN_FILENO, TCSANOW, &tios); + istty = 1; + } + + if (fgets(password, size, stdin) != NULL) + { + ret = True; + + /* strip final newline */ + p = strchr(password, '\n'); + if (p != NULL) + *p = 0; + } + + if (istty) + { + tios.c_lflag |= ECHO; + tcsetattr(STDIN_FILENO, TCSANOW, &tios); + fprintf(stderr, "\n"); + } + + return ret; } /* Client program */ int main(int argc, char *argv[]) { + char server[64]; char fullhostname[64]; char domain[16]; char password[16]; - char shell[32]; + char shell[128]; char directory[32]; - char title[32]; + BOOL prompt_password; struct passwd *pw; - char *server, *p; uint32 flags; + char *p; int c; - - printf("rdesktop: A Remote Desktop Protocol client.\n"); - printf("Version " VERSION - ". Copyright (C) 1999-2001 Matt Chapman.\n"); - printf("See http://www.rdesktop.org/ for more information.\n\n"); + int username_option = 0; flags = RDP_LOGON_NORMAL; + prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; - strcpy(keymapname, "us"); + strcpy(keymapname, "en-us"); - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:t:fbemlKh?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:a:fbemCKT:Dh?")) != -1) { switch (c) { case 'u': STRNCPY(username, optarg, sizeof(username)); + username_option = 1; break; case 'd': @@ -112,8 +168,19 @@ break; case 'p': + if ((optarg[0] == '-') && (optarg[1] == 0)) + { + prompt_password = True; + break; + } + STRNCPY(password, optarg, sizeof(password)); flags |= RDP_LOGON_AUTO; + + /* try to overwrite argument so it won't appear in ps */ + p = optarg; + while (*p) + *(p++) = 'X'; break; case 'n': @@ -121,11 +188,16 @@ break; case 'k': - STRNCPY(keymapname, optarg, - sizeof(keymapname)); + STRNCPY(keymapname, optarg, sizeof(keymapname)); break; case 'g': + if (!strcmp(optarg, "workarea")) + { + width = height = 0; + break; + } + width = strtol(optarg, &p, 10); if (*p == 'x') height = strtol(p + 1, NULL, 10); @@ -153,18 +225,31 @@ sendmotion = False; break; - case 'l': - licence = False; - break; - - case 't': - tcp_port_rdp = strtol(optarg, NULL, 10); + case 'C': + owncolmap = True; break; case 'K': grab_keyboard = False; break; + case 'T': + STRNCPY(title, optarg, sizeof(title)); + break; + + case 'D': + hide_decorations = True; + break; + + case 'a': + server_bpp = strtol(optarg, NULL, 10); + if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15 && server_bpp != 24) + { + error("invalid server bpp\n"); + return 1; + } + break; + case 'h': case '?': default: @@ -179,9 +264,15 @@ return 1; } - server = argv[optind]; + STRNCPY(server, argv[optind], sizeof(server)); + p = strchr(server, ':'); + if (p != NULL) + { + tcp_port_rdp = strtol(p + 1, NULL, 10); + *p = 0; + } - if (username[0] == 0) + if (!username_option) { pw = getpwuid(getuid()); if ((pw == NULL) || (pw->pw_name == NULL)) @@ -208,63 +299,102 @@ STRNCPY(hostname, fullhostname, sizeof(hostname)); } - if (!strcmp(password, "-")) - { - p = getpass("Password: "); - if (p == NULL) - { - error("failed to read password\n"); - return 0; - } - STRNCPY(password, p, sizeof(password)); - } + if (prompt_password && read_password(password, sizeof(password))) + flags |= RDP_LOGON_AUTO; - if ((width == 0) || (height == 0)) + if (title[0] == 0) { - width = 800; - height = 600; + strcpy(title, "rdesktop - "); + strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); } - strcpy(title, "rdesktop - "); - strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); - - xkeymap_init1(); + if (!ui_init()) + return 1; if (!rdp_connect(server, flags, domain, password, shell, directory)) return 1; - printf("Connection successful.\n"); + DEBUG(("Connection successful.\n")); + memset(password, 0, sizeof(password)); - if (ui_create_window(title)) + if (ui_create_window()) { rdp_main_loop(); ui_destroy_window(); } - printf("Disconnecting...\n"); + DEBUG(("Disconnecting...\n")); rdp_disconnect(); + ui_deinit(); return 0; } +#ifdef EGD_SOCKET +/* Read 32 random bytes from PRNGD or EGD socket (based on OpenSSL RAND_egd) */ +static BOOL +generate_random_egd(uint8 * buf) +{ + struct sockaddr_un addr; + BOOL ret = False; + int fd; + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + return False; + + addr.sun_family = AF_UNIX; + memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET)); + if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) + goto err; + + /* PRNGD and EGD use a simple communications protocol */ + buf[0] = 1; /* Non-blocking (similar to /dev/urandom) */ + buf[1] = 32; /* Number of requested random bytes */ + if (write(fd, buf, 2) != 2) + goto err; + + if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */ + goto err; + + if (read(fd, buf, 32) != 32) + goto err; + + ret = True; + + err: + close(fd); + return ret; +} +#endif + /* Generate a 32-byte random for the secure transport code. */ void generate_random(uint8 * random) { struct stat st; struct tms tmsbuf; - uint32 *r = (uint32 *) random; - int fd; + MD5_CTX md5; + uint32 *r; + int fd, n; - /* If we have a kernel random device, use it. */ + /* If we have a kernel random device, try that first */ if (((fd = open("/dev/urandom", O_RDONLY)) != -1) || ((fd = open("/dev/random", O_RDONLY)) != -1)) { - read(fd, random, 32); + n = read(fd, random, 32); close(fd); - return; + if (n == 32) + return; } +#ifdef EGD_SOCKET + /* As a second preference use an EGD */ + if (generate_random_egd(random)) + return; +#endif + /* Otherwise use whatever entropy we can gather - ideas welcome. */ + r = (uint32 *) random; r[0] = (getpid()) | (getppid() << 16); r[1] = (getuid()) | (getgid() << 16); r[2] = times(&tmsbuf); /* system uptime (clocks) */ @@ -273,6 +403,13 @@ r[5] = st.st_atime; r[6] = st.st_mtime; r[7] = st.st_ctime; + + /* Hash both halves with MD5 to obscure possible patterns */ + MD5_Init(&md5); + MD5_Update(&md5, random, 16); + MD5_Final(random, &md5); + MD5_Update(&md5, random + 16, 16); + MD5_Final(random + 16, &md5); } /* malloc; exit if out of memory */ @@ -321,6 +458,19 @@ va_end(ap); } +/* report a warning */ +void +warning(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "WARNING: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + /* report an unimplemented protocol feature */ void unimpl(char *format, ...) @@ -356,9 +506,7 @@ printf(" "); for (i = 0; i < thisline; i++) - printf("%c", - (line[i] >= 0x20 - && line[i] < 0x7f) ? line[i] : '.'); + printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); printf("\n"); offset += thisline; @@ -366,10 +514,11 @@ } } +#ifdef SAVE_LICENCE int load_licence(unsigned char **data) { - char path[PATH_MAX]; + char *path; char *home; struct stat st; int fd; @@ -378,8 +527,8 @@ if (home == NULL) return -1; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); + path = xmalloc(strlen(home) + strlen(hostname) + 20); + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); fd = open(path, O_RDONLY); if (fd == -1) @@ -395,27 +544,130 @@ void save_licence(unsigned char *data, int length) { - char path[PATH_MAX]; + char *fpath; /* file path for licence */ + char *fname, *fnamewrk; /* file name for licence .inkl path. */ char *home; - int fd; + uint32 y; + struct flock fnfl; + int fnfd, fnwrkfd, i, wlen; + struct stream s, *s_ptr; + uint32 len; + + /* Construct a stream, so that we can use macros to extract the + * licence. + */ + s_ptr = &s; + s_ptr->p = data; + /* Skip first two bytes */ + in_uint16(s_ptr, len); + + /* Skip three strings */ + for (i = 0; i < 3; i++) + { + in_uint32(s_ptr, len); + s_ptr->p += len; + /* Make sure that we won't be past the end of data after + * reading the next length value + */ + if ((s_ptr->p) + 4 > data + length) + { + printf("Error in parsing licence key.\n"); + printf("Strings %d end value %x > supplied length (%x)\n", + i, s_ptr->p, data + length); + return; + } + } + in_uint32(s_ptr, len); + if (s_ptr->p + len > data + length) + { + printf("Error in parsing licence key.\n"); + printf("End of licence %x > supplied length (%x)\n", s_ptr->p + len, data + length); + return; + } home = getenv("HOME"); if (home == NULL) return; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1); - mkdir(path, 0700); + /* set and create the directory -- if it doesn't exist. */ + fpath = xmalloc(strlen(home) + 11); + STRNCPY(fpath, home, strlen(home) + 1); - strncat(path, "/licence", sizeof(path) - strlen(path) - 1); + sprintf(fpath, "%s/.rdesktop", fpath); + if (mkdir(fpath, 0700) == -1 && errno != EEXIST) + { + perror("mkdir"); + exit(1); + } - fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); - if (fd == -1) + /* set the real licence filename, and put a write lock on it. */ + fname = xmalloc(strlen(fpath) + strlen(hostname) + 10); + sprintf(fname, "%s/licence.%s", fpath, hostname); + fnfd = open(fname, O_RDONLY); + if (fnfd != -1) + { + fnfl.l_type = F_WRLCK; + fnfl.l_whence = SEEK_SET; + fnfl.l_start = 0; + fnfl.l_len = 1; + fcntl(fnfd, F_SETLK, &fnfl); + } + + /* create a temporary licence file */ + fnamewrk = xmalloc(strlen(fname) + 12); + for (y = 0;; y++) + { + sprintf(fnamewrk, "%s.%lu", fname, y); + fnwrkfd = open(fnamewrk, O_WRONLY | O_CREAT | O_EXCL, 0600); + if (fnwrkfd == -1) + { + if (errno == EINTR || errno == EEXIST) + continue; + perror("create"); + exit(1); + } + break; + } + /* write to the licence file */ + for (y = 0; y < len;) { - perror("open"); - return; + do + { + wlen = write(fnwrkfd, s_ptr->p + y, len - y); + } + while (wlen == -1 && errno == EINTR); + if (wlen < 1) + { + perror("write"); + unlink(fnamewrk); + exit(1); + } + y += wlen; + } + + /* close the file and rename it to fname */ + if (close(fnwrkfd) == -1) + { + perror("close"); + unlink(fnamewrk); + exit(1); + } + if (rename(fnamewrk, fname) == -1) + { + perror("rename"); + unlink(fnamewrk); + exit(1); + } + /* close the file lock on fname */ + if (fnfd != -1) + { + fnfl.l_type = F_UNLCK; + fnfl.l_whence = SEEK_SET; + fnfl.l_start = 0; + fnfl.l_len = 1; + fcntl(fnfd, F_SETLK, &fnfl); + close(fnfd); } - write(fd, data, length); - close(fd); } +#endif