/*
- * Copyright (C) 2006 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2006, 2007 Stig Venaas <venaas@uninett.no>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*/
-/* BUGS:
- * peers can not yet be specified with literal IPv6 addresses due to port syntax
- */
-
/* TODO:
- * make our server ignore client retrans and do its own instead?
* accounting
* radius keep alives (server status)
- * tls certificate validation, see below urls
- * clean tls shutdown, see http://www.linuxjournal.com/article/4822
- * and http://www.linuxjournal.com/article/5487
- * SSL_shutdown() and shutdown()
- * If shutdown() we may not need REUSEADDR
- * when tls client goes away, ensure that all related threads and state
- * are removed
* setsockopt(keepalive...), check if openssl has some keepalive feature
*/
* 1 + (2 + 2 * 3) + (2 * 30) + (2 * 30) = 129 threads
*/
+#include <sys/socket.h>
+#include <netinet/in.h>
#include <netdb.h>
+#include <string.h>
#include <unistd.h>
#include <sys/time.h>
+#include <libgen.h>
#include <pthread.h>
#include <openssl/ssl.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/md5.h>
#include <openssl/hmac.h>
+#include "debug.h"
#include "radsecproxy.h"
static struct options options;
-static struct client clients[MAX_PEERS];
-static struct server servers[MAX_PEERS];
+static struct client *clients;
+static struct server *servers;
+static int client_udp_count = 0;
+static int client_tls_count = 0;
static int client_count = 0;
+static int server_udp_count = 0;
+static int server_tls_count = 0;
static int server_count = 0;
+static struct peer *tcp_server_listen;
+static struct peer *udp_server_listen;
static struct replyq udp_server_replyq;
static int udp_server_sock = -1;
static pthread_mutex_t *ssl_locks;
/* callbacks for making OpenSSL thread safe */
unsigned long ssl_thread_id() {
return (unsigned long)pthread_self();
-};
+}
void ssl_locking_callback(int mode, int type, const char *file, int line) {
if (mode & CRYPTO_LOCK) {
pthread_mutex_unlock(&ssl_locks[type]);
}
-void ssl_init() {
+static int pem_passwd_cb(char *buf, int size, int rwflag, void *userdata) {
+ int pwdlen = strlen(userdata);
+ if (rwflag != 0 || pwdlen > size) /* not for decryption or too large */
+ return 0;
+ memcpy(buf, userdata, pwdlen);
+ return pwdlen;
+}
+
+static int verify_cb(int ok, X509_STORE_CTX *ctx) {
+ char buf[256];
+ X509 *err_cert;
+ int err, depth;
+
+ err_cert = X509_STORE_CTX_get_current_cert(ctx);
+ err = X509_STORE_CTX_get_error(ctx);
+ depth = X509_STORE_CTX_get_error_depth(ctx);
+
+ if (depth > MAX_CERT_DEPTH) {
+ ok = 0;
+ err = X509_V_ERR_CERT_CHAIN_TOO_LONG;
+ X509_STORE_CTX_set_error(ctx, err);
+ }
+
+ if (!ok) {
+ X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
+ printf("verify error: num=%d:%s:depth=%d:%s\n", err, X509_verify_cert_error_string(err), depth, buf);
+
+ switch (err) {
+ case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+ X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
+ printf("issuer=%s\n", buf);
+ break;
+ case X509_V_ERR_CERT_NOT_YET_VALID:
+ case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
+ printf("Certificate not yet valid\n");
+ break;
+ case X509_V_ERR_CERT_HAS_EXPIRED:
+ printf("Certificate has expired\n");
+ break;
+ case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
+ printf("Certificate no longer valid (after notAfter)\n");
+ break;
+ }
+ }
+ /* printf("certificate verify returns %d\n", ok); */
+ return ok;
+}
+
+SSL_CTX *ssl_init() {
+ SSL_CTX *ctx;
int i;
unsigned long error;
printf("TLSCertificateFile and TLSCertificateKeyFile must be specified for TLS\n");
exit(1);
}
+ if (!options.tlscacertificatefile && !options.tlscacertificatepath) {
+ printf("CA Certificate file/path need to be configured\n");
+ exit(1);
+ }
ssl_locks = malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));
ssl_lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
RAND_seed((unsigned char *)&pid, sizeof(pid));
}
- ssl_ctx = SSL_CTX_new(TLSv1_method());
- if (!ssl_ctx) {
- printf("failed to initialise ssl");
- exit(1);
- }
-
- if (!SSL_CTX_use_certificate_file(ssl_ctx, options.tlscertificatefile, SSL_FILETYPE_PEM)) {
- while ((error = ERR_get_error()))
- err("SSL: %s", ERR_error_string(error, NULL));
- errx("Failed to load certificate");
+ ctx = SSL_CTX_new(TLSv1_method());
+ if (options.tlscertificatekeypassword) {
+ SSL_CTX_set_default_passwd_cb_userdata(ctx, options.tlscertificatekeypassword);
+ SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
}
- if (!SSL_CTX_use_PrivateKey_file(ssl_ctx, options.tlscertificatekeyfile, SSL_FILETYPE_PEM)) {
- while ((error = ERR_get_error()))
- err("SSL: %s", ERR_error_string(error, NULL));
- errx("Failed to load private key");
+ if (SSL_CTX_use_certificate_chain_file(ctx, options.tlscertificatefile) &&
+ SSL_CTX_use_PrivateKey_file(ctx, options.tlscertificatekeyfile, SSL_FILETYPE_PEM) &&
+ SSL_CTX_check_private_key(ctx) &&
+ SSL_CTX_load_verify_locations(ctx, options.tlscacertificatefile, options.tlscacertificatepath)) {
+ 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);
+ return ctx;
}
+
+ while ((error = ERR_get_error()))
+ err("SSL: %s", ERR_error_string(error, NULL));
+ exit(1);
}
void printauth(char *s, unsigned char *t) {
printf("\n");
}
-int resolvepeer(struct peer *peer) {
+int resolvepeer(struct peer *peer, int ai_flags) {
struct addrinfo hints, *addrinfo;
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = (peer->type == 'T' ? SOCK_STREAM : SOCK_DGRAM);
hints.ai_family = AF_UNSPEC;
+ hints.ai_flags = ai_flags;
if (getaddrinfo(peer->host, peer->port, &hints, &addrinfo)) {
err("resolvepeer: can't resolve %s port %s", peer->host, peer->port);
return 0;
return s;
}
+int bindtoaddr(struct addrinfo *addrinfo) {
+ int s, on = 1;
+ struct addrinfo *res;
+
+ for (res = addrinfo; res; res = res->ai_next) {
+ s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+ if (s < 0) {
+ err("bindtoaddr: socket failed");
+ continue;
+ }
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+ if (!bind(s, res->ai_addr, res->ai_addrlen))
+ return s;
+ err("bindtoaddr: bind failed");
+ close(s);
+ }
+ return -1;
+}
+
/* 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) {
return rad;
}
+int tlsverifycert(struct peer *peer) {
+ int i, l, loc;
+ X509 *cert;
+ X509_NAME *nm;
+ X509_NAME_ENTRY *e;
+ unsigned char *v;
+ unsigned long error;
+
+#if 1
+ if (SSL_get_verify_result(peer->ssl) != X509_V_OK) {
+ printf("tlsverifycert: basic validation failed\n");
+ while ((error = ERR_get_error()))
+ err("clientwr: TLS: %s", ERR_error_string(error, NULL));
+ return 0;
+ }
+#endif
+ cert = SSL_get_peer_certificate(peer->ssl);
+ if (!cert) {
+ printf("tlsverifycert: failed to obtain certificate\n");
+ 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;
+ printf("cn: ");
+ for (i = 0; i < l; i++)
+ printf("%c", v[i]);
+ printf("\n");
+ if (l == strlen(peer->host) && !strncasecmp(peer->host, (char *)v, l)) {
+ printf("tlsverifycert: Found cn matching host %s, All OK\n", peer->host);
+ return 1;
+ }
+ printf("tlsverifycert: cn not matching host %s\n", peer->host);
+ }
+ X509_free(cert);
+ return 0;
+}
+
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);
sleep(10);
} else if (elapsed < 5)
sleep(10);
- else if (elapsed < 600)
- sleep(elapsed * 2);
- else if (elapsed < 10000)
- sleep(900);
- else
- server->lastconnecttry.tv_sec = now.tv_sec; // no sleep at startup
+ else if (elapsed < 600) {
+ printf("tlsconnect: sleeping %lds\n", elapsed);
+ sleep(elapsed);
+ } else if (elapsed < 1000) {
+ printf("tlsconnect: sleeping %ds\n", 900);
+ sleep(900);
+ } else
+ server->lastconnecttry.tv_sec = now.tv_sec; /* no sleep at startup */
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);
SSL_free(server->peer.ssl);
server->peer.ssl = SSL_new(ssl_ctx);
SSL_set_fd(server->peer.ssl, server->sock);
- if (SSL_connect(server->peer.ssl) > 0)
+ if (SSL_connect(server->peer.ssl) > 0 && tlsverifycert(&server->peer))
break;
- while ((error = ERR_get_error()))
- err("tlsconnect: TLS: %s", ERR_error_string(error, NULL));
}
printf("tlsconnect: TLS connection to %s port %s up\n", server->peer.host, server->peer.port);
gettimeofday(&server->lastconnecttry, NULL);
if (cnt <= 0) {
printf("radtlsget: connection lost\n");
if (SSL_get_error(ssl, cnt) == SSL_ERROR_ZERO_RETURN) {
- //remote end sent close_notify, send one back
+ /* remote end sent close_notify, send one back */
SSL_shutdown(ssl);
}
return NULL;
if (cnt <= 0) {
printf("radtlsget: connection lost\n");
if (SSL_get_error(ssl, cnt) == SSL_ERROR_ZERO_RETURN) {
- //remote end sent close_notify, send one back
+ /* remote end sent close_notify, send one back */
SSL_shutdown(ssl);
}
free(rad);
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));
+ err("clientradput: TLS: %s", ERR_error_string(error, NULL));
tlsconnect(server, &lastconnecttry, "clientradput");
lastconnecttry = server->lastconnecttry;
}
result = (EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) &&
EVP_DigestUpdate(&mdctx, rad, RADLEN(rad)) &&
- EVP_DigestUpdate(&mdctx, sec, strlen(sec)) &&
+ EVP_DigestUpdate(&mdctx, sec, strlen((char *)sec)) &&
EVP_DigestFinal_ex(&mdctx, rad + 4, &md_len) &&
md_len == 16);
pthread_mutex_unlock(&lock);
EVP_DigestUpdate(&mdctx, rad, 4) &&
EVP_DigestUpdate(&mdctx, reqauth, 16) &&
(len <= 20 || EVP_DigestUpdate(&mdctx, rad + 20, len - 20)) &&
- EVP_DigestUpdate(&mdctx, sec, strlen(sec)) &&
+ EVP_DigestUpdate(&mdctx, sec, strlen((char *)sec)) &&
EVP_DigestFinal_ex(&mdctx, hash, &len) &&
len == 16 &&
!memcmp(hash, rad + 4, 16));
return result;
}
-int checkmessageauth(char *rad, uint8_t *authattr, char *secret) {
+int checkmessageauth(unsigned char *rad, uint8_t *authattr, char *secret) {
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static unsigned char first = 1;
static HMAC_CTX hmacctx;
return 1;
}
-int createmessageauth(char *rad, char *authattrval, char *secret) {
+int createmessageauth(unsigned char *rad, unsigned char *authattrval, char *secret) {
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static unsigned char first = 1;
static HMAC_CTX hmacctx;
if (!createmessageauth(rq->buf, rq->messageauthattrval, to->peer.secret))
return;
- gettimeofday(&rq->expiry, NULL);
- rq->expiry.tv_sec += 30;
to->requests[i] = *rq;
if (!to->newrq) {
pthread_mutex_unlock(&to->newrq_mutex);
}
-void sendreply(struct client *to, struct server *from, char *buf, struct sockaddr_storage *tosa) {
+void sendreply(struct client *to, struct server *from, unsigned char *buf, struct sockaddr_storage *tosa) {
struct replyq *replyq = to->replyq;
pthread_mutex_lock(&replyq->count_mutex);
pthread_mutex_unlock(&replyq->count_mutex);
}
-int pwdencrypt(uint8_t *in, uint8_t len, uint8_t *shared, uint8_t sharedlen, uint8_t *auth) {
+int pwdencrypt(uint8_t *in, uint8_t len, char *shared, uint8_t sharedlen, uint8_t *auth) {
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static unsigned char first = 1;
static EVP_MD_CTX mdctx;
input = auth;
for (;;) {
if (!EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) ||
- !EVP_DigestUpdate(&mdctx, shared, sharedlen) ||
+ !EVP_DigestUpdate(&mdctx, (uint8_t *)shared, sharedlen) ||
!EVP_DigestUpdate(&mdctx, input, 16) ||
!EVP_DigestFinal_ex(&mdctx, hash, &md_len) ||
md_len != 16) {
return 1;
}
-int pwddecrypt(uint8_t *in, uint8_t len, uint8_t *shared, uint8_t sharedlen, uint8_t *auth) {
+int pwddecrypt(uint8_t *in, uint8_t len, char *shared, uint8_t sharedlen, uint8_t *auth) {
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static unsigned char first = 1;
static EVP_MD_CTX mdctx;
input = auth;
for (;;) {
if (!EVP_DigestInit_ex(&mdctx, EVP_md5(), NULL) ||
- !EVP_DigestUpdate(&mdctx, shared, sharedlen) ||
+ !EVP_DigestUpdate(&mdctx, (uint8_t *)shared, sharedlen) ||
!EVP_DigestUpdate(&mdctx, input, 16) ||
!EVP_DigestFinal_ex(&mdctx, hash, &md_len) ||
md_len != 16) {
return NULL;
}
-struct server *radsrv(struct request *rq, char *buf, struct client *from) {
+int rqinqueue(struct server *to, struct client *from, uint8_t id) {
+ int i;
+
+ pthread_mutex_lock(&to->newrq_mutex);
+ for (i = 0; i < MAX_REQUESTS; i++)
+ if (to->requests[i].buf && to->requests[i].origid == id && to->requests[i].from == from)
+ break;
+ pthread_mutex_unlock(&to->newrq_mutex);
+
+ return i < MAX_REQUESTS;
+}
+
+struct server *radsrv(struct request *rq, unsigned char *buf, struct client *from) {
uint8_t code, id, *auth, *attr, attrvallen;
uint8_t *usernameattr = NULL, *userpwdattr = NULL, *tunnelpwdattr = NULL, *messageauthattr = NULL;
int i;
printf("\n");
}
- to = id2server(&usernameattr[RAD_Attr_Value], usernameattr[RAD_Attr_Length] - 2);
+ to = id2server((char *)&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;
}
+
+ if (rqinqueue(to, from, id)) {
+ printf("radsrv: ignoring request from host %s with id %d, already got one\n", from->peer.host, id);
+ return NULL;
+ }
if (messageauthattr && (messageauthattr[RAD_Attr_Length] != 18 ||
!checkmessageauth(buf, &messageauthattr[RAD_Attr_Value], from->peer.secret))) {
rq->messageauthattrval = (messageauthattr ? &messageauthattr[RAD_Attr_Value] : NULL);
memcpy(rq->origauth, auth, 16);
memcpy(auth, newauth, 16);
- printauth("rq->origauth", rq->origauth);
+ printauth("rq->origauth", (unsigned char *)rq->origauth);
printauth("auth", auth);
return to;
}
printf("clientrd: discarding, only accept access accept, access reject and access challenge messages\n");
continue;
}
+
+ printf("got message type: %d, id: %d\n", buf[0], buf[1]);
i = buf[1]; /* i is the id */
continue;
}
- if (!validauth(buf, server->requests[i].buf + 4, server->peer.secret)) {
+ if (!validauth(buf, server->requests[i].buf + 4, (unsigned char *)server->peer.secret)) {
pthread_mutex_unlock(&server->newrq_mutex);
printf("clientrd: invalid auth, ignoring\n");
continue;
from = server->requests[i].from;
-
/* messageauthattr present? */
messageauthattr = NULL;
left = RADLEN(buf) - 20;
goto getnext;
}
if (attr[RAD_Attr_Type] == RAD_Attr_Vendor_Specific &&
- ((uint16_t *)attr)[1] == 0 && ntohs(((uint16_t *)attr)[2]) == 311) { // 311 == MS
+ ((uint16_t *)attr)[1] == 0 && ntohs(((uint16_t *)attr)[2]) == 311) { /* 311 == MS */
subleft = attr[RAD_Attr_Length] - 6;
subattr = attr + 6;
while (subleft > 1) {
if (subattr[RAD_Attr_Length] < 20)
continue;
- if (!msmppdecrypt(subattr + 4, subattr[RAD_Attr_Length] - 4,
- server->peer.secret, strlen(server->peer.secret), server->requests[i].buf + 4, subattr + 2)) {
+ if (!msmppdecrypt(subattr + 4, subattr[RAD_Attr_Length] - 4, (unsigned char *)server->peer.secret,
+ strlen(server->peer.secret), server->requests[i].buf + 4, subattr + 2)) {
printf("clientrd: failed to decrypt msppe key\n");
continue;
}
- if (!msmppencrypt(subattr + 4, subattr[RAD_Attr_Length] - 4,
- from->peer.secret, strlen(from->peer.secret), server->requests[i].origauth, subattr + 2)) {
+ if (!msmppencrypt(subattr + 4, subattr[RAD_Attr_Length] - 4, (unsigned char *)from->peer.secret,
+ strlen(from->peer.secret), (unsigned char *)server->requests[i].origauth, subattr + 2)) {
printf("clientrd: failed to encrypt msppe key\n");
continue;
}
server->requests[i].received = 1;
pthread_mutex_unlock(&server->newrq_mutex);
- if (!radsign(buf, from->peer.secret)) {
+ if (!radsign(buf, (unsigned char *)from->peer.secret)) {
printf("clientrd: failed to sign message\n");
continue;
}
struct request *rq;
pthread_t clientrdth;
int i;
- struct timeval now;
-
+ uint8_t rnd;
+ struct timeval now, lastsend;
+ struct timespec timeout;
+
+ memset(&lastsend, 0, sizeof(struct timeval));
+ memset(&timeout, 0, sizeof(struct timespec));
+
if (server->peer.type == 'U') {
if ((server->sock = connecttoserver(server->peer.addrinfo)) < 0) {
printf("clientwr: connecttoserver failed\n");
for (;;) {
pthread_mutex_lock(&server->newrq_mutex);
- while (!server->newrq) {
- printf("clientwr: waiting for signal\n");
- pthread_cond_wait(&server->newrq_cond, &server->newrq_mutex);
- printf("clientwr: got signal\n");
+ if (!server->newrq) {
+ gettimeofday(&now, NULL);
+ if (timeout.tv_sec) {
+ printf("clientwr: waiting up to %ld secs for new request\n", timeout.tv_sec - now.tv_sec);
+ pthread_cond_timedwait(&server->newrq_cond, &server->newrq_mutex, &timeout);
+ timeout.tv_sec = 0;
+ } else if (options.statusserver) {
+ timeout.tv_sec = now.tv_sec + STATUS_SERVER_PERIOD;
+ /* add random 0-7 seconds to timeout */
+ RAND_bytes(&rnd, 1);
+ timeout.tv_sec += rnd / 32;
+ pthread_cond_timedwait(&server->newrq_cond, &server->newrq_mutex, &timeout);
+ timeout.tv_sec = 0;
+ } else {
+ printf("clientwr: waiting for new request\n");
+ pthread_cond_wait(&server->newrq_cond, &server->newrq_mutex);
+ }
}
- server->newrq = 0;
+ if (server->newrq) {
+ printf("clientwr: got new request\n");
+ server->newrq = 0;
+ } else
+ printf("clientwr: request timer expired, processing request queue\n");
pthread_mutex_unlock(&server->newrq_mutex);
-
+
for (i = 0; i < MAX_REQUESTS; i++) {
pthread_mutex_lock(&server->newrq_mutex);
while (!server->requests[i].buf && i < MAX_REQUESTS)
pthread_mutex_unlock(&server->newrq_mutex);
break;
}
-
- gettimeofday(&now, NULL);
rq = server->requests + i;
if (rq->received) {
pthread_mutex_unlock(&server->newrq_mutex);
continue;
}
- if (now.tv_sec > rq->expiry.tv_sec) {
+
+ gettimeofday(&now, NULL);
+ if (now.tv_sec <= rq->expiry.tv_sec) {
+ if (!timeout.tv_sec || rq->expiry.tv_sec < timeout.tv_sec)
+ timeout.tv_sec = rq->expiry.tv_sec;
+ pthread_mutex_unlock(&server->newrq_mutex);
+ continue;
+ }
+
+ if (rq->tries == (server->peer.type == 'T' ? 1 : REQUEST_RETRIES)) {
printf("clientwr: removing expired packet from queue\n");
- free(rq->buf);
- /* setting this to NULL means that it can be reused */
- rq->buf = NULL;
- pthread_mutex_unlock(&server->newrq_mutex);
- continue;
- }
+ free(rq->buf);
+ /* setting this to NULL means that it can be reused */
+ rq->buf = NULL;
+ pthread_mutex_unlock(&server->newrq_mutex);
+ continue;
+ }
+ pthread_mutex_unlock(&server->newrq_mutex);
- if (rq->tries)
- continue; // not re-sending (yet)
-
+ rq->expiry.tv_sec = now.tv_sec +
+ (server->peer.type == 'T' ? REQUEST_EXPIRY : REQUEST_EXPIRY / REQUEST_RETRIES);
+ if (!timeout.tv_sec || rq->expiry.tv_sec < timeout.tv_sec)
+ timeout.tv_sec = rq->expiry.tv_sec;
rq->tries++;
- pthread_mutex_unlock(&server->newrq_mutex);
-
clientradput(server, server->requests[i].buf);
+ gettimeofday(&lastsend, NULL);
+ usleep(200000);
+ }
+ if (options.statusserver) {
+ gettimeofday(&now, NULL);
+ if (now.tv_sec - lastsend.tv_sec >= STATUS_SERVER_PERIOD) {
+ lastsend.tv_sec = now.tv_sec;
+ printf("clientwr: should send status to %s here\n", server->peer.host);
+ }
}
}
- /* should do more work to maintain TLS connections, keepalives etc */
}
void *udpserverwr(void *arg) {
struct server *to;
struct client *fr;
pthread_t udpserverwrth;
-
- if ((udp_server_sock = bindport(SOCK_DGRAM, options.udpserverport)) < 0) {
+
+ if ((udp_server_sock = bindtoaddr(udp_server_listen->addrinfo)) < 0) {
printf("udpserverrd: socket/bind failed\n");
exit(1);
}
- printf("udpserverrd: listening on UDP port %s\n", options.udpserverport);
+ printf("udpserverrd: listening for UDP on %s:%s\n",
+ udp_server_listen->host ? udp_server_listen->host : "*", udp_server_listen->port);
if (pthread_create(&udpserverwrth, NULL, udpserverwr, NULL))
errx("pthread_create failed");
printf("tls server writer, got signal\n");
}
if (!client->peer.ssl) {
- //ssl might have changed while waiting
+ /* ssl might have changed while waiting */
pthread_mutex_unlock(&replyq->count_mutex);
printf("tlsserverwr: exiting as requested\n");
pthread_exit(NULL);
if (SSL_accept(ssl) <= 0) {
while ((error = ERR_get_error()))
err("tlsserverrd: SSL: %s", ERR_error_string(error, NULL));
- errx("accept failed, child exiting");
+ printf("SSL_accept failed\n");
+ goto errexit;
}
-
- if (pthread_create(&tlsserverwrth, NULL, tlsserverwr, (void *)client))
- errx("pthread_create failed");
-
- for (;;) {
- buf = radtlsget(client->peer.ssl);
- if (!buf)
- break;
- printf("tlsserverrd: got Radius message from %s\n", client->peer.host);
- memset(&rq, 0, sizeof(struct request));
- to = radsrv(&rq, buf, client);
- if (!to) {
- printf("ignoring request, no place to send it\n");
- continue;
+ if (tlsverifycert(&client->peer)) {
+ if (pthread_create(&tlsserverwrth, NULL, tlsserverwr, (void *)client)) {
+ err("pthread_create failed");
+ goto errexit;
}
- sendrq(to, client, &rq);
+ for (;;) {
+ buf = radtlsget(client->peer.ssl);
+ if (!buf)
+ break;
+ printf("tlsserverrd: got Radius message from %s\n", client->peer.host);
+ memset(&rq, 0, sizeof(struct request));
+ to = radsrv(&rq, buf, client);
+ if (!to) {
+ printf("ignoring request, no place to send it\n");
+ continue;
+ }
+ sendrq(to, client, &rq);
+ }
+ printf("tlsserverrd: connection lost\n");
+ /* stop writer by setting peer.ssl to NULL and give signal in case waiting for data */
+ client->peer.ssl = NULL;
+ pthread_mutex_lock(&client->replyq->count_mutex);
+ pthread_cond_signal(&client->replyq->count_cond);
+ pthread_mutex_unlock(&client->replyq->count_mutex);
+ printf("tlsserverrd: waiting for writer to end\n");
+ pthread_join(tlsserverwrth, NULL);
}
- printf("tlsserverrd: connection lost\n");
- // stop writer by setting peer.ssl to NULL and give signal in case waiting for data
- client->peer.ssl = NULL;
- pthread_mutex_lock(&client->replyq->count_mutex);
- pthread_cond_signal(&client->replyq->count_cond);
- pthread_mutex_unlock(&client->replyq->count_mutex);
- printf("tlsserverrd: waiting for writer to end\n");
- pthread_join(tlsserverwrth, NULL);
+
+ errexit:
s = SSL_get_fd(ssl);
SSL_free(ssl);
+ shutdown(s, SHUT_RDWR);
close(s);
printf("tlsserverrd thread for %s exiting\n", client->peer.host);
+ client->peer.ssl = NULL;
pthread_exit(NULL);
}
size_t fromlen = sizeof(from);
struct client *client;
- if ((s = bindport(SOCK_STREAM, DEFAULT_TLS_PORT)) < 0) {
+ if ((s = bindtoaddr(tcp_server_listen->addrinfo)) < 0) {
printf("tlslistener: socket/bind failed\n");
exit(1);
}
listen(s, 0);
- printf("listening for incoming TLS on port %s\n", DEFAULT_TLS_PORT);
+ printf("listening for incoming TCP on %s:%s\n",
+ tcp_server_listen->host ? tcp_server_listen->host : "*", tcp_server_listen->port);
for (;;) {
snew = accept(s, (struct sockaddr *)&from, &fromlen);
- if (snew < 0)
- errx("accept failed");
+ if (snew < 0) {
+ err("accept failed");
+ continue;
+ }
printf("incoming TLS connection from %s\n", addr2string((struct sockaddr *)&from, fromlen));
client = find_client('T', (struct sockaddr *)&from, NULL);
}
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");
+ if (pthread_create(&tlsserverth, NULL, tlsserverrd, (void *)client)) {
+ err("pthread_create failed");
+ SSL_free(client->peer.ssl);
+ shutdown(snew, SHUT_RDWR);
+ close(snew);
+ client->peer.ssl = NULL;
+ continue;
+ }
pthread_detach(tlsserverth);
}
return 0;
int ipv6 = 0;
p = s;
- // allow literal addresses and port, e.g. [2001:db8::1]:1812
+ /* allow literal addresses and port, e.g. [2001:db8::1]:1812 */
if (*p == '[') {
p++;
field = p;
}
if (*p == ':') {
/* port number or service name is specified */;
- field = p++;
+ field = ++p;
for (; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++);
if (field == p) {
printf("syntax error, : but no following port\n");
return p;
}
-// * is default, else longest match ... ";" used for separator
+/* * is default, else longest match ... ";" used for separator */
char *parserealmlist(char *s, struct server *server) {
char *p;
int i, n, l;
return p;
}
+FILE *openconfigfile(const char *filename) {
+ FILE *f;
+ char pathname[100], *base;
+
+ f = fopen(filename, "r");
+ if (f) {
+ printf("reading config file %s\n", filename);
+ return f;
+ }
+
+ if (strlen(filename) + 1 <= sizeof(pathname)) {
+ /* basename() might modify the string */
+ strcpy(pathname, filename);
+ base = basename(pathname);
+ f = fopen(base, "r");
+ }
+
+ if (!f)
+ debug(DBG_ERR, "could not read config file %s nor %s\n%s", filename, base, strerror(errno));
+
+ debug(DBG_INFO, "reading config file %s", base);
+ return f;
+}
+
/* exactly one argument must be non-NULL */
void getconfig(const char *serverfile, const char *clientfile) {
FILE *f;
struct client *client;
struct server *server;
struct peer *peer;
- int *count;
-
+ int i, count, *ucount, *tcount;
+
+ f = openconfigfile(serverfile ? serverfile : clientfile);
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;
+ ucount = &server_udp_count;
+ tcount = &server_tls_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));
+ ucount = &client_udp_count;
+ tcount = &client_tls_count;
+ }
+ while (fgets(line, 1024, f)) {
+ for (p = line; *p == ' ' || *p == '\t'; p++);
+ switch (*p) {
+ case '#':
+ case '\n':
+ break;
+ case 'T':
+ (*tcount)++;
+ break;
+ case 'U':
+ (*ucount)++;
+ break;
+ default:
+ debug(DBG_ERR, "type must be U or T, got %c", *p);
+ }
+ }
+
+ if (serverfile) {
+ count = server_count = server_udp_count + server_tls_count;
+ servers = calloc(count, sizeof(struct server));
+ if (!servers)
+ debug(DBG_ERR, "malloc failed");
+ } else {
+ count = client_count = client_udp_count + client_tls_count;
+ clients = calloc(count, sizeof(struct client));
+ if (!clients)
+ debug(DBG_ERR, "malloc failed");
+ }
+
+ if (client_udp_count) {
+ udp_server_replyq.replies = malloc(client_udp_count * MAX_REQUESTS * sizeof(struct reply));
if (!udp_server_replyq.replies)
- errx("malloc failed");
- udp_server_replyq.size = 4 * MAX_REQUESTS;
+ debug(DBG_ERR, "malloc failed");
+ udp_server_replyq.size = client_udp_count * 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;
}
- *count = 0;
- while (fgets(line, 1024, f) && *count < MAX_PEERS) {
+ rewind(f);
+ for (i = 0; i < count && fgets(line, 1024, f);) {
if (serverfile) {
- server = &servers[*count];
- memset(server, 0, sizeof(struct server));
+ server = &servers[i];
peer = &server->peer;
} else {
- client = &clients[*count];
- memset(client, 0, sizeof(struct client));
+ client = &clients[i];
peer = &client->peer;
}
for (p = line; *p == ' ' || *p == '\t'; p++);
if (*p == '#' || *p == '\n')
continue;
- if (*p != 'U' && *p != 'T') {
- printf("server type must be U or T, got %c\n", *p);
- exit(1);
- }
- peer->type = *p;
+ peer->type = *p; /* we already know it must be U or T */
for (p++; *p == ' ' || *p == '\t'; p++);
p = parsehostport(p, peer);
for (; *p == ' ' || *p == '\t'; p++);
for (; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++);
if (field == p) {
/* no secret set and end of line, line is complete if TLS */
- if (peer->type == 'U') {
- printf("secret must be specified for UDP\n");
- exit(1);
- }
+ if (peer->type == 'U')
+ debug(DBG_ERR, "secret must be specified for UDP");
peer->secret = stringcopy(DEFAULT_TLS_SECRET, 0);
} else {
peer->secret = stringcopy(field, p - field);
/* check that rest of line only white space */
for (; *p == ' ' || *p == '\t'; p++);
- if (*p && *p != '\n') {
- printf("max 4 fields per line, found a 5th\n");
- exit(1);
- }
+ if (*p && *p != '\n')
+ debug(DBG_ERR, "max 4 fields per line, found a 5th");
}
- 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);
- }
+ if ((serverfile && !resolvepeer(&server->peer, 0)) ||
+ (clientfile && !resolvepeer(&client->peer, 0)))
+ debug(DBG_ERR, "failed to resolve host %s port %s, exiting", peer->host, peer->port);
if (serverfile) {
pthread_mutex_init(&server->lock, NULL);
server->sock = -1;
- server->requests = malloc(MAX_REQUESTS * sizeof(struct request));
+ server->requests = calloc(MAX_REQUESTS, sizeof(struct request));
if (!server->requests)
- errx("malloc failed");
- memset(server->requests, 0, MAX_REQUESTS * sizeof(struct request));
+ debug(DBG_ERR, "malloc failed");
server->newrq = 0;
pthread_mutex_init(&server->newrq_mutex, NULL);
pthread_cond_init(&server->newrq_cond, NULL);
else {
client->replyq = malloc(sizeof(struct replyq));
if (!client->replyq)
- errx("malloc failed");
- client->replyq->replies = malloc(MAX_REQUESTS * sizeof(struct reply));
+ debug(DBG_ERR, "malloc failed");
+ client->replyq->replies = calloc(MAX_REQUESTS, sizeof(struct reply));
if (!client->replyq->replies)
- errx("malloc failed");
+ debug(DBG_ERR, "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);
+ debug(DBG_INFO, "got type %c, host %s, port %s, secret %s", peer->type, peer->host, peer->port, peer->secret);
if (serverfile) {
- printf(" with realms:");
+ debug(DBG_INFO, " with realms:");
for (r = server->realms; *r; r++)
- printf(" %s", *r);
- printf("\n");
+ debug(DBG_INFO, "\t%s", *r);
}
- (*count)++;
+ i++;
}
fclose(f);
}
+struct peer *server_create(char type) {
+ struct peer *server;
+ char *conf;
+
+ server = malloc(sizeof(struct peer));
+ if (!server)
+ errx("malloc failed");
+ memset(server, 0, sizeof(struct peer));
+ server->type = type;
+ conf = (type == 'T' ? options.listentcp : options.listenudp);
+ if (conf) {
+ parsehostport(conf, server);
+ if (!strcmp(server->host, "*")) {
+ free(server->host);
+ server->host = NULL;
+ }
+ } else
+ server->port = stringcopy(type == 'T' ? DEFAULT_TLS_PORT : DEFAULT_UDP_PORT, 0);
+ if (!resolvepeer(server, AI_PASSIVE)) {
+ printf("failed to resolve host %s port %s, exiting\n", server->host, server->port);
+ exit(1);
+ }
+ return server;
+}
+
void getmainconfig(const char *configfile) {
FILE *f;
char line[1024];
char *p, *opt, *endopt, *val, *endval;
- printf("opening file %s for reading\n", configfile);
- f = fopen(configfile, "r");
- if (!f)
- errx("getmainconfig failed to open %s for reading", configfile);
-
+ f = openconfigfile(configfile);
memset(&options, 0, sizeof(options));
while (fgets(line, 1024, f)) {
for (; *p == ' ' || *p == '\t'; p++);
if (!*p || *p == '\n') {
endopt[1] = '\0';
- printf("error in %s, option %s has no value\n", configfile, opt);
- exit(1);
+ debug(DBG_ERR, "error in %s, option %s has no value", configfile, opt);
}
val = p;
for (; *p && *p != '\n'; p++)
endval = p;
endopt[1] = '\0';
endval[1] = '\0';
- printf("getmainconfig: %s = %s\n", opt, val);
+ debug(DBG_INFO, "getmainconfig: %s = %s", opt, val);
+ if (!strcasecmp(opt, "TLSCACertificateFile")) {
+ options.tlscacertificatefile = stringcopy(val, 0);
+ continue;
+ }
+ if (!strcasecmp(opt, "TLSCACertificatePath")) {
+ options.tlscacertificatepath = stringcopy(val, 0);
+ continue;
+ }
if (!strcasecmp(opt, "TLSCertificateFile")) {
options.tlscertificatefile = stringcopy(val, 0);
continue;
options.tlscertificatekeyfile = stringcopy(val, 0);
continue;
}
- if (!strcasecmp(opt, "UDPServerPort")) {
- options.udpserverport = stringcopy(val, 0);
+ if (!strcasecmp(opt, "TLSCertificateKeyPassword")) {
+ options.tlscertificatekeypassword = stringcopy(val, 0);
continue;
}
-
- printf("error in %s, unknown option %s\n", configfile, opt);
- exit(1);
- }
- fclose(f);
-
- if (!options.udpserverport)
- options.udpserverport = stringcopy(DEFAULT_UDP_PORT, 0);
-}
-
-#if 0
-void parseargs(int argc, char **argv) {
- int c;
-
- while ((c = getopt(argc, argv, "p:")) != -1) {
- switch (c) {
- case 'p':
- udp_server_port = optarg;
- break;
- default:
- goto usage;
+ if (!strcasecmp(opt, "ListenUDP")) {
+ options.listenudp = stringcopy(val, 0);
+ continue;
+ }
+ if (!strcasecmp(opt, "ListenTCP")) {
+ options.listentcp = stringcopy(val, 0);
+ continue;
}
+ if (!strcasecmp(opt, "StatusServer")) {
+ if (!strcasecmp(val, "on"))
+ options.statusserver = 1;
+ else if (strcasecmp(val, "off")) {
+ debug(DBG_ERR, "error in %s, value of option %s is %s, must be on or off", configfile, opt, val);
+ }
+ continue;
+ }
+ debug(DBG_ERR, "error in %s, unknown option %s", configfile, opt);
}
-
- return;
-
- usage:
- printf("radsecproxy [ -p UDP-port ]\n");
- exit(1);
+ fclose(f);
}
-#endif
int main(int argc, char **argv) {
pthread_t udpserverth;
- // pthread_attr_t joinable;
int i;
-
- // parseargs(argc, argv);
- getmainconfig("radsecproxy.conf");
- getconfig("servers.conf", NULL);
- getconfig(NULL, "clients.conf");
-
- // pthread_attr_init(&joinable);
- // pthread_attr_setdetachstate(&joinable, PTHREAD_CREATE_JOINABLE);
-
- /* listen on UDP if at least one UDP client */
-
- for (i = 0; i < client_count; i++)
- if (clients[i].peer.type == 'U') {
- if (pthread_create(&udpserverth, NULL /*&joinable*/, udpserverrd, NULL))
- errx("pthread_create failed");
- break;
- }
- /* only initialise ssl here if at least one TLS server defined */
- for (i = 0; i < server_count; i++)
- if (servers[i].peer.type == 'T') {
- ssl_init();
- break;
- }
+ debug_set_level(DEBUG_LEVEL);
+ getmainconfig(CONFIG_MAIN);
+ getconfig(CONFIG_SERVERS, NULL);
+ getconfig(NULL, CONFIG_CLIENTS);
+ if (client_udp_count) {
+ udp_server_listen = server_create('U');
+ if (pthread_create(&udpserverth, NULL, udpserverrd, NULL))
+ debug(DBG_ERR, "pthread_create failed");
+ }
+
+ if (client_tls_count || server_tls_count)
+ ssl_ctx = ssl_init();
+
for (i = 0; i < server_count; i++)
if (pthread_create(&servers[i].clientth, NULL, clientwr, (void *)&servers[i]))
- errx("pthread_create failed");
-
- /* start listener if at least one TLS client defined */
- for (i = 0; i < client_count; i++)
- if (clients[i].peer.type == 'T') {
- if (!ssl_ctx)
- ssl_init();
- return tlslistener();
- }
+ debug(DBG_ERR, "pthread_create failed");
+ if (client_tls_count) {
+ tcp_server_listen = server_create('T');
+ return tlslistener();
+ }
+
/* just hang around doing nothing, anything to do here? */
for (;;)
sleep(1000);
projects / radsecproxy.git / blobdiff