added --existing option, similar to one suggested by Gildas Quiniou <gildas@stip.fr>

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 5ecce15..50c10aa 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -55,7 +55,7 @@ static void gen_challenge(char *addr, char *challenge)
 
        memset(input, 0, sizeof(input));
 
-       strlcpy((char *)input, addr, 16);
+       strlcpy((char *)input, addr, 17);
        gettimeofday(&tv, NULL);
        SIVAL(input, 16, tv.tv_sec);
        SIVAL(input, 20, tv.tv_usec);
@@ -75,12 +75,33 @@ 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) {
+               rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+               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));
@@ -111,6 +132,55 @@ static int get_secret(int module, char *user, char *secret, int len)
        return 1;
 }
 
+static char *getpassf(char *filename)
+{
+       char buffer[100];
+       int len=0;
+       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) {
+               rprintf(FERROR,"could not open password file \"%s\"\n",filename);
+               if (envpw) rprintf(FERROR,"falling back to RSYNC_PASSWORD environment variable.\n");    
+               return NULL;
+       }
+       
+       if (do_stat(filename, &st) == -1) {
+               rprintf(FERROR,"stat(%s) : %s\n", filename, strerror(errno));
+               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 ( (len=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)
 {
@@ -197,10 +267,11 @@ 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"))) {
                pass = getpass("Password: ");
        }
 
@@ -209,7 +280,7 @@ void auth_client(int fd, char *user, char *challenge)
        }
 
        generate_hash(pass, challenge, pass2);
-       
        io_printf(fd, "%s %s\n", user, pass2);
 }
 
+