// L2TPNS Radius Stuff
-char const *cvs_id_radius = "$Id: radius.c,v 1.36 2005/06/30 14:31:26 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.51 2006/06/11 12:46:18 bodea Exp $";
#include <time.h>
#include <stdio.h>
extern int *radfds;
extern ip_filtert *ip_filters;
+static const hasht zero;
+
+static void calc_auth(const void *buf, size_t len, const uint8_t *in, uint8_t *out)
+{
+ MD5_CTX ctx;
+
+ MD5_Init(&ctx);
+ MD5_Update(&ctx, (void *)buf, 4); // code, id, length
+ MD5_Update(&ctx, (void *)in, 16); // auth
+ MD5_Update(&ctx, (void *)(buf + 20), len - 20);
+ MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
+ MD5_Final(out, &ctx);
+}
+
// Set up socket for radius requests
void initrad(void)
{
if (s)
{
if (state == RADIUSAUTH)
- sessionshutdown(s, "RADIUS timeout.", 3, 0);
+ sessionshutdown(s, "RADIUS timeout.", CDN_ADMIN_DISC, TERM_REAUTHENTICATION_FAILURE);
else
{
LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",
{
*p = 1; // user name
p[1] = strlen(session[s].user) + 2;
- strcpy(p + 2, session[s].user);
+ strcpy((char *) p + 2, session[s].user);
p += p[1];
}
if (state == RADIUSAUTH)
while (p < pl)
{
MD5_CTX ctx;
- MD5Init(&ctx);
- MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret));
+ MD5_Init(&ctx);
+ MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
if (p)
- MD5Update(&ctx, pass + p - 16, 16);
+ MD5_Update(&ctx, pass + p - 16, 16);
else
- MD5Update(&ctx, radius[r].auth, 16);
- MD5Final(hash, &ctx);
+ MD5_Update(&ctx, radius[r].auth, 16);
+ MD5_Final(hash, &ctx);
do
{
pass[p] ^= hash[p & 15];
p += p[1];
}
}
- else if (state == RADIUSSTART || state == RADIUSSTOP || state == RADIUSINTERIM)
- { // accounting
+ else // accounting
+ {
*p = 40; // accounting type
p[1] = 6;
*(uint32_t *) (p + 2) = htonl(state - RADIUSSTART + 1); // start=1, stop=2, interim=3
{
*p = 44; // session ID
p[1] = 18;
- sprintf(p + 2, "%08X%08X", session[s].unique_id, session[s].opened);
+ sprintf((char *) p + 2, "%08X%08X", session[s].unique_id, session[s].opened);
p += p[1];
if (state == RADIUSSTART)
{ // start
p[1] = 6;
*(uint32_t *) (p + 2) = htonl(session[s].cout);
p += p[1];
- if (state == RADIUSSTOP)
- {
- *p = 46; // session time
- p[1] = 6;
- *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened);
- p += p[1];
- }
+
+ *p = 46; // session time
+ p[1] = 6;
+ *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened);
+ p += p[1];
*p = 47; // input packets
p[1] = 6;
p[1] = 6;
*(uint32_t *) (p + 2) = htonl(session[s].cout_wrap);
p += p[1];
+
+ if (state == RADIUSSTOP && radius[r].term_cause)
+ {
+ *p = 49; // acct-terminate-cause
+ p[1] = 6;
+ *(uint32_t *) (p + 2) = htonl(radius[r].term_cause);
+ p += p[1];
+
+ if (radius[r].term_msg)
+ {
+ *p = 26; // vendor-specific
+ *(uint32_t *) (p + 2) = htonl(9); // Cisco
+ p[6] = 1; // Cisco-AVPair
+ p[7] = 2 + sprintf((char *) p + 8, "disc-cause-ext=%s", radius[r].term_msg);
+ p[1] = p[7] + 6;
+ p += p[1];
+ }
+ }
}
- if (session[s].snoop_ip && session[s].snoop_port)
{
- *p = 26; // vendor-specific
- *(uint32_t *) (p + 2) = htonl(9); // Cisco
- p[6] = 1; // Cisco-AVPair
- p[7] = 2 + sprintf(p + 8, "intercept=%s:%d",
- fmtaddr(session[s].snoop_ip, 0), session[s].snoop_port);
-
- p[1] = p[7] + 6;
- p += p[1];
+ struct param_radius_account acct = { &tunnel[session[s].tunnel], &session[s], &p };
+ run_plugins(PLUGIN_RADIUS_ACCOUNT, &acct);
}
}
}
+
if (s)
{
- *p = 5; // NAS-Port
+ *p = 5; // NAS-Port
p[1] = 6;
*(uint32_t *) (p + 2) = htonl(s);
p += p[1];
- }
- if (s && session[s].ip)
- {
- *p = 8; // Framed-IP-Address
+
+ *p = 6; // Service-Type
p[1] = 6;
- *(uint32_t *) (p + 2) = htonl(session[s].ip);
- p += p[1];
- }
- if (*session[s].called)
- {
- *p = 30; // called
- p[1] = strlen(session[s].called) + 2;
- strcpy(p + 2, session[s].called);
- p += p[1];
- }
- if (*radius[r].calling)
- {
- *p = 31; // calling
- p[1] = strlen(radius[r].calling) + 2;
- strcpy(p + 2, radius[r].calling);
+ *(uint32_t *) (p + 2) = htonl(2); // Framed-User
p += p[1];
- }
- else if (*session[s].calling)
- {
- *p = 31; // calling
- p[1] = strlen(session[s].calling) + 2;
- strcpy(p + 2, session[s].calling);
+
+ *p = 7; // Framed-Protocol
+ p[1] = 6;
+ *(uint32_t *) (p + 2) = htonl(1); // PPP
p += p[1];
+
+ if (session[s].ip)
+ {
+ *p = 8; // Framed-IP-Address
+ p[1] = 6;
+ *(uint32_t *) (p + 2) = htonl(session[s].ip);
+ p += p[1];
+ }
+
+ if (session[s].route[0].ip)
+ {
+ int r;
+ for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
+ {
+ int width = 32;
+ if (session[s].route[r].mask)
+ {
+ int mask = session[s].route[r].mask;
+ while (!(mask & 1))
+ {
+ width--;
+ mask >>= 1;
+ }
+ }
+
+ *p = 22; // Framed-Route
+ p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
+ fmtaddr(htonl(session[s].route[r].ip), 0),
+ width, fmtaddr(htonl(session[s].ip), 1)) + 2;
+
+ p += p[1];
+ }
+ }
+
+ if (session[s].session_timeout)
+ {
+ *p = 27; // Session-Timeout
+ p[1] = 6;
+ *(uint32_t *) (p + 2) = htonl(session[s].session_timeout);
+ p += p[1];
+ }
+
+ if (session[s].idle_timeout)
+ {
+ *p = 28; // Idle-Timeout
+ p[1] = 6;
+ *(uint32_t *) (p + 2) = htonl(session[s].idle_timeout);
+ p += p[1];
+ }
+
+ if (*session[s].called)
+ {
+ *p = 30; // called
+ p[1] = strlen(session[s].called) + 2;
+ strcpy((char *) p + 2, session[s].called);
+ p += p[1];
+ }
+
+ if (*session[s].calling)
+ {
+ *p = 31; // calling
+ p[1] = strlen(session[s].calling) + 2;
+ strcpy((char *) p + 2, session[s].calling);
+ p += p[1];
+ }
}
+
// NAS-IP-Address
*p = 4;
p[1] = 6;
*(uint16_t *) (b + 2) = htons(p - b);
if (state != RADIUSAUTH)
{
- // Build auth for accounting packet
- char z[16] = {0};
- char hash[16] = {0};
- MD5_CTX ctx;
- MD5Init(&ctx);
- MD5Update(&ctx, b, 4);
- MD5Update(&ctx, z, 16);
- MD5Update(&ctx, b + 20, (p - b) - 20);
- MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret));
- MD5Final(hash, &ctx);
- memcpy(b + 4, hash, 16);
- memcpy(radius[r].auth, hash, 16);
+ // Build auth for accounting packet
+ calc_auth(b, p - b, zero, b + 4);
+ memcpy(radius[r].auth, b + 4, 16);
}
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
static void handle_avpair(sessionidt s, uint8_t *avp, int len)
{
- char *key = avp;
- char *value = memchr(avp, '=', len);
- char tmp[2048] = "";
+ uint8_t *key = avp;
+ uint8_t *value = memchr(avp, '=', len);
+ uint8_t tmp[2048] = "";
if (value)
{
// Run hooks
{
- struct param_radius_response p = { &tunnel[session[s].tunnel], &session[s], key, value };
+ struct param_radius_response p = { &tunnel[session[s].tunnel], &session[s], (char *) key, (char *) value };
run_plugins(PLUGIN_RADIUS_RESPONSE, &p);
}
}
// process RADIUS response
void processrad(uint8_t *buf, int len, char socket_index)
{
- uint8_t b[MAXCONTROL];
- MD5_CTX ctx;
+ uint8_t b[MAXETHER];
uint16_t r;
sessionidt s;
tunnelidt t = 0;
return;
}
t = session[s].tunnel;
- MD5Init(&ctx);
- MD5Update(&ctx, buf, 4);
- MD5Update(&ctx, radius[r].auth, 16);
- MD5Update(&ctx, buf + 20, len - 20);
- MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret));
- MD5Final(hash, &ctx);
+ calc_auth(buf, len, radius[r].auth, hash);
do {
if (memcmp(hash, buf + 4, 16))
{
if (radius[r].chap)
{
// CHAP
- uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
+ uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPCHAP, 0, 0, 0);
if (!p) return; // Abort!
*p = (r_code == AccessAccept) ? 3 : 4; // ack/nak
else
{
// PAP
- uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
+ uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPPAP, 0, 0, 0);
if (!p) return; // Abort!
// ack/nak
LOG(3, s, session[s].tunnel, " Radius reply contains primary DNS address %s\n",
fmtaddr(htonl(session[s].dns1), 0));
}
+ else if (*p == 27)
+ {
+ // Session timeout
+ if (p[1] < 6) {
+ LOG(2, s, session[s].tunnel, "Error: Received Session timeout with length %d < 6\n", p[1]);
+ continue;
+ }
+
+ session[s].timeout = ntohl(*(uint32_t *) (p + 2));
+ LOG(3, s, session[s].tunnel, " Radius reply contains Session timeout %d\n", session[s].timeout);
+ if (!session[s].timeout)
+ sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, TERM_SESSION_TIMEOUT);
+ }
else if (*p == 136)
{
// DNS address
else if (*p == 11)
{
// Filter-Id
- char *filter = p + 2;
+ char *filter = (char *) p + 2;
int l = p[1] - 2;
char *suffix;
int f;
ip_filters[f].used++;
}
}
+ else if (*p == 27)
+ {
+ // Session-Timeout
+ uint32_t to = ntohl(*(uint32_t *)(p + 2));
+
+ LOG(3, s, session[s].tunnel, " Radius reply contains Session-Timeout = %u\n", to);
+ if (to > 0)
+ {
+ session[s].session_timeout = to;
+ }
+ }
+ else if (*p == 28)
+ {
+ // Idle-Timeout
+ uint32_t to = ntohl(*(uint32_t *)(p + 2));
+
+ LOG(3, s, session[s].tunnel, " Radius reply contains Idle-Timeout = %u\n", to);
+ if (to > 0)
+ {
+ session[s].idle_timeout = to;
+ }
+ }
else if (*p == 26 && p[1] >= 7)
{
// Vendor-Specific Attribute
int prefixlen;
uint8_t *n = p + 2;
uint8_t *e = p + p[1];
- uint8_t *m = strchr(n, '/');
+ uint8_t *m = memchr(n, '/', e - p);
*m++ = 0;
- inet_pton(AF_INET6, n, &r6);
+ inet_pton(AF_INET6, (char *) n, &r6);
prefixlen = 0;
while (m < e && isdigit(*m)) {
if (!session[s].dns1 && config->default_dns1)
{
- session[s].dns1 = htonl(config->default_dns1);
+ session[s].dns1 = ntohl(config->default_dns1);
LOG(3, s, t, " Sending dns1 = %s\n", fmtaddr(config->default_dns1, 0));
}
if (!session[s].dns2 && config->default_dns2)
{
- session[s].dns2 = htonl(config->default_dns2);
+ session[s].dns2 = ntohl(config->default_dns2);
LOG(3, s, t, " Sending dns2 = %s\n", fmtaddr(config->default_dns2, 0));
}
// Valid Session, set it up
session[s].unique_id = 0;
- sessionsetup(t, s);
+ sessionsetup(s, t);
}
else
{
switch (radius[r].state)
{
case RADIUSCHAP: // sending CHAP down PPP
- sendchap(t, s);
- break;
- case RADIUSIPCP:
- sendipcp(t, s); // send IPCP
+ sendchap(s, t);
break;
case RADIUSAUTH: // sending auth to RADIUS server
- radiussend(r, RADIUSAUTH);
- break;
case RADIUSSTART: // sending start accounting to RADIUS server
- radiussend(r, RADIUSSTART);
- break;
case RADIUSSTOP: // sending stop accounting to RADIUS server
- radiussend(r, RADIUSSTOP);
- break;
case RADIUSINTERIM: // sending interim accounting to RADIUS server
- radiussend(r, RADIUSINTERIM);
+ radiussend(r, radius[r].state);
break;
default:
case RADIUSNULL: // Not in use
extern int daefd;
-void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
+void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local)
{
int i, r_code, r_id, length, attribute_length;
- uint8_t vector[16], hash[16], *packet, attribute;
- MD5_CTX ctx;
+ uint8_t *packet, attribute;
+ hasht hash;
char username[MAXUSER] = "";
in_addr_t nas = 0;
in_addr_t ip = 0;
LOG(3, 0, 0, "Received DAE %s, id %d\n", radius_code(r_code), r_id);
// check authenticator
- memcpy(vector, buf + 4, 16);
- memset(buf + 4, 0, 16);
-
- i = strlen(config->radiussecret);
- if (i > 16) i = 16;
-
- MD5Init(&ctx);
- MD5Update(&ctx, buf, len);
- MD5Update(&ctx, buf, config->radiussecret, i);
- MD5Final(hash, &ctx);
- if (memcmp(hash, vector, 16) != 0)
+ calc_auth(buf, len, zero, hash);
+ if (memcmp(hash, buf + 4, 16) != 0)
{
LOG(1, 0, 0, "Incorrect vector in DAE request (wrong secret in radius config?)\n");
return;
}
len = p - packet;
- i = find_filter(packet, len);
+ i = find_filter((char *) packet, len);
if (i < 0 || !*ip_filters[i].name)
{
error = 404;
LOG(3, s, t, " DAE Disconnect %d (%s)\n", s, session[s].user);
r_code = DisconnectACK;
- sessionshutdown(s, "Requested by PoD", 3, 0); // disconnect session
+ sessionshutdown(s, "Requested by PoD", CDN_ADMIN_DISC, TERM_ADMIN_RESET); // disconnect session
break;
case CoARequest: // Change of Authorization
packet = buf;
*packet++ = r_code;
*packet++ = r_id;
- packet += 2;
- memset(packet, 0, 16);
- packet += 16;
- len = 20;
+ // skip len + auth
+ packet += 2 + 16;
+ len = packet - buf;
// add attributes
if (error)
*((uint16_t *)(buf + 2)) = htons(len);
// make vector
- i = strlen(config->radiussecret);
- if (i > 16) i = 16;
-
- MD5Init(&ctx);
- MD5Update(&ctx, buf, len);
- MD5Update(&ctx, config->radiussecret, i);
- MD5Final(hash, &ctx);
- memcpy(buf + 4, hash, 16);
+ calc_auth(buf, len, hash, buf + 4);
LOG(3, 0, 0, "Sending DAE %s, id=%d\n", radius_code(r_code), r_id);
// send DAE response
- if (sendto(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen) < 0)
+ if (sendtofrom(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen, local) < 0)
LOG(0, 0, 0, "Error sending DAE response packet: %s\n", strerror(errno));
}
projects / l2tpns.git / blobdiff