Index: include/auth.h
===================================================================
RCS file: /cvsroot/proftp/proftpd/include/auth.h,v
retrieving revision 1.4
diff -u -r1.4 auth.h
--- include/auth.h 10 Jun 2005 17:21:10 -0000 1.4
+++ include/auth.h 17 Apr 2007 21:19:55 -0000
@@ -1,6 +1,6 @@
/*
* ProFTPD - FTP server daemon
- * Copyright (c) 2004-2005 The ProFTPD Project team
+ * Copyright (c) 2004-2007 The ProFTPD Project team
*
* 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
@@ -86,6 +86,7 @@
config_rec *pr_auth_get_anon_config(pool *p, char **, char **, char **);
/* For internal use only. */
+int init_auth(void);
int set_groups(pool *, gid_t, array_header *);
#endif /* PR_MODULES_H */
Index: modules/mod_core.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_core.c,v
retrieving revision 1.298
diff -u -r1.298 mod_core.c
--- modules/mod_core.c 9 Mar 2007 16:20:54 -0000 1.298
+++ modules/mod_core.c 17 Apr 2007 21:19:55 -0000
@@ -4418,6 +4418,8 @@
config_rec *c = NULL;
unsigned int *debug_level = NULL;
+ init_auth();
+
/* Check for a server-specific TimeoutIdle. */
c = find_config(main_server->conf, CONF_PARAM, "TimeoutIdle", FALSE);
if (c != NULL)
Index: src/auth.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/auth.c,v
retrieving revision 1.47
diff -u -r1.47 auth.c
--- src/auth.c 8 Jan 2007 22:59:28 -0000 1.47
+++ src/auth.c 17 Apr 2007 21:19:56 -0000
@@ -2,7 +2,7 @@
* ProFTPD - FTP server daemon
* Copyright (c) 1997, 1998 Public Flood Software
* Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver@tos.net>
- * Copyright (c) 2001-2006 The ProFTPD Project team
+ * Copyright (c) 2001-2007 The ProFTPD Project team
*
* 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
@@ -30,6 +30,10 @@
#include "conf.h"
+static pool *auth_pool = NULL;
+static pr_table_t *auth_tab = NULL;
+static const char *trace_channel = "auth";
+
/* The difference between this function, and pr_cmd_alloc(), is that this
* allocates the cmd_rec directly from the given pool, whereas pr_cmd_alloc()
* will allocate a subpool from the given pool, and allocate its cmd_rec
@@ -63,7 +67,7 @@
return c;
}
-static modret_t *dispatch_auth(cmd_rec *cmd, char *match) {
+static modret_t *dispatch_auth(cmd_rec *cmd, char *match, module **m) {
authtable *start_tab = NULL, *iter_tab = NULL;
modret_t *mr = NULL;
@@ -74,7 +78,12 @@
while (iter_tab) {
pr_signals_handle();
- pr_trace_msg("auth", 6, "dispatching auth request \"%s\" to module mod_%s",
+ if (m && *m && *m != iter_tab->m) {
+ goto next;
+ }
+
+ pr_trace_msg(trace_channel, 6,
+ "dispatching auth request \"%s\" to module mod_%s",
match, iter_tab->m->name);
mr = call_module(iter_tab->m, iter_tab->handler, cmd);
@@ -83,9 +92,19 @@
break;
if (MODRET_ISHANDLED(mr) ||
- MODRET_ISERROR(mr))
+ MODRET_ISERROR(mr)) {
+
+ /* Return a pointer, if requested, to the module which answered the
+ * auth request. This is used, for example, by auth_getpwnam() for
+ * associating the answering auth module with the data looked up.
+ */
+ if (m)
+ *m = iter_tab->m;
+
break;
+ }
+ next:
iter_tab = pr_stash_get_symbol(PR_SYM_AUTH, match, iter_tab,
&cmd->stash_index);
@@ -106,7 +125,7 @@
modret_t *mr = NULL;
cmd = make_cmd(p, 0);
- mr = dispatch_auth(cmd, "setpwent");
+ mr = dispatch_auth(cmd, "setpwent", NULL);
if (cmd->tmp_pool) {
destroy_pool(cmd->tmp_pool);
@@ -121,13 +140,20 @@
modret_t *mr = NULL;
cmd = make_cmd(p, 0);
- mr = dispatch_auth(cmd, "endpwent");
+ mr = dispatch_auth(cmd, "endpwent", NULL);
if (cmd->tmp_pool) {
destroy_pool(cmd->tmp_pool);
cmd->tmp_pool = NULL;
}
+ if (auth_tab) {
+ pr_trace_msg(trace_channel, 5, "emptying authcache");
+ (void) pr_table_empty(auth_tab);
+ (void) pr_table_free(auth_tab);
+ auth_tab = NULL;
+ }
+
return;
}
@@ -136,7 +162,7 @@
modret_t *mr = NULL;
cmd = make_cmd(p, 0);
- mr = dispatch_auth(cmd, "setgrent");
+ mr = dispatch_auth(cmd, "setgrent", NULL);
if (cmd->tmp_pool) {
destroy_pool(cmd->tmp_pool);
@@ -151,7 +177,7 @@
modret_t *mr = NULL;
cmd = make_cmd(p, 0);
- mr = dispatch_auth(cmd, "endgrent");
+ mr = dispatch_auth(cmd, "endgrent", NULL);
if (cmd->tmp_pool) {
destroy_pool(cmd->tmp_pool);
@@ -167,7 +193,7 @@
struct passwd *res = NULL;
cmd = make_cmd(p, 0);
- mr = dispatch_auth(cmd, "getpwent");
+ mr = dispatch_auth(cmd, "getpwent", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
res = mr->data;
@@ -201,7 +227,7 @@
struct group *res = NULL;
cmd = make_cmd(p, 0);
- mr = dispatch_auth(cmd, "getgrent");
+ mr = dispatch_auth(cmd, "getgrent", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
res = mr->data;
@@ -228,11 +254,13 @@
cmd_rec *cmd = NULL;
modret_t *mr = NULL;
struct passwd *res = NULL;
+ module *m = NULL;
cmd = make_cmd(p, 1, name);
- mr = dispatch_auth(cmd, "getpwnam");
+ mr = dispatch_auth(cmd, "getpwnam", &m);
- if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
+ if (MODRET_ISHANDLED(mr) &&
+ MODRET_HASDATA(mr))
res = mr->data;
if (cmd->tmp_pool) {
@@ -257,6 +285,46 @@
return NULL;
}
+ if (!auth_tab && auth_pool) {
+ auth_tab = pr_table_alloc(auth_pool, 0);
+ }
+
+ if (m && auth_tab) {
+ int count = 0;
+ void *value = NULL;
+
+ value = palloc(auth_pool, sizeof(module *));
+ *((module **) value) = m;
+
+ count = pr_table_exists(auth_tab, name);
+ if (count <= 0) {
+ if (pr_table_add(auth_tab, pstrdup(auth_pool, name), value,
+ sizeof(module *)) < 0) {
+ pr_trace_msg(trace_channel, 3,
+ "error adding module 'mod_%s.c' for user '%s' to the authcache: %s",
+ m->name, name, strerror(errno));
+
+ } else {
+ pr_trace_msg(trace_channel, 5,
+ "stashed module 'mod_%s.c' for user '%s' in the authcache",
+ m->name, name);
+ }
+
+ } else {
+ if (pr_table_set(auth_tab, pstrdup(auth_pool, name), value,
+ sizeof(module *)) < 0) {
+ pr_trace_msg(trace_channel, 3,
+ "error setting module 'mod_%s.c' for user '%s' in the authcache: %s",
+ m->name, name, strerror(errno));
+
+ } else {
+ pr_trace_msg(trace_channel, 5,
+ "stashed module 'mod_%s.c' for user '%s' in the authcache",
+ m->name, name);
+ }
+ }
+ }
+
pr_log_debug(DEBUG10, "retrieved UID %lu for user '%s'",
(unsigned long) res->pw_uid, name);
return res;
@@ -268,7 +336,7 @@
struct passwd *res = NULL;
cmd = make_cmd(p, 1, (void *) &uid);
- mr = dispatch_auth(cmd, "getpwuid");
+ mr = dispatch_auth(cmd, "getpwuid", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
res = mr->data;
@@ -306,7 +374,7 @@
struct group *res = NULL;
cmd = make_cmd(p, 1, name);
- mr = dispatch_auth(cmd, "getgrnam");
+ mr = dispatch_auth(cmd, "getgrnam", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
res = mr->data;
@@ -339,7 +407,7 @@
struct group *res = NULL;
cmd = make_cmd(p, 1, (void *) &gid);
- mr = dispatch_auth(cmd, "getgrgid");
+ mr = dispatch_auth(cmd, "getgrgid", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
res = mr->data;
@@ -369,10 +437,25 @@
int pr_auth_authenticate(pool *p, const char *name, const char *pw) {
cmd_rec *cmd = NULL;
modret_t *mr = NULL;
+ module *m = NULL;
int res = PR_AUTH_NOPWD;
cmd = make_cmd(p, 2, name, pw);
- mr = dispatch_auth(cmd, "auth");
+
+ if (auth_tab) {
+
+ /* Fetch the specific module to be used for authenticating this user. */
+ void *v = pr_table_get(auth_tab, name, NULL);
+ if (v) {
+ m = *((module **) v);
+
+ pr_trace_msg(trace_channel, 4,
+ "using module 'mod_%s.c' from authcache to authenticate user '%s'",
+ m->name, name);
+ }
+ }
+
+ mr = dispatch_auth(cmd, "auth", m ? &m : NULL);
if (MODRET_ISHANDLED(mr))
res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
@@ -391,10 +474,25 @@
int pr_auth_check(pool *p, const char *cpw, const char *name, const char *pw) {
cmd_rec *cmd = NULL;
modret_t *mr = NULL;
+ module *m = NULL;
int res = PR_AUTH_BADPWD;
cmd = make_cmd(p, 3, cpw, name, pw);
- mr = dispatch_auth(cmd, "check");
+
+ if (auth_tab) {
+
+ /* Fetch the specific module to be used for authenticating this user. */
+ void *v = pr_table_get(auth_tab, name, NULL);
+ if (v) {
+ m = *((module **) v);
+
+ pr_trace_msg(trace_channel, 4,
+ "using module 'mod_%s.c' from authcache to authenticate user '%s'",
+ m->name, name);
+ }
+ }
+
+ mr = dispatch_auth(cmd, "check", m ? &m : NULL);
if (MODRET_ISHANDLED(mr))
res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
@@ -413,7 +511,7 @@
int res = TRUE;
cmd = make_cmd(p, 1, name);
- mr = dispatch_auth(cmd, "requires_pass");
+ mr = dispatch_auth(cmd, "requires_pass", NULL);
if (MODRET_ISHANDLED(mr))
res = FALSE;
@@ -438,7 +536,7 @@
memset(namebuf, '\0', sizeof(namebuf));
cmd = make_cmd(p, 1, (void *) &uid);
- mr = dispatch_auth(cmd, "uid2name");
+ mr = dispatch_auth(cmd, "uid2name", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
res = mr->data;
@@ -463,7 +561,7 @@
memset(namebuf, '\0', sizeof(namebuf));
cmd = make_cmd(p, 1, (void *) &gid);
- mr = dispatch_auth(cmd, "gid2name");
+ mr = dispatch_auth(cmd, "gid2name", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
res = mr->data;
@@ -485,7 +583,7 @@
uid_t res = (uid_t) -1;
cmd = make_cmd(p, 1, name);
- mr = dispatch_auth(cmd, "name2uid");
+ mr = dispatch_auth(cmd, "name2uid", NULL);
if (MODRET_ISHANDLED(mr))
res = *((uid_t *) mr->data);
@@ -506,7 +604,7 @@
gid_t res = (gid_t) -1;
cmd = make_cmd(p, 1, name);
- mr = dispatch_auth(cmd, "name2gid");
+ mr = dispatch_auth(cmd, "name2gid", NULL);
if (MODRET_ISHANDLED(mr))
res = *((gid_t *) mr->data);
@@ -538,7 +636,7 @@
cmd = make_cmd(p, 3, name, group_ids ? *group_ids : NULL,
group_names ? *group_names : NULL);
- mr = dispatch_auth(cmd, "getgroups");
+ mr = dispatch_auth(cmd, "getgroups", NULL);
if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
res = *((int *) mr->data);
@@ -832,3 +930,10 @@
return res;
}
+/* Internal use only. To be called in the session process. */
+int init_auth(void) {
+ auth_pool = make_sub_pool(permanent_pool);
+ pr_pool_tag(auth_pool, "Auth API");
+
+ return 0;
+}
