Call wildmatch(), not fnmatch().

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index a4835a6..ef4f6af 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -1,5 +1,6 @@
-/* 
-   Copyright (C) Andrew Tridgell 1998
+/* -*- c-file-style: "linux"; -*-
+   
+   Copyright (C) 1998-2000 by Andrew Tridgell 
    
    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
@@ -56,7 +57,7 @@ static void gen_challenge(char *addr, char *challenge)
        memset(input, 0, sizeof(input));
 
        strlcpy((char *)input, addr, 17);
-       gettimeofday(&tv, NULL);
+       sys_gettimeofday(&tv);
        SIVAL(input, 16, tv.tv_sec);
        SIVAL(input, 20, tv.tv_usec);
        SIVAL(input, 24, getpid());
@@ -75,16 +76,37 @@ static int get_secret(int module, char *user, char *secret, int len)
        int fd, found=0;
        char line[MAXPATHLEN];
        char *p, *pass=NULL;
+       STRUCT_STAT st;
+       int ok = 1;
+       extern int am_root;
 
        if (!fname || !*fname) return 0;
 
        fd = open(fname,O_RDONLY);
        if (fd == -1) return 0;
 
+       if (do_stat(fname, &st) == -1) {
+               rsyserr(FERROR, errno, "stat(%s)", fname);
+               ok = 0;
+       } else if (lp_strict_modes(module)) {
+               if ((st.st_mode & 06) != 0) {
+                       rprintf(FERROR,"secrets file must not be other-accessible (see strict modes option)\n");
+                       ok = 0;
+               } else if (am_root && (st.st_uid != 0)) {
+                       rprintf(FERROR,"secrets file must be owned by root when running as root (see strict modes)\n");
+                       ok = 0;
+               }
+       }
+       if (!ok) {
+               rprintf(FERROR,"continuing without secrets file\n");
+               close(fd);
+               return 0;
+       }
+
        while (!found) {
                int i = 0;
-               memset(line, 0, sizeof(line));
-               while (i<(sizeof(line)-1)) {
+               memset(line, 0, sizeof line);
+               while ((size_t) i < (sizeof(line)-1)) {
                        if (read(fd, &line[i], 1) != 1) {
                                memset(line, 0, sizeof(line));
                                close(fd);
@@ -111,6 +133,54 @@ static int get_secret(int module, char *user, char *secret, int len)
        return 1;
 }
 
+static char *getpassf(char *filename)
+{
+       char buffer[100];
+       int fd=0;
+       STRUCT_STAT st;
+       int ok = 1;
+       extern int am_root;
+       char *envpw=getenv("RSYNC_PASSWORD");
+
+       if (!filename) return NULL;
+
+       if ( (fd=open(filename,O_RDONLY)) == -1) {
+               rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
+               if (envpw) rprintf(FERROR,"falling back to RSYNC_PASSWORD environment variable.\n");    
+               return NULL;
+       }
+       
+       if (do_stat(filename, &st) == -1) {
+               rsyserr(FERROR, errno, "stat(%s)", filename);
+               ok = 0;
+       } else if ((st.st_mode & 06) != 0) {
+               rprintf(FERROR,"password file must not be other-accessible\n");
+               ok = 0;
+       } else if (am_root && (st.st_uid != 0)) {
+               rprintf(FERROR,"password file must be owned by root when running as root\n");
+               ok = 0;
+       }
+       if (!ok) {
+               rprintf(FERROR,"continuing without password file\n");
+               if (envpw) rprintf(FERROR,"using RSYNC_PASSWORD environment variable.\n");
+               close(fd);
+               return NULL;
+       }
+
+       if (envpw) rprintf(FERROR,"RSYNC_PASSWORD environment variable ignored\n");
+
+       buffer[sizeof(buffer)-1]='\0';
+       if (read(fd,buffer,sizeof(buffer)-1) > 0)
+       {
+               char *p = strtok(buffer,"\n\r");
+               close(fd);
+               if (p) p = strdup(p);
+               return p;
+       }       
+
+       return NULL;
+}
+
 /* generate a 16 byte hash from a password and challenge */
 static void generate_hash(char *in, char *challenge, char *out)
 {
@@ -133,7 +203,7 @@ static void generate_hash(char *in, char *challenge, char *out)
 
    otherwise return username
 */
-char *auth_server(int fd, int module, char *addr, char *leader)
+char *auth_server(int f_in, int f_out, int module, char *addr, char *leader)
 {
        char *users = lp_auth_users(module);
        char challenge[16];
@@ -152,9 +222,9 @@ char *auth_server(int fd, int module, char *addr, char *leader)
        
        base64_encode(challenge, 16, b64_challenge);
 
-       io_printf(fd,"%s%s\n", leader, b64_challenge);
+       io_printf(f_out, "%s%s\n", leader, b64_challenge);
 
-       if (!read_line(fd, line, sizeof(line)-1)) {
+       if (!read_line(f_in, line, sizeof(line)-1)) {
                return NULL;
        }
 
@@ -164,12 +234,12 @@ char *auth_server(int fd, int module, char *addr, char *leader)
        if (sscanf(line,"%99s %29s", user, pass) != 2) {
                return NULL;
        }
-
+       
        users = strdup(users);
        if (!users) return NULL;
 
        for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) {
-               if (strcmp(tok, user) == 0) break;
+               if (wildmatch(tok, user)) break;
        }
        free(users);
 
@@ -197,10 +267,20 @@ void auth_client(int fd, char *user, char *challenge)
 {
        char *pass;
        char pass2[30];
+       extern char *password_file;
 
        if (!user || !*user) return;
 
-       if (!(pass=getenv("RSYNC_PASSWORD"))) {
+       if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
+               /* XXX: cyeoh says that getpass is deprecated, because
+                * it may return a truncated password on some systems,
+                * and it is not in the LSB.
+                 *
+                 * Andrew Klein says that getpassphrase() is present
+                 * on Solaris and reads up to 256 characters.
+                 *
+                 * OpenBSD has a readpassphrase() that might be more suitable.
+                 */
                pass = getpass("Password: ");
        }
 
@@ -209,7 +289,7 @@ void auth_client(int fd, char *user, char *challenge)
        }
 
        generate_hash(pass, challenge, pass2);
-       
        io_printf(fd, "%s %s\n", user, pass2);
 }
 
+