x11vnc: view-only plain passwd: -viewpasswd and 2nd line of -passwdfile

6 files changed, 116 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index ef9d490..a775cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-27  Karl Runge <runge@karlrunge.com>
+	* x11vnc: -viewpasswd, viewonly passwds.
+	* some typos in prepare_x11vnc_dist.sh 
+	* libvncserver: fix view-only plain passwd and view-only CutText 
+
 2004-05-25  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
 	* moved the library into libvncserver/
 	* moved x11vnc into x11vnc/
diff --git a/libvncserver/main.c b/libvncserver/main.c
index 488f09d..3182145 100644
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -473,9 +473,11 @@ rfbBool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len)
   int i=0;
 
   for(passwds=(char**)cl->screen->rfbAuthPasswdData;*passwds;passwds++,i++) {
-    vncEncryptBytes(cl->authChallenge, *passwds);
+    uint8_t auth_tmp[CHALLENGESIZE];
+    memcpy((char *)auth_tmp, (char *)cl->authChallenge, CHALLENGESIZE);
+    vncEncryptBytes(auth_tmp, *passwds);
 
-    if (memcmp(cl->authChallenge, response, len) == 0) {
+    if (memcmp(auth_tmp, response, len) == 0) {
       if(i>=cl->screen->rfbAuthPasswdFirstViewOnly)
 	cl->viewOnly=TRUE;
       return(TRUE);
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index e22283e..4fe2605 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -1017,22 +1017,22 @@ rfbProcessClientNormalMessage(cl)
 	    return;
 	}
 
-	if(!cl->viewOnly) {
-	    msg.cct.length = Swap32IfLE(msg.cct.length);
+	msg.cct.length = Swap32IfLE(msg.cct.length);
 
-	    str = (char *)malloc(msg.cct.length);
+	str = (char *)malloc(msg.cct.length);
 
-	    if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) {
-		if (n != 0)
-		    rfbLogPerror("rfbProcessClientNormalMessage: read");
-		free(str);
-		rfbCloseClient(cl);
-		return;
-	    }
+	if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) {
+	    if (n != 0)
+	        rfbLogPerror("rfbProcessClientNormalMessage: read");
+	    free(str);
+	    rfbCloseClient(cl);
+	    return;
+	}
 
+	if(!cl->viewOnly) {
 	    cl->screen->setXCutText(str, msg.cct.length, cl);
-	    free(str);
 	}
+	free(str);
 
         return;
 
diff --git a/prepare_x11vnc_dist.sh b/prepare_x11vnc_dist.sh
index b4bf63b..0f287e3 100644
--- a/prepare_x11vnc_dist.sh
+++ b/prepare_x11vnc_dist.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="0.1"
+VERSION="0.6.1"
 
 cd "$(dirname "$0")"
 
@@ -24,8 +24,8 @@ sed -e "s/^SUBDIRS.*$/SUBDIRS=libvncserver x11vnc/" \
 > Makefile.am
 
 cat libvncserver.spec.in | \
-sed -e "s/Johannes.Schindelin/Karl Runge/g" \
-    -e "s/Johannes.Schindelin@gmx.de/karl@runge.com/gi" \
+sed -e "s/Johannes.Schindelin@gmx.de/runge@karlrunge.com/gi" \
+    -e "s/Johannes.Schindelin/Karl Runge/g" \
     -e "s/a library to make writing a vnc server easy/a VNC server for the current X11 session/" \
     -e "/%description/,/%prep/d" \
     -e '/%setup/s/^\(.*\)$/%description\
@@ -37,7 +37,7 @@ Based on the ideas of x0rfbserver and on LibVNCServer, it has evolved\
 into a versatile and performant while still easy to use program.\
 \
 x11vnc was put together and is (actively ;-) maintained by\
-Karl Runge <karl@runge.com>\
+Karl Runge <runge@karlrunge.com>\
 \
 %prep\
 \1/' \
@@ -55,7 +55,7 @@ cat acinclude.m4.LibVNCServer | \
 sed -e "s/^\(_PKG.*\)\$PACKAGE\(.*\)$/\1LibVNCServer\2/" \
 > acinclude.m4
 
-make x11vnc-0.1.tar.gz
+make x11vnc-${VERSION}.tar.gz
 for f in configure.ac Makefile.am libvncserver/Makefile.am acinclude.m4; do
 	mv -f $f.LibVNCServer $f
 done
diff --git a/x11vnc/ChangeLog b/x11vnc/ChangeLog
index 9e468f6..ab88b92 100644
--- a/x11vnc/ChangeLog
+++ b/x11vnc/ChangeLog
@@ -1,3 +1,6 @@
+2004-05-27  Karl Runge <runge@karlrunge.com>
+	* add view-only passwd via -viewpasswd and 2nd line of -passwdfile
+
 2004-05-21  Karl Runge <runge@karlrunge.com>
 	* -accept: add view-only decision and other improvements.
 	* add -gone command option for when a client leaves.
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index 144b280..7795c24 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -119,10 +119,12 @@
 #endif
 
 /* 
- * Temporary kludge: to run with -xinerama define the following macro
- * and be sure to link with * -lXinerama (e.g. LDFLAGS=-lXinerama before
- * configure).  Support for this is being added to libvncserver 'configure.ac'
- * so it will all be done automatically.
+ * Temporary kludge: to run with -xinerama define the following
+ * macro (uncomment) and be sure to link with -lXinerama
+ * (e.g. LDFLAGS=-lXinerama before configure).  Support for this is
+ * being added to libvncserver 'configure.ac' so it will all be done
+ * automatically, but it won't be in users' build trees for a while,
+ * so one can do it manually here.
 
 #define LIBVNCSERVER_HAVE_LIBXINERAMA
  */
@@ -131,9 +133,15 @@
 #endif
 
 /*        date +'"lastmod:    %Y-%m-%d";' */
-char lastmod[] = "lastmod:    2004-05-21";
+char lastmod[] = "lastmod:    2004-05-27";
 
 
+/*
+ * Well, here starts all our global data, someday we need to split this
+ * file up.  One advantage to this big blob is that it is easy for users
+ * to download and replace a single file to try out the latest version...
+ */
+
 /* X and rfb framebuffer */
 Display *dpy = 0;
 Visual *visual;
@@ -209,6 +217,7 @@ char *allow_list = NULL;	/* for -allow and -localhost */
 char *accept_cmd = NULL;	/* for -accept */
 char *gone_cmd = NULL;		/* for -gone */
 int view_only = 0;		/* clients can only watch. */
+char *viewonly_passwd = NULL;	/* view only passwd. */
 int inetd = 0;			/* spawned from inetd(1) */
 int connect_once = 1;		/* disconnect after first connection session. */
 int flash_cmap = 0;		/* follow installed colormaps */
@@ -462,8 +471,8 @@ void client_gone(rfbClientPtr client) {
 		 * with our RFB_CLIENT_REFUSE behavior in new_client()  (i.e.
 		 * we disconnect after 1 successful connection).
 		 */
-		if (client->state == RFB_PROTOCOL_VERSION ||
-		    client->state == RFB_AUTHENTICATION && accepted_client) {
+		if ((client->state == RFB_PROTOCOL_VERSION ||
+		     client->state == RFB_AUTHENTICATION) && accepted_client) {
 			rfbLog("connect_once: bad password or early "
 			   "disconnect.\n");
 			rfbLog("connect_once: waiting for next connection.\n"); 
@@ -3598,6 +3607,16 @@ if (strcmp(LIBVNCSERVER_VERSION, "0.5") && strcmp(LIBVNCSERVER_VERSION, "0.6"))
 	bytes_per_line = screen->paddedWidthInBytes;
 	bpp = screen->rfbServerFormat.bitsPerPixel;
 	depth = screen->rfbServerFormat.depth;
+
+	if (viewonly_passwd) {
+		/* append the view only passwd after the normal passwd */
+		char **passwds_new = malloc(3*sizeof(char**));
+		char **passwds_old = (char **) screen->rfbAuthPasswdData;
+		passwds_new[0] = passwds_old[0];
+		passwds_new[1] = viewonly_passwd;
+		passwds_new[2] = NULL;
+		screen->rfbAuthPasswdData = (void*) passwds_new;
+	}
 }
 
 /*
@@ -5795,8 +5814,12 @@ void print_help() {
 "                       simple subnet, for more control build libvncserver with\n"
 "                       libwrap support.\n"
 "-localhost             Same as -allow 127.0.0.1\n"
-"-passwdfile filename   Specify libvncserver -passwd via the first line of file\n"
-"                       \"filename\" instead of via command line.  Note: this\n"
+"-viewpasswd string     Supply a 2nd password for view-only logins.  The -passwd\n"
+"                       (non-view-only) password must also be supplied.\n"
+"-passwdfile filename   Specify libvncserver -passwd via the first line of the\n"
+"                       file \"filename\" instead of via command line.  If a\n"
+"                       second non blank line exists in the file it is taken\n"
+"                       as a view-only password (i.e. -viewpasswd) Note: this\n"
 "                       is a simple plaintext passwd, see also -rfbauth below.\n"
 "-accept string         Run a command (possibly to prompt the user at the\n"
 "                       X11 display) to decide whether an incoming client\n"
@@ -6069,6 +6092,7 @@ int main(int argc, char** argv) {
 	char *logfile = NULL;
 	char *passwdfile = NULL;
 	int pw_loc = -1;
+	int vpw_loc = -1;
 	int dt = 0;
 	int bg = 0;
 	int got_rfbwait = 0;
@@ -6104,6 +6128,9 @@ int main(int argc, char** argv) {
 			force_indexed_color = 1;
 		} else if (!strcmp(arg, "-viewonly")) {
 			view_only = 1;
+		} else if (!strcmp(arg, "-viewpasswd")) {
+			vpw_loc = i;
+			viewonly_passwd = strdup(argv[++i]);
 		} else if (!strcmp(arg, "-passwdfile")) {
 			passwdfile = argv[++i];
 		} else if (!strcmp(arg, "-shared")) {
@@ -6305,6 +6332,7 @@ int main(int argc, char** argv) {
 			}
 		}
 	} else if (passwdfile) {
+		/* read passwd from file */
 		char line[512];
 		FILE *in;
 		in = fopen(passwdfile, "r");
@@ -6315,15 +6343,62 @@ int main(int argc, char** argv) {
 			exit(1);
 		}
 		if (fgets(line, 512, in) != NULL) {
-			line[strlen(line)-1] = '\0';
+			int len = strlen(line); 
+			if (len > 0 && line[len-1] == '\n') {
+				line[len-1] = '\0';
+			}
 			argv2[argc2++] = "-passwd";
 			argv2[argc2++] = strdup(line);
+			pw_loc = 100;	/* just for pw_loc check below */
+			if (fgets(line, 512, in) != NULL) {
+				/* try to read viewonly passwd from file */
+				int ok = 0;
+				len = strlen(line); 
+				if (len > 0 && line[len-1] == '\n') {
+					line[len-1] = '\0';
+				}
+				if (strlen(line) > 0) {
+					char *p = line;
+					/* check for non-blank line */
+					while (*p != '\0') {
+						if (! isspace(*p)) {
+							ok = 1;
+						}
+						p++;
+					}
+				}
+				if (ok) {
+					viewonly_passwd = strdup(line);
+				} else {
+					fprintf(stderr, "*** not setting"
+					    " viewonly password to the 2nd"
+					    " line of %s. (blank or other"
+					    " problem)\n", passwdfile);
+				}
+			}
 		} else {
-			fprintf(stderr, "cannot read passwdfile: %s\n",
-			    passwdfile);
-			perror("fgets");
+			fprintf(stderr, "cannot read a line from "
+			    "passwdfile: %s\n", passwdfile);
 			exit(1);
 		}
+		fclose(in);
+	}
+	if (vpw_loc > 0) {
+		char *p = argv[vpw_loc];		
+		while (*p != '\0') {
+			*p++ = '\0';
+		}
+		if (vpw_loc+1 < argc) {
+			p = argv[vpw_loc+1];		
+			while (*p != '\0') {
+				*p++ = '\0';
+			}
+		}
+	} 
+	if (viewonly_passwd && pw_loc < 0) {
+		fprintf(stderr, "-passwd must be supplied when using "
+		    "-viewpasswd\n");
+		exit(1);
 	}
 
 	/* fixup settings that do not make sense */