char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
int bit_offset, byte_offset, idx, i;
unsigned char *d = (unsigned char *)buf;
- char *p;
int bytes = (len*8 + 5)/6;
memset(out, 0, bytes+1);
memset(input, 0, sizeof(input));
- strncpy((char *)input, addr, 16);
+ strlcpy((char *)input, addr, 17);
gettimeofday(&tv, NULL);
SIVAL(input, 16, tv.tv_sec);
SIVAL(input, 20, tv.tv_usec);
{
char *fname = lp_secrets_file(module);
int fd, found=0;
- char line[1024];
- char *p, *pass;
+ 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));
close(fd);
if (!found) return 0;
- if (strlen(pass) > len-1) {
- memset(line, 0, sizeof(line));
- return 0;
+ strlcpy(secret, pass, 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;
}
- strcpy(secret, pass);
- return 1;
+ 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 */
-void generate_hash(char *in, char *challenge, char *out)
+static void generate_hash(char *in, char *challenge, char *out)
{
char buf[16];
}
/* possible negotiate authentication with the client. Use "leader" to
- start off the auth if necessary */
-int auth_server(int fd, int module, char *addr, char *leader)
+ start off the auth if necessary
+
+ return NULL if authentication failed
+
+ return "" if anonymous access
+
+ otherwise return username
+*/
+char *auth_server(int fd, int module, char *addr, char *leader)
{
char *users = lp_auth_users(module);
char challenge[16];
char b64_challenge[30];
- char line[1024];
- char user[100];
+ char line[MAXPATHLEN];
+ static char user[100];
char secret[100];
char pass[30];
char pass2[30];
+ char *tok;
/* if no auth list then allow anyone in! */
- if (!users || !*users) return 1;
+ if (!users || !*users) return "";
gen_challenge(addr, challenge);
io_printf(fd,"%s%s\n", leader, b64_challenge);
if (!read_line(fd, line, sizeof(line)-1)) {
- return 0;
+ return NULL;
}
memset(user, 0, sizeof(user));
memset(pass, 0, sizeof(pass));
if (sscanf(line,"%99s %29s", user, pass) != 2) {
- return 0;
+ 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;
}
+ free(users);
+ if (!tok) {
+ return NULL;
+ }
+
memset(secret, 0, sizeof(secret));
if (!get_secret(module, user, secret, sizeof(secret)-1)) {
memset(secret, 0, sizeof(secret));
- return 0;
+ return NULL;
}
generate_hash(secret, b64_challenge, pass2);
memset(secret, 0, sizeof(secret));
- return (strcmp(pass, pass2) == 0);
+ if (strcmp(pass, pass2) == 0)
+ return user;
+
+ return NULL;
}
{
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: ");
}
}
generate_hash(pass, challenge, pass2);
-
io_printf(fd, "%s %s\n", user, pass2);
}
+