* Support rsync daemon authentication.
*
* Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2002, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2002-2009 Wayne Davison
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
static void gen_challenge(const char *addr, char *challenge)
{
char input[32];
- char md4_out[MD4_SUM_LENGTH];
+ char digest[MAX_DIGEST_LEN];
struct timeval tv;
+ int len;
memset(input, 0, sizeof input);
sum_init(0);
sum_update(input, sizeof input);
- sum_end(md4_out);
+ len = sum_end(digest);
- base64_encode(md4_out, MD4_SUM_LENGTH, challenge, 0);
+ base64_encode(digest, len, challenge, 0);
}
return NULL;
if ((fd = open(filename,O_RDONLY)) < 0) {
- rsyserr(FERROR, errno, "could not open password file \"%s\"",
+ rsyserr(FWARNING, errno, "could not open password file \"%s\"",
filename);
if (envpw)
- rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
+ rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
if (do_stat(filename, &st) == -1) {
- rsyserr(FERROR, errno, "stat(%s)", filename);
+ rsyserr(FWARNING, errno, "stat(%s)", filename);
ok = 0;
} else if ((st.st_mode & 06) != 0) {
- rprintf(FERROR,"password file must not be other-accessible\n");
+ rprintf(FWARNING, "password file must not be other-accessible\n");
ok = 0;
} else if (MY_UID() == 0 && st.st_uid != 0) {
- rprintf(FERROR,"password file must be owned by root when running as root\n");
+ rprintf(FWARNING, "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);
+ rprintf(FWARNING, "continuing without password file\n");
+ if (envpw)
+ rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
- if (envpw)
- rprintf(FERROR, "RSYNC_PASSWORD environment variable ignored\n");
-
n = read(fd, buffer, sizeof buffer - 1);
close(fd);
if (n > 0) {
* and the challenge string and return it base64-encoded. */
static void generate_hash(const char *in, const char *challenge, char *out)
{
- char buf[MD4_SUM_LENGTH];
+ char buf[MAX_DIGEST_LEN];
+ int len;
sum_init(0);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
- sum_end(buf);
+ len = sum_end(buf);
- base64_encode(buf, MD4_SUM_LENGTH, out, 0);
+ base64_encode(buf, len, out, 0);
}
/* Possibly negotiate authentication with the client. Use "leader" to
const char *addr, const char *leader)
{
char *users = lp_auth_users(module);
- char challenge[MD4_SUM_LENGTH*2];
+ char challenge[MAX_DIGEST_LEN*2];
char line[BIGPATHBUFLEN];
char secret[512];
- char pass2[MD4_SUM_LENGTH*2];
+ char pass2[MAX_DIGEST_LEN*2];
char *tok, *pass;
/* if no auth list then allow anyone in! */
io_printf(f_out, "%s%s\n", leader, challenge);
- if (!read_line(f_in, line, sizeof line - 1)
+ if (!read_line_old(f_in, line, sizeof line)
|| (pass = strchr(line, ' ')) == NULL) {
rprintf(FLOG, "auth failed on module %s from %s (%s): "
"invalid challenge response\n",
void auth_client(int fd, const char *user, const char *challenge)
{
const char *pass;
- char pass2[MD4_SUM_LENGTH*2];
+ char pass2[MAX_DIGEST_LEN*2];
if (!user || !*user)
user = "nobody";