From: bodea Date: Thu, 10 Mar 2005 03:31:25 +0000 (+0000) Subject: allow username to be set when ungardening X-Git-Tag: release_2_1_0~69 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/29c173cadc5969d03fabac250fa9868c2481f10c?ds=sidebyside allow username to be set when ungardening --- diff --git a/Changes b/Changes index b9b96e2..5c89cf2 100644 --- a/Changes +++ b/Changes @@ -33,6 +33,8 @@ - Avoid a possible buffer overflow in processpap. - Kill session if authentication was rejected. - Simplify AVP unhiding code. +- Add optional "username" parameter to ungarden control, allowing the + username to be reset before going online. * Fri Dec 17 2004 Brendan O'Dea 2.0.13 - Better cluster master collision resolution: keep a counter of state diff --git a/garden.c b/garden.c index bda354b..61e76da 100644 --- a/garden.c +++ b/garden.c @@ -9,7 +9,7 @@ /* walled garden */ -char const *cvs_id = "$Id: garden.c,v 1.20 2004/12/16 08:49:53 bodea Exp $"; +char const *cvs_id = "$Id: garden.c,v 1.21 2005/03/10 03:31:25 bodea Exp $"; int plugin_api_version = PLUGIN_API_VERSION; static struct pluginfuncs *p = 0; @@ -44,7 +44,7 @@ char *down_commands[] = { #define F_GARDEN 1 #define F_CLEANUP 2 -int garden_session(sessiont *s, int flag); +int garden_session(sessiont *s, int flag, char *newuser); int plugin_post_auth(struct param_post_auth *data) { @@ -63,7 +63,7 @@ int plugin_new_session(struct param_new_session *data) return PLUGIN_RET_OK; // Slaves don't do walled garden processing. if (data->s->walled_garden) - garden_session(data->s, F_GARDEN); + garden_session(data->s, F_GARDEN, 0); return PLUGIN_RET_OK; } @@ -74,14 +74,14 @@ int plugin_kill_session(struct param_new_session *data) return PLUGIN_RET_OK; // Slaves don't do walled garden processing. if (data->s->walled_garden) - garden_session(data->s, F_CLEANUP); + garden_session(data->s, F_CLEANUP, 0); return PLUGIN_RET_OK; } char *plugin_control_help[] = { " garden USER|SID Put user into the walled garden", - " ungarden SID Release session from garden", + " ungarden SID [USER] Release session from garden", 0 }; @@ -103,10 +103,13 @@ int plugin_control(struct param_control *data) flag = data->argv[0][0] == 'g' ? F_GARDEN : F_UNGARDEN; - if (data->argc != 2) + if (data->argc < 2 || data->argc > 3 || (data->argc > 2 && flag == F_GARDEN)) { data->response = NSCTL_RES_ERR; - data->additional = "one argument required: username or session id"; + data->additional = flag == F_GARDEN + ? "requires username or session id" + : "requires session id and optional username"; + return PLUGIN_RET_STOP; } @@ -135,7 +138,7 @@ int plugin_control(struct param_control *data) return PLUGIN_RET_STOP; } - garden_session(s, flag); + garden_session(s, flag, data->argc > 2 ? data->argv[2] : 0); p->session_changed(session); data->response = NSCTL_RES_OK; @@ -162,12 +165,12 @@ int plugin_become_master(void) int plugin_new_session_master(sessiont *s) { if (s->walled_garden) - garden_session(s, F_GARDEN); + garden_session(s, F_GARDEN, 0); return PLUGIN_RET_OK; } -int garden_session(sessiont *s, int flag) +int garden_session(sessiont *s, int flag, char *newuser) { char cmd[2048]; sessionidt sess; @@ -191,6 +194,12 @@ int garden_session(sessiont *s, int flag) // Normal User p->log(2, sess, s->tunnel, "Un-Garden user %s (%s)\n", s->user, p->fmtaddr(htonl(s->ip), 0)); + if (newuser) + { + snprintf(s->user, MAXUSER, "%s", newuser); + p->log(2, sess, s->tunnel, " Setting username to %s\n", s->user); + } + // Kick off any duplicate usernames // but make sure not to kick off ourself if (s->ip && !s->die && (other = p->get_session_by_username(s->user)) && s != p->get_session_by_id(other)) { diff --git a/l2tpns.h b/l2tpns.h index 042271c..3783771 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -1,5 +1,5 @@ // L2TPNS Global Stuff -// $Id: l2tpns.h,v 1.57 2005/02/14 06:58:39 bodea Exp $ +// $Id: l2tpns.h,v 1.58 2005/03/10 03:31:25 bodea Exp $ #ifndef __L2TPNS_H__ #define __L2TPNS_H__ @@ -32,6 +32,8 @@ #define MAXCONTROL 1000 // max length control message we ever send... #define MAXETHER (1500+18) // max packet we try sending to tun #define MAXTEL 96 // telephone number +#define MAXUSER 128 // username +#define MAXPASS 128 // password #define MAXPLUGINS 20 // maximum number of plugins to load #define MAXRADSERVER 10 // max radius servers #define MAXROUTE 10 // max static routes per session @@ -202,7 +204,7 @@ typedef struct uint8_t flags1; // additional flags (currently unused); char random_vector[MAXTEL]; int random_vector_length; - char user[129]; // user (needed in seesion for radius stop messages) (can we reduce this? --mo) + char user[MAXUSER]; // user (needed in seesion for radius stop messages) char called[MAXTEL]; // called number char calling[MAXTEL]; // calling number uint32_t tx_connect_speed; diff --git a/ppp.c b/ppp.c index bf1d8b5..b18840f 100644 --- a/ppp.c +++ b/ppp.c @@ -1,6 +1,6 @@ // L2TPNS PPP Stuff -char const *cvs_id_ppp = "$Id: ppp.c,v 1.44 2005/02/14 06:58:39 bodea Exp $"; +char const *cvs_id_ppp = "$Id: ppp.c,v 1.45 2005/03/10 03:31:25 bodea Exp $"; #include #include @@ -28,8 +28,8 @@ static void initccp(tunnelidt t, sessionidt s); // Process PAP messages void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) { - char user[129]; - char pass[129]; + char user[MAXUSER]; + char pass[MAXPASS]; uint16_t hl; CSTAT(processpap);