From 9c31b3835214db6ef39402c0211841547e2088bc Mon Sep 17 00:00:00 2001 From: bodea Date: Mon, 14 Feb 2005 05:56:38 +0000 Subject: [PATCH] Kill session if authentication was rejected --- radius.c | 110 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 48 deletions(-) diff --git a/radius.c b/radius.c index ff52cdc..1bbb65a 100644 --- a/radius.c +++ b/radius.c @@ -1,6 +1,6 @@ // L2TPNS Radius Stuff -char const *cvs_id_radius = "$Id: radius.c,v 1.22 2005/01/05 14:35:01 bodea Exp $"; +char const *cvs_id_radius = "$Id: radius.c,v 1.20.2.1 2005/02/14 05:56:38 bodea Exp $"; #include #include @@ -25,6 +25,18 @@ extern configt *config; extern int *radfds; extern ip_filtert *ip_filters; +static const char *radius_state(int state) +{ + static char *tmp = NULL; + int i; + for (i = 0; radius_states[i]; i++) + if (i == state) return radius_states[i]; + + if (tmp == NULL) tmp = (char *)calloc(64, 1); + sprintf(tmp, "%d", state); + return tmp; +} + // Set up socket for radius requests void initrad(void) { @@ -46,6 +58,7 @@ void radiusclear(uint16_t r, sessionidt s) memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL; } + static uint16_t get_free_radius() { int count; @@ -105,7 +118,7 @@ void radiussend(uint16_t r, uint8_t state) uint8_t *p; sessionidt s; - CSTAT(radiussend); + CSTAT(call_radiussend); s = radius[r].session; if (!config->numradiusservers) @@ -128,7 +141,6 @@ void radiussend(uint16_t r, uint8_t state) if (radius[r].state != state) radius[r].try = 0; - radius[r].state = state; radius[r].retry = backoff(radius[r].try++); LOG(4, s, session[s].tunnel, "Send RADIUS id %d sock %d state %s try %d\n", @@ -144,7 +156,7 @@ void radiussend(uint16_t r, uint8_t state) else { LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n", - radius_state(state)); + radius_states[state]); radiusclear(r, s); } STAT(radius_timeout); @@ -155,7 +167,7 @@ void radiussend(uint16_t r, uint8_t state) radius[r].state = RADIUSWAIT; radius[r].retry = 100; } - return; + return ; } // contruct RADIUS access request switch (state) @@ -337,7 +349,9 @@ void radiussend(uint16_t r, uint8_t state) { // get radius port uint16_t port = config->radiusport[(radius[r].try - 1) % config->numradiusservers]; - // assume RADIUS accounting port is the authentication port +1 + // no need to define the accounting port for itself: + // the accounting port is as far as I know always one more + // than the auth port JK 20040713 addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1); } @@ -355,10 +369,14 @@ void processrad(uint8_t *buf, int len, char socket_index) tunnelidt t = 0; hasht hash; uint8_t routes = 0; - int r_code; - int r_id; - CSTAT(processrad); + int r_code, r_id ; // Radius code. + + r_code = buf[0]; // First byte in radius packet. + r_id = buf[1]; // radius reply indentifier. + + + CSTAT(call_processrad); LOG_HEX(5, "RADIUS Response", buf, len); if (len < 20 || len < ntohs(*(uint16_t *) (buf + 2))) @@ -366,16 +384,11 @@ void processrad(uint8_t *buf, int len, char socket_index) LOG(1, 0, 0, "Duff RADIUS response length %d\n", len); return ; } - - r_code = buf[0]; // response type - r_id = buf[1]; // radius reply indentifier. - len = ntohs(*(uint16_t *) (buf + 2)); r = socket_index | (r_id << RADIUS_SHIFT); s = radius[r].session; - LOG(3, s, session[s].tunnel, "Received %s, radius %d response for session %u (%s, id %d)\n", - radius_state(radius[r].state), r, s, radius_code(r_code), r_id); - + LOG(3, s, session[s].tunnel, "Received %s, radius %d response for session %u (code %d, id %d)\n", + radius_states[radius[r].state], r, s, r_code, r_id); if (!s && radius[r].state != RADIUSSTOP) { LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n"); @@ -399,29 +412,16 @@ void processrad(uint8_t *buf, int len, char socket_index) LOG(0, s, session[s].tunnel, " Incorrect auth on RADIUS response!! (wrong secret in radius config?)\n"); return; // Do nothing. On timeout, it will try the next radius server. } - - if ((radius[r].state == RADIUSAUTH && r_code != AccessAccept && r_code != AccessReject) || - ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP) && r_code != AccountingResponse)) + if ((radius[r].state == RADIUSAUTH && *buf != 2 && *buf != 3) || + ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP) && *buf != 5)) { - LOG(1, s, session[s].tunnel, " Unexpected RADIUS response %s\n", radius_code(r_code)); + LOG(1, s, session[s].tunnel, " Unexpected RADIUS response %d\n", *buf); return; // We got something we didn't expect. Let the timeouts take // care off finishing the radius session if that's really correct. } - if (radius[r].state == RADIUSAUTH) { - // run post-auth plugin - struct param_post_auth packet = { - &tunnel[t], - &session[s], - session[s].user, - (r_code == AccessAccept), - radius[r].chap ? PPPCHAP : PPPPAP - }; - - run_plugins(PLUGIN_POST_AUTH, &packet); - r_code = packet.auth_allowed ? AccessAccept : AccessReject; - + LOG(4, s, session[s].tunnel, " Original response is \"%s\"\n", (*buf == 2) ? "accept" : "reject"); // process auth response if (radius[r].chap) { @@ -429,13 +429,18 @@ void processrad(uint8_t *buf, int len, char socket_index) uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP); if (!p) return; // Abort! - *p = (r_code == AccessAccept) ? 3 : 4; // ack/nak + { + struct param_post_auth packet = { &tunnel[t], &session[s], session[s].user, (*buf == 2), PPPCHAP }; + run_plugins(PLUGIN_POST_AUTH, &packet); + *buf = packet.auth_allowed ? 2 : 3; + } + + LOG(3, s, session[s].tunnel, " CHAP User %s authentication %s.\n", session[s].user, + (*buf == 2) ? "allowed" : "denied"); + *p = (*buf == 2) ? 3 : 4; // ack/nak p[1] = radius[r].id; *(uint16_t *) (p + 2) = ntohs(4); // no message tunnelsend(b, (p - b) + 4, t); // send it - - LOG(3, s, session[s].tunnel, " CHAP User %s authentication %s.\n", session[s].user, - (r_code == AccessAccept) ? "allowed" : "denied"); } else { @@ -443,18 +448,23 @@ void processrad(uint8_t *buf, int len, char socket_index) uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP); if (!p) return; // Abort! + { + struct param_post_auth packet = { &tunnel[t], &session[s], session[s].user, (*buf == 2), PPPPAP }; + run_plugins(PLUGIN_POST_AUTH, &packet); + *buf = packet.auth_allowed ? 2 : 3; + } + + LOG(3, s, session[s].tunnel, " PAP User %s authentication %s.\n", session[s].user, + (*buf == 2) ? "allowed" : "denied"); // ack/nak - *p = r_code; + *p = *buf; p[1] = radius[r].id; *(uint16_t *) (p + 2) = ntohs(5); p[4] = 0; // no message tunnelsend(b, (p - b) + 5, t); // send it - - LOG(3, s, session[s].tunnel, " PAP User %s authentication %s.\n", session[s].user, - (r_code == AccessAccept) ? "allowed" : "denied"); } - if (r_code == AccessAccept) + if (*buf == 2) { // Login successful // Extract IP, routes, etc @@ -470,6 +480,9 @@ void processrad(uint8_t *buf, int len, char socket_index) session[s].ip_pool_index = -1; LOG(3, s, session[s].tunnel, " Radius reply contains IP address %s\n", fmtaddr(htonl(session[s].ip), 0)); + + if (session[s].ip == 0xFFFFFFFE) + session[s].ip = 0; // assign from pool } else if (*p == 135) { @@ -621,10 +634,10 @@ void processrad(uint8_t *buf, int len, char socket_index) } } } - else if (r_code == AccessReject) + else if (*buf == 3) { - LOG(2, s, session[s].tunnel, " Authentication denied for %s\n", session[s].user); -//FIXME: We should tear down the session here! + LOG(2, s, session[s].tunnel, " Authentication rejected for %s\n", session[s].user); + sessionkill(s, "Authentication rejected"); break; } @@ -646,7 +659,7 @@ void processrad(uint8_t *buf, int len, char socket_index) else { // An ack for a stop or start record. - LOG(3, s, t, " RADIUS accounting ack recv in state %s\n", radius_state(radius[r].state)); + LOG(3, s, t, " RADIUS accounting ack recv in state %s\n", radius_states[radius[r].state]); break; } } while (0); @@ -661,9 +674,10 @@ void radiusretry(uint16_t r) sessionidt s = radius[r].session; tunnelidt t = 0; - CSTAT(radiusretry); + CSTAT(call_radiusretry); - if (s) t = session[s].tunnel; + if (s) + t = session[s].tunnel; radius[r].retry = backoff(radius[r].try + 1); switch (radius[r].state) -- 2.20.1