/*
* Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2010, 2011 NORDUnet A/S
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <openssl/err.h>
#include <openssl/md5.h>
#include "debug.h"
-#include "list.h"
#include "hash.h"
#include "util.h"
#include "hostport.h"
#include "tcp.h"
#include "tls.h"
#include "dtls.h"
+#if defined(WANT_FTICKS)
+#include "fticks.h"
+#endif
static struct options options;
static struct list *clconfs, *srvconfs;
replymsg = radattr2ascii(radmsg_gettype(msg, RAD_Attr_Reply_Message));
if (stationid) {
if (replymsg) {
- debug(DBG_WARN, "%s for user %s stationid %s from %s (%s) to %s (%s)",
- radmsgtype2string(msg->code), username, stationid, server->conf->name, replymsg, from->conf->name, addr2string(from->addr));
+ debug(DBG_NOTICE,
+ "%s for user %s stationid %s from %s (%s) to %s (%s)",
+ radmsgtype2string(msg->code), username, stationid,
+ server->conf->name, replymsg, from->conf->name,
+ addr2string(from->addr));
free(replymsg);
} else
- debug(DBG_WARN, "%s for user %s stationid %s from %s to %s (%s)",
- radmsgtype2string(msg->code), username, stationid, server->conf->name, from->conf->name, addr2string(from->addr));
+ debug(DBG_NOTICE,
+ "%s for user %s stationid %s from %s to %s (%s)",
+ radmsgtype2string(msg->code), username, stationid,
+ server->conf->name, from->conf->name,
+ addr2string(from->addr));
free(stationid);
} else {
if (replymsg) {
- debug(DBG_WARN, "%s for user %s from %s (%s) to %s (%s)",
- radmsgtype2string(msg->code), username, server->conf->name, replymsg, from->conf->name, addr2string(from->addr));
+ debug(DBG_NOTICE, "%s for user %s from %s (%s) to %s (%s)",
+ radmsgtype2string(msg->code), username,
+ server->conf->name, replymsg, from->conf->name,
+ addr2string(from->addr));
free(replymsg);
} else
- debug(DBG_WARN, "%s for user %s from %s to %s (%s)",
- radmsgtype2string(msg->code), username, server->conf->name, from->conf->name, addr2string(from->addr));
+ debug(DBG_NOTICE, "%s for user %s from %s to %s (%s)",
+ radmsgtype2string(msg->code), username,
+ server->conf->name, from->conf->name,
+ addr2string(from->addr));
}
free(username);
}
}
+#if defined(WANT_FTICKS)
+ if (msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject)
+ if (options.fticks_reporting && from->conf->fticks_viscountry != NULL)
+ fticks_log(&options, from, msg, rqout);
+#endif
+
msg->id = (char)rqout->rq->rqid;
memcpy(msg->auth, rqout->rq->rqauth, 16);
close(fd[1]);
pushgconffile(&cf, fdopen(fd[0], "r"), conf->dynamiclookupcommand);
- ok = getgenericconfig(&cf, NULL,
- "Server", CONF_CBK, confserver_cb, (void *)conf,
- NULL
- );
+ ok = getgenericconfig(&cf, NULL, "Server", CONF_CBK, confserver_cb,
+ (void *) conf, NULL);
freegconf(&cf);
if (waitpid(pid, &status, 0) < 0) {
}
if (status) {
- debug(DBG_INFO, "dynamicconfig: command exited with status %d", WEXITSTATUS(status));
- goto errexit;
+ if (WEXITSTATUS(status) == 10) {
+ debug(DBG_INFO, "dynamicconfig: command signals empty config");
+ }
+ else {
+ debug(DBG_INFO, "dynamicconfig: command exited with status %d",
+ WEXITSTATUS(status));
+ goto errexit;
+ }
}
if (ok)
struct rewrite *getrewrite(char *alt1, char *alt2) {
struct rewrite *r;
- if ((r = hash_read(rewriteconfs, alt1, strlen(alt1))))
- return r;
- if ((r = hash_read(rewriteconfs, alt2, strlen(alt2))))
- return r;
+ if (alt1)
+ if ((r = hash_read(rewriteconfs, alt1, strlen(alt1))))
+ return r;
+ if (alt2)
+ if ((r = hash_read(rewriteconfs, alt2, strlen(alt2))))
+ return r;
return NULL;
}
memset(conf, 0, sizeof(struct clsrvconf));
conf->certnamecheck = 1;
- if (!getgenericconfig(cf, block,
- "type", CONF_STR, &conftype,
- "host", CONF_MSTR, &conf->hostsrc,
- "secret", CONF_STR, &conf->secret,
+ if (!getgenericconfig(
+ cf, block,
+ "type", CONF_STR, &conftype,
+ "host", CONF_MSTR, &conf->hostsrc,
+ "secret", CONF_STR, &conf->secret,
#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
- "tls", CONF_STR, &conf->tls,
- "matchcertificateattribute", CONF_STR, &conf->matchcertattr,
- "CertificateNameCheck", CONF_BLN, &conf->certnamecheck,
+ "tls", CONF_STR, &conf->tls,
+ "matchcertificateattribute", CONF_STR, &conf->matchcertattr,
+ "CertificateNameCheck", CONF_BLN, &conf->certnamecheck,
#endif
- "DuplicateInterval", CONF_LINT, &dupinterval,
- "addTTL", CONF_LINT, &addttl,
- "rewrite", CONF_STR, &rewriteinalias,
- "rewriteIn", CONF_STR, &conf->confrewritein,
- "rewriteOut", CONF_STR, &conf->confrewriteout,
- "rewriteattribute", CONF_STR, &conf->confrewriteusername,
- NULL
+ "DuplicateInterval", CONF_LINT, &dupinterval,
+ "addTTL", CONF_LINT, &addttl,
+ "rewrite", CONF_STR, &rewriteinalias,
+ "rewriteIn", CONF_STR, &conf->confrewritein,
+ "rewriteOut", CONF_STR, &conf->confrewriteout,
+ "rewriteattribute", CONF_STR, &conf->confrewriteusername,
+#if defined(WANT_FTICKS)
+ "fticksVISCOUNTRY", CONF_STR, &conf->fticks_viscountry,
+ "fticksVISINST", CONF_STR, &conf->fticks_visinst,
+#endif
+ NULL
))
debugx(1, DBG_ERR, "configuration error");
#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
if (conf->type == RAD_TLS || conf->type == RAD_DTLS) {
- conf->tlsconf = conf->tls ? tlsgettls(conf->tls, NULL) : tlsgettls("defaultclient", "default");
+ conf->tlsconf = conf->tls
+ ? tlsgettls(conf->tls, NULL)
+ : tlsgettls("defaultClient", "default");
if (!conf->tlsconf)
debugx(1, DBG_ERR, "error in block %s, no tls context defined", block);
if (conf->matchcertattr && !addmatchcertattr(conf))
conf->confrewritein = rewriteinalias;
else
free(rewriteinalias);
- conf->rewritein = conf->confrewritein ? getrewrite(conf->confrewritein, NULL) : getrewrite("defaultclient", "default");
+ conf->rewritein = conf->confrewritein
+ ? getrewrite(conf->confrewritein, NULL)
+ : getrewrite("defaultClient", "default");
if (conf->confrewriteout)
conf->rewriteout = getrewrite(conf->confrewriteout, NULL);
int compileserverconfig(struct clsrvconf *conf, const char *block) {
#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
if (conf->type == RAD_TLS || conf->type == RAD_DTLS) {
- conf->tlsconf = conf->tls ? tlsgettls(conf->tls, NULL) : tlsgettls("defaultserver", "default");
+ conf->tlsconf = conf->tls
+ ? tlsgettls(conf->tls, NULL)
+ : tlsgettls("defaultServer", "default");
if (!conf->tlsconf) {
debug(DBG_ERR, "error in block %s, no tls context defined", block);
return 0;
if (conf->retrycount == 255)
conf->retrycount = conf->pdef->retrycountdefault;
- conf->rewritein = conf->confrewritein ? getrewrite(conf->confrewritein, NULL) : getrewrite("defaultserver", "default");
+ conf->rewritein = conf->confrewritein
+ ? getrewrite(conf->confrewritein, NULL)
+ : getrewrite("defaultServer", "default");
if (conf->confrewriteout)
conf->rewriteout = getrewrite(conf->confrewriteout, NULL);
if (!addhostport(&conf->hostports, conf->hostsrc, conf->portsrc, 0)) {
- debug(DBG_ERR, "error in block %s, failed to parse %s", block, conf->hostsrc);
+ debug(DBG_ERR, "error in block %s, failed to parse %s", block, *conf->hostsrc);
return 0;
}
struct gconffile *cfs;
char **listenargs[RAD_PROTOCOUNT];
char *sourcearg[RAD_PROTOCOUNT];
+#if defined(WANT_FTICKS)
+ uint8_t *fticks_reporting_str = NULL;
+ uint8_t *fticks_mac_str = NULL;
+ uint8_t *fticks_key_str = NULL;
+#endif
int i;
cfs = openconfigfile(configfile);
if (!rewriteconfs)
debugx(1, DBG_ERR, "malloc failed");
- if (!getgenericconfig(&cfs, NULL,
+ if (!getgenericconfig(
+ &cfs, NULL,
#ifdef RADPROT_UDP
- "ListenUDP", CONF_MSTR, &listenargs[RAD_UDP],
- "SourceUDP", CONF_STR, &sourcearg[RAD_UDP],
+ "ListenUDP", CONF_MSTR, &listenargs[RAD_UDP],
+ "SourceUDP", CONF_STR, &sourcearg[RAD_UDP],
#endif
#ifdef RADPROT_TCP
- "ListenTCP", CONF_MSTR, &listenargs[RAD_TCP],
- "SourceTCP", CONF_STR, &sourcearg[RAD_TCP],
+ "ListenTCP", CONF_MSTR, &listenargs[RAD_TCP],
+ "SourceTCP", CONF_STR, &sourcearg[RAD_TCP],
#endif
#ifdef RADPROT_TLS
- "ListenTLS", CONF_MSTR, &listenargs[RAD_TLS],
- "SourceTLS", CONF_STR, &sourcearg[RAD_TLS],
+ "ListenTLS", CONF_MSTR, &listenargs[RAD_TLS],
+ "SourceTLS", CONF_STR, &sourcearg[RAD_TLS],
#endif
#ifdef RADPROT_DTLS
- "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
- "SourceDTLS", CONF_STR, &sourcearg[RAD_DTLS],
+ "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
+ "SourceDTLS", CONF_STR, &sourcearg[RAD_DTLS],
#endif
- "TTLAttribute", CONF_STR, &options.ttlattr,
- "addTTL", CONF_LINT, &addttl,
- "LogLevel", CONF_LINT, &loglevel,
- "LogDestination", CONF_STR, &options.logdestination,
- "LoopPrevention", CONF_BLN, &options.loopprevention,
- "Client", CONF_CBK, confclient_cb, NULL,
- "Server", CONF_CBK, confserver_cb, NULL,
- "Realm", CONF_CBK, confrealm_cb, NULL,
+ "TTLAttribute", CONF_STR, &options.ttlattr,
+ "addTTL", CONF_LINT, &addttl,
+ "LogLevel", CONF_LINT, &loglevel,
+ "LogDestination", CONF_STR, &options.logdestination,
+ "LoopPrevention", CONF_BLN, &options.loopprevention,
+ "Client", CONF_CBK, confclient_cb, NULL,
+ "Server", CONF_CBK, confserver_cb, NULL,
+ "Realm", CONF_CBK, confrealm_cb, NULL,
#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
- "TLS", CONF_CBK, conftls_cb, NULL,
+ "TLS", CONF_CBK, conftls_cb, NULL,
#endif
- "Rewrite", CONF_CBK, confrewrite_cb, NULL,
- NULL
+ "Rewrite", CONF_CBK, confrewrite_cb, NULL,
+#if defined(WANT_FTICKS)
+ "FTicksReporting", CONF_STR, &fticks_reporting_str,
+ "FTicksMAC", CONF_STR, &fticks_mac_str,
+ "FTicksKey", CONF_STR, &fticks_key_str,
+ "FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
+#endif
+ NULL
))
debugx(1, DBG_ERR, "configuration error");
if (loglevel != LONG_MIN) {
- if (loglevel < 1 || loglevel > 4)
- debugx(1, DBG_ERR, "error in %s, value of option LogLevel is %d, must be 1, 2, 3 or 4", configfile, loglevel);
+ if (loglevel < 1 || loglevel > 5)
+ debugx(1, DBG_ERR, "error in %s, value of option LogLevel is %d, must be 1, 2, 3, 4 or 5", configfile, loglevel);
options.loglevel = (uint8_t)loglevel;
}
if (addttl != LONG_MIN) {
if (!setttlattr(&options, DEFAULT_TTL_ATTR))
debugx(1, DBG_ERR, "Failed to set TTLAttribute, exiting");
+#if defined(WANT_FTICKS)
+ fticks_configure(&options, &fticks_reporting_str, &fticks_mac_str,
+ &fticks_key_str);
+#endif
+
for (i = 0; i < RAD_PROTOCOUNT; i++)
if (listenargs[i] || sourcearg[i])
setprotoopts(i, listenargs[i], sourcearg[i]);
*configfile = optarg;
break;
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);
+ if (strlen(optarg) != 1 || *optarg < '1' || *optarg > '5')
+ debugx(1, DBG_ERR, "Debug level must be 1, 2, 3, 4 or 5, not %s", optarg);
*loglevel = *optarg - '0';
break;
case 'f':
}
int createpidfile(const char *pidfile) {
- int r;
+ int r = 0;
FILE *f = fopen(pidfile, "w");
if (f)
- r = fprintf(f, "%d\n", getpid());
+ r = fprintf(f, "%ld\n", (long) getpid());
return f && !fclose(f) && r >= 0;
}
-int main(int argc, char **argv) {
+int radsecproxy_main(int argc, char **argv) {
pthread_t sigth;
sigset_t sigset;
struct list_node *entry;
options.loglevel = loglevel;
else if (options.loglevel)
debug_set_level(options.loglevel);
- if (!foreground)
- debug_set_destination(options.logdestination ? options.logdestination : "x-syslog:///");
+ if (!foreground) {
+ debug_set_destination(options.logdestination
+ ? options.logdestination
+ : "x-syslog:///", LOG_TYPE_DEBUG);
+#if defined(WANT_FTICKS)
+ if (options.ftickssyslogfacility) {
+ debug_set_destination(options.ftickssyslogfacility,
+ LOG_TYPE_FTICKS);
+ free(options.ftickssyslogfacility);
+ }
+#endif
+ }
free(options.logdestination);
if (!list_first(clconfs))
projects / libradsec.git / blobdiff