X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/61ccf1dbeea93978803303d2cd43efa5da2cc7d1..2417770134dfb5e942934143c41b4545400f0018:/sbr/ruserpass.c

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index 3c8565fd..bc24f520 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -34,7 +34,7 @@ static FILE *cfile;
 #define	ID	10
 #define	MACH	11
 
-static char tokval[100];
+#define MAX_TOKVAL_SIZE 1024
 
 struct toktab {
     char *tokstr;
@@ -55,7 +55,7 @@ static struct toktab toktabs[] = {
 /*
  * prototypes
  */
-static int token(void);
+static int token(char *);
 
 
 void
@@ -71,7 +71,10 @@ ruserpass(char *host, char **aname, char **apass)
 	if (errno != ENOENT)
 	    perror (credentials_file);
     } else {
-	while ((t = token())) {
+        char tokval[MAX_TOKVAL_SIZE];
+        tokval[0] = '\0';
+
+	while ((t = token(tokval))) {
 	    switch(t) {
 	    case DEFAULT:
 		usedefault = 1;
@@ -79,7 +82,7 @@ ruserpass(char *host, char **aname, char **apass)
 
 	    case MACH:
 		if (!usedefault) {
-		    if (token() != ID)
+		    if (token(tokval) != ID)
 			continue;
 		    /*
 		     * Allow match either for user's host name.
@@ -89,17 +92,16 @@ ruserpass(char *host, char **aname, char **apass)
 		    continue;
 		}
 	    match:
-		while ((t = token()) && t != MACH && t != DEFAULT) {
+		while ((t = token(tokval)) && t != MACH && t != DEFAULT) {
 		    switch(t) {
 		    case LOGIN:
-			if (token() && *aname == 0) {
-			    *aname = mh_xmalloc((size_t) strlen(tokval) + 1);
-			    strcpy(*aname, tokval);
-			}
+			if (token(tokval) && *aname == 0)
+                            *aname = mh_xstrdup(tokval);
 			break;
 
 		    case PASSWD:
-			if (fstat(fileno(cfile), &stb) >= 0 &&
+			if (!credentials_no_perm_check &&
+			    fstat(fileno(cfile), &stb) >= 0 &&
 			    (stb.st_mode & 077) != 0) {
 			    /* We make this a fatal error to force the
 			       user to correct it. */
@@ -108,10 +110,8 @@ ruserpass(char *host, char **aname, char **apass)
 			    adios(NULL, "Remove password or correct file "
 				  "permissions.");
 			}
-			if (token() && *apass == 0) {
-			    *apass = mh_xmalloc((size_t) strlen(tokval) + 1);
-			    strcpy(*apass, tokval);
-			}
+			if (token(tokval) && *apass == 0)
+                            *apass = mh_xstrdup(tokval);
 			break;
 
 		    case ACCOUNT:
@@ -145,14 +145,15 @@ ruserpass(char *host, char **aname, char **apass)
 	}
 	printf("Name (%s:%s): ", host, myname);
 
-	fgets(tmp, sizeof(tmp) - 1, stdin);
+	if (fgets(tmp, sizeof(tmp) - 1, stdin) == NULL) {
+	    advise ("tmp", "fgets");
+	}
 	tmp[strlen(tmp) - 1] = '\0';
-	if (*tmp != '\0') {
+	if (*tmp != '\0' || myname == NULL) {
 	    myname = tmp;
 	}
 
-	*aname = mh_xmalloc((size_t) strlen(myname) + 1);
-	strcpy (*aname, myname);
+        *aname = mh_xstrdup(myname);
     }
 
     if (!*apass) {
@@ -161,19 +162,18 @@ ruserpass(char *host, char **aname, char **apass)
 
 	snprintf(prompt, sizeof(prompt), "Password (%s:%s): ", host, *aname);
 	mypass = nmh_getpass(prompt);
-	
+
 	if (*mypass == '\0') {
 	    mypass = *aname;
 	}
 
-	*apass = mh_xmalloc((size_t) strlen(mypass) + 1);
-	strcpy (*apass, mypass);
+        *aname = mh_xstrdup(mypass);
     }
 
 }
 
 static int
-token(void)
+token(char *tokval)
 {
     char *cp;
     int c;
@@ -192,6 +192,10 @@ token(void)
 	    if (c == '\\')
 		c = getc(cfile);
 	    *cp++ = c;
+            if (cp - tokval > MAX_TOKVAL_SIZE-1) {
+                adios(NULL, "credential tokens restricted to length %d",
+                      MAX_TOKVAL_SIZE - 1);
+            }
 	}
     } else {
 	*cp++ = c;
@@ -200,6 +204,10 @@ token(void)
 	    if (c == '\\')
 		c = getc(cfile);
 	    *cp++ = c;
+            if (cp - tokval > MAX_TOKVAL_SIZE-1) {
+                adios(NULL, "credential tokens restricted to length %d",
+                      MAX_TOKVAL_SIZE - 1);
+            }
 	}
     }
     *cp = 0;