/*
- * 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
*/
/* 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;
static long *ssl_lock_count;
-static SSL_CTX *ssl_ctx_cl = NULL;
-static SSL_CTX *ssl_ctx_srv = NULL;
+static SSL_CTX *ssl_ctx = NULL;
extern int optind;
extern char *optarg;
/* 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]);
}
+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;
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);
+ debug(DBG_WARN, "verify error: num=%d:%s:depth=%d:%s", 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);
+ debug(DBG_WARN, "\tIssuer=%s", 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");
+ debug(DBG_WARN, "\tCertificate not yet valid");
break;
case X509_V_ERR_CERT_HAS_EXPIRED:
- printf("Certificate has expired\n");
+ debug(DBG_WARN, "Certificate has expired");
break;
case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
- printf("Certificate no longer valid (after notAfter)\n");
+ debug(DBG_WARN, "Certificate no longer valid (after notAfter)");
break;
}
}
+#ifdef DEBUG
printf("certificate verify returns %d\n", ok);
+#endif
return ok;
}
-void ssl_init(SSL_CTX **ctx_srv, SSL_CTX **ctx_cl) {
+SSL_CTX *ssl_init() {
+ SSL_CTX *ctx;
int i;
unsigned long error;
- STACK_OF(X509_NAME) *calist;
- if (!options.tlscertificatefile || !options.tlscertificatekeyfile) {
- printf("TLSCertificateFile and TLSCertificateKeyFile must be specified for TLS\n");
- exit(1);
- }
+ if (!options.tlscertificatefile || !options.tlscertificatekeyfile)
+ debugx(1, DBG_ERR, "TLSCertificateFile and TLSCertificateKeyFile must be specified for TLS");
+
+ if (!options.tlscacertificatefile && !options.tlscacertificatepath)
+ debugx(1, DBG_ERR, "CA Certificate file/path need to be configured");
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));
}
-#if 0
- if (ctx_srv) {
- *ctx_srv = SSL_CTX_new(TLSv1_server_method());
- if (!SSL_CTX_use_certificate_chain_file(*ctx_srv, options.tlscertificatefile) ||
- !SSL_CTX_use_PrivateKey_file(*ctx_srv, options.tlscertificatekeyfile, SSL_FILETYPE_PEM) ||
- !SSL_CTX_check_private_key(*ctx_srv))
- goto errexit;
-#if 1
-#if 1
- calist = (options.tlscacertificatefile
- ? SSL_load_client_CA_file(options.tlscacertificatefile)
- : sk_X509_NAME_new_null());
- if (!calist || (options.tlscacertificatepath &&
- !SSL_add_dir_cert_subjects_to_stack(calist, options.tlscacertificatepath)))
- goto errexit;
- SSL_CTX_set_client_CA_list(*ctx_srv, calist);
-#endif
- if (!options.tlscacertificatefile && !options.tlscacertificatepath) {
- printf("CA Certificate file/path need to be configured\n");
- exit(1);
- }
- if (!SSL_CTX_load_verify_locations(*ctx_srv, options.tlscacertificatefile, options.tlscacertificatepath))
- goto errexit;
- SSL_CTX_set_verify(*ctx_srv, SSL_VERIFY_PEER, verify_cb);
- SSL_CTX_set_verify_depth(*ctx_srv, MAX_CERT_DEPTH + 1);
-#endif
+ 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 (ctx_cl) {
- *ctx_cl = SSL_CTX_new(TLSv1_client_method());
- if (!SSL_CTX_use_certificate_chain_file(*ctx_cl, options.tlscertificatefile) ||
- !SSL_CTX_use_PrivateKey_file(*ctx_cl, options.tlscertificatekeyfile, SSL_FILETYPE_PEM) ||
- !SSL_CTX_check_private_key(*ctx_cl))
- goto errexit;
- if (!options.tlscacertificatefile && !options.tlscacertificatepath) {
- printf("CA Certificate file/path need to be configured\n");
- exit(1);
- }
- if (!SSL_CTX_load_verify_locations(*ctx_cl, options.tlscacertificatefile, options.tlscacertificatepath))
- goto errexit;
- SSL_CTX_set_verify(*ctx_cl, SSL_VERIFY_PEER, verify_cb);
- SSL_CTX_set_verify_depth(*ctx_cl, MAX_CERT_DEPTH + 1);
- }
-#else
- if (ctx_srv) {
- *ctx_srv = SSL_CTX_new(TLSv1_server_method());
- if (!SSL_CTX_use_certificate_chain_file(*ctx_srv, options.tlscertificatefile) ||
- !SSL_CTX_use_PrivateKey_file(*ctx_srv, options.tlscertificatekeyfile, SSL_FILETYPE_PEM) ||
- !SSL_CTX_check_private_key(*ctx_srv))
- goto errexit;
-#if 0
- calist = (SSL_load_client_CA_file(options.tlscacertificatefile));
- SSL_CTX_set_client_CA_list(*ctx_srv, calist);
-#endif
- if (!SSL_CTX_load_verify_locations(*ctx_srv, options.tlscacertificatefile, NULL/*options.tlscacertificatepath*/))
- goto errexit;
-
- SSL_CTX_set_verify(*ctx_srv, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb);
- SSL_CTX_set_verify_depth(*ctx_srv, MAX_CERT_DEPTH + 1);
- }
- if (ctx_cl) {
- *ctx_cl = SSL_CTX_new(TLSv1_client_method());
- if (!SSL_CTX_use_certificate_chain_file(*ctx_cl, options.tlscertificatefile) ||
- !SSL_CTX_use_PrivateKey_file(*ctx_cl, options.tlscertificatekeyfile, SSL_FILETYPE_PEM) ||
- !SSL_CTX_check_private_key(*ctx_cl))
- goto errexit;
- if (!SSL_CTX_load_verify_locations(*ctx_cl,options.tlscacertificatefile, NULL/*options.tlscacertificatepath*/))
- goto errexit;
-
- SSL_CTX_set_verify(*ctx_cl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb);
- SSL_CTX_set_verify_depth(*ctx_cl, MAX_CERT_DEPTH + 1);
-#if 0
- calist = (SSL_load_client_CA_file(options.tlscacertificatefile));
- SSL_CTX_set_client_CA_list(*ctx_cl, calist);
-#endif
+ 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;
}
-#endif
- return;
-
- errexit:
+
while ((error = ERR_get_error()))
- err("SSL: %s", ERR_error_string(error, NULL));
+ debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
+ debug(DBG_ERR, "Error initialising SSL/TLS");
exit(1);
}
+#ifdef DEBUG
void printauth(char *s, unsigned char *t) {
int i;
printf("%s:", s);
printf("%02x ", t[i]);
printf("\n");
}
+#endif
-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);
+ debug(DBG_WARN, "resolvepeer: can't resolve %s port %s", peer->host, peer->port);
return 0;
}
for (res = addrinfo; res; res = res->ai_next) {
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (s < 0) {
- err("connecttoserver: socket failed");
+ debug(DBG_WARN, "connecttoserver: socket failed");
continue;
}
if (connect(s, res->ai_addr, res->ai_addrlen) == 0)
break;
- err("connecttoserver: connect failed");
+ debug(DBG_WARN, "connecttoserver: connect failed");
close(s);
s = -1;
}
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) {
+ debug(DBG_WARN, "bindtoaddr: 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");
+ 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) {
for (;;) {
cnt = recvfrom(s, buf, sizeof(buf), 0, (struct sockaddr *)&from, &fromlen);
if (cnt == -1) {
- err("radudpget: recv failed");
+ debug(DBG_WARN, "radudpget: recv failed");
continue;
}
- printf("radudpget: got %d bytes from %s\n", cnt, addr2string((struct sockaddr *)&from, fromlen));
+ debug(DBG_DBG, "radudpget: got %d bytes from %s", cnt, addr2string((struct sockaddr *)&from, fromlen));
if (cnt < 20) {
- printf("radudpget: packet too small\n");
+ debug(DBG_WARN, "radudpget: packet too small");
continue;
}
len = RADLEN(buf);
if (cnt < len) {
- printf("radudpget: packet smaller than length field in radius header\n");
+ debug(DBG_WARN, "radudpget: packet smaller than length field in radius header");
continue;
}
if (cnt > len)
- printf("radudpget: packet was padded with %d bytes\n", cnt - len);
+ debug(DBG_DBG, "radudpget: packet was padded with %d bytes", cnt - len);
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");
+ debug(DBG_WARN, "radudpget: got packet from wrong or unknown UDP peer, ignoring");
continue;
}
rad = malloc(len);
if (rad)
break;
- err("radudpget: malloc failed");
+ debug(DBG_ERR, "radudpget: malloc failed");
}
memcpy(rad, buf, len);
if (client)
}
int tlsverifycert(struct peer *peer) {
- int i, l, loc;
+ int 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");
+ debug(DBG_ERR, "tlsverifycert: basic validation failed");
while ((error = ERR_get_error()))
- err("clientwr: TLS: %s", ERR_error_string(error, NULL));
+ debug(DBG_ERR, "tlsverifycert: 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");
+ debug(DBG_ERR, "tlsverifycert: failed to obtain certificate");
return 0;
}
nm = X509_get_subject_name(cert);
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, v, l)) {
- printf("tlsverifycert: Found cn matching host %s, All OK\n", peer->host);
+#ifdef DEBUG
+ {
+ int i;
+ printf("cn: ");
+ for (i = 0; i < l; i++)
+ printf("%c", v[i]);
+ printf("\n");
+ }
+#endif
+ if (l == strlen(peer->host) && !strncasecmp(peer->host, (char *)v, l)) {
+ debug(DBG_DBG, "tlsverifycert: Found cn matching host %s, All OK", peer->host);
return 1;
}
- printf("tlsverifycert: cn not matching host %s\n", peer->host);
+ debug(DBG_ERR, "tlsverifycert: cn not matching host %s", peer->host);
}
X509_free(cert);
return 0;
struct timeval now;
time_t elapsed;
- printf("tlsconnect called from %s\n", text);
+ debug(DBG_DBG, "tlsconnect called from %s", text);
pthread_mutex_lock(&server->lock);
if (when && memcmp(&server->lastconnecttry, when, sizeof(struct timeval))) {
/* already reconnected, nothing to do */
- printf("tlsconnect(%s): seems already reconnected\n", text);
+ debug(DBG_DBG, "tlsconnect(%s): seems already reconnected", text);
pthread_mutex_unlock(&server->lock);
return;
}
- printf("tlsconnect %s\n", text);
+ debug(DBG_DBG, "tlsconnect %s", text);
for (;;) {
gettimeofday(&now, NULL);
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
- printf("tlsconnect: trying to open TLS connection to %s port %s\n", server->peer.host, server->peer.port);
+ else if (elapsed < 600) {
+ debug(DBG_INFO, "tlsconnect: sleeping %lds", elapsed);
+ sleep(elapsed);
+ } else if (elapsed < 1000) {
+ debug(DBG_INFO, "tlsconnect: sleeping %ds", 900);
+ sleep(900);
+ } else
+ server->lastconnecttry.tv_sec = now.tv_sec; /* no sleep at startup */
+ debug(DBG_WARN, "tlsconnect: trying to open TLS connection to %s port %s", server->peer.host, server->peer.port);
if (server->sock >= 0)
close(server->sock);
- if ((server->sock = connecttoserver(server->peer.addrinfo)) < 0)
+ if ((server->sock = connecttoserver(server->peer.addrinfo)) < 0) {
+ debug(DBG_ERR, "tlsconnect: connecttoserver failed");
continue;
+ }
+
SSL_free(server->peer.ssl);
- server->peer.ssl = SSL_new(ssl_ctx_cl);
+ server->peer.ssl = SSL_new(ssl_ctx);
SSL_set_fd(server->peer.ssl, server->sock);
if (SSL_connect(server->peer.ssl) > 0 && tlsverifycert(&server->peer))
break;
}
- printf("tlsconnect: TLS connection to %s port %s up\n", server->peer.host, server->peer.port);
+ debug(DBG_WARN, "tlsconnect: TLS connection to %s port %s up", server->peer.host, server->peer.port);
gettimeofday(&server->lastconnecttry, NULL);
pthread_mutex_unlock(&server->lock);
}
for (total = 0; total < 4; total += cnt) {
cnt = SSL_read(ssl, buf + total, 4 - total);
if (cnt <= 0) {
- printf("radtlsget: connection lost\n");
+ debug(DBG_ERR, "radtlsget: connection lost");
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;
len = RADLEN(buf);
rad = malloc(len);
if (!rad) {
- err("radtlsget: malloc failed");
+ debug(DBG_ERR, "radtlsget: malloc failed");
continue;
}
memcpy(rad, buf, 4);
for (; total < len; total += cnt) {
cnt = SSL_read(ssl, rad + total, len - total);
if (cnt <= 0) {
- printf("radtlsget: connection lost\n");
+ debug(DBG_ERR, "radtlsget: connection lost");
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);
break;
free(rad);
- printf("radtlsget: packet smaller than minimum radius size\n");
+ debug(DBG_WARN, "radtlsget: packet smaller than minimum radius size");
}
- printf("radtlsget: got %d bytes\n", total);
+ debug(DBG_DBG, "radtlsget: got %d bytes", total);
return rad;
}
len = RADLEN(rad);
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);
+ debug(DBG_DBG, "clienradput: sent UDP of length %d to %s port %s", len, server->peer.host, server->peer.port);
return 1;
}
- err("clientradput: send failed");
+ debug(DBG_WARN, "clientradput: send failed");
return 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));
+ debug(DBG_ERR, "clientradput: TLS: %s", ERR_error_string(error, NULL));
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",
+ debug(DBG_DBG, "clientradput: Sent %d bytes, Radius packet of length %d to TLS peer %s",
cnt, len, server->peer.host);
return 1;
}
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;
HMAC_Final(&hmacctx, hash, &md_len);
memcpy(authattr, auth, 16);
if (md_len != 16) {
- printf("message auth computation failed\n");
+ debug(DBG_WARN, "message auth computation failed");
pthread_mutex_unlock(&lock);
return 0;
}
if (memcmp(auth, hash, 16)) {
- printf("message authenticator, wrong value\n");
+ debug(DBG_WARN, "message authenticator, wrong value");
pthread_mutex_unlock(&lock);
return 0;
}
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;
HMAC_Update(&hmacctx, rad, RADLEN(rad));
HMAC_Final(&hmacctx, authattrval, &md_len);
if (md_len != 16) {
- printf("message auth computation failed\n");
+ debug(DBG_WARN, "message auth computation failed");
pthread_mutex_unlock(&lock);
return 0;
}
if (!to->requests[i].buf)
break;
if (i == to->nextid) {
- printf("No room in queue, dropping request\n");
+ debug(DBG_WARN, "No room in queue, dropping request");
pthread_mutex_unlock(&to->newrq_mutex);
return;
}
to->nextid = i + 1;
rq->buf[1] = (char)i;
- printf("sendrq: inserting packet with id %d in queue for %s\n", i, to->peer.host);
+ debug(DBG_DBG, "sendrq: inserting packet with id %d in queue for %s", i, to->peer.host);
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) {
to->newrq = 1;
- printf("signalling client writer\n");
+ debug(DBG_DBG, "signalling client writer");
pthread_cond_signal(&to->newrq_cond);
}
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);
if (replyq->count == replyq->size) {
- printf("No room in queue, dropping request\n");
+ debug(DBG_WARN, "No room in queue, dropping request");
pthread_mutex_unlock(&replyq->count_mutex);
return;
}
replyq->count++;
if (replyq->count == 1) {
- printf("signalling client writer\n");
+ debug(DBG_DBG, "signalling client writer");
pthread_cond_signal(&replyq->count_cond);
}
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) {
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);
+ debug(DBG_DBG, "found matching realm: %s, host %s", *realm, servers[i].peer.host);
return servers + i;
}
}
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;
uint16_t len;
int left;
struct server *to;
unsigned char newauth[16];
+ char attrstring[256];
+#ifdef DEBUG
+ int i;
+#endif
code = *(uint8_t *)buf;
id = *(uint8_t *)(buf + 1);
len = RADLEN(buf);
auth = (uint8_t *)(buf + 4);
- printf("radsrv: code %d, id %d, length %d\n", code, id, len);
+ debug(DBG_DBG, "radsrv: code %d, id %d, length %d", code, id, len);
if (code != RAD_Access_Request) {
- printf("radsrv: server currently accepts only access-requests, ignoring\n");
+ debug(DBG_INFO, "radsrv: server currently accepts only access-requests, ignoring");
return NULL;
}
attr = buf + 20;
while (left > 1) {
+ if (attr[RAD_Attr_Length] < 2) {
+ debug(DBG_WARN, "radsrv: invalid attribute length, ignoring packet");
+ return NULL;
+ }
left -= attr[RAD_Attr_Length];
if (left < 0) {
- printf("radsrv: attribute length exceeds packet length, ignoring packet\n");
+ debug(DBG_WARN, "radsrv: attribute length exceeds packet length, ignoring packet");
return NULL;
}
switch (attr[RAD_Attr_Type]) {
attr += attr[RAD_Attr_Length];
}
if (left)
- printf("radsrv: malformed packet? remaining byte after last attribute\n");
+ debug(DBG_WARN, "radsrv: malformed packet? remaining byte after last attribute");
- if (usernameattr) {
- printf("radsrv: Username: ");
- for (i = 0; i < usernameattr[RAD_Attr_Length] - 2; i++)
- printf("%c", usernameattr[RAD_Attr_Value + i]);
- printf("\n");
+ if (!usernameattr) {
+ debug(DBG_WARN, "radsrv: ignoring request, no username attribute");
+ return NULL;
}
-
- to = id2server(&usernameattr[RAD_Attr_Value], usernameattr[RAD_Attr_Length] - 2);
+
+ memcpy(attrstring, &usernameattr[RAD_Attr_Value], usernameattr[RAD_Attr_Length] - 2);
+ attrstring[usernameattr[RAD_Attr_Length] - 2] = '\0';
+ debug(DBG_DBG, "Access Request with username: %s", attrstring);
+
+ 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");
+ debug(DBG_INFO, "radsrv: ignoring request, don't know where to send it");
+ return NULL;
+ }
+
+ if (rqinqueue(to, from, id)) {
+ debug(DBG_INFO, "radsrv: ignoring request from host %s with id %d, already got one", from->peer.host, id);
return NULL;
}
if (messageauthattr && (messageauthattr[RAD_Attr_Length] != 18 ||
!checkmessageauth(buf, &messageauthattr[RAD_Attr_Value], from->peer.secret))) {
- printf("radsrv: message authentication failed\n");
+ debug(DBG_WARN, "radsrv: message authentication failed");
return NULL;
}
if (!RAND_bytes(newauth, 16)) {
- printf("radsrv: failed to generate random auth\n");
+ debug(DBG_WARN, "radsrv: failed to generate random auth");
return NULL;
}
+#ifdef DEBUG
printauth("auth", auth);
printauth("newauth", newauth);
+#endif
if (userpwdattr) {
- printf("radsrv: found userpwdattr of length %d\n", userpwdattr[RAD_Attr_Length]);
+ debug(DBG_DBG, "radsrv: found userpwdattr of length %d", userpwdattr[RAD_Attr_Length]);
attrvallen = userpwdattr[RAD_Attr_Length] - 2;
if (attrvallen < 16 || attrvallen > 128 || attrvallen % 16) {
- printf("radsrv: invalid user password length\n");
+ debug(DBG_WARN, "radsrv: invalid user password length");
return NULL;
}
if (!pwddecrypt(&userpwdattr[RAD_Attr_Value], attrvallen, from->peer.secret, strlen(from->peer.secret), auth)) {
- printf("radsrv: cannot decrypt password\n");
+ debug(DBG_WARN, "radsrv: cannot decrypt password");
return NULL;
}
+#ifdef DEBUG
printf("radsrv: password: ");
for (i = 0; i < attrvallen; i++)
printf("%02x ", userpwdattr[RAD_Attr_Value + i]);
printf("\n");
+#endif
if (!pwdencrypt(&userpwdattr[RAD_Attr_Value], attrvallen, to->peer.secret, strlen(to->peer.secret), newauth)) {
- printf("radsrv: cannot encrypt password\n");
+ debug(DBG_WARN, "radsrv: cannot encrypt password");
return NULL;
}
}
if (tunnelpwdattr) {
- printf("radsrv: found tunnelpwdattr of length %d\n", tunnelpwdattr[RAD_Attr_Length]);
+ debug(DBG_DBG, "radsrv: found tunnelpwdattr of length %d", tunnelpwdattr[RAD_Attr_Length]);
attrvallen = tunnelpwdattr[RAD_Attr_Length] - 2;
if (attrvallen < 16 || attrvallen > 128 || attrvallen % 16) {
- printf("radsrv: invalid user password length\n");
+ debug(DBG_WARN, "radsrv: invalid user password length");
return NULL;
}
if (!pwddecrypt(&tunnelpwdattr[RAD_Attr_Value], attrvallen, from->peer.secret, strlen(from->peer.secret), auth)) {
- printf("radsrv: cannot decrypt password\n");
+ debug(DBG_WARN, "radsrv: cannot decrypt password");
return NULL;
}
+#ifdef DEBUG
printf("radsrv: password: ");
for (i = 0; i < attrvallen; i++)
printf("%02x ", tunnelpwdattr[RAD_Attr_Value + i]);
printf("\n");
+#endif
if (!pwdencrypt(&tunnelpwdattr[RAD_Attr_Value], attrvallen, to->peer.secret, strlen(to->peer.secret), newauth)) {
- printf("radsrv: cannot encrypt password\n");
+ debug(DBG_WARN, "radsrv: cannot encrypt password");
return NULL;
}
}
rq->messageauthattrval = (messageauthattr ? &messageauthattr[RAD_Attr_Value] : NULL);
memcpy(rq->origauth, auth, 16);
memcpy(auth, newauth, 16);
- printauth("rq->origauth", rq->origauth);
+#ifdef DEBUG
+ printauth("rq->origauth", (unsigned char *)rq->origauth);
printauth("auth", auth);
+#endif
return to;
}
server->connectionok = 1;
- if (*buf != RAD_Access_Accept && *buf != RAD_Access_Reject && *buf != RAD_Access_Challenge) {
- printf("clientrd: discarding, only accept access accept, access reject and access challenge messages\n");
+ 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, "clientrd: discarding, only accept access accept, access reject and access challenge messages");
continue;
}
- i = buf[1]; /* i is the id */
-
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");
+ debug(DBG_INFO, "clientrd: no matching request sent with this id, ignoring");
continue;
}
if (server->requests[i].received) {
pthread_mutex_unlock(&server->newrq_mutex);
- printf("clientrd: already received, ignoring\n");
+ debug(DBG_INFO, "clientrd: already received, ignoring");
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");
+ debug(DBG_WARN, "clientrd: invalid auth, ignoring");
continue;
}
from = server->requests[i].from;
-
/* messageauthattr present? */
messageauthattr = NULL;
left = RADLEN(buf) - 20;
while (left > 1) {
left -= attr[RAD_Attr_Length];
if (left < 0) {
- printf("clientrd: attribute length exceeds packet length, ignoring packet\n");
+ debug(DBG_WARN, "clientrd: attribute length exceeds packet length, ignoring packet");
goto getnext;
}
if (attr[RAD_Attr_Type] == RAD_Attr_Message_Authenticator) {
if (attr[RAD_Attr_Length] != 18) {
- printf("clientrd: illegal message auth attribute length, ignoring packet\n");
+ debug(DBG_WARN, "clientrd: illegal message auth attribute length, ignoring packet");
goto getnext;
}
memcpy(tmp, buf + 4, 16);
memcpy(buf + 4, server->requests[i].buf + 4, 16);
if (!checkmessageauth(buf, &attr[RAD_Attr_Value], server->peer.secret)) {
- printf("clientrd: message authentication failed\n");
+ debug(DBG_WARN, "clientrd: message authentication failed");
goto getnext;
}
memcpy(buf + 4, tmp, 16);
- printf("clientrd: message auth ok\n");
+ debug(DBG_DBG, "clientrd: message auth ok");
messageauthattr = attr;
break;
}
while (left > 1) {
left -= attr[RAD_Attr_Length];
if (left < 0) {
- printf("clientrd: attribute length exceeds packet length, ignoring packet\n");
+ debug(DBG_WARN, "clientrd: attribute length exceeds packet length, ignoring packet");
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_Type] != RAD_VS_ATTR_MS_MPPE_Send_Key &&
subattr[RAD_Attr_Type] != RAD_VS_ATTR_MS_MPPE_Recv_Key)
continue;
- printf("clientrd: Got MS MPPE\n");
+ debug(DBG_DBG, "clientrd: Got MS MPPE");
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)) {
- printf("clientrd: failed to decrypt msppe key\n");
+ 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)) {
+ debug(DBG_WARN, "clientrd: failed to decrypt msppe key");
continue;
}
- if (!msmppencrypt(subattr + 4, subattr[RAD_Attr_Length] - 4,
- from->peer.secret, strlen(from->peer.secret), server->requests[i].origauth, subattr + 2)) {
- printf("clientrd: failed to encrypt msppe key\n");
+ 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)) {
+ debug(DBG_WARN, "clientrd: failed to encrypt msppe key");
continue;
}
}
if (subleft < 0) {
- printf("clientrd: bad vendor specific attr or subattr length, ignoring packet\n");
+ debug(DBG_WARN, "clientrd: bad vendor specific attr or subattr length, ignoring packet");
goto getnext;
}
}
attr += attr[RAD_Attr_Length];
}
+ /* log DBG_INFO that received access accept/reject and username attr from original request */
+ /* TODO STIG */
/* 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);
+#ifdef DEBUG
printauth("origauth/buf+4", buf + 4);
+#endif
if (messageauthattr) {
if (!createmessageauth(buf, &messageauthattr[RAD_Attr_Value], from->peer.secret))
continue;
- printf("clientrd: computed messageauthattr\n");
+ debug(DBG_DBG, "clientrd: computed messageauthattr");
}
if (from->peer.type == 'U')
server->requests[i].received = 1;
pthread_mutex_unlock(&server->newrq_mutex);
- if (!radsign(buf, from->peer.secret)) {
- printf("clientrd: failed to sign message\n");
+ if (!radsign(buf, (unsigned char *)from->peer.secret)) {
+ debug(DBG_WARN, "clientrd: failed to sign message");
continue;
}
- printauth("signedorigauth/buf+4", buf + 4);
- printf("clientrd: giving packet back to where it came from\n");
+#ifdef DEBUG
+ printauth("signedorigauth/buf+4", buf + 4);
+#endif
+ debug(DBG_DBG, "clientrd: giving packet back to where it came from");
sendreply(from, server, buf, from->peer.type == 'U' ? &fromsa : NULL);
}
}
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");
- exit(1);
- }
+ if ((server->sock = connecttoserver(server->peer.addrinfo)) < 0)
+ debugx(1, DBG_ERR, "clientwr: connecttoserver failed");
} else
tlsconnect(server, NULL, "new client");
if (pthread_create(&clientrdth, NULL, clientrd, (void *)server))
- errx("clientwr: pthread_create failed");
+ debugx(1, DBG_ERR, "clientwr: pthread_create failed");
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) {
+ debug(DBG_DBG, "clientwr: waiting up to %ld secs for new request", 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 {
+ debug(DBG_DBG, "clientwr: waiting for new request");
+ pthread_cond_wait(&server->newrq_cond, &server->newrq_mutex);
+ }
}
- server->newrq = 0;
+ if (server->newrq) {
+ debug(DBG_DBG, "clientwr: got new request");
+ server->newrq = 0;
+ } else
+ debug(DBG_DBG, "clientwr: request timer expired, processing request queue");
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) {
- printf("clientwr: removing received packet from queue\n");
+ debug(DBG_DBG, "clientwr: removing received packet from queue");
free(rq->buf);
/* setting this to NULL means that it can be reused */
rq->buf = NULL;
pthread_mutex_unlock(&server->newrq_mutex);
continue;
}
- if (now.tv_sec > rq->expiry.tv_sec) {
- 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;
- }
-
- if (rq->tries)
- continue; // not re-sending (yet)
- rq->tries++;
+ 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)) {
+ debug(DBG_DBG, "clientwr: removing expired packet from queue");
+ 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);
-
+
+ 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++;
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;
+ debug(DBG_DBG, "clientwr: should send status to %s here", server->peer.host);
+ }
}
}
- /* should do more work to maintain TLS connections, keepalives etc */
}
void *udpserverwr(void *arg) {
pthread_mutex_lock(&replyq->count_mutex);
for (;;) {
while (!replyq->count) {
- printf("udp server writer, waiting for signal\n");
+ debug(DBG_DBG, "udp server writer, waiting for signal");
pthread_cond_wait(&replyq->count_cond, &replyq->count_mutex);
- printf("udp server writer, got signal\n");
+ debug(DBG_DBG, "udp server writer, got signal");
}
pthread_mutex_unlock(&replyq->count_mutex);
if (sendto(udp_server_sock, reply->buf, RADLEN(reply->buf), 0,
(struct sockaddr *)&reply->tosa, SOCKADDR_SIZE(reply->tosa)) < 0)
- err("sendudp: send failed");
+ debug(DBG_WARN, "sendudp: send failed");
free(reply->buf);
pthread_mutex_lock(&replyq->count_mutex);
struct server *to;
struct client *fr;
pthread_t udpserverwrth;
-
- if ((udp_server_sock = bindport(SOCK_DGRAM, options.udpserverport)) < 0) {
- printf("udpserverrd: socket/bind failed\n");
- exit(1);
- }
- printf("udpserverrd: listening on UDP port %s\n", options.udpserverport);
+
+ if ((udp_server_sock = bindtoaddr(udp_server_listen->addrinfo)) < 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);
if (pthread_create(&udpserverwrth, NULL, udpserverwr, NULL))
- errx("pthread_create failed");
+ debugx(1, DBG_ERR, "pthread_create failed");
for (;;) {
fr = NULL;
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");
+ debug(DBG_INFO, "udpserverrd: ignoring request, no place to send it");
continue;
}
sendrq(to, fr, &rq);
struct client *client = (struct client *)arg;
struct replyq *replyq;
- printf("tlsserverwr starting for %s\n", client->peer.host);
+ debug(DBG_DBG, "tlsserverwr starting for %s", client->peer.host);
replyq = client->replyq;
pthread_mutex_lock(&replyq->count_mutex);
for (;;) {
while (!replyq->count) {
if (client->peer.ssl) {
- printf("tls server writer, waiting for signal\n");
+ debug(DBG_DBG, "tls server writer, waiting for signal");
pthread_cond_wait(&replyq->count_cond, &replyq->count_mutex);
- printf("tls server writer, got signal\n");
+ debug(DBG_DBG, "tls server writer, got signal");
}
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");
+ debug(DBG_DBG, "tlsserverwr: exiting as requested");
pthread_exit(NULL);
}
}
pthread_mutex_unlock(&replyq->count_mutex);
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));
+ debug(DBG_DBG, "tlsserverwr: Sent %d bytes, Radius packet of length %d",
+ cnt, RADLEN(replyq->replies->buf));
else
while ((error = ERR_get_error()))
- err("tlsserverwr: SSL: %s", ERR_error_string(error, NULL));
+ debug(DBG_ERR, "tlsserverwr: SSL: %s", ERR_error_string(error, NULL));
free(replyq->replies->buf);
pthread_mutex_lock(&replyq->count_mutex);
pthread_t tlsserverwrth;
SSL *ssl;
- printf("tlsserverrd starting for %s\n", client->peer.host);
+ debug(DBG_DBG, "tlsserverrd starting for %s", client->peer.host);
ssl = client->peer.ssl;
if (SSL_accept(ssl) <= 0) {
while ((error = ERR_get_error()))
- err("tlsserverrd: SSL: %s", ERR_error_string(error, NULL));
- errx("accept failed, child exiting");
+ debug(DBG_ERR, "tlsserverrd: SSL: %s", ERR_error_string(error, NULL));
+ debug(DBG_ERR, "SSL_accept failed");
+ goto errexit;
}
-
- if (1 /*tlsverifycert(&client->peer)*/) {
- if (pthread_create(&tlsserverwrth, NULL, tlsserverwr, (void *)client))
- errx("pthread_create failed");
-
+ if (tlsverifycert(&client->peer)) {
+ if (pthread_create(&tlsserverwrth, NULL, tlsserverwr, (void *)client)) {
+ debug(DBG_ERR, "tlsserverrd: pthread_create failed");
+ goto errexit;
+ }
for (;;) {
buf = radtlsget(client->peer.ssl);
if (!buf)
break;
- printf("tlsserverrd: got Radius message from %s\n", client->peer.host);
+ debug(DBG_DBG, "tlsserverrd: got Radius message from %s", 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");
+ debug(DBG_INFO, "tlsserverrd: ignoring request, no place to send it");
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
+ debug(DBG_ERR, "tlsserverrd: connection lost");
+ /* 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");
+ debug(DBG_DBG, "tlsserverrd: waiting for writer to end");
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);
+ debug(DBG_DBG, "tlsserverrd thread for %s exiting", 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) {
- printf("tlslistener: socket/bind failed\n");
- exit(1);
- }
+ if ((s = bindtoaddr(tcp_server_listen->addrinfo)) < 0)
+ debugx(1, DBG_ERR, "tlslistener: socket/bind failed");
listen(s, 0);
- printf("listening for incoming TLS on port %s\n", DEFAULT_TLS_PORT);
+ debug(DBG_WARN, "listening for incoming TCP on %s:%s",
+ 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");
- printf("incoming TLS connection from %s\n", addr2string((struct sockaddr *)&from, fromlen));
+ if (snew < 0) {
+ debug(DBG_WARN, "accept failed");
+ continue;
+ }
+ debug(DBG_WARN, "incoming TLS connection from %s", addr2string((struct sockaddr *)&from, fromlen));
client = find_client('T', (struct sockaddr *)&from, NULL);
if (!client) {
- printf("ignoring request, not a known TLS client\n");
+ debug(DBG_WARN, "ignoring request, not a known TLS client");
shutdown(snew, SHUT_RDWR);
close(snew);
continue;
}
if (client->peer.ssl) {
- printf("Ignoring incoming connection, already have one from this client\n");
+ debug(DBG_WARN, "Ignoring incoming TLS connection, already have one from this client");
shutdown(snew, SHUT_RDWR);
close(snew);
continue;
}
- client->peer.ssl = SSL_new(ssl_ctx_srv);
+ 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)) {
+ debug(DBG_ERR, "tlslistener: 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;
for (; *p && *p != ']' && *p != ' ' && *p != '\t' && *p != '\n'; p++);
- if (*p != ']') {
- printf("no ] matching initial [\n");
- exit(1);
- }
+ 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) {
- printf("missing host/address\n");
- exit(1);
- }
+ if (field == p)
+ debugx(1, DBG_ERR, "missing host/address");
+
peer->host = stringcopy(field, p - field);
if (ipv6) {
p++;
- if (*p && *p != ':' && *p != ' ' && *p != '\t' && *p != '\n') {
- printf("unexpected character after ]\n");
- exit(1);
- }
+ 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++;
+ field = ++p;
for (; *p && *p != ' ' && *p != '\t' && *p != '\n'; p++);
- if (field == p) {
- printf("syntax error, : but no following port\n");
- exit(1);
- }
+ if (field == p)
+ debugx(1, DBG_ERR, "syntax error, : but no following port");
peer->port = stringcopy(field, p - field);
} else
peer->port = stringcopy(peer->type == 'U' ? DEFAULT_UDP_PORT : DEFAULT_TLS_PORT, 0);
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;
if (*p == ';')
n++;
l = p - s;
- if (!l) {
- printf("realm list must be specified\n");
- exit(1);
- }
+ if (!l)
+ debugx(1, DBG_ERR, "realm list must be specified");
+
server->realmdata = stringcopy(s, l);
server->realms = malloc((1+n) * sizeof(char *));
if (!server->realms)
- errx("malloc failed");
+ debugx(1, DBG_ERR, "malloc failed");
server->realms[0] = server->realmdata;
for (n = 1, i = 0; i < l; i++)
if (server->realmdata[i] == ';') {
return p;
}
+FILE *openconfigfile(const char *filename) {
+ FILE *f;
+ char pathname[100], *base;
+
+ f = fopen(filename, "r");
+ if (f) {
+ debug(DBG_DBG, "reading config file %s", 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)
+ 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;
+}
+
/* 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) {
+ ucount = &server_udp_count;
+ tcount = &server_tls_count;
+ } else {
+ 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:
+ debugx(1, DBG_ERR, "type must be U or T, got %c", *p);
+ }
+ }
+
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;
+ count = server_count = server_udp_count + server_tls_count;
+ servers = calloc(count, sizeof(struct server));
+ if (!servers)
+ debugx(1, DBG_ERR, "malloc failed");
} 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));
+ count = client_count = client_udp_count + client_tls_count;
+ clients = calloc(count, sizeof(struct client));
+ if (!clients)
+ debugx(1, 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;
+ debugx(1, 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')
+ debugx(1, 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')
+ debugx(1, 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)))
+ debugx(1, 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));
+ debugx(1, 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));
+ debugx(1, DBG_ERR, "malloc failed");
+ client->replyq->replies = calloc(MAX_REQUESTS, sizeof(struct reply));
if (!client->replyq->replies)
- errx("malloc failed");
+ debugx(1, 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_DBG, "got type %c, host %s, port %s, secret %s", peer->type, peer->host, peer->port, peer->secret);
if (serverfile) {
- printf(" with realms:");
+ debug(DBG_DBG, " with realms:");
for (r = server->realms; *r; r++)
- printf(" %s", *r);
- printf("\n");
+ debug(DBG_DBG, "\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)
+ debugx(1, DBG_ERR, "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))
+ debugx(1, DBG_ERR, "failed to resolve host %s port %s, exiting", server->host, server->port);
+ 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);
+ debugx(1, 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_DBG, "getmainconfig: %s = %s", opt, val);
if (!strcasecmp(opt, "TLSCACertificateFile")) {
options.tlscacertificatefile = stringcopy(val, 0);
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);
+ 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")) {
+ debugx(1, DBG_ERR, "error in %s, value of option %s is %s, must be on or off", configfile, opt, val);
+ }
+ continue;
+ }
+ if (!strcasecmp(opt, "LogLevel")) {
+ if (strlen(val) != 1 || *val < '1' || *val > '4')
+ debugx(1, DBG_ERR, "error in %s, value of option %s is %s, must be 1, 2, 3 or 4", configfile, opt, val);
+ options.loglevel = *val - '0';
+ continue;
+ }
+ if (!strcasecmp(opt, "LogDestination")) {
+ options.logdestination = stringcopy(val, 0);
+ continue;
+ }
+ debugx(1, DBG_ERR, "error in %s, unknown option %s", configfile, opt);
}
fclose(f);
-
- if (!options.udpserverport)
- options.udpserverport = stringcopy(DEFAULT_UDP_PORT, 0);
}
-#if 0
-void parseargs(int argc, char **argv) {
+void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *loglevel) {
int c;
- while ((c = getopt(argc, argv, "p:")) != -1) {
+ while ((c = getopt(argc, argv, "d:f")) != -1) {
switch (c) {
- case 'p':
- udp_server_port = optarg;
+ case 'd':
+ if (strlen(optarg) != 1 || *optarg < '1' || *optarg > '4')
+ debugx(1, DBG_ERR, "Debug level must be 1, 2, 3 or 4, not %s", optarg);
+ *loglevel = *optarg - '0';
+ break;
+ case 'f':
+ *foreground = 1;
break;
default:
goto usage;
}
}
-
- return;
+ if (!(argc - optind))
+ return;
usage:
- printf("radsecproxy [ -p UDP-port ]\n");
+ debug(DBG_ERR, "Usage:\n%s [ -f ] [ -d debuglevel ]", argv[0]);
exit(1);
}
-#endif
int main(int argc, char **argv) {
pthread_t udpserverth;
- // pthread_attr_t joinable;
- int i, tlsclients = 0, tlsservers = 0;
-
- // parseargs(argc, argv);
- getmainconfig("radsecproxy.conf");
- getconfig("servers.conf", NULL);
- getconfig(NULL, "clients.conf");
+ int i;
+ uint8_t foreground = 0, loglevel = 0;
- // 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;
- }
+ debug_init("radsecproxy");
+ debug_set_level(DEBUG_LEVEL);
+ getargs(argc, argv, &foreground, &loglevel);
+ if (loglevel)
+ debug_set_level(loglevel);
+ getmainconfig(CONFIG_MAIN);
+ if (loglevel)
+ options.loglevel = loglevel;
+ else if (options.loglevel)
+ debug_set_level(options.loglevel);
+ if (foreground)
+ options.logdestination = NULL;
+ else {
+ if (!options.logdestination)
+ options.logdestination = "x-syslog://";
+ debug_set_destination(options.logdestination);
+ }
+ getconfig(CONFIG_SERVERS, NULL);
+ getconfig(NULL, CONFIG_CLIENTS);
+
+ if (!foreground && (daemon(0, 0) < 0))
+ debugx(1, DBG_ERR, "daemon() failed: %s", strerror(errno));
+
+ if (client_udp_count) {
+ udp_server_listen = server_create('U');
+ if (pthread_create(&udpserverth, NULL, udpserverrd, NULL))
+ debugx(1, DBG_ERR, "pthread_create failed");
+ }
- for (i = 0; i < client_count; i++)
- if (clients[i].peer.type == 'T') {
- tlsclients = 1;
- break;
- }
- for (i = 0; i < server_count; i++)
- if (servers[i].peer.type == 'T') {
- tlsservers = 1;
- break;
- }
- ssl_init(tlsclients ? &ssl_ctx_srv : NULL, tlsservers ? &ssl_ctx_cl : NULL);
+ 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");
+ debugx(1, DBG_ERR, "pthread_create failed");
- if (tlsclients)
+ 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 / libradsec.git / blobdiff