Add radsecproxy-hash.c.

[libradsec.git] / radsecproxy.c

diff --git a/radsecproxy.c b/radsecproxy.c
index 8cf2f27..6554e8d 100644 (file)
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -69,7 +69,6 @@
 #include <openssl/err.h>
 #include <openssl/md5.h>
 #include "debug.h"
-#include "list.h"
 #include "hash.h"
 #include "util.h"
 #include "hostport.h"
@@ -78,6 +77,9 @@
 #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;
@@ -1665,6 +1667,12 @@ void replyh(struct server *server, unsigned char *buf) {
        }
     }
 
+#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);
 
@@ -2255,10 +2263,8 @@ int dynamicconfig(struct server *server) {
 
     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) {
@@ -2676,7 +2682,9 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
            "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,
+#endif
            NULL
            ))
        debugx(1, DBG_ERR, "configuration error");
@@ -2792,7 +2800,7 @@ int compileserverconfig(struct clsrvconf *conf, const char *block) {
        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;
     }
 
@@ -3004,76 +3012,16 @@ int setprotoopts(uint8_t type, char **listenargs, char *sourcearg) {
     return 1;
 }
 
-int configure_fticks(char **reporting, char **mac, char **key) {
-    int r = 0;
-
-    if (*reporting == NULL)
-       goto out;
-
-    if (strcasecmp(*reporting, "None") == 0)
-       options.fticks_reporting = RSP_FTICKS_REPORTING_NONE;
-    else if (strcasecmp(*reporting, "Basic") == 0)
-       options.fticks_reporting = RSP_FTICKS_REPORTING_BASIC;
-    else if (strcasecmp(*reporting, "Full") == 0)
-       options.fticks_reporting = RSP_FTICKS_REPORTING_FULL;
-    else {
-       debugx(1, DBG_ERR, "config error: invalid F-Ticks-Reporting value: %s",
-              *reporting);
-       r = 1;
-       goto out;
-    }
-
-    if (strcasecmp(*mac, "Static") == 0)
-       options.fticks_mac = RSP_FTICKS_MAC_STATIC;
-    else if (strcasecmp(*mac, "Original") == 0)
-       options.fticks_mac = RSP_FTICKS_MAC_ORIGINAL;
-    else if (strcasecmp(*mac, "VendorHashed") == 0)
-       options.fticks_mac = RSP_FTICKS_MAC_VENDOR_HASHED;
-    else if (strcasecmp(*mac, "VendorKeyHashed") == 0)
-       options.fticks_mac = RSP_FTICKS_MAC_VENDOR_KEY_HASHED;
-    else if (strcasecmp(*mac, "FullyHashed") == 0)
-       options.fticks_mac = RSP_FTICKS_MAC_FULLY_HASHED;
-    else if (strcasecmp(*mac, "FullyKeyHashed") == 0)
-       options.fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED;
-    else {
-       debugx(1, DBG_ERR, "config error: invalid F-Ticks-MAC value: %s", *mac);
-       r = 1;
-       goto out;
-    }
-
-    if (*key == NULL
-       && (options.fticks_mac == RSP_FTICKS_MAC_VENDOR_KEY_HASHED
-           || options.fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) {
-       debugx(1, DBG_ERR,
-              "config error: F-Ticks-MAC %s requires an F-Ticks-Key", *mac);
-       options.fticks_mac = RSP_FTICKS_MAC_STATIC;
-       r = 1;
-       goto out;
-    }
-
-    if (*key != NULL)
-       options.fticks_key = *key;
-
-out:
-    if (*reporting != NULL) {
-       free(*reporting);
-       *reporting = NULL;
-    }
-    if (*mac != NULL) {
-       free(*mac);
-       *mac = NULL;
-    }
-    return r;
-}
-
 void getmainconfig(const char *configfile) {
     long int addttl = LONG_MIN, loglevel = LONG_MIN;
     struct gconffile *cfs;
     char **listenargs[RAD_PROTOCOUNT];
     char *sourcearg[RAD_PROTOCOUNT];
-    char *fticks_reporting_str = NULL;
-    char *fticks_mac_str = NULL;
-    char *fticks_key_str = NULL;
+#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);
@@ -3127,9 +3075,11 @@ void getmainconfig(const char *configfile) {
            "TLS", CONF_CBK, conftls_cb, NULL,
 #endif
            "Rewrite", CONF_CBK, confrewrite_cb, NULL,
-           "F-Ticks-Reporting", CONF_STR, &fticks_reporting_str,
-           "F-Ticks-MAC", CONF_STR, &fticks_mac_str,
-           "F-Ticks-Key", CONF_STR, &fticks_key_str,
+#if defined(WANT_FTICKS)
+           "FTicksReporting", CONF_STR, &fticks_reporting_str,
+           "FTicksMAC", CONF_STR, &fticks_mac_str,
+           "FTicksKey", CONF_STR, &fticks_key_str,
+#endif
            NULL
            ))
        debugx(1, DBG_ERR, "configuration error");
@@ -3147,7 +3097,10 @@ void getmainconfig(const char *configfile) {
     if (!setttlattr(&options, DEFAULT_TTL_ATTR))
        debugx(1, DBG_ERR, "Failed to set TTLAttribute, exiting");
 
-    configure_fticks(&fticks_reporting_str, &fticks_mac_str, &fticks_key_str);
+#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])
@@ -3254,7 +3207,7 @@ int createpidfile(const char *pidfile) {
     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;