* make our server ignore client retrans?
* tls keep alives
* routing based on id....
+ * need to also encrypt Tunnel-Password and Message-Authenticator attrs
* tls certificate validation
*/
#include <netdb.h>
#include <unistd.h>
+#include <sys/time.h>
#include <pthread.h>
#include <openssl/ssl.h>
#include <openssl/rand.h>
#include <openssl/md5.h>
#include "radsecproxy.h"
-static struct peer peers[MAX_PEERS];
-static int peer_count = 0;
+static struct client clients[MAX_PEERS];
+static struct server servers[MAX_PEERS];
+
+static int client_count = 0;
+static int server_count = 0;
static struct replyq udp_server_replyq;
static int udp_server_sock = -1;
}
int resolvepeer(struct peer *peer) {
- struct addrinfo hints;
-
- pthread_mutex_lock(&peer->lock);
- if (peer->addrinfo) {
- /* assume we should re-resolve */
- freeaddrinfo(peer->addrinfo);
- peer->addrinfo = NULL;
- }
+ struct addrinfo hints, *addrinfo;
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = (peer->type == 'T' ? SOCK_STREAM : SOCK_DGRAM);
hints.ai_family = AF_UNSPEC;
- if (getaddrinfo(peer->host, peer->port, &hints, &peer->addrinfo)) {
+ if (getaddrinfo(peer->host, peer->port, &hints, &addrinfo)) {
err("resolvepeer: can't resolve %s port %s", peer->host, peer->port);
- peer->addrinfo = NULL; /* probably don't need this */
- pthread_mutex_unlock(&peer->lock);
return 0;
}
- pthread_mutex_unlock(&peer->lock);
+
+ if (peer->addrinfo)
+ freeaddrinfo(peer->addrinfo);
+ peer->addrinfo = addrinfo;
return 1;
}
-int connecttopeer(struct peer *peer) {
+int connecttoserver(struct addrinfo *addrinfo) {
int s;
struct addrinfo *res;
- if (!peer->addrinfo) {
- resolvepeer(peer);
- if (!peer->addrinfo) {
- printf("connecttopeer: can't resolve %s into address to connect to\n", peer->host);
- return -1;
- }
- }
-
- for (res = peer->addrinfo; res; res = res->ai_next) {
+ for (res = addrinfo; res; res = res->ai_next) {
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (s < 0) {
- err("connecttopeer: socket failed");
+ err("connecttoserver: socket failed");
continue;
}
if (connect(s, res->ai_addr, res->ai_addrlen) == 0)
break;
- err("connecttopeer: connect failed");
+ err("connecttoserver: connect failed");
close(s);
s = -1;
}
return s;
}
-/* returns the peer with matching address, or NULL */
-/* if peer argument is not NULL, we only check that one peer */
-struct peer *find_peer(char type, struct sockaddr *addr, struct peer *peer) {
+/* returns the client with matching address, or NULL */
+/* if client argument is not NULL, we only check that one client */
+struct client *find_client(char type, struct sockaddr *addr, struct client *client) {
struct sockaddr_in6 *sa6;
struct in_addr *a4 = NULL;
- struct peer *p;
+ struct client *c;
int i;
struct addrinfo *res;
} else
a4 = &((struct sockaddr_in *)addr)->sin_addr;
- p = (peer ? peer : peers);
- for (i = 0; i < peer_count; i++) {
- if (p->type == type)
- for (res = p->addrinfo; res; res = res->ai_next)
+ c = (client ? client : clients);
+ for (i = 0; i < client_count; i++) {
+ if (c->peer.type == type)
+ for (res = c->peer.addrinfo; res; res = res->ai_next)
if ((a4 && res->ai_family == AF_INET &&
!memcmp(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, 4)) ||
(res->ai_family == AF_INET6 &&
!memcmp(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 16)))
- return p;
- if (peer)
+ return c;
+ if (client)
break;
- p++;
+ c++;
}
return NULL;
}
+/* returns the server with matching address, or NULL */
+/* if server argument is not NULL, we only check that one server */
+struct server *find_server(char type, struct sockaddr *addr, struct server *server) {
+ struct sockaddr_in6 *sa6;
+ struct in_addr *a4 = NULL;
+ struct server *s;
+ int i;
+ struct addrinfo *res;
+
+ if (addr->sa_family == AF_INET6) {
+ sa6 = (struct sockaddr_in6 *)addr;
+ if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr))
+ a4 = (struct in_addr *)&sa6->sin6_addr.s6_addr[12];
+ } else
+ a4 = &((struct sockaddr_in *)addr)->sin_addr;
+
+ s = (server ? server : servers);
+ for (i = 0; i < server_count; i++) {
+ if (s->peer.type == type)
+ for (res = s->peer.addrinfo; res; res = res->ai_next)
+ if ((a4 && res->ai_family == AF_INET &&
+ !memcmp(a4, &((struct sockaddr_in *)res->ai_addr)->sin_addr, 4)) ||
+ (res->ai_family == AF_INET6 &&
+ !memcmp(&sa6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 16)))
+ return s;
+ if (server)
+ break;
+ s++;
+ }
+ return NULL;
+}
+
+/* exactly one of client and server must be non-NULL */
/* 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 peer **peer, struct sockaddr_storage *sa) {
+unsigned char *radudpget(int s, struct client **client, struct server **server, struct sockaddr_storage *sa) {
int cnt, len;
- struct peer *f;
+ void *f;
unsigned char buf[65536], *rad;
struct sockaddr_storage from;
socklen_t fromlen = sizeof(from);
if (cnt > len)
printf("radudpget: packet was padded with %d bytes\n", cnt - len);
- f = find_peer('U', (struct sockaddr *)&from, *peer);
+ f = (client
+ ? (void *)find_client('U', (struct sockaddr *)&from, *client)
+ : (void *)find_server('U', (struct sockaddr *)&from, *server));
if (!f) {
printf("radudpget: got packet from wrong or unknown UDP peer, ignoring\n");
continue;
err("radudpget: malloc failed");
}
memcpy(rad, buf, len);
- *peer = f; /* only need this if *peer == NULL, but if not NULL *peer == f here */
+ if (client)
+ *client = (struct client *)f; /* only need this if *client == NULL, but if not NULL *client == f here */
+ else
+ *server = (struct server *)f; /* only need this if *server == NULL, but if not NULL *server == f here */
if (sa)
*sa = from;
return rad;
}
-void tlsconnect(struct peer *peer, int oldsock, char *text) {
- unsigned int sleeptime, try = 0;
-
- pthread_mutex_lock(&peer->lock);
- if (peer->sockcl != oldsock) {
+void tlsconnect(struct server *server, struct timeval *when, char *text) {
+ struct timeval now;
+ time_t elapsed;
+ unsigned long error;
+
+ printf("tlsconnect called from %s\n", text);
+ pthread_mutex_lock(&server->lock);
+ if (when && memcmp(&server->lastconnecttry, when, sizeof(struct timeval))) {
/* already reconnected, nothing to do */
- printf("reconnect: seems already reconnected\n");
- pthread_mutex_unlock(&peer->lock);
+ printf("tlsconnect(%s): seems already reconnected\n", text);
+ pthread_mutex_unlock(&server->lock);
return;
}
- printf("tlsconnect %d %s\n", oldsock, text);
- sleep(1);
+ printf("tlsconnect %s\n", text);
+
for (;;) {
- printf("tlsconnect: trying to open TLS connection to %s port %s\n", peer->host, peer->port);
- if ((peer->sockcl = connecttopeer(peer)) >= 0)
+ gettimeofday(&now, NULL);
+ elapsed = now.tv_sec - server->lastconnecttry.tv_sec;
+ if (server->connectionok) {
+ server->connectionok = 0;
+ sleep(10);
+ } else if (elapsed < 5)
+ sleep(10);
+ else if (elapsed < 600)
+ sleep(elapsed * 2);
+ else if (elapsed < 10000) /* no sleep at startup */
+ sleep(900);
+ printf("tlsconnect: trying to open TLS connection to %s port %s\n", server->peer.host, server->peer.port);
+ if (server->sock >= 0)
+ close(server->sock);
+ if ((server->sock = connecttoserver(server->peer.addrinfo)) < 0)
+ continue;
+ SSL_free(server->peer.ssl);
+ server->peer.ssl = SSL_new(ssl_ctx_cl);
+ SSL_set_fd(server->peer.ssl, server->sock);
+ if (SSL_connect(server->peer.ssl) > 0)
break;
- try++;
- if (try < 6)
- sleeptime = 10;
- else if (try < 20)
- sleeptime = 60;
- else
- sleeptime = 900;
- /* should possibly re-resolve host addresses at some point */
- printf("tlsconnect: can't connect, retry #%d in %ds\n", try, sleeptime);
- sleep(sleeptime);
+ while ((error = ERR_get_error()))
+ err("tlsconnect: TLS: %s", ERR_error_string(error, NULL));
}
-
- SSL_free(peer->sslcl);
- peer->sslcl = SSL_new(ssl_ctx_cl);
- SSL_set_fd(peer->sslcl, peer->sockcl);
- /* must close oldsock after get new socket so that they are always different */
- if (oldsock >= 0)
- close(oldsock);
- SSL_connect(peer->sslcl);
- printf("tlsconnect: TLS connection to %s port %s up\n", peer->host, peer->port);
- pthread_mutex_unlock(&peer->lock);
+ printf("tlsconnect: TLS connection to %s port %s up\n", server->peer.host, server->peer.port);
+ gettimeofday(&server->lastconnecttry, NULL);
+ pthread_mutex_unlock(&server->lock);
}
unsigned char *radtlsget(SSL *ssl) {
return rad;
}
-int clientradput(struct peer *peer, unsigned char *rad) {
- int cnt, s;
+int clientradput(struct server *server, unsigned char *rad) {
+ int cnt;
size_t len;
unsigned long error;
-
+ struct timeval lastconnecttry;
+
len = RADLEN(rad);
- if (peer->type == 'U') {
- if (send(peer->sockcl, rad, len, 0) >= 0) {
- printf("clienradput: sent UDP of length %d to %s port %s\n", len, peer->host, peer->port);
+ if (server->peer.type == 'U') {
+ if (send(server->sock, rad, len, 0) >= 0) {
+ printf("clienradput: sent UDP of length %d to %s port %s\n", len, server->peer.host, server->peer.port);
return 1;
}
err("clientradput: send failed");
return 0;
}
- s = peer->sockcl;
- while ((cnt = SSL_write(peer->sslcl, rad, len)) <= 0) {
+ lastconnecttry = server->lastconnecttry;
+ while ((cnt = SSL_write(server->peer.ssl, rad, len)) <= 0) {
while ((error = ERR_get_error()))
err("clientwr: TLS: %s", ERR_error_string(error, NULL));
- tlsconnect(peer, s, "clientradput");
- s = peer->sockcl;
+ tlsconnect(server, &lastconnecttry, "clientradput");
+ lastconnecttry = server->lastconnecttry;
}
-
+
+ server->connectionok = 1;
printf("clientradput: Sent %d bytes, Radius packet of length %d to TLS peer %s\n",
- cnt, len, peer->host);
+ cnt, len, server->peer.host);
return 1;
}
return result;
}
-void sendrq(struct peer *to, struct peer *from, struct request *rq) {
+void sendrq(struct server *to, struct client *from, struct request *rq) {
int i;
pthread_mutex_lock(&to->newrq_mutex);
pthread_mutex_unlock(&to->newrq_mutex);
}
-void sendreply(struct peer *to, struct peer *from, char *buf, struct sockaddr_storage *tosa) {
+void sendreply(struct client *to, struct server *from, char *buf, struct sockaddr_storage *tosa) {
struct replyq *replyq = to->replyq;
pthread_mutex_lock(&replyq->count_mutex);
return 1;
}
-struct peer *radsrv(struct request *rq, char *buf, struct peer *from) {
+struct server *id2server(char *id, uint8_t len) {
+ int i;
+ char **realm, *idrealm;
+
+ idrealm = strchr(id, '@');
+ if (idrealm) {
+ idrealm++;
+ len -= idrealm - id;
+ } else {
+ idrealm = "-";
+ len = 1;
+ }
+ for (i = 0; i < server_count; i++) {
+ for (realm = servers[i].realms; *realm; realm++) {
+ if ((strlen(*realm) == 1 && **realm == '*') ||
+ (strlen(*realm) == len && !memcmp(idrealm, *realm, len))) {
+ printf("found matching realm: %s, host %s\n", *realm, servers[i].peer.host);
+ return servers + i;
+ }
+ }
+ }
+ return NULL;
+}
+
+struct server *radsrv(struct request *rq, char *buf, struct client *from) {
uint8_t code, id, *auth, *attr, *usernameattr = NULL, *userpwdattr = NULL, pwd[128], pwdlen;
int i;
uint16_t len;
int left;
- struct peer *to;
+ struct server *to;
unsigned char newauth[16];
code = *(uint8_t *)buf;
if (usernameattr) {
printf("radsrv: Username: ");
- for (i = 0; i < usernameattr[RAD_Attr_Length]; i++)
+ for (i = 0; i < usernameattr[RAD_Attr_Length] - 2; i++)
printf("%c", usernameattr[RAD_Attr_Value + i]);
printf("\n");
}
- /* find out where to send the packet, for now we send to first connected
- TLS peer if UDP, and first UDP peer if TLS */
-
- i = peer_count;
- switch (from->type) {
- case 'U':
- for (i = 0; i < peer_count; i++)
- if (peers[i].type == 'T' && peers[i].sockcl >= 0)
- break;
- break;
- case 'T':
- for (i = 0; i < peer_count; i++)
- if (peers[i].type == 'U')
- break;
- break;
- }
-
- if (i == peer_count) {
+ to = id2server(&usernameattr[RAD_Attr_Value], usernameattr[RAD_Attr_Length] - 2);
+ if (!to) {
printf("radsrv: ignoring request, don't know where to send it\n");
return NULL;
}
- to = &peers[i];
-
if (!RAND_bytes(newauth, 16)) {
printf("radsrv: failed to generate random auth\n");
return NULL;
return NULL;
}
- if (!pwdcrypt(pwd, &userpwdattr[RAD_Attr_Value], pwdlen, from->secret, strlen(from->secret), auth)) {
+ if (!pwdcrypt(pwd, &userpwdattr[RAD_Attr_Value], pwdlen, from->peer.secret, strlen(from->peer.secret), auth)) {
printf("radsrv: cannot decrypt password\n");
return NULL;
}
for (i = 0; i < pwdlen; i++)
printf("%02x ", pwd[i]);
printf("\n");
- if (!pwdcrypt(&userpwdattr[RAD_Attr_Value], pwd, pwdlen, to->secret, strlen(to->secret), newauth)) {
+ if (!pwdcrypt(&userpwdattr[RAD_Attr_Value], pwd, pwdlen, to->peer.secret, strlen(to->peer.secret), newauth)) {
printf("radsrv: cannot encrypt password\n");
return NULL;
}
}
void *clientrd(void *arg) {
- struct peer *from, *peer = (struct peer *)arg;
- int i, s;
+ struct server *server = (struct server *)arg;
+ struct client *from;
+ int i;
unsigned char *buf;
struct sockaddr_storage fromsa;
+ struct timeval lastconnecttry;
for (;;) {
- s = peer->sockcl;
- buf = (peer->type == 'U' ? radudpget(s, &peer, NULL) : radtlsget(peer->sslcl));
- if (!buf && peer->type == 'T') {
- printf("retry in 60s\n");
- sleep(60); /* should have exponential backoff perhaps, better do it inside radtlsget */
- tlsconnect(peer, s, "clientrd");
+ lastconnecttry = server->lastconnecttry;
+ buf = (server->peer.type == 'U' ? radudpget(server->sock, NULL, &server, NULL) : radtlsget(server->peer.ssl));
+ if (!buf && server->peer.type == 'T') {
+ tlsconnect(server, &lastconnecttry, "clientrd");
continue;
}
+
+ server->connectionok = 1;
i = buf[1]; /* i is the id */
- pthread_mutex_lock(&peer->newrq_mutex);
- if (!peer->requests[i].buf || !peer->requests[i].tries) {
- pthread_mutex_unlock(&peer->newrq_mutex);
+ pthread_mutex_lock(&server->newrq_mutex);
+ if (!server->requests[i].buf || !server->requests[i].tries) {
+ pthread_mutex_unlock(&server->newrq_mutex);
printf("clientrd: no matching request sent with this id, ignoring\n");
continue;
}
- if (peer->requests[i].received) {
- pthread_mutex_unlock(&peer->newrq_mutex);
+ if (server->requests[i].received) {
+ pthread_mutex_unlock(&server->newrq_mutex);
printf("clientrd: already received, ignoring\n");
continue;
}
- if (!validauth(buf, peer->requests[i].buf + 4, peer->secret)) {
- pthread_mutex_unlock(&peer->newrq_mutex);
+ if (!validauth(buf, server->requests[i].buf + 4, server->peer.secret)) {
+ pthread_mutex_unlock(&server->newrq_mutex);
printf("clientrd: invalid auth, ignoring\n");
continue;
}
/* once we set received = 1, requests[i] may be reused */
- buf[1] = (char)peer->requests[i].origid;
- memcpy(buf + 4, peer->requests[i].origauth, 16);
- from = peer->requests[i].from;
- if (from->type == 'U')
- fromsa = peer->requests[i].fromsa;
- peer->requests[i].received = 1;
- pthread_mutex_unlock(&peer->newrq_mutex);
-
- if (!radsign(buf, from->secret)) {
+ buf[1] = (char)server->requests[i].origid;
+ memcpy(buf + 4, server->requests[i].origauth, 16);
+ from = server->requests[i].from;
+ if (from->peer.type == 'U')
+ fromsa = server->requests[i].fromsa;
+ server->requests[i].received = 1;
+ pthread_mutex_unlock(&server->newrq_mutex);
+
+ if (!radsign(buf, from->peer.secret)) {
printf("clientrd: failed to sign message\n");
continue;
}
printf("clientrd: giving packet back to where it came from\n");
- sendreply(from, peer, buf, from->type == 'U' ? &fromsa : NULL);
+ sendreply(from, server, buf, from->peer.type == 'U' ? &fromsa : NULL);
}
}
void *clientwr(void *arg) {
- struct peer *peer = (struct peer *)arg;
+ struct server *server = (struct server *)arg;
pthread_t clientrdth;
int i;
- if (peer->type == 'U') {
- if ((peer->sockcl = connecttopeer(peer)) < 0) {
- printf("clientwr: connecttopeer failed\n");
+ if (server->peer.type == 'U') {
+ if ((server->sock = connecttoserver(server->peer.addrinfo)) < 0) {
+ printf("clientwr: connecttoserver failed\n");
exit(1);
}
} else
- tlsconnect(peer, -1, "new client");
+ tlsconnect(server, NULL, "new client");
- if (pthread_create(&clientrdth, NULL, clientrd, (void *)peer))
+ if (pthread_create(&clientrdth, NULL, clientrd, (void *)server))
errx("clientwr: pthread_create failed");
for (;;) {
- pthread_mutex_lock(&peer->newrq_mutex);
- while (!peer->newrq) {
+ pthread_mutex_lock(&server->newrq_mutex);
+ while (!server->newrq) {
printf("clientwr: waiting for signal\n");
- pthread_cond_wait(&peer->newrq_cond, &peer->newrq_mutex);
+ pthread_cond_wait(&server->newrq_cond, &server->newrq_mutex);
printf("clientwr: got signal\n");
}
- peer->newrq = 0;
- pthread_mutex_unlock(&peer->newrq_mutex);
+ server->newrq = 0;
+ pthread_mutex_unlock(&server->newrq_mutex);
for (i = 0; i < MAX_REQUESTS; i++) {
- pthread_mutex_lock(&peer->newrq_mutex);
- while (!peer->requests[i].buf && i < MAX_REQUESTS)
+ pthread_mutex_lock(&server->newrq_mutex);
+ while (!server->requests[i].buf && i < MAX_REQUESTS)
i++;
if (i == MAX_REQUESTS) {
- pthread_mutex_unlock(&peer->newrq_mutex);
+ pthread_mutex_unlock(&server->newrq_mutex);
break;
}
/* already received or too many tries */
- if (peer->requests[i].received || peer->requests[i].tries > 2) {
- free(peer->requests[i].buf);
+ if (server->requests[i].received || server->requests[i].tries > 2) {
+ free(server->requests[i].buf);
/* setting this to NULL means that it can be reused */
- peer->requests[i].buf = NULL;
- pthread_mutex_unlock(&peer->newrq_mutex);
+ server->requests[i].buf = NULL;
+ pthread_mutex_unlock(&server->newrq_mutex);
continue;
}
- pthread_mutex_unlock(&peer->newrq_mutex);
+ pthread_mutex_unlock(&server->newrq_mutex);
- peer->requests[i].tries++;
- clientradput(peer, peer->requests[i].buf);
+ server->requests[i].tries++;
+ clientradput(server, server->requests[i].buf);
}
}
/* should do more work to maintain TLS connections, keepalives etc */
void *udpserverrd(void *arg) {
struct request rq;
unsigned char *buf;
- struct peer *to, *fr;
+ struct server *to;
+ struct client *fr;
pthread_t udpserverwrth;
if ((udp_server_sock = bindport(SOCK_DGRAM, udp_server_port)) < 0) {
for (;;) {
fr = NULL;
memset(&rq, 0, sizeof(struct request));
- buf = radudpget(udp_server_sock, &fr, &rq.fromsa);
+ buf = radudpget(udp_server_sock, &fr, NULL, &rq.fromsa);
to = radsrv(&rq, buf, fr);
if (!to) {
printf("udpserverrd: ignoring request, no place to send it\n");
void *tlsserverwr(void *arg) {
int cnt;
unsigned long error;
- struct peer *peer = (struct peer *)arg;
+ struct client *client = (struct client *)arg;
struct replyq *replyq;
- pthread_mutex_lock(&peer->replycount_mutex);
+ pthread_mutex_lock(&client->replycount_mutex);
for (;;) {
- replyq = peer->replyq;
+ replyq = client->replyq;
while (!replyq->count) {
printf("tls server writer, waiting for signal\n");
pthread_cond_wait(&replyq->count_cond, &replyq->count_mutex);
printf("tls server writer, got signal\n");
}
pthread_mutex_unlock(&replyq->count_mutex);
- cnt = SSL_write(peer->sslsrv, replyq->replies->buf, RADLEN(replyq->replies->buf));
+ cnt = SSL_write(client->peer.ssl, replyq->replies->buf, RADLEN(replyq->replies->buf));
if (cnt > 0)
printf("tlsserverwr: Sent %d bytes, Radius packet of length %d\n",
cnt, RADLEN(replyq->replies->buf));
struct request rq;
char unsigned *buf;
unsigned long error;
- struct peer *to;
+ struct server *to;
int s;
- struct peer *peer = (struct peer *)arg;
+ struct client *client = (struct client *)arg;
pthread_t tlsserverwrth;
printf("tlsserverrd starting\n");
- if (SSL_accept(peer->sslsrv) <= 0) {
+ if (SSL_accept(client->peer.ssl) <= 0) {
while ((error = ERR_get_error()))
err("tlsserverrd: SSL: %s", ERR_error_string(error, NULL));
errx("accept failed, child exiting");
}
- if (pthread_create(&tlsserverwrth, NULL, tlsserverwr, (void *)peer))
+ if (pthread_create(&tlsserverwrth, NULL, tlsserverwr, (void *)client))
errx("pthread_create failed");
for (;;) {
- buf = radtlsget(peer->sslsrv);
+ buf = radtlsget(client->peer.ssl);
if (!buf) {
printf("tlsserverrd: connection lost\n");
- s = SSL_get_fd(peer->sslsrv);
- SSL_free(peer->sslsrv);
- peer->sslsrv = NULL;
+ s = SSL_get_fd(client->peer.ssl);
+ SSL_free(client->peer.ssl);
+ client->peer.ssl = NULL;
if (s >= 0)
close(s);
pthread_exit(NULL);
}
- printf("tlsserverrd: got Radius message from %s\n", peer->host);
+ printf("tlsserverrd: got Radius message from %s\n", client->peer.host);
memset(&rq, 0, sizeof(struct request));
- to = radsrv(&rq, buf, peer);
+ to = radsrv(&rq, buf, client);
if (!to) {
printf("ignoring request, no place to send it\n");
continue;
}
- sendrq(to, peer, &rq);
+ sendrq(to, client, &rq);
}
}
int s, snew;
struct sockaddr_storage from;
size_t fromlen = sizeof(from);
- struct peer *peer;
+ struct client *client;
if ((s = bindport(SOCK_STREAM, DEFAULT_TLS_PORT)) < 0) {
printf("tlslistener: socket/bind failed\n");
exit(1);
}
-
+
listen(s, 0);
printf("listening for incoming TLS on port %s\n", DEFAULT_TLS_PORT);
errx("accept failed");
printf("incoming TLS connection from %s\n", addr2string((struct sockaddr *)&from, fromlen));
- peer = find_peer('T', (struct sockaddr *)&from, NULL);
- if (!peer) {
- printf("ignoring request, not a known TLS peer\n");
+ client = find_client('T', (struct sockaddr *)&from, NULL);
+ if (!client) {
+ printf("ignoring request, not a known TLS client\n");
close(snew);
continue;
}
- if (peer->sslsrv) {
- printf("Ignoring incoming connection, already have one from this peer\n");
+ if (client->peer.ssl) {
+ printf("Ignoring incoming connection, already have one from this client\n");
close(snew);
continue;
}
- peer->sslsrv = SSL_new(ssl_ctx);
- SSL_set_fd(peer->sslsrv, snew);
- if (pthread_create(&tlsserverth, NULL, tlsserverrd, (void *)peer))
+ client->peer.ssl = SSL_new(ssl_ctx);
+ SSL_set_fd(client->peer.ssl, snew);
+ if (pthread_create(&tlsserverth, NULL, tlsserverrd, (void *)client))
errx("pthread_create failed");
-
- for (;;) {
- /* currently only one server thread, so just halt here */
- sleep(1000);
- }
}
return 0;
}
-char *parsehostport(char *s, char **host, char **port) {
+char *parsehostport(char *s, struct peer *peer) {
char *p, *field;
int ipv6 = 0;
printf("missing host/address\n");
exit(1);
}
- *host = malloc(p - field + 1);
- if (!*host)
+ peer->host = malloc(p - field + 1);
+ if (!peer->host)
errx("malloc failed");
- memcpy(*host, field, p - field);
- (*host)[p - field] = '\0';
+ memcpy(peer->host, field, p - field);
+ peer->host[p - field] = '\0';
if (ipv6) {
p++;
if (*p && *p != ':' && *p != ' ' && *p != '\t' && *p != '\n') {
printf("syntax error, : but no following port\n");
exit(1);
}
- *port = malloc(p - field + 1);
- if (!*port)
+ peer->port = malloc(p - field + 1);
+ if (!peer->port)
errx("malloc failed");
- memcpy(*port, field, p - field);
- (*port)[p - field ] = '\0';
+ memcpy(peer->port, field, p - field);
+ peer->port[p - field] = '\0';
} else
- *port = NULL;
+ peer->port = NULL;
return p;
}
-void getconfig(const char *filename) {
+// * is default, else longest match ... ";" used for separator
+char *parserealmlist(char *s, struct server *server) {
+ char *p;
+ int i, n, l;
+
+ for (p = s, n = 1; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++)
+ if (*p == ';')
+ n++;
+ l = p - s;
+ if (!l) {
+ server->realms = NULL;
+ return p;
+ }
+ server->realmdata = malloc(l + 1);
+ if (!server->realmdata)
+ errx("malloc failed");
+ memcpy(server->realmdata, s, l);
+ server->realmdata[l] = '\0';
+ server->realms = malloc((1+n) * sizeof(char *));
+ if (!server->realms)
+ errx("malloc failed");
+ server->realms[0] = server->realmdata;
+ for (n = 1, i = 0; i < l; i++)
+ if (server->realmdata[i] == ';') {
+ server->realmdata[i] = '\0';
+ server->realms[n++] = server->realmdata + i + 1;
+ }
+ server->realms[n] = NULL;
+ return p;
+}
+
+/* exactly one argument must be non-NULL */
+void getconfig(const char *serverfile, const char *clientfile) {
FILE *f;
char line[1024];
- char *p, *field;
+ char *p, *field, **r;
+ struct client *client;
+ struct server *server;
struct peer *peer;
+ int *count;
- peer_count = 0;
-
- udp_server_replyq.replies = malloc(4 * MAX_REQUESTS * sizeof(struct reply));
- if (!udp_server_replyq.replies)
- errx("malloc failed");
- udp_server_replyq.size = 4 * MAX_REQUESTS;
- udp_server_replyq.count = 0;
- pthread_mutex_init(&udp_server_replyq.count_mutex, NULL);
- pthread_cond_init(&udp_server_replyq.count_cond, NULL);
+ if (serverfile) {
+ printf("opening file %s for reading\n", serverfile);
+ f = fopen(serverfile, "r");
+ if (!f)
+ errx("getconfig failed to open %s for reading", serverfile);
+ count = &server_count;
+ } else {
+ printf("opening file %s for reading\n", clientfile);
+ f = fopen(clientfile, "r");
+ if (!f)
+ errx("getconfig failed to open %s for reading", clientfile);
+ udp_server_replyq.replies = malloc(4 * MAX_REQUESTS * sizeof(struct reply));
+ if (!udp_server_replyq.replies)
+ errx("malloc failed");
+ udp_server_replyq.size = 4 * MAX_REQUESTS;
+ udp_server_replyq.count = 0;
+ pthread_mutex_init(&udp_server_replyq.count_mutex, NULL);
+ pthread_cond_init(&udp_server_replyq.count_cond, NULL);
+ count = &client_count;
+ }
- f = fopen(filename, "r");
- if (!f)
- errx("getconfig failed to open %s for reading", filename);
-
- while (fgets(line, 1024, f) && peer_count < MAX_PEERS) {
- peer = &peers[peer_count];
- memset(peer, 0, sizeof(struct peer));
-
+ *count = 0;
+ while (fgets(line, 1024, f) && *count < MAX_PEERS) {
+ if (serverfile) {
+ server = &servers[*count];
+ memset(server, 0, sizeof(struct server));
+ peer = &server->peer;
+ } else {
+ client = &clients[*count];
+ memset(client, 0, sizeof(struct client));
+ peer = &client->peer;
+ }
for (p = line; *p == ' ' || *p == '\t'; p++);
if (*p == '#' || *p == '\n')
continue;
}
peer->type = *p;
for (p++; *p == ' ' || *p == '\t'; p++);
- p = parsehostport(p, &peer->host, &peer->port);
+ p = parsehostport(p, peer);
if (!peer->port)
peer->port = (peer->type == 'U' ? DEFAULT_UDP_PORT : DEFAULT_TLS_PORT);
for (; *p == ' ' || *p == '\t'; p++);
+ if (serverfile) {
+ p = parserealmlist(p, server);
+ if (!server->realms) {
+ printf("realm list must be specified\n");
+ exit(1);
+ }
+ for (; *p == ' ' || *p == '\t'; p++);
+ }
field = p;
for (; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++);
if (field == p) {
/* check that rest of line only white space */
for (; *p == ' ' || *p == '\t'; p++);
if (*p && *p != '\n') {
- printf("max 3 fields per line, found a 4th\n");
+ printf("max 4 fields per line, found a 5th\n");
exit(1);
}
}
- peer->sockcl = -1;
- peer->sslsrv = NULL;
- peer->sslcl = NULL;
- pthread_mutex_init(&peer->lock, NULL);
- if (!resolvepeer(peer)) {
+
+ if ((serverfile && !resolvepeer(&server->peer)) ||
+ (clientfile && !resolvepeer(&client->peer))) {
printf("failed to resolve host %s port %s, exiting\n", peer->host, peer->port);
exit(1);
}
- peer->requests = malloc(MAX_REQUESTS * sizeof(struct request));
- if (!peer->requests)
- errx("malloc failed");
- memset(peer->requests, 0, MAX_REQUESTS * sizeof(struct request));
- peer->newrq = 0;
- pthread_mutex_init(&peer->newrq_mutex, NULL);
- pthread_cond_init(&peer->newrq_cond, NULL);
-
- if (peer->type == 'U')
- peer->replyq = &udp_server_replyq;
- else {
- peer->replyq = malloc(sizeof(struct replyq));
- if (!peer->replyq)
- errx("malloc failed");
- peer->replyq->replies = malloc(MAX_REQUESTS * sizeof(struct reply));
- if (!peer->replyq->replies)
+
+ if (serverfile) {
+ pthread_mutex_init(&server->lock, NULL);
+ server->sock = -1;
+ server->requests = malloc(MAX_REQUESTS * sizeof(struct request));
+ if (!server->requests)
errx("malloc failed");
- peer->replyq->size = MAX_REQUESTS;
- peer->replyq->count = 0;
- pthread_mutex_init(&peer->replyq->count_mutex, NULL);
- pthread_cond_init(&peer->replyq->count_cond, NULL);
+ memset(server->requests, 0, MAX_REQUESTS * sizeof(struct request));
+ server->newrq = 0;
+ pthread_mutex_init(&server->newrq_mutex, NULL);
+ pthread_cond_init(&server->newrq_cond, NULL);
+ } else {
+ if (peer->type == 'U')
+ client->replyq = &udp_server_replyq;
+ else {
+ client->replyq = malloc(sizeof(struct replyq));
+ if (!client->replyq)
+ errx("malloc failed");
+ client->replyq->replies = malloc(MAX_REQUESTS * sizeof(struct reply));
+ if (!client->replyq->replies)
+ errx("malloc failed");
+ client->replyq->size = MAX_REQUESTS;
+ client->replyq->count = 0;
+ pthread_mutex_init(&client->replyq->count_mutex, NULL);
+ pthread_cond_init(&client->replyq->count_cond, NULL);
+ }
+ }
+ printf("got type %c, host %s, port %s, secret %s\n", peer->type, peer->host, peer->port, peer->secret);
+ if (serverfile) {
+ printf(" with realms:");
+ for (r = server->realms; *r; r++)
+ printf(" %s", *r);
+ printf("\n");
}
- printf("got type %c, host %s, port %s, secret %s\n", peers[peer_count].type,
- peers[peer_count].host, peers[peer_count].port, peers[peer_count].secret);
- peer_count++;
+ (*count)++;
}
fclose(f);
}
int i;
parseargs(argc, argv);
- getconfig("radsecproxy.conf");
+ getconfig("servers.conf", NULL);
+ getconfig(NULL, "clients.conf");
ssl_locks_setup();
pthread_attr_init(&joinable);
pthread_attr_setdetachstate(&joinable, PTHREAD_CREATE_JOINABLE);
- /* listen on UDP if at least one UDP peer */
+ /* listen on UDP if at least one UDP client */
- for (i = 0; i < peer_count; i++)
- if (peers[i].type == 'U') {
+ for (i = 0; i < client_count; i++)
+ if (clients[i].peer.type == 'U') {
if (pthread_create(&udpserverth, &joinable, udpserverrd, NULL))
errx("pthread_create failed");
break;
}
- for (i = 0; i < peer_count; i++)
- if (peers[i].type == 'T')
- break;
-
- if (i == peer_count) {
- printf("No TLS peers defined, just doing UDP proxying\n");
- /* just hang around doing nothing, anything to do here? */
- pthread_join(udpserverth, NULL);
- return 0;
- }
-
/* SSL setup */
SSL_load_error_strings();
SSL_library_init();
if (!ssl_ctx_cl)
errx("no ssl ctx");
- for (i = 0; i < peer_count; i++) {
- if (pthread_create(&peers[i].clientth, NULL, clientwr, (void *)&peers[i]))
+ for (i = 0; i < server_count; i++) {
+ if (pthread_create(&servers[i].clientth, NULL, clientwr, (void *)&servers[i]))
errx("pthread_create failed");
}
+ for (i = 0; i < client_count; i++)
+ if (clients[i].peer.type == 'T')
+ break;
+
+ if (i == client_count) {
+ printf("No TLS clients defined, not starting TLS listener\n");
+ /* just hang around doing nothing, anything to do here? */
+ for (;;)
+ sleep(1000);
+ }
+
/* setting up server/daemon part */
ssl_ctx_srv = SSL_CTX_new(TLSv1_server_method());
if (!ssl_ctx_srv)
err("SSL: %s", ERR_error_string(error, NULL));
errx("Failed to load private key");
}
+
return tlslistener(ssl_ctx_srv);
}
projects / radsecproxy.git / blobdiff