/* -*- c-file-style: "linux"; -*-
-
- Copyright (C) 1998-2000 by Andrew Tridgell
-
+
+ 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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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., 675 Mass Ave, Cambridge, MA 02139, USA.
}
}
-/* create a 16 byte challenge buffer */
+/* Generate a challenge buffer and return it base64-encoded. */
static void gen_challenge(char *addr, char *challenge)
{
char input[32];
+ char md4_out[MD4_SUM_LENGTH];
struct timeval tv;
- memset(input, 0, sizeof(input));
+ memset(input, 0, sizeof input);
strlcpy((char *)input, addr, 17);
sys_gettimeofday(&tv);
SIVAL(input, 20, tv.tv_usec);
SIVAL(input, 24, getpid());
- sum_init();
- sum_update(input, sizeof(input));
- sum_end(challenge);
+ sum_init(0);
+ sum_update(input, sizeof input);
+ sum_end(md4_out);
+
+ base64_encode(md4_out, MD4_SUM_LENGTH, challenge);
}
return 0;
if (do_stat(fname, &st) == -1) {
- rsyserr(FERROR, errno, "stat(%s)", fname);
+ rsyserr(FLOG, errno, "stat(%s)", safe_fname(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");
+ rprintf(FLOG, "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");
+ rprintf(FLOG, "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");
+ rprintf(FLOG, "continuing without secrets file\n");
close(fd);
return 0;
}
return NULL;
if ((fd = open(filename,O_RDONLY)) < 0) {
- rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
+ rsyserr(FERROR, errno, "could not open password file \"%s\"",
+ safe_fname(filename));
if (envpw)
- rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
+ rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
return NULL;
}
-
+
if (do_stat(filename, &st) == -1) {
- rsyserr(FERROR, errno, "stat(%s)", filename);
+ rsyserr(FERROR, errno, "stat(%s)", safe_fname(filename));
ok = 0;
} else if ((st.st_mode & 06) != 0) {
rprintf(FERROR,"password file must not be other-accessible\n");
buffer[n] = '\0';
if ((p = strtok(buffer, "\n\r")) != NULL)
return strdup(p);
- }
+ }
return NULL;
}
-/* generate a 16 byte hash from a password and challenge */
+/* Generate an MD4 hash created from the combination of the password
+ * and the challenge string and return it base64-encoded. */
static void generate_hash(char *in, char *challenge, char *out)
{
- char buf[16];
+ char buf[MD4_SUM_LENGTH];
- sum_init();
+ sum_init(0);
sum_update(in, strlen(in));
sum_update(challenge, strlen(challenge));
sum_end(buf);
- base64_encode(buf, 16, out);
+ base64_encode(buf, MD4_SUM_LENGTH, out);
}
-/* possible negotiate authentication with the client. Use "leader" to
- start off the auth if necessary
-
- return NULL if authentication failed
-
- return "" if anonymous access
-
- otherwise return username
-*/
-char *auth_server(int f_in, int f_out, int module, char *addr, char *leader)
+/* Possibly negotiate authentication with the client. Use "leader" to
+ * start off the auth if necessary.
+ *
+ * Return NULL if authentication failed. Return "" if anonymous access.
+ * Otherwise return username.
+ */
+char *auth_server(int f_in, int f_out, int module, char *host, char *addr,
+ char *leader)
{
char *users = lp_auth_users(module);
- char challenge[16];
- char b64_challenge[30];
+ char challenge[MD4_SUM_LENGTH*2];
char line[MAXPATHLEN];
- static char user[100];
- char secret[100];
- char pass[30];
- char pass2[30];
- char *tok;
+ char secret[512];
+ char pass2[MD4_SUM_LENGTH*2];
+ char *tok, *pass;
/* if no auth list then allow anyone in! */
- if (!users || !*users) return "";
+ if (!users || !*users)
+ return "";
gen_challenge(addr, challenge);
-
- base64_encode(challenge, 16, b64_challenge);
- io_printf(f_out, "%s%s\n", leader, b64_challenge);
+ io_printf(f_out, "%s%s\n", leader, challenge);
- if (!read_line(f_in, line, sizeof(line)-1)) {
+ if (!read_line(f_in, line, sizeof line - 1)
+ || (pass = strchr(line, ' ')) == NULL) {
+ rprintf(FLOG, "auth failed on module %s from %s (%s): "
+ "invalid challenge response\n",
+ lp_name(module), host, addr);
return NULL;
}
+ *pass++ = '\0';
- memset(user, 0, sizeof(user));
- memset(pass, 0, sizeof(pass));
+ if (!(users = strdup(users)))
+ out_of_memory("auth_server");
- 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 (wildmatch(tok, user)) break;
+ for (tok = strtok(users, " ,\t"); tok; tok = strtok(NULL, " ,\t")) {
+ if (wildmatch(tok, line))
+ break;
}
free(users);
if (!tok) {
+ rprintf(FLOG, "auth failed on module %s from %s (%s): "
+ "unauthorized user\n",
+ lp_name(module), host, addr);
return NULL;
}
-
- memset(secret, 0, sizeof(secret));
- if (!get_secret(module, user, secret, sizeof(secret)-1)) {
- memset(secret, 0, sizeof(secret));
+
+ memset(secret, 0, sizeof secret);
+ if (!get_secret(module, line, secret, sizeof secret - 1)) {
+ memset(secret, 0, sizeof secret);
+ rprintf(FLOG, "auth failed on module %s from %s (%s): "
+ "missing secret for user \"%s\"\n",
+ lp_name(module), host, addr, line);
return NULL;
}
- generate_hash(secret, b64_challenge, pass2);
- memset(secret, 0, sizeof(secret));
-
- if (strcmp(pass, pass2) == 0)
- return user;
+ generate_hash(secret, challenge, pass2);
+ memset(secret, 0, sizeof secret);
- return NULL;
+ if (strcmp(pass, pass2) != 0) {
+ rprintf(FLOG, "auth failed on module %s from %s (%s): "
+ "password mismatch\n",
+ lp_name(module), host, addr);
+ return NULL;
+ }
+
+ return strdup(line);
}
void auth_client(int fd, char *user, char *challenge)
{
char *pass;
- char pass2[30];
+ char pass2[MD4_SUM_LENGTH*2];
if (!user || !*user)
user = "nobody";
- if (!(pass=getpassf(password_file)) && !(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.
generate_hash(pass, challenge, pass2);
io_printf(fd, "%s %s\n", user, pass2);
}
-
-
git.samba.org / rsync.git / blobdiff