// L2TPNS Radius Stuff
-char const *cvs_id_radius = "$Id: radius.c,v 1.38 2005/07/31 10:35:39 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.46 2005/12/09 00:43:17 bodea Exp $";
#include <time.h>
#include <stdio.h>
#include <ctype.h>
#include <netinet/in.h>
#include <errno.h>
-#include <openssl/md5.h>
+#include "md5.h"
#include "constants.h"
#include "l2tpns.h"
#include "plugin.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)
{
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((char *) 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);
}
}
}
*(uint32_t *) (p + 2) = htonl(session[s].ip);
p += p[1];
}
+ if (s && 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].called)
{
*p = 30; // called
strcpy((char *) p + 2, session[s].called);
p += p[1];
}
- else if (*session[s].calling)
+ if (*session[s].calling)
{
*p = 31; // calling
p[1] = strlen(session[s].calling) + 2;
*(uint16_t *) (b + 2) = htons(p - b);
if (state != RADIUSAUTH)
{
- // Build auth for accounting packet
- uint8_t z[16] = {0};
- uint8_t hash[16] = {0};
- MD5_CTX ctx;
- MD5_Init(&ctx);
- MD5_Update(&ctx, b, 4);
- MD5_Update(&ctx, z, 16);
- MD5_Update(&ctx, b + 20, (p - b) - 20);
- MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
- MD5_Final(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;
// 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;
- MD5_Init(&ctx);
- MD5_Update(&ctx, buf, 4);
- MD5_Update(&ctx, radius[r].auth, 16);
- MD5_Update(&ctx, buf + 20, len - 20);
- MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
- MD5_Final(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);
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);
if (!p) return; // Abort!
// ack/nak
// 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);
+ sendchap(s, t);
break;
case RADIUSAUTH: // sending auth to RADIUS server
case RADIUSSTART: // sending start accounting to RADIUS server
void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
{
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;
-
- MD5_Init(&ctx);
- MD5_Update(&ctx, buf, len);
- MD5_Update(&ctx, config->radiussecret, i);
- MD5_Final(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;
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;
-
- MD5_Init(&ctx);
- MD5_Update(&ctx, buf, len);
- MD5_Update(&ctx, config->radiussecret, i);
- MD5_Final(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);
projects / l2tpns.git / blobdiff