#include <string.h>
#include <unistd.h>
#include <sys/time.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
#include <regex.h>
#include <libgen.h>
#include <pthread.h>
#include <openssl/err.h>
#include <openssl/md5.h>
#include <openssl/hmac.h>
+#include <openssl/x509v3.h>
#include "debug.h"
+#include "list.h"
+#include "util.h"
+#include "gconfig.h"
#include "radsecproxy.h"
static struct options options;
-static struct clsrvconf *clconfs = NULL;
-static struct clsrvconf *srvconfs = NULL;
-static struct realm *realms = NULL;
-static struct tls *tls = NULL;
+struct list *clconfs, *srvconfs, *realms, *tlsconfs;
static int client_udp_count = 0;
static int client_tls_count = 0;
-static int clconf_count = 0;
static int server_udp_count = 0;
static int server_tls_count = 0;
-static int srvconf_count = 0;
-static int realm_count = 0;
-static int tls_count = 0;
-static struct clsrvconf *tcp_server_listen;
-static struct clsrvconf *udp_server_listen;
+static struct clsrvconf *srcudpres = NULL;
+static struct clsrvconf *srctcpres = NULL;
+
static struct replyq *udp_server_replyq = NULL;
static int udp_server_sock = -1;
+static int udp_accserver_sock = -1;
+static int udp_client4_sock = -1;
+static int udp_client6_sock = -1;
static pthread_mutex_t *ssl_locks;
static long *ssl_lock_count;
extern int optind;
return ok;
}
-#ifdef DEBUG
-void printauth(char *s, unsigned char *t) {
- int i;
- printf("%s:", s);
- for (i = 0; i < 16; i++)
- printf("%02x ", t[i]);
- printf("\n");
-}
-#endif
-
int resolvepeer(struct clsrvconf *conf, int ai_flags) {
- struct addrinfo hints, *addrinfo;
-
+ struct addrinfo hints, *addrinfo, *res;
+ char *slash, *s;
+ int plen;
+
+ slash = conf->host ? strchr(conf->host, '/') : NULL;
+ if (slash) {
+ s = slash + 1;
+ if (!*s) {
+ debug(DBG_WARN, "resolvepeer: prefix length must be specified after the / in %s", conf->host);
+ return 0;
+ }
+ for (; *s; s++)
+ if (*s < '0' || *s > '9') {
+ debug(DBG_WARN, "resolvepeer: %s in %s is not a valid prefix length", slash + 1, conf->host);
+ return 0;
+ }
+ plen = atoi(slash + 1);
+ if (plen < 0 || plen > 128) {
+ debug(DBG_WARN, "resolvepeer: %s in %s is not a valid prefix length", slash + 1, conf->host);
+ return 0;
+ }
+ *slash = '\0';
+ }
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = (conf->type == 'T' ? SOCK_STREAM : SOCK_DGRAM);
hints.ai_family = AF_UNSPEC;
hints.ai_flags = ai_flags;
- if (getaddrinfo(conf->host, conf->port, &hints, &addrinfo)) {
- debug(DBG_WARN, "resolvepeer: can't resolve %s port %s", conf->host, conf->port);
- return 0;
+ if (!conf->host && !conf->port) {
+ /* getaddrinfo() doesn't like host and port to be NULL */
+ if (getaddrinfo(conf->host, DEFAULT_UDP_PORT, &hints, &addrinfo)) {
+ debug(DBG_WARN, "resolvepeer: can't resolve (null) port (null)");
+ return 0;
+ }
+ for (res = addrinfo; res; res = res->ai_next) {
+ switch (res->ai_family) {
+ case AF_INET:
+ ((struct sockaddr_in *)res->ai_addr)->sin_port = 0;
+ break;
+ case AF_INET6:
+ ((struct sockaddr_in6 *)res->ai_addr)->sin6_port = 0;
+ break;
+ }
+ }
+ } else {
+ if (slash)
+ hints.ai_flags |= AI_NUMERICHOST;
+ if (getaddrinfo(conf->host, conf->port, &hints, &addrinfo)) {
+ debug(DBG_WARN, "resolvepeer: can't resolve %s port %s", conf->host, conf->port);
+ return 0;
+ }
+ if (slash) {
+ *slash = '/';
+ switch (addrinfo->ai_family) {
+ case AF_INET:
+ if (plen > 32) {
+ debug(DBG_WARN, "resolvepeer: prefix length must be <= 32 in %s", conf->host);
+ freeaddrinfo(addrinfo);
+ return 0;
+ }
+ break;
+ case AF_INET6:
+ break;
+ default:
+ debug(DBG_WARN, "resolvepeer: prefix must be IPv4 or IPv6 in %s", conf->host);
+ freeaddrinfo(addrinfo);
+ return 0;
+ }
+ conf->prefixlen = plen;
+ } else
+ conf->prefixlen = 255;
}
-
if (conf->addrinfo)
freeaddrinfo(conf->addrinfo);
conf->addrinfo = addrinfo;
return 1;
}
-int connecttoserver(struct addrinfo *addrinfo) {
- int s;
+int bindtoaddr(struct addrinfo *addrinfo, int family, int reuse, int v6only) {
+ int s, on = 1;
struct addrinfo *res;
-
- s = -1;
+
for (res = addrinfo; res; res = res->ai_next) {
+ if (family != AF_UNSPEC && family != res->ai_family)
+ continue;
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (s < 0) {
- debug(DBG_WARN, "connecttoserver: socket failed");
+ debug(DBG_WARN, "bindtoaddr: socket failed");
continue;
}
- if (connect(s, res->ai_addr, res->ai_addrlen) == 0)
- break;
- debug(DBG_WARN, "connecttoserver: connect failed");
+ if (reuse)
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+#ifdef IPV6_V6ONLY
+ if (v6only)
+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
+#endif
+
+ if (!bind(s, res->ai_addr, res->ai_addrlen))
+ return s;
+ debug(DBG_WARN, "bindtoaddr: bind failed");
close(s);
- s = -1;
}
- return s;
+ return -1;
}
-int bindtoaddr(struct addrinfo *addrinfo) {
- int s, on = 1;
+char *parsehostport(char *s, struct clsrvconf *conf, char *default_port) {
+ char *p, *field;
+ int ipv6 = 0;
+
+ p = s;
+ /* allow literal addresses and port, e.g. [2001:db8::1]:1812 */
+ if (*p == '[') {
+ p++;
+ field = p;
+ for (; *p && *p != ']' && *p != ' ' && *p != '\t' && *p != '\n'; p++);
+ if (*p != ']')
+ debugx(1, DBG_ERR, "no ] matching initial [");
+ ipv6 = 1;
+ } else {
+ field = p;
+ for (; *p && *p != ':' && *p != ' ' && *p != '\t' && *p != '\n'; p++);
+ }
+ if (field == p)
+ debugx(1, DBG_ERR, "missing host/address");
+
+ conf->host = stringcopy(field, p - field);
+ if (ipv6) {
+ p++;
+ if (*p && *p != ':' && *p != ' ' && *p != '\t' && *p != '\n')
+ debugx(1, DBG_ERR, "unexpected character after ]");
+ }
+ if (*p == ':') {
+ /* port number or service name is specified */;
+ field = ++p;
+ for (; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++);
+ if (field == p)
+ debugx(1, DBG_ERR, "syntax error, : but no following port");
+ conf->port = stringcopy(field, p - field);
+ } else
+ conf->port = default_port ? stringcopy(default_port, 0) : NULL;
+ return p;
+}
+
+struct clsrvconf *resolve_hostport(char type, char *lconf, char *default_port) {
+ struct clsrvconf *conf;
+
+ conf = malloc(sizeof(struct clsrvconf));
+ if (!conf)
+ debugx(1, DBG_ERR, "malloc failed");
+ memset(conf, 0, sizeof(struct clsrvconf));
+ conf->type = type;
+ if (lconf) {
+ parsehostport(lconf, conf, default_port);
+ if (!strcmp(conf->host, "*")) {
+ free(conf->host);
+ conf->host = NULL;
+ }
+ } else
+ conf->port = default_port ? stringcopy(default_port, 0) : NULL;
+ if (!resolvepeer(conf, AI_PASSIVE))
+ debugx(1, DBG_ERR, "failed to resolve host %s port %s, exiting", conf->host, conf->port);
+ return conf;
+}
+
+int connecttcp(struct addrinfo *addrinfo) {
+ int s;
struct addrinfo *res;
-
+
+ s = -1;
for (res = addrinfo; res; res = res->ai_next) {
- s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+ s = bindtoaddr(srctcpres->addrinfo, res->ai_family, 1, 1);
if (s < 0) {
- debug(DBG_WARN, "bindtoaddr: socket failed");
+ debug(DBG_WARN, "connecttoserver: socket failed");
continue;
}
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
- if (!bind(s, res->ai_addr, res->ai_addrlen))
- return s;
- debug(DBG_WARN, "bindtoaddr: bind failed");
+ if (connect(s, res->ai_addr, res->ai_addrlen) == 0)
+ break;
+ debug(DBG_WARN, "connecttoserver: connect failed");
close(s);
+ s = -1;
}
- return -1;
+ return s;
}
-/* returns the peer with matching address, or NULL */
-/* if peer argument is not NULL, we only check that one client */
-struct clsrvconf *find_peer(char type, struct sockaddr *addr, struct clsrvconf *confs, int count) {
+/* returns 1 if the len first bits are equal, else 0 */
+int prefixmatch(void *a1, void *a2, uint8_t len) {
+ static uint8_t mask[] = { 0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe };
+ int r, l = len / 8;
+ if (l && memcmp(a1, a2, l))
+ return 0;
+ r = len % 8;
+ if (!r)
+ return 1;
+ return (((uint8_t *)a1)[l] & mask[r]) == (((uint8_t *)a2)[l] & mask[r]);
+}
+
+/* returns the config with matching address, or NULL */
+/* if conf argument is not NULL, we only check that one */
+struct clsrvconf *find_conf(char type, struct sockaddr *addr, struct list *confs, struct clsrvconf *conf) {
struct sockaddr_in6 *sa6 = NULL;
struct in_addr *a4 = NULL;
- int i;
struct addrinfo *res;
-
+ struct list_node *entry;
+
if (addr->sa_family == AF_INET6) {
sa6 = (struct sockaddr_in6 *)addr;
- if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr))
+ if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
a4 = (struct in_addr *)&sa6->sin6_addr.s6_addr[12];
+ sa6 = NULL;
+ }
} else
a4 = &((struct sockaddr_in *)addr)->sin_addr;
- for (i = 0; i < count; i++) {
- if (confs->type == type)
- for (res = confs->addrinfo; res; res = res->ai_next)
- if ((a4 && res->ai_family == AF_INET &&
- !memcmp(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, 4)) ||
- (sa6 && res->ai_family == AF_INET6 &&
- !memcmp(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 16)))
- return confs;
- confs++;
+ if (conf) {
+ if (conf->type == type) {
+ if (conf->prefixlen == 255) {
+ for (res = conf->addrinfo; res; res = res->ai_next)
+ if ((a4 && res->ai_family == AF_INET &&
+ !memcmp(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, 4)) ||
+ (sa6 && res->ai_family == AF_INET6 &&
+ !memcmp(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 16)))
+ return conf;
+ } else {
+ res = conf->addrinfo;
+ if (res &&
+ ((a4 && res->ai_family == AF_INET &&
+ prefixmatch(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, conf->prefixlen)) ||
+ (sa6 && res->ai_family == AF_INET6 &&
+ prefixmatch(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, conf->prefixlen))))
+ return conf;
+ }
+ }
+ return NULL;
}
+
+ for (entry = list_first(confs); entry; entry = list_next(entry)) {
+ conf = (struct clsrvconf *)entry->data;
+ if (conf->type == type) {
+ if (conf->prefixlen == 255) {
+ for (res = conf->addrinfo; res; res = res->ai_next)
+ if ((a4 && res->ai_family == AF_INET &&
+ !memcmp(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, 4)) ||
+ (sa6 && res->ai_family == AF_INET6 &&
+ !memcmp(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 16)))
+ return conf;
+ } else {
+ res = conf->addrinfo;
+ if (res &&
+ ((a4 && res->ai_family == AF_INET &&
+ prefixmatch(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, conf->prefixlen)) ||
+ (sa6 && res->ai_family == AF_INET6 &&
+ prefixmatch(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, conf->prefixlen))))
+ return conf;
+ }
+ }
+ }
return NULL;
}
+struct replyq *newreplyq() {
+ struct replyq *replyq;
+
+ replyq = malloc(sizeof(struct replyq));
+ if (!replyq)
+ debugx(1, DBG_ERR, "malloc failed");
+ replyq->replies = list_create();
+ if (!replyq->replies)
+ debugx(1, DBG_ERR, "malloc failed");
+ pthread_mutex_init(&replyq->mutex, NULL);
+ pthread_cond_init(&replyq->cond, NULL);
+ return replyq;
+}
+
+struct client *addclient(struct clsrvconf *conf) {
+ struct client *new = malloc(sizeof(struct client));
+
+ if (!new) {
+ debug(DBG_ERR, "malloc failed");
+ return NULL;
+ }
+ if (!conf->clients) {
+ conf->clients = list_create();
+ if (!conf->clients) {
+ debug(DBG_ERR, "malloc failed");
+ return NULL;
+ }
+ }
+
+ memset(new, 0, sizeof(struct client));
+ new->conf = conf;
+ new->replyq = conf->type == 'T' ? newreplyq() : udp_server_replyq;
+
+ list_push(conf->clients, new);
+ return new;
+}
+
+void removeclient(struct client *client) {
+ if (!client || !client->conf->clients)
+ return;
+
+ list_removedata(client->conf->clients, client);
+ free(client);
+}
+
+void addserver(struct clsrvconf *conf) {
+ if (conf->servers)
+ debugx(1, DBG_ERR, "addserver: currently works with just one server per conf");
+
+ conf->servers = malloc(sizeof(struct server));
+ if (!conf->servers)
+ debugx(1, DBG_ERR, "malloc failed");
+ memset(conf->servers, 0, sizeof(struct server));
+ conf->servers->conf = conf;
+
+ if (conf->type == 'U') {
+ if (!srcudpres)
+ srcudpres = resolve_hostport('U', options.sourceudp, NULL);
+ switch (conf->addrinfo->ai_family) {
+ case AF_INET:
+ if (udp_client4_sock < 0) {
+ udp_client4_sock = bindtoaddr(srcudpres->addrinfo, AF_INET, 0, 1);
+ if (udp_client4_sock < 0)
+ debugx(1, DBG_ERR, "addserver: failed to create client socket for server %s", conf->host);
+ }
+ conf->servers->sock = udp_client4_sock;
+ break;
+ case AF_INET6:
+ if (udp_client6_sock < 0) {
+ udp_client6_sock = bindtoaddr(srcudpres->addrinfo, AF_INET6, 0, 1);
+ if (udp_client6_sock < 0)
+ debugx(1, DBG_ERR, "addserver: failed to create client socket for server %s", conf->host);
+ }
+ conf->servers->sock = udp_client6_sock;
+ break;
+ default:
+ debugx(1, DBG_ERR, "addserver: unsupported address family");
+ }
+
+ } else {
+ if (!srctcpres)
+ srctcpres = resolve_hostport('T', options.sourcetcp, NULL);
+ conf->servers->sock = -1;
+ }
+
+ pthread_mutex_init(&conf->servers->lock, NULL);
+ conf->servers->requests = calloc(MAX_REQUESTS, sizeof(struct request));
+ if (!conf->servers->requests)
+ debugx(1, DBG_ERR, "malloc failed");
+ conf->servers->newrq = 0;
+ pthread_mutex_init(&conf->servers->newrq_mutex, NULL);
+ pthread_cond_init(&conf->servers->newrq_cond, NULL);
+}
+
/* exactly one of client and server must be non-NULL */
/* should probably take peer list (client(s) or server(s)) as argument instead */
/* if *peer == NULL we return who we received from, else require it to be from peer */
/* return from in sa if not NULL */
unsigned char *radudpget(int s, struct client **client, struct server **server, struct sockaddr_storage *sa) {
- int cnt, len, confcount;
+ int cnt, len;
unsigned char buf[65536], *rad;
struct sockaddr_storage from;
socklen_t fromlen = sizeof(from);
- struct clsrvconf *confs, *p;
-
+ struct clsrvconf *p;
+ struct list_node *node;
+
for (;;) {
cnt = recvfrom(s, buf, sizeof(buf), 0, (struct sockaddr *)&from, &fromlen);
if (cnt == -1) {
debug(DBG_DBG, "radudpget: packet was padded with %d bytes", cnt - len);
if (client)
- if (*client) {
- confcount = 1;
- confs = (*client)->conf;
- } else {
- confcount = clconf_count;
- confs = clconfs;
- }
+ if (*client)
+ p = find_conf('U', (struct sockaddr *)&from, NULL, (*client)->conf);
+ else
+ p = find_conf('U', (struct sockaddr *)&from, clconfs, NULL);
else
- if (*server) {
- confcount = 1;
- confs = (*server)->conf;
- } else {
- confcount = srvconf_count;
- confs = srvconfs;
- }
+ if (*server)
+ p = find_conf('U', (struct sockaddr *)&from, NULL, (*server)->conf);
+ else
+ p = find_conf('U', (struct sockaddr *)&from, srvconfs, NULL);
- p = find_peer('U', (struct sockaddr *)&from, confs, confcount);
if (!p) {
debug(DBG_WARN, "radudpget: got packet from wrong or unknown UDP peer, ignoring");
continue;
}
-
+
rad = malloc(len);
- if (rad)
- break;
- debug(DBG_ERR, "radudpget: malloc failed");
+ if (!rad) {
+ debug(DBG_ERR, "radudpget: malloc failed");
+ continue;
+ }
+
+ if (client && !*client) {
+ node = list_first(p->clients);
+ *client = node ? (struct client *)node->data : addclient(p);
+ if (!*client) {
+ free(rad);
+ continue;
+ }
+ } else if (server && !*server)
+ *server = p->servers;
+
+ break;
}
memcpy(rad, buf, len);
- if (client && !*client)
- *client = p->clients;
- else if (server && !*server)
- *server = p->servers;
if (sa)
*sa = from;
return rad;
}
+int subjectaltnameaddr(X509 *cert, int family, struct in6_addr *addr) {
+ int loc, i, l, n, r = 0;
+ char *v;
+ X509_EXTENSION *ex;
+ STACK_OF(GENERAL_NAME) *alt;
+ GENERAL_NAME *gn;
+
+ debug(DBG_DBG, "subjectaltnameaddr");
+
+ loc = X509_get_ext_by_NID(cert, NID_subject_alt_name, -1);
+ if (loc < 0)
+ return r;
+
+ ex = X509_get_ext(cert, loc);
+ alt = X509V3_EXT_d2i(ex);
+ if (!alt)
+ return r;
+
+ n = sk_GENERAL_NAME_num(alt);
+ for (i = 0; i < n; i++) {
+ gn = sk_GENERAL_NAME_value(alt, i);
+ if (gn->type != GEN_IPADD)
+ continue;
+ r = -1;
+ v = (char *)ASN1_STRING_data(gn->d.ia5);
+ l = ASN1_STRING_length(gn->d.ia5);
+ if (((family == AF_INET && l == sizeof(struct in_addr)) || (family == AF_INET6 && l == sizeof(struct in6_addr)))
+ && !memcmp(v, &addr, l)) {
+ r = 1;
+ break;
+ }
+ }
+ GENERAL_NAMES_free(alt);
+ return r;
+}
+
+int subjectaltnameregexp(X509 *cert, int type, char *exact, regex_t *regex) {
+ int loc, i, l, n, r = 0;
+ char *s, *v;
+ X509_EXTENSION *ex;
+ STACK_OF(GENERAL_NAME) *alt;
+ GENERAL_NAME *gn;
+
+ debug(DBG_DBG, "subjectaltnameregexp");
+
+ loc = X509_get_ext_by_NID(cert, NID_subject_alt_name, -1);
+ if (loc < 0)
+ return r;
+
+ ex = X509_get_ext(cert, loc);
+ alt = X509V3_EXT_d2i(ex);
+ if (!alt)
+ return r;
+
+ n = sk_GENERAL_NAME_num(alt);
+ for (i = 0; i < n; i++) {
+ gn = sk_GENERAL_NAME_value(alt, i);
+ if (gn->type != type)
+ continue;
+ r = -1;
+ v = (char *)ASN1_STRING_data(gn->d.ia5);
+ l = ASN1_STRING_length(gn->d.ia5);
+ if (l <= 0)
+ continue;
+#ifdef DEBUG
+ printfchars(NULL, gn->type == GEN_DNS ? "dns" : "uri", NULL, v, l);
+#endif
+ if (exact) {
+ if (memcmp(v, exact, l))
+ continue;
+ } else {
+ s = stringcopy((char *)v, l);
+ if (!s) {
+ debug(DBG_ERR, "malloc failed");
+ continue;
+ }
+ if (regexec(regex, s, 0, NULL, 0)) {
+ free(s);
+ continue;
+ }
+ free(s);
+ }
+ r = 1;
+ break;
+ }
+ GENERAL_NAMES_free(alt);
+ return r;
+}
+
int tlsverifycert(SSL *ssl, struct clsrvconf *conf) {
- int l, loc;
+ int l, loc, r;
X509 *cert;
X509_NAME *nm;
X509_NAME_ENTRY *e;
- unsigned char *v;
+ ASN1_STRING *s;
+ char *v;
+ uint8_t type = 0; /* 0 for DNS, AF_INET for IPv4, AF_INET6 for IPv6 */
unsigned long error;
-
+ struct in6_addr addr;
+
if (SSL_get_verify_result(ssl) != X509_V_OK) {
debug(DBG_ERR, "tlsverifycert: basic validation failed");
while ((error = ERR_get_error()))
debug(DBG_ERR, "tlsverifycert: failed to obtain certificate");
return 0;
}
- nm = X509_get_subject_name(cert);
- loc = -1;
- for (;;) {
- loc = X509_NAME_get_index_by_NID(nm, NID_commonName, loc);
- if (loc == -1)
- break;
- e = X509_NAME_get_entry(nm, loc);
- l = ASN1_STRING_to_UTF8(&v, X509_NAME_ENTRY_get_data(e));
- if (l < 0)
- continue;
+
+ if (conf->prefixlen == 255) {
+ if (inet_pton(AF_INET, conf->host, &addr))
+ type = AF_INET;
+ else if (inet_pton(AF_INET6, conf->host, &addr))
+ type = AF_INET6;
+
+ r = type ? subjectaltnameaddr(cert, type, &addr) : subjectaltnameregexp(cert, GEN_DNS, conf->host, NULL);
+ if (r) {
+ if (r < 0) {
+ X509_free(cert);
+ debug(DBG_DBG, "tlsverifycert: No subjectaltname matching %s %s", type ? "address" : "host", conf->host);
+ return 0;
+ }
+ debug(DBG_DBG, "tlsverifycert: Found subjectaltname matching %s %s", type ? "address" : "host", conf->host);
+ } else {
+ nm = X509_get_subject_name(cert);
+ loc = -1;
+ for (;;) {
+ loc = X509_NAME_get_index_by_NID(nm, NID_commonName, loc);
+ if (loc == -1)
+ break;
+ e = X509_NAME_get_entry(nm, loc);
+ s = X509_NAME_ENTRY_get_data(e);
+ v = (char *) ASN1_STRING_data(s);
+ l = ASN1_STRING_length(s);
+ if (l < 0)
+ continue;
#ifdef DEBUG
- {
- int i;
- printf("cn: ");
- for (i = 0; i < l; i++)
- printf("%c", v[i]);
- printf("\n");
+ printfchars(NULL, "cn", NULL, v, l);
+#endif
+ if (l == strlen(conf->host) && !strncasecmp(conf->host, v, l)) {
+ r = 1;
+ debug(DBG_DBG, "tlsverifycert: Found cn matching host %s", conf->host);
+ break;
+ }
+ }
+ if (!r) {
+ X509_free(cert);
+ debug(DBG_ERR, "tlsverifycert: cn not matching host %s", conf->host);
+ return 0;
+ }
}
-#endif
- if (l == strlen(conf->host) && !strncasecmp(conf->host, (char *)v, l)) {
- debug(DBG_DBG, "tlsverifycert: Found cn matching host %s, All OK", conf->host);
- return 1;
+ }
+ if (conf->certuriregex) {
+ r = subjectaltnameregexp(cert, GEN_URI, NULL, conf->certuriregex);
+ if (r < 1) {
+ debug(DBG_DBG, "tlsverifycert: subjectaltname URI not matching regex");
+ X509_free(cert);
+ return 0;
}
- debug(DBG_ERR, "tlsverifycert: cn not matching host %s", conf->host);
+ debug(DBG_DBG, "tlsverifycert: subjectaltname URI matching regex");
}
X509_free(cert);
- return 0;
+ return 1;
}
void tlsconnect(struct server *server, struct timeval *when, char *text) {
debug(DBG_WARN, "tlsconnect: trying to open TLS connection to %s port %s", server->conf->host, server->conf->port);
if (server->sock >= 0)
close(server->sock);
- if ((server->sock = connecttoserver(server->conf->addrinfo)) < 0) {
- debug(DBG_ERR, "tlsconnect: connecttoserver failed");
+ if ((server->sock = connecttcp(server->conf->addrinfo)) < 0) {
+ debug(DBG_ERR, "tlsconnect: connecttcp failed");
continue;
}
size_t len;
unsigned long error;
struct timeval lastconnecttry;
+ struct clsrvconf *conf = server->conf;
len = RADLEN(rad);
- if (server->conf->type == 'U') {
- if (send(server->sock, rad, len, 0) >= 0) {
- debug(DBG_DBG, "clienradput: sent UDP of length %d to %s port %s", len, server->conf->host, server->conf->port);
+ if (conf->type == 'U') {
+ if (sendto(server->sock, rad, len, 0, conf->addrinfo->ai_addr, conf->addrinfo->ai_addrlen) >= 0) {
+ debug(DBG_DBG, "clienradput: sent UDP of length %d to %s port %s", len, conf->host, conf->port);
return 1;
}
debug(DBG_WARN, "clientradput: send failed");
}
server->connectionok = 1;
- debug(DBG_DBG, "clientradput: Sent %d bytes, Radius packet of length %d to TLS peer %s",
- cnt, len, server->conf->host);
+ debug(DBG_DBG, "clientradput: Sent %d bytes, Radius packet of length %d to TLS peer %s", cnt, len, conf->host);
return 1;
}
return NULL;
}
+void freerqdata(struct request *rq) {
+ if (rq->origusername)
+ free(rq->origusername);
+ if (rq->buf)
+ free(rq->buf);
+}
+
void sendrq(struct server *to, struct request *rq) {
int i;
uint8_t *attr;
break;
if (i == to->nextid) {
debug(DBG_WARN, "No room in queue, dropping request");
- free(rq->buf);
+ freerqdata(rq);
pthread_mutex_unlock(&to->newrq_mutex);
return;
}
attr = attrget(rq->buf + 20, RADLEN(rq->buf) - 20, RAD_Attr_Message_Authenticator);
if (attr && !createmessageauth(rq->buf, ATTRVAL(attr), to->conf->secret)) {
- free(rq->buf);
+ freerqdata(rq);
pthread_mutex_unlock(&to->newrq_mutex);
return;
}
}
void sendreply(struct client *to, unsigned char *buf, struct sockaddr_storage *tosa) {
- struct replyq *replyq = to->replyq;
+ struct reply *reply;
+ uint8_t first;
if (!radsign(buf, (unsigned char *)to->conf->secret)) {
free(buf);
debug(DBG_WARN, "sendreply: failed to sign message");
return;
}
-
- pthread_mutex_lock(&replyq->count_mutex);
- if (replyq->count == replyq->size) {
- debug(DBG_WARN, "No room in queue, dropping request");
- pthread_mutex_unlock(&replyq->count_mutex);
+
+ reply = malloc(sizeof(struct reply));
+ if (!reply) {
free(buf);
+ debug(DBG_ERR, "sendreply: malloc failed");
return;
}
-
- replyq->replies[replyq->count].buf = buf;
+ memset(reply, 0, sizeof(struct reply));
+ reply->buf = buf;
if (tosa)
- replyq->replies[replyq->count].tosa = *tosa;
- replyq->count++;
+ reply->tosa = *tosa;
+
+ pthread_mutex_lock(&to->replyq->mutex);
- if (replyq->count == 1) {
+ first = list_first(to->replyq->replies) == NULL;
+
+ if (!list_push(to->replyq->replies, reply)) {
+ pthread_mutex_unlock(&to->replyq->mutex);
+ free(reply);
+ free(buf);
+ debug(DBG_ERR, "sendreply: malloc failed");
+ return;
+ }
+
+ if (first) {
debug(DBG_DBG, "signalling server writer");
- pthread_cond_signal(&replyq->count_cond);
+ pthread_cond_signal(&to->replyq->cond);
}
- pthread_mutex_unlock(&replyq->count_mutex);
+ pthread_mutex_unlock(&to->replyq->mutex);
}
int pwdencrypt(uint8_t *in, uint8_t len, char *shared, uint8_t sharedlen, uint8_t *auth) {
first = 0;
}
-#if 0
- printf("msppencrypt auth in: ");
- for (i = 0; i < 16; i++)
- printf("%02x ", auth[i]);
- printf("\n");
-
- printf("msppencrypt salt in: ");
- for (i = 0; i < 2; i++)
- printf("%02x ", salt[i]);
- printf("\n");
-
- printf("msppencrypt in: ");
- for (i = 0; i < len; i++)
- printf("%02x ", text[i]);
- printf("\n");
+#if 0
+ printfchars(NULL, "msppencrypt auth in", "%02x ", auth, 16);
+ printfchars(NULL, "msppencrypt salt in", "%02x ", salt, 2);
+ printfchars(NULL, "msppencrypt in", "%02x ", text, len);
#endif
if (!EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) ||
}
#if 0
- printf("msppencrypt hash: ");
- for (i = 0; i < 16; i++)
- printf("%02x ", hash[i]);
- printf("\n");
+ printfchars(NULL, "msppencrypt hash", "%02x ", hash, 16);
#endif
for (i = 0; i < 16; i++)
for (offset = 16; offset < len; offset += 16) {
#if 0
printf("text + offset - 16 c(%d): ", offset / 16);
- for (i = 0; i < 16; i++)
- printf("%02x ", (text + offset - 16)[i]);
- printf("\n");
+ printfchars(NULL, NULL, "%02x ", text + offset - 16, 16);
#endif
if (!EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) ||
!EVP_DigestUpdate(&mdctx, shared, sharedlen) ||
pthread_mutex_unlock(&lock);
return 0;
}
-#if 0
- printf("msppencrypt hash: ");
- for (i = 0; i < 16; i++)
- printf("%02x ", hash[i]);
- printf("\n");
+#if 0
+ printfchars(NULL, "msppencrypt hash", "%02x ", hash, 16);
#endif
for (i = 0; i < 16; i++)
}
#if 0
- printf("msppencrypt out: ");
- for (i = 0; i < len; i++)
- printf("%02x ", text[i]);
- printf("\n");
+ printfchars(NULL, "msppencrypt out", "%02x ", text, len);
#endif
pthread_mutex_unlock(&lock);
first = 0;
}
-#if 0
- printf("msppdecrypt auth in: ");
- for (i = 0; i < 16; i++)
- printf("%02x ", auth[i]);
- printf("\n");
-
- printf("msppedecrypt salt in: ");
- for (i = 0; i < 2; i++)
- printf("%02x ", salt[i]);
- printf("\n");
-
- printf("msppedecrypt in: ");
- for (i = 0; i < len; i++)
- printf("%02x ", text[i]);
- printf("\n");
+#if 0
+ printfchars(NULL, "msppdecrypt auth in", "%02x ", auth, 16);
+ printfchars(NULL, "msppdecrypt salt in", "%02x ", salt, 2);
+ printfchars(NULL, "msppdecrypt in", "%02x ", text, len);
#endif
if (!EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) ||
}
#if 0
- printf("msppedecrypt hash: ");
- for (i = 0; i < 16; i++)
- printf("%02x ", hash[i]);
- printf("\n");
+ printfchars(NULL, "msppdecrypt hash", "%02x ", hash, 16);
#endif
for (i = 0; i < 16; i++)
for (offset = 16; offset < len; offset += 16) {
#if 0
printf("text + offset - 16 c(%d): ", offset / 16);
- for (i = 0; i < 16; i++)
- printf("%02x ", (text + offset - 16)[i]);
- printf("\n");
+ printfchars(NULL, NULL, "%02x ", text + offset - 16, 16);
#endif
if (!EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) ||
!EVP_DigestUpdate(&mdctx, shared, sharedlen) ||
pthread_mutex_unlock(&lock);
return 0;
}
-#if 0
- printf("msppedecrypt hash: ");
- for (i = 0; i < 16; i++)
- printf("%02x ", hash[i]);
- printf("\n");
+#if 0
+ printfchars(NULL, "msppdecrypt hash", "%02x ", hash, 16);
#endif
- for (i = 0; i < 16; i++)
- plain[offset + i] = text[offset + i] ^ hash[i];
+ for (i = 0; i < 16; i++)
+ plain[offset + i] = text[offset + i] ^ hash[i];
}
memcpy(text, plain, len);
#if 0
- printf("msppedecrypt out: ");
- for (i = 0; i < len; i++)
- printf("%02x ", text[i]);
- printf("\n");
+ printfchars(NULL, "msppdecrypt out", "%02x ", text, len);
#endif
pthread_mutex_unlock(&lock);
}
struct realm *id2realm(char *id, uint8_t len) {
- int i;
- for (i = 0; i < realm_count; i++)
- if (!regexec(&realms[i].regex, id, 0, NULL, 0)) {
- debug(DBG_DBG, "found matching realm: %s", realms[i].name);
- return realms + i;
+ struct list_node *entry;
+ struct realm *realm;
+
+ for (entry = list_first(realms); entry; entry = list_next(entry)) {
+ realm = (struct realm *)entry->data;
+ if (!regexec(&realm->regex, id, 0, NULL, 0)) {
+ debug(DBG_DBG, "found matching realm: %s", realm->name);
+ return realm;
}
+ }
return NULL;
}
}
int pwdrecrypt(uint8_t *pwd, uint8_t len, char *oldsecret, char *newsecret, uint8_t *oldauth, uint8_t *newauth) {
-#ifdef DEBUG
- int i;
-#endif
if (len < 16 || len > 128 || len % 16) {
debug(DBG_WARN, "pwdrecrypt: invalid password length");
return 0;
return 0;
}
#ifdef DEBUG
- printf("pwdrecrypt: password: ");
- for (i = 0; i < len; i++)
- printf("%02x ", pwd[i]);
- printf("\n");
+ printfchars(NULL, "pwdrecrypt: password", "%02x ", pwd, len);
#endif
if (!pwdencrypt(pwd, len, newsecret, strlen(newsecret), newauth)) {
debug(DBG_WARN, "pwdrecrypt: cannot encrypt password");
return 1;
}
+/* returns a pointer to the resized attribute value */
+uint8_t *resizeattr(uint8_t **buf, uint8_t newvallen, uint8_t type) {
+ uint8_t *attrs, *attr, vallen;
+ uint16_t len;
+ unsigned char *new;
+
+ len = RADLEN(*buf) - 20;
+ attrs = *buf + 20;
+
+ attr = attrget(attrs, len, type);
+ if (!attr)
+ return NULL;
+
+ vallen = ATTRVALLEN(attr);
+ if (vallen == newvallen)
+ return attr + 2;
+
+ len += newvallen - vallen;
+ if (newvallen > vallen) {
+ new = realloc(*buf, len);
+ if (!new) {
+ debug(DBG_ERR, "resizeattr: malloc failed");
+ return NULL;
+ }
+ if (new != *buf) {
+ attr += new - *buf;
+ attrs = new + 20;
+ *buf = new;
+ }
+ }
+ memmove(attr + 2 + newvallen, attr + 2 + vallen, len - (attr - attrs + newvallen));
+ attr[1] = newvallen + 2;
+ ((uint16_t *)*buf)[1] = htons(len + 20);
+ return attr + 2;
+}
+
+int rewriteusername(struct request *rq, char *in) {
+ size_t nmatch = 10, reslen = 0, start = 0;
+ regmatch_t pmatch[10], *pfield;
+ int i;
+ unsigned char *result;
+ char *out = rq->from->conf->rewriteattrreplacement;
+
+ if (regexec(rq->from->conf->rewriteattrregex, in, nmatch, pmatch, 0)) {
+ debug(DBG_DBG, "rewriteattr: username not matching, no rewrite");
+ return 1;
+ }
+
+ rq->origusername = stringcopy(in, 0);
+ if (!rq->origusername)
+ return 0;
+
+ for (i = start; out[i]; i++) {
+ if (out[i] == '\\' && out[i + 1] >= '1' && out[i + 1] <= '9') {
+ pfield = &pmatch[out[i + 1] - '0'];
+ if (pfield->rm_so >= 0) {
+ reslen += i - start + pfield->rm_eo - pfield->rm_so;
+ start = i + 2;
+ }
+ i++;
+ }
+ }
+ reslen += i - start;
+
+ result = resizeattr(&rq->buf, reslen, RAD_Attr_User_Name);
+ if (!result)
+ return 0;
+
+ start = 0;
+ reslen = 0;
+ for (i = start; out[i]; i++) {
+ if (out[i] == '\\' && out[i + 1] >= '1' && out[i + 1] <= '9') {
+ pfield = &pmatch[out[i + 1] - '0'];
+ if (pfield->rm_so >= 0) {
+ memcpy(result + reslen, out + start, i - start);
+ reslen += i - start;
+ memcpy(result + reslen, in + pfield->rm_so, pfield->rm_eo - pfield->rm_so);
+ reslen += pfield->rm_eo - pfield->rm_so;
+ start = i + 2;
+ }
+ i++;
+ }
+ }
+
+ memcpy(result + reslen, out + start, i - start);
+ reslen += i - start;
+ memcpy(in, result, reslen);
+ in[reslen] = '\0';
+ return 1;
+}
+
+void acclog(unsigned char *attrs, int length, char *host) {
+ unsigned char *attr;
+ char username[256];
+
+ attr = attrget(attrs, length, RAD_Attr_User_Name);
+ if (!attr) {
+ debug(DBG_INFO, "acclog: accounting-request from %s without username attribute", host);
+ return;
+ }
+ memcpy(username, ATTRVAL(attr), ATTRVALLEN(attr));
+ username[ATTRVALLEN(attr)] = '\0';
+ debug(DBG_INFO, "acclog: accounting-request from %s with username: %s", host, username);
+}
+
+void respondaccounting(struct request *rq) {
+ unsigned char *resp;
+
+ resp = malloc(20);
+ if (!resp) {
+ debug(DBG_ERR, "respondstatusserver: malloc failed");
+ return;
+ }
+ memcpy(resp, rq->buf, 20);
+ resp[0] = RAD_Accounting_Response;
+ resp[2] = 0;
+ resp[3] = 20;
+ debug(DBG_DBG, "respondaccounting: responding to %s", rq->from->conf->host);
+ sendreply(rq->from, resp, rq->from->conf->type == 'U' ? &rq->fromsa : NULL);
+}
+
void respondstatusserver(struct request *rq) {
unsigned char *resp;
unsigned char *resp;
int len = 20;
- if (message)
+ if (message && *message)
len += 2 + strlen(message);
resp = malloc(len);
memcpy(resp, rq->buf, 20);
resp[0] = RAD_Access_Reject;
*(uint16_t *)(resp + 2) = htons(len);
- if (message) {
+ if (message && *message) {
resp[20] = RAD_Attr_Reply_Message;
resp[21] = len - 20;
memcpy(resp + 22, message, len - 22);
sendreply(rq->from, resp, rq->from->conf->type == 'U' ? &rq->fromsa : NULL);
}
+struct server *realm2server(struct realm *realm) {
+ struct list_node *entry;
+ struct server *server, *best = NULL;
+
+ for (entry = list_first(realm->srvconfs); entry; entry = list_next(entry)) {
+ server = ((struct clsrvconf *)entry->data)->servers;
+ if (!server->connectionok)
+ continue;
+ if (!server->loststatsrv)
+ return server;
+ if (!best) {
+ best = server;
+ continue;
+ }
+ if (server->loststatsrv < best->loststatsrv)
+ best = server;
+ }
+ return best;
+}
+
void radsrv(struct request *rq) {
uint8_t code, id, *auth, *attrs, *attr;
uint16_t len;
struct server *to = NULL;
char username[256];
- unsigned char *buf, newauth[16];
+ unsigned char newauth[16];
struct realm *realm = NULL;
- buf = rq->buf;
- code = *(uint8_t *)buf;
- id = *(uint8_t *)(buf + 1);
- len = RADLEN(buf);
- auth = (uint8_t *)(buf + 4);
+ code = *(uint8_t *)rq->buf;
+ id = *(uint8_t *)(rq->buf + 1);
+ len = RADLEN(rq->buf);
+ auth = (uint8_t *)(rq->buf + 4);
debug(DBG_DBG, "radsrv: code %d, id %d, length %d", code, id, len);
- if (code != RAD_Access_Request && code != RAD_Status_Server) {
- debug(DBG_INFO, "radsrv: server currently accepts only access-requests and status-server, ignoring");
- free(buf);
+ if (code != RAD_Access_Request && code != RAD_Status_Server && code != RAD_Accounting_Request) {
+ debug(DBG_INFO, "radsrv: server currently accepts only access-requests, accounting-requests and status-server, ignoring");
+ freerqdata(rq);
return;
}
len -= 20;
- attrs = buf + 20;
+ attrs = rq->buf + 20;
if (!attrvalidate(attrs, len)) {
debug(DBG_WARN, "radsrv: attribute validation failed, ignoring packet");
- free(buf);
+ freerqdata(rq);
return;
}
- if (code == RAD_Access_Request) {
- attr = attrget(attrs, len, RAD_Attr_User_Name);
- if (!attr) {
- debug(DBG_WARN, "radsrv: ignoring request, no username attribute");
- free(buf);
- return;
- }
- memcpy(username, ATTRVAL(attr), ATTRVALLEN(attr));
- username[ATTRVALLEN(attr)] = '\0';
- debug(DBG_DBG, "Access Request with username: %s", username);
+ attr = attrget(attrs, len, RAD_Attr_Message_Authenticator);
+ if (attr && (ATTRVALLEN(attr) != 16 || !checkmessageauth(rq->buf, ATTRVAL(attr), rq->from->conf->secret))) {
+ debug(DBG_WARN, "radsrv: message authentication failed");
+ freerqdata(rq);
+ return;
+ }
- realm = id2realm(username, strlen(username));
- if (!realm) {
- debug(DBG_INFO, "radsrv: ignoring request, don't know where to send it");
- free(buf);
- return;
+ if (code != RAD_Access_Request) {
+ switch (code) {
+ case RAD_Accounting_Request:
+ acclog(attrs, len, rq->from->conf->host);
+ respondaccounting(rq);
+ break;
+ case RAD_Status_Server:
+ respondstatusserver(rq);
+ break;
}
- to = realm->srvconf->servers;
+ freerqdata(rq);
+ return;
+ }
- if (to && rqinqueue(to, rq->from, id)) {
- debug(DBG_INFO, "radsrv: already got request from host %s with id %d, ignoring", rq->from->conf->host, id);
- free(buf);
+ /* code == RAD_Access_Request */
+ attr = attrget(attrs, len, RAD_Attr_User_Name);
+ if (!attr) {
+ debug(DBG_WARN, "radsrv: ignoring request, no username attribute");
+ freerqdata(rq);
+ return;
+ }
+ memcpy(username, ATTRVAL(attr), ATTRVALLEN(attr));
+ username[ATTRVALLEN(attr)] = '\0';
+
+ if (rq->from->conf->rewriteattrregex) {
+ if (!rewriteusername(rq, username)) {
+ debug(DBG_WARN, "radsrv: username malloc failed, ignoring request");
+ freerqdata(rq);
return;
}
+ len = RADLEN(rq->buf) - 20;
+ auth = (uint8_t *)(rq->buf + 4);
+ attrs = rq->buf + 20;
}
-
- attr = attrget(attrs, len, RAD_Attr_Message_Authenticator);
- if (attr && (ATTRVALLEN(attr) != 16 || !checkmessageauth(buf, ATTRVAL(attr), rq->from->conf->secret))) {
- debug(DBG_WARN, "radsrv: message authentication failed");
- free(buf);
+
+ if (rq->origusername)
+ debug(DBG_DBG, "Access Request with username: %s (originally %s)", username, rq->origusername);
+ else
+ debug(DBG_DBG, "Access Request with username: %s", username);
+
+ realm = id2realm(username, strlen(username));
+ if (!realm) {
+ debug(DBG_INFO, "radsrv: ignoring request, don't know where to send it");
+ freerqdata(rq);
return;
}
-
- if (code == RAD_Status_Server) {
- respondstatusserver(rq);
+
+ to = realm2server(realm);
+ if (to && rqinqueue(to, rq->from, id)) {
+ debug(DBG_INFO, "radsrv: already got request from host %s with id %d, ignoring", rq->from->conf->host, id);
+ freerqdata(rq);
return;
}
if (!to) {
- debug(DBG_INFO, "radsrv: sending reject to %s for %s", rq->from->conf->host, username);
- respondreject(rq, realm->message);
+ if (realm->message) {
+ debug(DBG_INFO, "radsrv: sending reject to %s for %s", rq->from->conf->host, username);
+ respondreject(rq, realm->message);
+ }
+ freerqdata(rq);
return;
}
if (!RAND_bytes(newauth, 16)) {
debug(DBG_WARN, "radsrv: failed to generate random auth");
- free(buf);
+ freerqdata(rq);
return;
}
-#ifdef DEBUG
- printauth("auth", auth);
+#ifdef DEBUG
+ printfchars(NULL, "auth", "%02x ", auth, 16);
#endif
attr = attrget(attrs, len, RAD_Attr_User_Password);
if (attr) {
debug(DBG_DBG, "radsrv: found userpwdattr with value length %d", ATTRVALLEN(attr));
if (!pwdrecrypt(ATTRVAL(attr), ATTRVALLEN(attr), rq->from->conf->secret, to->conf->secret, auth, newauth)) {
- free(buf);
+ freerqdata(rq);
return;
}
}
if (attr) {
debug(DBG_DBG, "radsrv: found tunnelpwdattr with value length %d", ATTRVALLEN(attr));
if (!pwdrecrypt(ATTRVAL(attr), ATTRVALLEN(attr), rq->from->conf->secret, to->conf->secret, auth, newauth)) {
- free(buf);
+ freerqdata(rq);
return;
}
}
sendrq(to, rq);
}
-void *clientrd(void *arg) {
- struct server *server = (struct server *)arg;
+int replyh(struct server *server, unsigned char *buf) {
struct client *from;
+ struct request *rq;
int i, len, sublen;
- unsigned char *buf, *messageauth, *subattrs, *attrs, *attr;
+ unsigned char *messageauth, *subattrs, *attrs, *attr, *username;
struct sockaddr_storage fromsa;
- struct timeval lastconnecttry;
char tmp[256];
- for (;;) {
- lastconnecttry = server->lastconnecttry;
- buf = (server->conf->type == 'U' ? radudpget(server->sock, NULL, &server, NULL) : radtlsget(server->ssl));
- if (!buf && server->conf->type == 'T') {
- tlsconnect(server, &lastconnecttry, "clientrd");
- continue;
- }
-
- server->connectionok = 1;
-
- i = buf[1]; /* i is the id */
+ server->connectionok = 1;
+ server->loststatsrv = 0;
+
+ i = buf[1]; /* i is the id */
+
+ switch (*buf) {
+ case RAD_Access_Accept:
+ debug(DBG_DBG, "got Access Accept with id %d", i);
+ break;
+ case RAD_Access_Reject:
+ debug(DBG_DBG, "got Access Reject with id %d", i);
+ break;
+ case RAD_Access_Challenge:
+ debug(DBG_DBG, "got Access Challenge with id %d", i);
+ break;
+ default:
+ debug(DBG_INFO, "replyh: discarding, only accept access accept, access reject and access challenge messages");
+ return 0;
+ }
- switch (*buf) {
- case RAD_Access_Accept:
- debug(DBG_DBG, "got Access Accept with id %d", i);
- break;
- case RAD_Access_Reject:
- debug(DBG_DBG, "got Access Reject with id %d", i);
- break;
- case RAD_Access_Challenge:
- debug(DBG_DBG, "got Access Challenge with id %d", i);
- break;
- default:
- free(buf);
- debug(DBG_INFO, "clientrd: discarding, only accept access accept, access reject and access challenge messages");
- continue;
- }
+ rq = server->requests + i;
- pthread_mutex_lock(&server->newrq_mutex);
- if (!server->requests[i].buf || !server->requests[i].tries) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_INFO, "clientrd: no matching request sent with this id, ignoring");
- continue;
- }
+ pthread_mutex_lock(&server->newrq_mutex);
+ if (!rq->buf || !rq->tries) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_INFO, "replyh: no matching request sent with this id, ignoring reply");
+ return 0;
+ }
- if (server->requests[i].received) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_INFO, "clientrd: already received, ignoring");
- continue;
- }
+ if (rq->received) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_INFO, "replyh: already received, ignoring reply");
+ return 0;
+ }
- if (!validauth(buf, server->requests[i].buf + 4, (unsigned char *)server->conf->secret)) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_WARN, "clientrd: invalid auth, ignoring");
- continue;
- }
+ if (!validauth(buf, rq->buf + 4, (unsigned char *)server->conf->secret)) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_WARN, "replyh: invalid auth, ignoring reply");
+ return 0;
+ }
- from = server->requests[i].from;
- len = RADLEN(buf) - 20;
- attrs = buf + 20;
+ from = rq->from;
+ len = RADLEN(buf) - 20;
+ attrs = buf + 20;
- if (!attrvalidate(attrs, len)) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_WARN, "clientrd: attribute validation failed, ignoring packet");
- continue;
- }
+ if (!attrvalidate(attrs, len)) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_WARN, "replyh: attribute validation failed, ignoring reply");
+ return 0;
+ }
- /* Message Authenticator */
- messageauth = attrget(attrs, len, RAD_Attr_Message_Authenticator);
- if (messageauth) {
- if (ATTRVALLEN(messageauth) != 16) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_WARN, "clientrd: illegal message auth attribute length, ignoring packet");
- continue;
- }
- memcpy(tmp, buf + 4, 16);
- memcpy(buf + 4, server->requests[i].buf + 4, 16);
- if (!checkmessageauth(buf, ATTRVAL(messageauth), server->conf->secret)) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_WARN, "clientrd: message authentication failed");
- continue;
- }
- memcpy(buf + 4, tmp, 16);
- debug(DBG_DBG, "clientrd: message auth ok");
+ /* Message Authenticator */
+ messageauth = attrget(attrs, len, RAD_Attr_Message_Authenticator);
+ if (messageauth) {
+ if (ATTRVALLEN(messageauth) != 16) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_WARN, "replyh: illegal message auth attribute length, ignoring reply");
+ return 0;
}
-
- if (*server->requests[i].buf == RAD_Status_Server) {
- server->requests[i].received = 1;
+ memcpy(tmp, buf + 4, 16);
+ memcpy(buf + 4, rq->buf + 4, 16);
+ if (!checkmessageauth(buf, ATTRVAL(messageauth), server->conf->secret)) {
pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_INFO, "clientrd: got status server response from %s", server->conf->host);
- continue;
+ debug(DBG_WARN, "replyh: message authentication failed, ignoring reply");
+ return 0;
}
+ memcpy(buf + 4, tmp, 16);
+ debug(DBG_DBG, "replyh: message auth ok");
+ }
+
+ if (*rq->buf == RAD_Status_Server) {
+ rq->received = 1;
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_INFO, "replyh: got status server response from %s", server->conf->host);
+ return 0;
+ }
- /* MS MPPE */
- for (attr = attrs; (attr = attrget(attr, len - (attr - attrs), RAD_Attr_Vendor_Specific)); attr += ATTRLEN(attr)) {
- if (ATTRVALLEN(attr) <= 4)
- break;
-
- if (((uint16_t *)attr)[1] != 0 || ntohs(((uint16_t *)attr)[2]) != 311) /* 311 == MS */
- continue;
+ /* MS MPPE */
+ for (attr = attrs; (attr = attrget(attr, len - (attr - attrs), RAD_Attr_Vendor_Specific)); attr += ATTRLEN(attr)) {
+ if (ATTRVALLEN(attr) <= 4)
+ break;
- sublen = ATTRVALLEN(attr) - 4;
- subattrs = ATTRVAL(attr) + 4;
- if (!attrvalidate(subattrs, sublen) ||
- !msmppe(subattrs, sublen, RAD_VS_ATTR_MS_MPPE_Send_Key, "MS MPPE Send Key",
- server->requests + i, server->conf->secret, from->conf->secret) ||
- !msmppe(subattrs, sublen, RAD_VS_ATTR_MS_MPPE_Recv_Key, "MS MPPE Recv Key",
- server->requests + i, server->conf->secret, from->conf->secret))
- break;
- }
- if (attr) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- debug(DBG_WARN, "clientrd: MS attribute handling failed, ignoring packet");
+ if (attr[2] != 0 || attr[3] != 0 || attr[4] != 1 || attr[5] != 55) /* 311 == MS */
continue;
- }
+
+ sublen = ATTRVALLEN(attr) - 4;
+ subattrs = ATTRVAL(attr) + 4;
+ if (!attrvalidate(subattrs, sublen) ||
+ !msmppe(subattrs, sublen, RAD_VS_ATTR_MS_MPPE_Send_Key, "MS MPPE Send Key",
+ rq, server->conf->secret, from->conf->secret) ||
+ !msmppe(subattrs, sublen, RAD_VS_ATTR_MS_MPPE_Recv_Key, "MS MPPE Recv Key",
+ rq, server->conf->secret, from->conf->secret))
+ break;
+ }
+ if (attr) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_WARN, "replyh: MS attribute handling failed, ignoring reply");
+ return 0;
+ }
- if (*buf == RAD_Access_Accept || *buf == RAD_Access_Reject) {
- attr = attrget(server->requests[i].buf + 20, RADLEN(server->requests[i].buf) - 20, RAD_Attr_User_Name);
- /* we know the attribute exists */
- memcpy(tmp, ATTRVAL(attr), ATTRVALLEN(attr));
- tmp[ATTRVALLEN(attr)] = '\0';
- switch (*buf) {
- case RAD_Access_Accept:
+ if (*buf == RAD_Access_Accept || *buf == RAD_Access_Reject) {
+ attr = attrget(rq->buf + 20, RADLEN(rq->buf) - 20, RAD_Attr_User_Name);
+ /* we know the attribute exists */
+ memcpy(tmp, ATTRVAL(attr), ATTRVALLEN(attr));
+ tmp[ATTRVALLEN(attr)] = '\0';
+ switch (*buf) {
+ case RAD_Access_Accept:
+ if (rq->origusername)
+ debug(DBG_INFO, "Access Accept for %s (originally %s) from %s", tmp, rq->origusername, server->conf->host);
+ else
debug(DBG_INFO, "Access Accept for %s from %s", tmp, server->conf->host);
- break;
- case RAD_Access_Reject:
+ break;
+ case RAD_Access_Reject:
+ if (rq->origusername)
+ debug(DBG_INFO, "Access Reject for %s (originally %s) from %s", tmp, rq->origusername, server->conf->host);
+ else
debug(DBG_INFO, "Access Reject for %s from %s", tmp, server->conf->host);
- break;
- }
+ break;
}
+ }
- /* once we set received = 1, requests[i] may be reused */
- buf[1] = (char)server->requests[i].origid;
- memcpy(buf + 4, server->requests[i].origauth, 16);
+ buf[1] = (char)rq->origid;
+ memcpy(buf + 4, rq->origauth, 16);
#ifdef DEBUG
- printauth("origauth/buf+4", buf + 4);
+ printfchars(NULL, "origauth/buf+4", "%02x ", buf + 4, 16);
#endif
+
+ if (rq->origusername) {
+ username = resizeattr(&buf, strlen(rq->origusername), RAD_Attr_User_Name);
+ if (!username) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_WARN, "replyh: malloc failed, ignoring reply");
+ return 0;
+ }
+ memcpy(username, rq->origusername, strlen(rq->origusername));
+ len = RADLEN(buf) - 20;
+ attrs = buf + 20;
+ if (messageauth)
+ messageauth = attrget(attrs, len, RAD_Attr_Message_Authenticator);
+ }
- if (messageauth) {
- if (!createmessageauth(buf, ATTRVAL(messageauth), from->conf->secret)) {
- pthread_mutex_unlock(&server->newrq_mutex);
- free(buf);
- continue;
- }
- debug(DBG_DBG, "clientrd: computed messageauthattr");
+ if (messageauth) {
+ if (!createmessageauth(buf, ATTRVAL(messageauth), from->conf->secret)) {
+ pthread_mutex_unlock(&server->newrq_mutex);
+ debug(DBG_WARN, "replyh: failed to create authenticator, malloc failed?, ignoring reply");
+ return 0;
}
+ debug(DBG_DBG, "replyh: computed messageauthattr");
+ }
- if (from->conf->type == 'U')
- fromsa = server->requests[i].fromsa;
- server->requests[i].received = 1;
- pthread_mutex_unlock(&server->newrq_mutex);
+ if (from->conf->type == 'U')
+ fromsa = rq->fromsa;
+ /* once we set received = 1, rq may be reused */
+ rq->received = 1;
+ pthread_mutex_unlock(&server->newrq_mutex);
+
+ debug(DBG_DBG, "replyh: giving packet back to where it came from");
+ sendreply(from, buf, from->conf->type == 'U' ? &fromsa : NULL);
+ return 1;
+}
- debug(DBG_DBG, "clientrd: giving packet back to where it came from");
- sendreply(from, buf, from->conf->type == 'U' ? &fromsa : NULL);
+void *udpclientrd(void *arg) {
+ struct server *server;
+ unsigned char *buf;
+ int *s = (int *)arg;
+
+ for (;;) {
+ server = NULL;
+ buf = radudpget(*s, NULL, &server, NULL);
+ if (!replyh(server, buf))
+ free(buf);
+ }
+}
+
+void *tlsclientrd(void *arg) {
+ struct server *server = (struct server *)arg;
+ unsigned char *buf;
+ struct timeval lastconnecttry;
+
+ for (;;) {
+ /* yes, lastconnecttry is really necessary */
+ lastconnecttry = server->lastconnecttry;
+ buf = radtlsget(server->ssl);
+ if (!buf) {
+ tlsconnect(server, &lastconnecttry, "clientrd");
+ continue;
+ }
+
+ if (!replyh(server, buf))
+ free(buf);
}
}
void *clientwr(void *arg) {
struct server *server = (struct server *)arg;
struct request *rq;
- pthread_t clientrdth;
+ pthread_t tlsclientrdth;
int i;
uint8_t rnd;
struct timeval now, lastsend;
}
if (server->conf->type == 'U') {
- if ((server->sock = connecttoserver(server->conf->addrinfo)) < 0)
- debugx(1, DBG_ERR, "clientwr: connecttoserver failed");
- } else
+ server->connectionok = 1;
+ } else {
tlsconnect(server, NULL, "new client");
+ server->connectionok = 1;
+ if (pthread_create(&tlsclientrdth, NULL, tlsclientrd, (void *)server))
+ debugx(1, DBG_ERR, "clientwr: pthread_create failed");
+ }
- if (pthread_create(&clientrdth, NULL, clientrd, (void *)server))
- debugx(1, DBG_ERR, "clientwr: pthread_create failed");
-
for (;;) {
pthread_mutex_lock(&server->newrq_mutex);
if (!server->newrq) {
for (i = 0; i < MAX_REQUESTS; i++) {
pthread_mutex_lock(&server->newrq_mutex);
- while (!server->requests[i].buf && i < MAX_REQUESTS)
+ while (i < MAX_REQUESTS && !server->requests[i].buf)
i++;
if (i == MAX_REQUESTS) {
pthread_mutex_unlock(&server->newrq_mutex);
debug(DBG_DBG, "clientwr: packet %d in queue is marked as received", i);
if (rq->buf) {
debug(DBG_DBG, "clientwr: freeing received packet %d from queue", i);
- free(rq->buf);
+ freerqdata(rq);
/* setting this to NULL means that it can be reused */
rq->buf = NULL;
}
if (rq->tries == (*rq->buf == RAD_Status_Server || server->conf->type == 'T'
? 1 : REQUEST_RETRIES)) {
debug(DBG_DBG, "clientwr: removing expired packet from queue");
- if (*rq->buf == RAD_Status_Server)
+ if (*rq->buf == RAD_Status_Server) {
debug(DBG_WARN, "clientwr: no status server response, %s dead?", server->conf->host);
- free(rq->buf);
+ if (server->loststatsrv < 255)
+ server->loststatsrv++;
+ }
+ freerqdata(rq);
/* setting this to NULL means that it can be reused */
rq->buf = NULL;
pthread_mutex_unlock(&server->newrq_mutex);
void *udpserverwr(void *arg) {
struct replyq *replyq = udp_server_replyq;
- struct reply *reply = replyq->replies;
+ struct reply *reply;
- pthread_mutex_lock(&replyq->count_mutex);
for (;;) {
- while (!replyq->count) {
+ pthread_mutex_lock(&replyq->mutex);
+ while (!(reply = (struct reply *)list_shift(replyq->replies))) {
debug(DBG_DBG, "udp server writer, waiting for signal");
- pthread_cond_wait(&replyq->count_cond, &replyq->count_mutex);
+ pthread_cond_wait(&replyq->cond, &replyq->mutex);
debug(DBG_DBG, "udp server writer, got signal");
}
- pthread_mutex_unlock(&replyq->count_mutex);
-
+ pthread_mutex_unlock(&replyq->mutex);
+
if (sendto(udp_server_sock, reply->buf, RADLEN(reply->buf), 0,
(struct sockaddr *)&reply->tosa, SOCKADDR_SIZE(reply->tosa)) < 0)
debug(DBG_WARN, "sendudp: send failed");
free(reply->buf);
-
- pthread_mutex_lock(&replyq->count_mutex);
- replyq->count--;
- memmove(replyq->replies, replyq->replies + 1,
- replyq->count * sizeof(struct reply));
+ free(reply);
}
}
void *udpserverrd(void *arg) {
struct request rq;
pthread_t udpserverwrth;
+ struct clsrvconf *listenres;
- if ((udp_server_sock = bindtoaddr(udp_server_listen->addrinfo)) < 0)
+ listenres = resolve_hostport('U', options.listenudp, DEFAULT_UDP_PORT);
+ if ((udp_server_sock = bindtoaddr(listenres->addrinfo, AF_UNSPEC, 1, 0)) < 0)
debugx(1, DBG_ERR, "udpserverrd: socket/bind failed");
debug(DBG_WARN, "udpserverrd: listening for UDP on %s:%s",
- udp_server_listen->host ? udp_server_listen->host : "*", udp_server_listen->port);
-
+ listenres->host ? listenres->host : "*", listenres->port);
+ free(listenres);
+
if (pthread_create(&udpserverwrth, NULL, udpserverwr, NULL))
debugx(1, DBG_ERR, "pthread_create failed");
}
}
+void *udpaccserverrd(void *arg) {
+ struct request rq;
+ struct clsrvconf *listenres;
+
+ listenres = resolve_hostport('U', options.listenaccudp, DEFAULT_UDP_PORT);
+ if ((udp_accserver_sock = bindtoaddr(listenres->addrinfo, AF_UNSPEC, 1, 0)) < 0)
+ debugx(1, DBG_ERR, "udpserverrd: socket/bind failed");
+
+ debug(DBG_WARN, "udpaccserverrd: listening for UDP on %s:%s",
+ listenres->host ? listenres->host : "*", listenres->port);
+ free(listenres);
+
+ for (;;) {
+ memset(&rq, 0, sizeof(struct request));
+ rq.buf = radudpget(udp_accserver_sock, &rq.from, NULL, &rq.fromsa);
+ if (*(uint8_t *)rq.buf == RAD_Accounting_Request) {
+ radsrv(&rq);
+ continue;
+ }
+ debug(DBG_INFO, "udpaccserverrd: got something other than accounting-request, ignoring");
+ freerqdata(&rq);
+ }
+}
+
void *tlsserverwr(void *arg) {
int cnt;
unsigned long error;
struct client *client = (struct client *)arg;
struct replyq *replyq;
+ struct reply *reply;
debug(DBG_DBG, "tlsserverwr starting for %s", client->conf->host);
replyq = client->replyq;
- pthread_mutex_lock(&replyq->count_mutex);
for (;;) {
- while (!replyq->count) {
+ pthread_mutex_lock(&replyq->mutex);
+ while (!list_first(replyq->replies)) {
if (client->ssl) {
debug(DBG_DBG, "tls server writer, waiting for signal");
- pthread_cond_wait(&replyq->count_cond, &replyq->count_mutex);
+ pthread_cond_wait(&replyq->cond, &replyq->mutex);
debug(DBG_DBG, "tls server writer, got signal");
}
if (!client->ssl) {
/* ssl might have changed while waiting */
- pthread_mutex_unlock(&replyq->count_mutex);
+ pthread_mutex_unlock(&replyq->mutex);
debug(DBG_DBG, "tlsserverwr: exiting as requested");
pthread_exit(NULL);
}
}
- pthread_mutex_unlock(&replyq->count_mutex);
- cnt = SSL_write(client->ssl, replyq->replies->buf, RADLEN(replyq->replies->buf));
+ reply = (struct reply *)list_shift(replyq->replies);
+ pthread_mutex_unlock(&replyq->mutex);
+ cnt = SSL_write(client->ssl, reply->buf, RADLEN(reply->buf));
if (cnt > 0)
debug(DBG_DBG, "tlsserverwr: Sent %d bytes, Radius packet of length %d",
- cnt, RADLEN(replyq->replies->buf));
+ cnt, RADLEN(reply->buf));
else
while ((error = ERR_get_error()))
debug(DBG_ERR, "tlsserverwr: SSL: %s", ERR_error_string(error, NULL));
- free(replyq->replies->buf);
-
- pthread_mutex_lock(&replyq->count_mutex);
- replyq->count--;
- memmove(replyq->replies, replyq->replies + 1, replyq->count * sizeof(struct reply));
+ free(reply->buf);
+ free(reply);
}
}
debug(DBG_ERR, "tlsserverrd: connection lost");
/* stop writer by setting ssl to NULL and give signal in case waiting for data */
client->ssl = NULL;
- pthread_mutex_lock(&client->replyq->count_mutex);
- pthread_cond_signal(&client->replyq->count_cond);
- pthread_mutex_unlock(&client->replyq->count_mutex);
+ pthread_mutex_lock(&client->replyq->mutex);
+ pthread_cond_signal(&client->replyq->cond);
+ pthread_mutex_unlock(&client->replyq->mutex);
debug(DBG_DBG, "tlsserverrd: waiting for writer to end");
pthread_join(tlsserverwrth, NULL);
}
shutdown(s, SHUT_RDWR);
close(s);
debug(DBG_DBG, "tlsserverrd thread for %s exiting", client->conf->host);
- client->ssl = NULL;
+ removeclient(client);
pthread_exit(NULL);
}
size_t fromlen = sizeof(from);
struct clsrvconf *conf;
struct client *client;
+ struct clsrvconf *listenres;
- if ((s = bindtoaddr(tcp_server_listen->addrinfo)) < 0)
+ listenres = resolve_hostport('T', options.listentcp, DEFAULT_TLS_PORT);
+ if ((s = bindtoaddr(listenres->addrinfo, AF_UNSPEC, 1, 0)) < 0)
debugx(1, DBG_ERR, "tlslistener: socket/bind failed");
listen(s, 0);
- debug(DBG_WARN, "listening for incoming TCP on %s:%s",
- tcp_server_listen->host ? tcp_server_listen->host : "*", tcp_server_listen->port);
-
+ debug(DBG_WARN, "listening for incoming TCP on %s:%s", listenres->host ? listenres->host : "*", listenres->port);
+ free(listenres);
+
for (;;) {
snew = accept(s, (struct sockaddr *)&from, &fromlen);
if (snew < 0) {
}
debug(DBG_WARN, "incoming TLS connection from %s", addr2string((struct sockaddr *)&from, fromlen));
- conf = find_peer('T', (struct sockaddr *)&from, clconfs, clconf_count);
+ conf = find_conf('T', (struct sockaddr *)&from, clconfs, NULL);
if (!conf) {
debug(DBG_WARN, "ignoring request, not a known TLS client");
shutdown(snew, SHUT_RDWR);
close(snew);
continue;
}
- client = conf->clients;
- if (client->ssl) {
- debug(DBG_WARN, "Ignoring incoming TLS connection, already have one from this client");
+ client = addclient(conf);
+
+ if (!client) {
+ debug(DBG_WARN, "Failed to create new client instance");
shutdown(snew, SHUT_RDWR);
close(snew);
continue;
if (pthread_create(&tlsserverth, NULL, tlsserverrd, (void *)client)) {
debug(DBG_ERR, "tlslistener: pthread_create failed");
SSL_free(client->ssl);
+ removeclient(client);
shutdown(snew, SHUT_RDWR);
close(snew);
- client->ssl = NULL;
continue;
}
pthread_detach(tlsserverth);
void tlsadd(char *value, char *cacertfile, char *cacertpath, char *certfile, char *certkeyfile, char *certkeypwd) {
struct tls *new;
SSL_CTX *ctx;
+ STACK_OF(X509_NAME) *calist;
int i;
unsigned long error;
debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
debugx(1, DBG_ERR, "Error initialising SSL/TLS in TLS context %s", value);
}
+
+ calist = cacertfile ? SSL_load_client_CA_file(cacertfile) : NULL;
+ if (!cacertfile || calist) {
+ if (cacertpath) {
+ if (!calist)
+ calist = sk_X509_NAME_new_null();
+ if (!SSL_add_dir_cert_subjects_to_stack(calist, cacertpath)) {
+ sk_X509_NAME_free(calist);
+ calist = NULL;
+ }
+ }
+ }
+ if (!calist) {
+ while ((error = ERR_get_error()))
+ debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
+ debugx(1, DBG_ERR, "Error adding CA subjects in TLS context %s", value);
+ }
+ SSL_CTX_set_client_CA_list(ctx, calist);
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb);
SSL_CTX_set_verify_depth(ctx, MAX_CERT_DEPTH + 1);
-
- tls_count++;
- tls = realloc(tls, tls_count * sizeof(struct tls));
- if (!tls)
+
+ new = malloc(sizeof(struct tls));
+ if (!new || !list_push(tlsconfs, new))
debugx(1, DBG_ERR, "malloc failed");
- new = tls + tls_count - 1;
+
memset(new, 0, sizeof(struct tls));
new->name = stringcopy(value, 0);
if (!new->name)
}
void tlsfree() {
- int i;
- for (i = 0; i < tls_count; i++)
- if (!tls[i].count)
- SSL_CTX_free(tls[i].ctx);
- tls_count = 0;
- free(tls);
- tls = NULL;
+ struct list_node *entry;
+ struct tls *t;
+
+ for (entry = list_first(tlsconfs); entry; entry = list_next(entry)) {
+ t = (struct tls *)entry->data;
+ if (t->name)
+ free(t->name);
+ if (!t->count)
+ SSL_CTX_free(t->ctx);
+ }
+ list_destroy(tlsconfs);
+ tlsconfs = NULL;
}
SSL_CTX *tlsgetctx(char *alt1, char *alt2) {
- int i, c1 = -1, c2 = -1;
- for (i = 0; i < tls_count; i++) {
- if (!strcasecmp(tls[i].name, alt1)) {
- c1 = i;
+ struct list_node *entry;
+ struct tls *t, *t1 = NULL, *t2 = NULL;
+
+ for (entry = list_first(tlsconfs); entry; entry = list_next(entry)) {
+ t = (struct tls *)entry->data;
+ if (!strcasecmp(t->name, alt1)) {
+ t1 = t;
break;
}
- if (c2 == -1 && alt2 && !strcasecmp(tls[i].name, alt2))
- c2 = i;
+ if (!t2 && alt2 && !strcasecmp(t->name, alt2))
+ t2 = t;
}
- i = (c1 == -1 ? c2 : c1);
- if (i == -1)
+ t = (t1 ? t1 : t2);
+ if (!t)
return NULL;
- tls[i].count++;
- return tls[i].ctx;
-}
-
-struct replyq *newreplyq(int size) {
- struct replyq *replyq;
-
- replyq = malloc(sizeof(struct replyq));
- if (!replyq)
- debugx(1, DBG_ERR, "malloc failed");
- replyq->replies = calloc(MAX_REQUESTS, sizeof(struct reply));
- if (!replyq->replies)
- debugx(1, DBG_ERR, "malloc failed");
- replyq->count = 0;
- replyq->size = size;
- pthread_mutex_init(&replyq->count_mutex, NULL);
- pthread_cond_init(&replyq->count_cond, NULL);
- return replyq;
-}
-
-void addclient(struct clsrvconf *conf) {
- if (conf->clients)
- debugx(1, DBG_ERR, "currently works with just one client per conf");
-
- conf->clients = malloc(sizeof(struct client));
- if (!conf->clients)
- debugx(1, DBG_ERR, "malloc failed");
- memset(conf->clients, 0, sizeof(struct client));
- conf->clients->conf = conf;
-
- if (conf->type == 'T')
- conf->clients->replyq = newreplyq(MAX_REQUESTS);
- else {
- if (!udp_server_replyq)
- udp_server_replyq = newreplyq(client_udp_count * MAX_REQUESTS);
- conf->clients->replyq = udp_server_replyq;
- }
-}
-
-void addserver(struct clsrvconf *conf) {
- if (conf->servers)
- debugx(1, DBG_ERR, "currently works with just one server per conf");
-
- conf->servers = malloc(sizeof(struct server));
- if (!conf->servers)
- debugx(1, DBG_ERR, "malloc failed");
- memset(conf->servers, 0, sizeof(struct server));
- conf->servers->conf = conf;
-
- conf->servers->sock = -1;
- pthread_mutex_init(&conf->servers->lock, NULL);
- conf->servers->requests = calloc(MAX_REQUESTS, sizeof(struct request));
- if (!conf->servers->requests)
- debugx(1, DBG_ERR, "malloc failed");
- conf->servers->newrq = 0;
- pthread_mutex_init(&conf->servers->newrq_mutex, NULL);
- pthread_cond_init(&conf->servers->newrq_cond, NULL);
+ t->count++;
+ return t->ctx;
}
-void addrealm(char *value, char *server, char *message) {
- int i, n;
+void addrealm(char *value, char **servers, char *message) {
+ int n;
struct realm *realm;
char *s, *regex = NULL;
-
- if (server) {
- for (i = 0; i < srvconf_count; i++)
- if (!strcasecmp(server, srvconfs[i].host))
- break;
- if (i == srvconf_count)
- debugx(1, DBG_ERR, "addrealm failed, no server %s", server);
- }
+ struct list_node *entry;
+ struct clsrvconf *conf;
if (*value == '/') {
/* regexp, remove optional trailing / if present */
debug(DBG_DBG, "addrealm: constructed regexp %s from %s", regex, value);
}
- realm_count++;
- realms = realloc(realms, realm_count * sizeof(struct realm));
- if (!realms)
+ realm = malloc(sizeof(struct realm));
+ if (!realm)
debugx(1, DBG_ERR, "malloc failed");
- realm = realms + realm_count - 1;
+
memset(realm, 0, sizeof(struct realm));
realm->name = stringcopy(value, 0);
if (!realm->name)
if (message && strlen(message) > 253)
debugx(1, DBG_ERR, "ReplyMessage can be at most 253 bytes");
realm->message = message;
- if (server)
- realm->srvconf = srvconfs + i;
+
if (regcomp(&realm->regex, regex ? regex : value + 1, REG_ICASE | REG_NOSUB))
debugx(1, DBG_ERR, "addrealm: failed to compile regular expression %s", regex ? regex : value + 1);
if (regex)
free(regex);
- debug(DBG_DBG, "addrealm: added realm %s for server %s", value, server);
-}
-
-char *parsehostport(char *s, struct clsrvconf *conf) {
- char *p, *field;
- int ipv6 = 0;
-
- p = s;
- /* allow literal addresses and port, e.g. [2001:db8::1]:1812 */
- if (*p == '[') {
- p++;
- field = p;
- for (; *p && *p != ']' && *p != ' ' && *p != '\t' && *p != '\n'; p++);
- if (*p != ']')
- debugx(1, DBG_ERR, "no ] matching initial [");
- ipv6 = 1;
- } else {
- field = p;
- for (; *p && *p != ':' && *p != ' ' && *p != '\t' && *p != '\n'; p++);
- }
- if (field == p)
- debugx(1, DBG_ERR, "missing host/address");
-
- conf->host = stringcopy(field, p - field);
- if (ipv6) {
- p++;
- if (*p && *p != ':' && *p != ' ' && *p != '\t' && *p != '\n')
- debugx(1, DBG_ERR, "unexpected character after ]");
- }
- if (*p == ':') {
- /* port number or service name is specified */;
- field = ++p;
- for (; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++);
- if (field == p)
- debugx(1, DBG_ERR, "syntax error, : but no following port");
- conf->port = stringcopy(field, p - field);
+
+ if (servers && *servers) {
+ realm->srvconfs = list_create();
+ if (!realm->srvconfs)
+ debugx(1, DBG_ERR, "malloc failed");
+ for (n = 0; servers[n]; n++) {
+ for (entry = list_first(srvconfs); entry; entry = list_next(entry)) {
+ conf = (struct clsrvconf *)entry->data;
+ if (!strcasecmp(servers[n], conf->name))
+ break;
+ }
+ if (!entry)
+ debugx(1, DBG_ERR, "addrealm failed, no server %s", servers[n]);
+ if (!list_push(realm->srvconfs, conf))
+ debugx(1, DBG_ERR, "malloc failed");
+ debug(DBG_DBG, "addrealm: added server %s for realm %s", conf->name, value);
+ }
} else
- conf->port = stringcopy(conf->type == 'U' ? DEFAULT_UDP_PORT : DEFAULT_TLS_PORT, 0);
- return p;
+ realm->srvconfs = NULL;
+
+ if (!list_push(realms, realm))
+ debugx(1, DBG_ERR, "malloc failed");
+ debug(DBG_DBG, "addrealm: added realm %s", value);
}
-FILE *openconfigfile(const char *filename) {
+struct gconffile *openconfigfile(const char *filename) {
FILE *f;
char pathname[100], *base = NULL;
+ struct gconffile *cf = NULL;
- f = fopen(filename, "r");
+ f = pushgconffile(&cf, filename);
if (f) {
debug(DBG_DBG, "reading config file %s", filename);
- return f;
+ return cf;
}
if (strlen(filename) + 1 <= sizeof(pathname)) {
/* basename() might modify the string */
strcpy(pathname, filename);
base = basename(pathname);
- f = fopen(base, "r");
+ f = pushgconffile(&cf, base);
}
if (!f)
debugx(1, DBG_ERR, "could not read config file %s nor %s\n%s", filename, base, strerror(errno));
debug(DBG_DBG, "reading config file %s", base);
- return f;
+ return cf;
}
-struct clsrvconf *server_create(char type) {
- struct clsrvconf *conf;
- char *lconf;
+int addmatchcertattr(struct clsrvconf *conf, char *matchcertattr) {
+ char *v;
+
+ v = matchcertattr + 20;
+ if (strncasecmp(matchcertattr, "SubjectAltName:URI:/", 20) || !*v)
+ return 0;
+ /* regexp, remove optional trailing / if present */
+ if (v[strlen(v) - 1] == '/')
+ v[strlen(v) - 1] = '\0';
+ if (!*v)
+ return 0;
- conf = malloc(sizeof(struct clsrvconf));
- if (!conf)
- debugx(1, DBG_ERR, "malloc failed");
- memset(conf, 0, sizeof(struct clsrvconf));
- conf->type = type;
- lconf = (type == 'T' ? options.listentcp : options.listenudp);
- if (lconf) {
- parsehostport(lconf, conf);
- if (!strcmp(conf->host, "*")) {
- free(conf->host);
- conf->host = NULL;
- }
- } else
- conf->port = stringcopy(type == 'T' ? DEFAULT_TLS_PORT : DEFAULT_UDP_PORT, 0);
- if (!resolvepeer(conf, AI_PASSIVE))
- debugx(1, DBG_ERR, "failed to resolve host %s port %s, exiting", conf->host, conf->port);
- return conf;
+ conf->certuriregex = malloc(sizeof(regex_t));
+ if (!conf->certuriregex) {
+ debug(DBG_ERR, "malloc failed");
+ return 0;
+ }
+ if (regcomp(conf->certuriregex, v, REG_ICASE | REG_NOSUB)) {
+ free(conf->certuriregex);
+ conf->certuriregex = NULL;
+ debug(DBG_ERR, "failed to compile regular expression %s", v);
+ return 0;
+ }
+ return 1;
}
-/* returns NULL on error, where to continue parsing if token and ok. E.g. "" will return token with empty string */
-char *strtokenquote(char *s, char **token, char *del, char *quote, char *comment) {
- char *t = s, *q, *r;
-
- if (!t || !token || !del)
- return NULL;
- while (*t && strchr(del, *t))
- t++;
- if (!*t || (comment && strchr(comment, *t))) {
- *token = NULL;
- return t + 1; /* needs to be non-NULL, but value doesn't matter */
- }
- if (quote && (q = strchr(quote, *t))) {
- t++;
- r = t;
- while (*t && *t != *q)
- t++;
- if (!*t || (t[1] && !strchr(del, t[1])))
- return NULL;
- *t = '\0';
- *token = r;
- return t + 1;
- }
- *token = t;
- t++;
- while (*t && !strchr(del, *t))
- t++;
- *t = '\0';
- return t + 1;
-}
-
-/* Parses config with following syntax:
- * One of these:
- * option-name value
- * option-name = value
- * Or:
- * option-name value {
- * option-name [=] value
- * ...
- * }
- */
-void getgeneralconfig(FILE *f, char *block, ...) {
- va_list ap;
- char line[1024];
- /* initialise lots of stuff to avoid stupid compiler warnings */
- char *tokens[3], *s, *opt = NULL, *val = NULL, *word, *optval, **str = NULL;
- int type = 0, tcount, conftype = 0;
- void (*cbk)(FILE *, char *, char *, char *) = NULL;
-
- while (fgets(line, 1024, f)) {
- s = line;
- for (tcount = 0; tcount < 3; tcount++) {
- s = strtokenquote(s, &tokens[tcount], " \t\n", "\"'", tcount ? NULL : "#");
- if (!s)
- debugx(1, DBG_ERR, "Syntax error in line starting with: %s", line);
- if (!tokens[tcount])
- break;
- }
- if (!tcount || **tokens == '#')
- continue;
-
- if (**tokens == '}') {
- if (block)
- return;
- debugx(1, DBG_ERR, "configuration error, found } with no matching {");
- }
-
- switch (tcount) {
- case 2:
- opt = tokens[0];
- val = tokens[1];
- conftype = CONF_STR;
- break;
- case 3:
- if (tokens[1][0] == '=' && tokens[1][1] == '\0') {
- opt = tokens[0];
- val = tokens[2];
- conftype = CONF_STR;
- break;
- }
- if (tokens[2][0] == '{' && tokens[2][1] == '\0') {
- opt = tokens[0];
- val = tokens[1];
- conftype = CONF_CBK;
- break;
- }
- /* fall through */
- default:
- if (block)
- debugx(1, DBG_ERR, "configuration error in block %s, line starting with %s", block, tokens[0]);
- debugx(1, DBG_ERR, "configuration error, syntax error in line starting with %s", tokens[0]);
- }
+int addrewriteattr(struct clsrvconf *conf, char *rewriteattr) {
+ char *v, *w;
+
+ v = rewriteattr + 11;
+ if (strncasecmp(rewriteattr, "User-Name:/", 11) || !*v)
+ return 0;
+ /* regexp, remove optional trailing / if present */
+ if (v[strlen(v) - 1] == '/')
+ v[strlen(v) - 1] = '\0';
- if (!*val)
- debugx(1, DBG_ERR, "configuration error, option %s needs a non-empty value", opt);
-
- va_start(ap, block);
- while ((word = va_arg(ap, char *))) {
- type = va_arg(ap, int);
- switch (type) {
- case CONF_STR:
- str = va_arg(ap, char **);
- if (!str)
- debugx(1, DBG_ERR, "getgeneralconfig: internal parameter error");
- break;
- case CONF_CBK:
- cbk = va_arg(ap, void (*)(FILE *, char *, char *, char *));
- break;
- default:
- debugx(1, DBG_ERR, "getgeneralconfig: internal parameter error");
- }
- if (!strcasecmp(opt, word))
- break;
- }
- va_end(ap);
-
- if (!word) {
- if (block)
- debugx(1, DBG_ERR, "configuration error in block %s, unknown option %s", block, opt);
- debugx(1, DBG_ERR, "configuration error, unknown option %s", opt);
- }
+ w = strchr(v, '/');
+ if (!*w)
+ return 0;
+ *w = '\0';
+ w++;
+
+ conf->rewriteattrregex = malloc(sizeof(regex_t));
+ if (!conf->rewriteattrregex) {
+ debug(DBG_ERR, "malloc failed");
+ return 0;
+ }
- if (type != conftype) {
- if (block)
- debugx(1, DBG_ERR, "configuration error in block %s, wrong syntax for option %s", block, opt);
- debugx(1, DBG_ERR, "configuration error, wrong syntax for option %s", opt);
- }
-
- switch (type) {
- case CONF_STR:
- if (block)
- debug(DBG_DBG, "getgeneralconfig: block %s: %s = %s", block, opt, val);
- else
- debug(DBG_DBG, "getgeneralconfig: %s = %s", opt, val);
- *str = stringcopy(val, 0);
- break;
- case CONF_CBK:
- optval = malloc(strlen(opt) + strlen(val) + 2);
- if (!optval)
- debugx(1, DBG_ERR, "malloc failed");
- sprintf(optval, "%s %s", opt, val);
- cbk(f, optval, opt, val);
- free(optval);
- break;
- default:
- debugx(1, DBG_ERR, "getgeneralconfig: internal parameter error");
- }
+ conf->rewriteattrreplacement = stringcopy(w, 0);
+ if (!conf->rewriteattrreplacement) {
+ free(conf->rewriteattrregex);
+ conf->rewriteattrregex = NULL;
+ return 0;
+ }
+
+ if (regcomp(conf->rewriteattrregex, v, REG_ICASE | REG_EXTENDED)) {
+ free(conf->rewriteattrregex);
+ conf->rewriteattrregex = NULL;
+ free(conf->rewriteattrreplacement);
+ conf->rewriteattrreplacement = NULL;
+ debug(DBG_ERR, "failed to compile regular expression %s", v);
+ return 0;
}
+
+ return 1;
}
void confclient_cb(FILE *f, char *block, char *opt, char *val) {
- char *type = NULL, *secret = NULL, *tls = NULL;
+ char *type = NULL, *tls = NULL, *matchcertattr = NULL, *rewriteattr = NULL;
struct clsrvconf *conf;
debug(DBG_DBG, "confclient_cb called for %s", block);
- getgeneralconfig(f, block,
+ conf = malloc(sizeof(struct clsrvconf));
+ if (!conf || !list_push(clconfs, conf))
+ debugx(1, DBG_ERR, "malloc failed");
+ memset(conf, 0, sizeof(struct clsrvconf));
+
+ getgenericconfig(f, block,
"type", CONF_STR, &type,
- "secret", CONF_STR, &secret,
+ "host", CONF_STR, &conf->host,
+ "secret", CONF_STR, &conf->secret,
"tls", CONF_STR, &tls,
+ "matchcertificateattribute", CONF_STR, &matchcertattr,
+ "rewriteattribute", CONF_STR, &rewriteattr,
NULL
);
- clconf_count++;
- clconfs = realloc(clconfs, clconf_count * sizeof(struct clsrvconf));
- if (!clconfs)
- debugx(1, DBG_ERR, "malloc failed");
- conf = clconfs + clconf_count - 1;
- memset(conf, 0, sizeof(struct clsrvconf));
-
- conf->host = stringcopy(val, 0);
+
+ /* leave conf->name to be NULL for clients */
+ if (!conf->host)
+ conf->host = stringcopy(val, 0);
if (type && !strcasecmp(type, "udp")) {
conf->type = 'U';
conf->ssl_ctx = tls ? tlsgetctx(tls, NULL) : tlsgetctx("defaultclient", "default");
if (!conf->ssl_ctx)
debugx(1, DBG_ERR, "error in block %s, no tls context defined", block);
+ if (matchcertattr && !addmatchcertattr(conf, matchcertattr))
+ debugx(1, DBG_ERR, "error in block %s, invalid MatchCertificateAttributeValue", block);
conf->type = 'T';
client_tls_count++;
} else
debugx(1, DBG_ERR, "error in block %s, type must be set to UDP or TLS", block);
free(type);
+ if (tls)
+ free(tls);
+ if (matchcertattr)
+ free(matchcertattr);
+
+ if (rewriteattr) {
+ if (!addrewriteattr(conf, rewriteattr))
+ debugx(1, DBG_ERR, "error in block %s, invalid RewriteAttributeValue", block);
+ free(rewriteattr);
+ }
if (!resolvepeer(conf, 0))
debugx(1, DBG_ERR, "failed to resolve host %s port %s, exiting", conf->host, conf->port);
- if (secret)
- conf->secret = secret;
- else {
+ if (!conf->secret) {
if (conf->type == 'U')
debugx(1, DBG_ERR, "error in block %s, secret must be specified for UDP", block);
conf->secret = stringcopy(DEFAULT_TLS_SECRET, 0);
}
void confserver_cb(FILE *f, char *block, char *opt, char *val) {
- char *type = NULL, *secret = NULL, *port = NULL, *tls = NULL, *statusserver = NULL;
+ char *type = NULL, *tls = NULL, *matchcertattr = NULL, *statusserver = NULL;
struct clsrvconf *conf;
debug(DBG_DBG, "confserver_cb called for %s", block);
- getgeneralconfig(f, block,
+ conf = malloc(sizeof(struct clsrvconf));
+ if (!conf || !list_push(srvconfs, conf))
+ debugx(1, DBG_ERR, "malloc failed");
+ memset(conf, 0, sizeof(struct clsrvconf));
+
+ getgenericconfig(f, block,
"type", CONF_STR, &type,
- "secret", CONF_STR, &secret,
- "port", CONF_STR, &port,
+ "host", CONF_STR, &conf->host,
+ "port", CONF_STR, &conf->port,
+ "secret", CONF_STR, &conf->secret,
"tls", CONF_STR, &tls,
+ "matchcertificateattribute", CONF_STR, &matchcertattr,
"StatusServer", CONF_STR, &statusserver,
NULL
);
- srvconf_count++;
- srvconfs = realloc(srvconfs, srvconf_count * sizeof(struct clsrvconf));
- if (!srvconfs)
- debugx(1, DBG_ERR, "malloc failed");
- conf = srvconfs + srvconf_count - 1;
- memset(conf, 0, sizeof(struct clsrvconf));
-
- conf->port = port;
- if (statusserver) {
- if (!strcasecmp(statusserver, "on"))
- conf->statusserver = 1;
- else if (strcasecmp(statusserver, "off"))
- debugx(1, DBG_ERR, "error in block %s, StatusServer is %s, must be on or off", block, statusserver);
- free(statusserver);
- }
-
- conf->host = stringcopy(val, 0);
+
+ conf->name = stringcopy(val, 0);
+ if (!conf->host)
+ conf->host = stringcopy(val, 0);
if (type && !strcasecmp(type, "udp")) {
conf->type = 'U';
server_udp_count++;
- if (!port)
+ if (!conf->port)
conf->port = stringcopy(DEFAULT_UDP_PORT, 0);
} else if (type && !strcasecmp(type, "tls")) {
conf->ssl_ctx = tls ? tlsgetctx(tls, NULL) : tlsgetctx("defaultserver", "default");
if (!conf->ssl_ctx)
debugx(1, DBG_ERR, "error in block %s, no tls context defined", block);
- if (!port)
+ if (matchcertattr && !addmatchcertattr(conf, matchcertattr))
+ debugx(1, DBG_ERR, "error in block %s, invalid MatchCertificateAttributeValue", block);
+ if (!conf->port)
conf->port = stringcopy(DEFAULT_TLS_PORT, 0);
conf->type = 'T';
server_tls_count++;
} else
debugx(1, DBG_ERR, "error in block %s, type must be set to UDP or TLS", block);
free(type);
+ if (tls)
+ free(tls);
+ if (matchcertattr)
+ free(matchcertattr);
if (!resolvepeer(conf, 0))
debugx(1, DBG_ERR, "failed to resolve host %s port %s, exiting", conf->host, conf->port);
- if (secret)
- conf->secret = secret;
- else {
+ if (!conf->secret) {
if (conf->type == 'U')
debugx(1, DBG_ERR, "error in block %s, secret must be specified for UDP", block);
conf->secret = stringcopy(DEFAULT_TLS_SECRET, 0);
}
+
+ if (statusserver) {
+ if (!strcasecmp(statusserver, "on"))
+ conf->statusserver = 1;
+ else if (strcasecmp(statusserver, "off"))
+ debugx(1, DBG_ERR, "error in block %s, StatusServer is %s, must be on or off", block, statusserver);
+ free(statusserver);
+ }
}
void confrealm_cb(FILE *f, char *block, char *opt, char *val) {
- char *server = NULL, *msg = NULL;
+ char **servers = NULL, *msg = NULL;
debug(DBG_DBG, "confrealm_cb called for %s", block);
- getgeneralconfig(f, block,
- "server", CONF_STR, &server,
+ getgenericconfig(f, block,
+ "server", CONF_MSTR, &servers,
"ReplyMessage", CONF_STR, &msg,
NULL
);
- addrealm(val, server, msg);
- free(server);
+ addrealm(val, servers, msg);
+ free(servers);
}
void conftls_cb(FILE *f, char *block, char *opt, char *val) {
debug(DBG_DBG, "conftls_cb called for %s", block);
- getgeneralconfig(f, block,
+ getgenericconfig(f, block,
"CACertificateFile", CONF_STR, &cacertfile,
"CACertificatePath", CONF_STR, &cacertpath,
"CertificateFile", CONF_STR, &certfile,
void getmainconfig(const char *configfile) {
FILE *f;
char *loglevel = NULL;
+ struct gconffile *cfs;
- f = openconfigfile(configfile);
+ cfs = openconfigfile(configfile);
+ f = cfs->file;
memset(&options, 0, sizeof(options));
-
- getgeneralconfig(f, NULL,
+
+ clconfs = list_create();
+ if (!clconfs)
+ debugx(1, DBG_ERR, "malloc failed");
+
+ srvconfs = list_create();
+ if (!srvconfs)
+ debugx(1, DBG_ERR, "malloc failed");
+
+ realms = list_create();
+ if (!realms)
+ debugx(1, DBG_ERR, "malloc failed");
+
+ tlsconfs = list_create();
+ if (!tlsconfs)
+ debugx(1, DBG_ERR, "malloc failed");
+
+ getgenericconfig(f, NULL,
"ListenUDP", CONF_STR, &options.listenudp,
"ListenTCP", CONF_STR, &options.listentcp,
+ "ListenAccountingUDP", CONF_STR, &options.listenaccudp,
+ "SourceUDP", CONF_STR, &options.sourceudp,
+ "SourceTCP", CONF_STR, &options.sourcetcp,
"LogLevel", CONF_STR, &loglevel,
"LogDestination", CONF_STR, &options.logdestination,
"Client", CONF_CBK, confclient_cb,
"TLS", CONF_CBK, conftls_cb,
NULL
);
- fclose(f);
+ popgconffile(&cfs);
tlsfree();
if (loglevel) {
}
}
-void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *loglevel, char **configfile) {
+void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *pretend, uint8_t *loglevel, char **configfile) {
int c;
- while ((c = getopt(argc, argv, "c:d:fv")) != -1) {
+ while ((c = getopt(argc, argv, "c:d:fpv")) != -1) {
switch (c) {
case 'c':
*configfile = optarg;
case 'f':
*foreground = 1;
break;
+ case 'p':
+ *pretend = 1;
+ break;
case 'v':
debugx(0, DBG_ERR, "radsecproxy revision $Rev$");
default:
return;
usage:
- debug(DBG_ERR, "Usage:\n%s [ -c configfile ] [ -d debuglevel ] [ -f ] [ -v ]", argv[0]);
+ debug(DBG_ERR, "Usage:\n%s [ -c configfile ] [ -d debuglevel ] [ -f ] [ -p ] [ -v ]", argv[0]);
exit(1);
}
int main(int argc, char **argv) {
- pthread_t udpserverth;
- int i;
- uint8_t foreground = 0, loglevel = 0;
+ pthread_t udpserverth, udpaccserverth, udpclient4rdth, udpclient6rdth;
+ struct list_node *entry;
+ uint8_t foreground = 0, pretend = 0, loglevel = 0;
char *configfile = NULL;
debug_init("radsecproxy");
debug_set_level(DEBUG_LEVEL);
- getargs(argc, argv, &foreground, &loglevel, &configfile);
+ getargs(argc, argv, &foreground, &pretend, &loglevel, &configfile);
if (loglevel)
debug_set_level(loglevel);
getmainconfig(configfile ? configfile : CONFIG_MAIN);
debug_set_destination(options.logdestination);
}
- if (!srvconf_count)
- debugx(1, DBG_ERR, "No servers configured, nothing to do, exiting");
- if (!clconf_count)
+ if (pretend)
+ debugx(0, DBG_ERR, "All OK so far; exiting since only pretending");
+
+ if (!list_first(clconfs))
debugx(1, DBG_ERR, "No clients configured, nothing to do, exiting");
- if (!realm_count)
+ if (!list_first(srvconfs))
+ debugx(1, DBG_ERR, "No servers configured, nothing to do, exiting");
+ if (!list_first(realms))
debugx(1, DBG_ERR, "No realms configured, nothing to do, exiting");
if (!foreground && (daemon(0, 0) < 0))
debugx(1, DBG_ERR, "daemon() failed: %s", strerror(errno));
debug(DBG_INFO, "radsecproxy revision $Rev$ starting");
-
- for (i = 0; i < clconf_count; i++)
- addclient(clconfs + i);
-
- for (i = 0; i < srvconf_count; i++)
- addserver(srvconfs + i);
-
+
if (client_udp_count) {
- udp_server_listen = server_create('U');
+ udp_server_replyq = newreplyq();
if (pthread_create(&udpserverth, NULL, udpserverrd, NULL))
debugx(1, DBG_ERR, "pthread_create failed");
+ if (options.listenaccudp)
+ if (pthread_create(&udpaccserverth, NULL, udpaccserverrd, NULL))
+ debugx(1, DBG_ERR, "pthread_create failed");
}
- for (i = 0; i < srvconf_count; i++)
- if (pthread_create(&srvconfs[i].servers->clientth, NULL, clientwr, (void *)srvconfs[i].servers))
+ for (entry = list_first(srvconfs); entry; entry = list_next(entry)) {
+ addserver((struct clsrvconf *)entry->data);
+ if (pthread_create(&((struct clsrvconf *)entry->data)->servers->clientth, NULL, clientwr,
+ (void *)((struct clsrvconf *)entry->data)->servers))
debugx(1, DBG_ERR, "pthread_create failed");
-
- if (client_tls_count) {
- tcp_server_listen = server_create('T');
- return tlslistener();
}
+ /* srcudpres no longer needed, while srctcpres is needed later */
+ if (srcudpres) {
+ free(srcudpres);
+ srcudpres = NULL;
+ }
+ if (udp_client4_sock >= 0)
+ if (pthread_create(&udpclient4rdth, NULL, udpclientrd, (void *)&udp_client4_sock))
+ debugx(1, DBG_ERR, "clientwr: pthread_create failed");
+ if (udp_client6_sock >= 0)
+ if (pthread_create(&udpclient6rdth, NULL, udpclientrd, (void *)&udp_client6_sock))
+ debugx(1, DBG_ERR, "clientwr: pthread_create failed");
+
+ if (client_tls_count)
+ return tlslistener();
/* just hang around doing nothing, anything to do here? */
for (;;)
projects / radsecproxy.git / blobdiff