X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Frealms.c;h=7abf7f0242dd5ddb7cff01759b2115e38df538c6;hb=afe7358fdedae3032f0cd2d746981f6c11ba141a;hp=475c256e820c14441c0ab736d5499b32cba0fb86;hpb=f025d063de46b9e90682b79e172546ca6df2607b;p=freeradius.git diff --git a/src/main/realms.c b/src/main/realms.c index 475c256..7abf7f0 100644 --- a/src/main/realms.c +++ b/src/main/realms.c @@ -32,13 +32,88 @@ RCSID("$Id$") #include #include +#ifdef HAVE_REGEX_H +#include + +/* + * For POSIX Regular expressions. + * (0) Means no extended regular expressions. + * REG_EXTENDED means use extended regular expressions. + */ +#ifndef REG_EXTENDED +#define REG_EXTENDED (0) +#endif + +#ifndef REG_NOSUB +#define REG_NOSUB (0) +#endif + +#ifndef REG_ICASE +#define REG_ICASE (0) +#endif +#endif + static rbtree_t *realms_byname = NULL; +#ifdef HAVE_REGEX_H +typedef struct realm_regex_t { + REALM *realm; + struct realm_regex_t *next; +} realm_regex_t; + +static realm_regex_t *realms_regex = NULL; + +#endif /* HAVE_REGEX_H */ + +typedef struct realm_config_t { + CONF_SECTION *cs; + int dead_time; + int retry_count; + int retry_delay; + int fallback; + int wake_all_if_all_dead; +} realm_config_t; + +static realm_config_t *realm_config = NULL; + +#ifdef WITH_PROXY static rbtree_t *home_servers_byaddr = NULL; static rbtree_t *home_servers_byname = NULL; +#ifdef WITH_STATS +static int home_server_max_number = 0; +static rbtree_t *home_servers_bynumber = NULL; +#endif static rbtree_t *home_pools_byname = NULL; +/* + * Map the proxy server configuration parameters to variables. + */ +static const CONF_PARSER proxy_config[] = { + { "retry_delay", PW_TYPE_INTEGER, + offsetof(realm_config_t, retry_delay), + NULL, Stringify(RETRY_DELAY) }, + + { "retry_count", PW_TYPE_INTEGER, + offsetof(realm_config_t, retry_count), + NULL, Stringify(RETRY_COUNT) }, + + { "default_fallback", PW_TYPE_BOOLEAN, + offsetof(realm_config_t, fallback), + NULL, "no" }, + + { "dead_time", PW_TYPE_INTEGER, + offsetof(realm_config_t, dead_time), + NULL, Stringify(DEAD_TIME) }, + + { "wake_all_if_all_dead", PW_TYPE_BOOLEAN, + offsetof(realm_config_t, wake_all_if_all_dead), + NULL, "no" }, + + { NULL, -1, 0, NULL, NULL } +}; +#endif + static int realm_name_cmp(const void *one, const void *two) { const REALM *a = one; @@ -48,6 +123,7 @@ static int realm_name_cmp(const void *one, const void *two) } +#ifdef WITH_PROXY static int home_server_name_cmp(const void *one, const void *two) { const home_server *a = one; @@ -64,12 +140,35 @@ static int home_server_addr_cmp(const void *one, const void *two) const home_server *a = one; const home_server *b = two; + if (a->server && !b->server) return -1; + if (!a->server && b->server) return +1; + + if (a->server && b->server) { + int rcode = a->type - b->type; + if (rcode != 0) return rcode; + return strcmp(a->server, b->server); + } + +#ifdef WITH_TCP + if (a->proto < b->proto) return -1; + if (a->proto > b->proto) return +1; +#endif + if (a->port < b->port) return -1; if (a->port > b->port) return +1; - return lrad_ipaddr_cmp(&a->ipaddr, &b->ipaddr); + return fr_ipaddr_cmp(&a->ipaddr, &b->ipaddr); } +#ifdef WITH_STATS +static int home_server_number_cmp(const void *one, const void *two) +{ + const home_server *a = one; + const home_server *b = two; + + return (a->number - b->number); +} +#endif static int home_pool_name_cmp(const void *one, const void *two) { @@ -83,97 +182,170 @@ static int home_pool_name_cmp(const void *one, const void *two) } -void realms_free(void) +/* + * Xlat for %{home_server:foo} + */ +static size_t xlat_home_server(UNUSED void *instance, REQUEST *request, + char *fmt, char *out, size_t outlen, + UNUSED RADIUS_ESCAPE_STRING func) { - rbtree_free(home_servers_byname); - home_servers_byname = NULL; + const char *value = NULL; + CONF_PAIR *cp; - rbtree_free(home_servers_byaddr); - home_servers_byaddr = NULL; + if (!fmt || !out || (outlen < 1)) return 0; - rbtree_free(home_pools_byname); - home_pools_byname = NULL; + if (!request || !request->home_server) { + *out = '\0'; + return 0; + } - rbtree_free(realms_byname); - realms_byname = NULL; + cp = cf_pair_find(request->home_server->cs, fmt); + if (!cp || !(value = cf_pair_value(cp))) { + *out = '\0'; + return 0; + } + + strlcpy(out, value, outlen); + + return strlen(out); } -int realms_init(CONF_SECTION *config) +/* + * Xlat for %{home_server_pool:foo} + */ +static size_t xlat_server_pool(UNUSED void *instance, REQUEST *request, + char *fmt, char *out, size_t outlen, + UNUSED RADIUS_ESCAPE_STRING func) { - CONF_SECTION *cs; + const char *value = NULL; + CONF_PAIR *cp; - if (realms_byname) return 1; + if (!fmt || !out || (outlen < 1)) return 0; - realms_byname = rbtree_create(realm_name_cmp, free, 0); - if (!realms_byname) { - realms_free(); + if (!request || !request->home_pool) { + *out = '\0'; return 0; } - home_servers_byaddr = rbtree_create(home_server_addr_cmp, free, 0); - if (!home_servers_byaddr) { - realms_free(); + cp = cf_pair_find(request->home_pool->cs, fmt); + if (!cp || !(value = cf_pair_value(cp))) { + *out = '\0'; return 0; } + + strlcpy(out, value, outlen); - home_servers_byname = rbtree_create(home_server_name_cmp, NULL, 0); - if (!home_servers_byname) { - realms_free(); - return 0; - } + return strlen(out); +} +#endif - home_pools_byname = rbtree_create(home_pool_name_cmp, free, 0); - if (!home_pools_byname) { - realms_free(); - return 0; - } +void realms_free(void) +{ +#ifdef WITH_PROXY +#ifdef WITH_STATS + rbtree_free(home_servers_bynumber); + home_servers_bynumber = NULL; +#endif - for (cs = cf_subsection_find_next(config, NULL, "realm"); - cs != NULL; - cs = cf_subsection_find_next(config, cs, "realm")) { - if (!realm_add(cs)) { - realms_free(); - return 0; + rbtree_free(home_servers_byname); + home_servers_byname = NULL; + + rbtree_free(home_servers_byaddr); + home_servers_byaddr = NULL; + + rbtree_free(home_pools_byname); + home_pools_byname = NULL; +#endif + + rbtree_free(realms_byname); + realms_byname = NULL; + +#ifdef HAVE_REGEX_H + if (realms_regex) { + realm_regex_t *this, *next; + + for (this = realms_regex; this != NULL; this = next) { + next = this->next; + free(this->realm); + free(this); } + realms_regex = NULL; } +#endif - return 1; + free(realm_config); + realm_config = NULL; } + +#ifdef WITH_PROXY +static CONF_PARSER limit_config[] = { + { "max_connections", PW_TYPE_INTEGER, + offsetof(home_server, max_connections), NULL, "16" }, + + { "max_requests", PW_TYPE_INTEGER, + offsetof(home_server,max_requests), NULL, "0" }, + + { "lifetime", PW_TYPE_INTEGER, + offsetof(home_server,lifetime), NULL, "0" }, + + { "idle_timeout", PW_TYPE_INTEGER, + offsetof(home_server,idle_timeout), NULL, "0" }, + + { NULL, -1, 0, NULL, NULL } /* end the list */ +}; + static struct in_addr hs_ip4addr; static struct in6_addr hs_ip6addr; +static char *hs_srcipaddr = NULL; static char *hs_type = NULL; static char *hs_check = NULL; +static char *hs_virtual_server = NULL; +#ifdef WITH_TCP +static char *hs_proto = NULL; +#endif static CONF_PARSER home_server_config[] = { { "ipaddr", PW_TYPE_IPADDR, 0, &hs_ip4addr, NULL }, { "ipv6addr", PW_TYPE_IPV6ADDR, 0, &hs_ip6addr, NULL }, + { "virtual_server", PW_TYPE_STRING_PTR, + 0, &hs_virtual_server, NULL }, - { "hostname", PW_TYPE_STRING_PTR, - offsetof(home_server,hostname), NULL, NULL}, { "port", PW_TYPE_INTEGER, offsetof(home_server,port), NULL, "0" }, { "type", PW_TYPE_STRING_PTR, 0, &hs_type, NULL }, +#ifdef WITH_TCP + { "proto", PW_TYPE_STRING_PTR, + 0, &hs_proto, NULL }, +#endif + { "secret", PW_TYPE_STRING_PTR, offsetof(home_server,secret), NULL, NULL}, + { "src_ipaddr", PW_TYPE_STRING_PTR, + 0, &hs_srcipaddr, NULL }, + { "response_window", PW_TYPE_INTEGER, offsetof(home_server,response_window), NULL, "30" }, + { "no_response_fail", PW_TYPE_BOOLEAN, + offsetof(home_server,no_response_fail), NULL, NULL }, { "max_outstanding", PW_TYPE_INTEGER, offsetof(home_server,max_outstanding), NULL, "65536" }, + { "require_message_authenticator", PW_TYPE_BOOLEAN, + offsetof(home_server, message_authenticator), 0, NULL }, { "zombie_period", PW_TYPE_INTEGER, offsetof(home_server,zombie_period), NULL, "40" }, { "status_check", PW_TYPE_STRING_PTR, 0, &hs_check, "none" }, { "ping_check", PW_TYPE_STRING_PTR, - 0, &hs_check, "none" }, + 0, &hs_check, NULL }, { "ping_interval", PW_TYPE_INTEGER, offsetof(home_server,ping_interval), NULL, "30" }, @@ -193,16 +365,41 @@ static CONF_PARSER home_server_config[] = { { "password", PW_TYPE_STRING_PTR, offsetof(home_server,ping_user_password), NULL, NULL}, - { NULL, -1, 0, NULL, NULL } /* end the list */ +#ifdef WITH_STATS + { "historic_average_window", PW_TYPE_INTEGER, + offsetof(home_server,ema.window), NULL, NULL }, +#endif + +#ifdef WITH_COA + { "irt", PW_TYPE_INTEGER, + offsetof(home_server, coa_irt), 0, Stringify(2) }, + { "mrt", PW_TYPE_INTEGER, + offsetof(home_server, coa_mrt), 0, Stringify(16) }, + { "mrc", PW_TYPE_INTEGER, + offsetof(home_server, coa_mrc), 0, Stringify(5) }, + { "mrd", PW_TYPE_INTEGER, + offsetof(home_server, coa_mrd), 0, Stringify(30) }, +#endif + + { "limit", PW_TYPE_SUBSECTION, 0, NULL, (const void *) limit_config }, + { NULL, -1, 0, NULL, NULL } /* end the list */ }; -static int home_server_add(CONF_SECTION *cs, int type) +static void null_free(UNUSED void *data) +{ +} + +static int home_server_add(realm_config_t *rc, CONF_SECTION *cs, int pool_type) { const char *name2; home_server *home; int dual = FALSE; + CONF_PAIR *cp; + + free(hs_virtual_server); /* used only for printing during parsing */ + hs_virtual_server = NULL; name2 = cf_section_name1(cs); if (!name2 || (strcasecmp(name2, "home_server") != 0)) { @@ -222,47 +419,83 @@ static int home_server_add(CONF_SECTION *cs, int type) memset(home, 0, sizeof(*home)); home->name = name2; + home->cs = cs; + + /* + * For zombie period calculations. We want to count + * zombies from the time when the server starts, instead + * of from 1970. + */ + home->last_packet = time(NULL); + + /* + * Authentication servers have a default "no_response_fail = 0". + * Accounting servers have a default "no_response_fail = 1". + * + * This is because authentication packets are retried, so + * they can fail over to another home server. Accounting + * packets are not retried, so they cannot fail over, and + * instead should be rejected immediately. + */ + home->no_response_fail = 2; memset(&hs_ip4addr, 0, sizeof(hs_ip4addr)); memset(&hs_ip6addr, 0, sizeof(hs_ip6addr)); - cf_section_parse(cs, home, home_server_config); - - if (!home->hostname && (htonl(hs_ip4addr.s_addr) == INADDR_NONE) && - IN6_IS_ADDR_UNSPECIFIED(&hs_ip6addr)) { - cf_log_err(cf_sectiontoitem(cs), - "No hostname, IPv4 address, or IPv6 address defined for home server %s.", - name2); - free(home); - free(hs_type); - hs_type = NULL; - free(hs_check); - hs_check = NULL; - return 0; + if (cf_section_parse(cs, home, home_server_config) < 0) { + goto error; } /* - * FIXME: Parse home->hostname! - * - * Right now, only ipaddr && ip6addr are used. - * The old-style parsing still allows hostnames. + * Figure out which one to use. */ - if (htonl(hs_ip4addr.s_addr) != INADDR_NONE) { + if (cf_pair_find(cs, "ipaddr")) { home->ipaddr.af = AF_INET; home->ipaddr.ipaddr.ip4addr = hs_ip4addr; - } else if (!IN6_IS_ADDR_UNSPECIFIED(&hs_ip6addr)) { + } else if (cf_pair_find(cs, "ipv6addr")) { home->ipaddr.af = AF_INET6; home->ipaddr.ipaddr.ip6addr = hs_ip6addr; + } else if ((cp = cf_pair_find(cs, "virtual_server")) != NULL) { + home->ipaddr.af = AF_UNSPEC; + home->server = cf_pair_value(cp); + if (!home->server) { + cf_log_err(cf_sectiontoitem(cs), + "Invalid value for virtual_server"); + goto error; + } + + if (!cf_section_sub_find_name2(rc->cs, "server", home->server)) { + + cf_log_err(cf_sectiontoitem(cs), + "No such server %s", home->server); + goto error; + } + + /* + * When CoA is used, the user has to specify the type + * of the home server, even when they point to + * virtual servers. + */ + home->secret = strdup(""); + goto skip_port; + } else { cf_log_err(cf_sectiontoitem(cs), - "FIXME: parse hostname for home server %s.", + "No ipaddr, ipv6addr, or virtual_server defined for home server \"%s\".", name2); + error: free(home); free(hs_type); hs_type = NULL; free(hs_check); hs_check = NULL; + free(hs_srcipaddr); + hs_srcipaddr = NULL; +#ifdef WITH_TCP + free(hs_proto); + hs_proto = NULL; +#endif return 0; } @@ -270,73 +503,73 @@ static int home_server_add(CONF_SECTION *cs, int type) cf_log_err(cf_sectiontoitem(cs), "No port, or invalid port defined for home server %s.", name2); - free(home); - free(hs_type); - hs_type = NULL; - free(hs_check); - hs_check = NULL; - return 0; + goto error; } if (0) { cf_log_err(cf_sectiontoitem(cs), "Fatal error! Home server %s is ourselves!", name2); - free(home); - free(hs_type); - hs_type = NULL; - free(hs_check); - hs_check = NULL; - return 0; + goto error; } + if (!home->secret) { + cf_log_err(cf_sectiontoitem(cs), + "No shared secret defined for home server %s.", + name2); + goto error; + } + + /* + * Use a reasonable default. + */ + skip_port: + if (!hs_type) hs_type = strdup("auth+acct"); + if (strcasecmp(hs_type, "auth") == 0) { home->type = HOME_TYPE_AUTH; - if (type != home->type) { + if (home->no_response_fail == 2) home->no_response_fail = 0; + if (pool_type != home->type) { + mismatch: cf_log_err(cf_sectiontoitem(cs), - "Server pool of \"acct\" servers cannot include home server %s of type \"auth\"", - name2); - free(home); - return 0; + "Home server %s of unexpected type \"%s\"", + name2, hs_type); + goto error; } } else if (strcasecmp(hs_type, "acct") == 0) { home->type = HOME_TYPE_ACCT; - if (type != home->type) { - cf_log_err(cf_sectiontoitem(cs), - "Server pool of \"auth\" servers cannot include home server %s of type \"acct\"", - name2); - free(home); - return 0; - } + if (home->no_response_fail == 2) home->no_response_fail = 1; + if (pool_type != home->type) goto mismatch; } else if (strcasecmp(hs_type, "auth+acct") == 0) { home->type = HOME_TYPE_AUTH; dual = TRUE; +#ifdef WITH_COA + } else if (strcasecmp(hs_type, "coa") == 0) { + home->type = HOME_TYPE_COA; + dual = FALSE; + + if (pool_type != home->type) goto mismatch; + + if (home->server != NULL) { + cf_log_err(cf_sectiontoitem(cs), + "Home servers of type \"coa\" cannot point to a virtual server"); + goto error; + } +#endif + } else { cf_log_err(cf_sectiontoitem(cs), "Invalid type \"%s\" for home server %s.", hs_type, name2); - free(home); - free(hs_type); - hs_type = NULL; - free(hs_check); - hs_check = NULL; - return 0; + goto error; } free(hs_type); hs_type = NULL; - if (!home->secret) { - cf_log_err(cf_sectiontoitem(cs), - "No shared secret defined for home server %s.", - name2); - free(home); - return 0; - } - - if (strcasecmp(hs_check, "none") == 0) { + if (!hs_check || (strcasecmp(hs_check, "none") == 0)) { home->ping_check = HOME_PING_CHECK_NONE; } else if (strcasecmp(hs_check, "status-server") == 0) { @@ -349,10 +582,7 @@ static int home_server_add(CONF_SECTION *cs, int type) cf_log_err(cf_sectiontoitem(cs), "Invalid ping_check \"%s\" for home server %s.", hs_check, name2); - free(home); - free(hs_check); - hs_check = NULL; - return 0; + goto error; } free(hs_check); hs_check = NULL; @@ -361,42 +591,99 @@ static int home_server_add(CONF_SECTION *cs, int type) (home->ping_check != HOME_PING_CHECK_STATUS_SERVER)) { if (!home->ping_user_name) { cf_log_err(cf_sectiontoitem(cs), "You must supply a user name to enable ping checks"); - free(home); - return 0; + goto error; } if ((home->type == HOME_TYPE_AUTH) && !home->ping_user_password) { cf_log_err(cf_sectiontoitem(cs), "You must supply a password to enable ping checks"); - free(home); - return 0; + goto error; } } - if (rbtree_finddata(home_servers_byaddr, home)) { - DEBUG2("Ignoring duplicate home server %s.", name2); - return 1; + home->proto = IPPROTO_UDP; +#ifdef WITH_TCP + if (hs_proto) { + if (strcmp(hs_proto, "udp") == 0) { + free(hs_proto); + hs_proto = NULL; + + } else if (strcmp(hs_proto, "tcp") == 0) { + free(hs_proto); + hs_proto = NULL; + home->proto = IPPROTO_TCP; + + } else { + cf_log_err(cf_sectiontoitem(cs), + "Unknown proto \"%s\".", hs_proto); + goto error; + } } +#endif + + if (!home->server && + rbtree_finddata(home_servers_byaddr, home)) { + cf_log_err(cf_sectiontoitem(cs), "Duplicate home server"); + goto error; + } + + /* + * If the home is a virtual server, don't look up source IP. + */ + if (!home->server) { + rad_assert(home->ipaddr.af != AF_UNSPEC); + + /* + * Otherwise look up the source IP using the same + * address family as the destination IP. + */ + if (hs_srcipaddr) { + if (ip_hton(hs_srcipaddr, home->ipaddr.af, &home->src_ipaddr) < 0) { + cf_log_err(cf_sectiontoitem(cs), "Failed parsing src_ipaddr"); + goto error; + } + + } else { + /* + * Source isn't specified: Source is + * the correct address family, but all zeros. + */ + home->src_ipaddr.af = home->ipaddr.af; + } + } + + free(hs_srcipaddr); + hs_srcipaddr = NULL; if (!rbtree_insert(home_servers_byname, home)) { cf_log_err(cf_sectiontoitem(cs), - "Internal error adding home server %s.", - name2); - free(home); - return 0; + "Internal error %d adding home server %s.", + __LINE__, name2); + goto error; } - if (!rbtree_insert(home_servers_byaddr, home)) { + if (!home->server && + !rbtree_insert(home_servers_byaddr, home)) { rbtree_deletebydata(home_servers_byname, home); cf_log_err(cf_sectiontoitem(cs), - "Internal error adding home server %s.", - name2); - free(home); - return 0; + "Internal error %d adding home server %s.", + __LINE__, name2); + goto error; } - if (home->response_window < 5) home->response_window = 5; - if (home->response_window > 60) home->response_window = 60; +#ifdef WITH_STATS + home->number = home_server_max_number++; + if (!rbtree_insert(home_servers_bynumber, home)) { + rbtree_deletebydata(home_servers_byname, home); + if (home->ipaddr.af != AF_UNSPEC) { + rbtree_deletebydata(home_servers_byname, home); + } + cf_log_err(cf_sectiontoitem(cs), + "Internal error %d adding home server %s.", + __LINE__, name2); + goto error; + } +#endif if (home->max_outstanding < 8) home->max_outstanding = 8; if (home->max_outstanding > 65536*16) home->max_outstanding = 65536*16; @@ -404,7 +691,10 @@ static int home_server_add(CONF_SECTION *cs, int type) if (home->ping_interval < 6) home->ping_interval = 6; if (home->ping_interval > 120) home->ping_interval = 120; - if (home->zombie_period < 20) home->zombie_period = 20; + if (home->response_window < 1) home->response_window = 1; + if (home->response_window > 60) home->response_window = 60; + + if (home->zombie_period < 1) home->zombie_period = 1; if (home->zombie_period > 120) home->zombie_period = 120; if (home->zombie_period < home->response_window) { @@ -420,6 +710,36 @@ static int home_server_add(CONF_SECTION *cs, int type) if (home->revive_interval < 60) home->revive_interval = 60; if (home->revive_interval > 3600) home->revive_interval = 3600; +#ifdef WITH_COA + if (home->coa_irt < 1) home->coa_irt = 1; + if (home->coa_irt > 5) home->coa_irt = 5; + + if (home->coa_mrc < 0) home->coa_mrc = 0; + if (home->coa_mrc > 20 ) home->coa_mrc = 20; + + if (home->coa_mrt < 0) home->coa_mrt = 0; + if (home->coa_mrt > 30 ) home->coa_mrt = 30; + + if (home->coa_mrd < 5) home->coa_mrd = 5; + if (home->coa_mrd > 60 ) home->coa_mrd = 60; +#endif + + if (home->max_connections > 1024) home->max_connections = 1024; + +#ifdef WITH_TCP + /* + * UDP sockets can't be connection limited. + */ + if (home->proto != IPPROTO_TCP) home->max_connections = 0; +#endif + + if ((home->idle_timeout > 0) && (home->idle_timeout < 5)) + home->idle_timeout = 5; + if ((home->lifetime > 0) && (home->lifetime < 5)) + home->lifetime = 5; + if ((home->lifetime > 0) && (home->idle_timeout > home->lifetime)) + home->idle_timeout = 0; + if (dual) { home_server *home2 = rad_malloc(sizeof(*home2)); @@ -428,41 +748,134 @@ static int home_server_add(CONF_SECTION *cs, int type) home2->type = HOME_TYPE_ACCT; home2->port++; home2->ping_user_password = NULL; + home2->cs = cs; + + if (home->no_response_fail == 2) home->no_response_fail = 0; + if (home2->no_response_fail == 2) home2->no_response_fail = 1; if (!rbtree_insert(home_servers_byname, home2)) { cf_log_err(cf_sectiontoitem(cs), - "Internal error adding home server %s.", - name2); + "Internal error %d adding home server %s.", + __LINE__, name2); free(home2); return 0; } - if (!rbtree_insert(home_servers_byaddr, home2)) { + if (!home->server && + !rbtree_insert(home_servers_byaddr, home2)) { rbtree_deletebydata(home_servers_byname, home2); cf_log_err(cf_sectiontoitem(cs), - "Internal error adding home server %s.", - name2); + "Internal error %d adding home server %s.", + __LINE__, name2); free(home2); return 0; } + +#ifdef WITH_STATS + home2->number = home_server_max_number++; + if (!rbtree_insert(home_servers_bynumber, home2)) { + rbtree_deletebydata(home_servers_byname, home2); + if (!home2->server) { + rbtree_deletebydata(home_servers_byname, home2); + } + cf_log_err(cf_sectiontoitem(cs), + "Internal error %d adding home server %s.", + __LINE__, name2); + free(home2); + return 0; + } +#endif } + /* + * Mark it as already processed + */ + cf_data_add(cs, "home_server", null_free, null_free); + return 1; } -static int server_pool_add(CONF_SECTION *cs, int server_type) +static home_pool_t *server_pool_alloc(const char *name, home_pool_type_t type, + int server_type, int num_home_servers) +{ + home_pool_t *pool; + + pool = rad_malloc(sizeof(*pool) + (sizeof(pool->servers[0]) * + num_home_servers)); + if (!pool) return NULL; /* just for pairanoia */ + + memset(pool, 0, sizeof(*pool) + (sizeof(pool->servers[0]) * + num_home_servers)); + + pool->name = name; + pool->type = type; + pool->server_type = server_type; + pool->num_home_servers = num_home_servers; + + return pool; +} + +static int pool_check_home_server(realm_config_t *rc, CONF_PAIR *cp, + const char *name, int server_type, + home_server **phome) +{ + home_server myhome, *home; + CONF_SECTION *server_cs; + + if (!name) { + cf_log_err(cf_pairtoitem(cp), + "No value given for home_server."); + return 0; + } + + myhome.name = name; + myhome.type = server_type; + home = rbtree_finddata(home_servers_byname, &myhome); + if (home) { + *phome = home; + return 1; + } + + server_cs = cf_section_sub_find_name2(rc->cs, "home_server", name); + if (!server_cs) { + cf_log_err(cf_pairtoitem(cp), + "Unknown home_server \"%s\".", name); + return 0; + } + + if (!home_server_add(rc, server_cs, server_type)) { + return 0; + } + + home = rbtree_finddata(home_servers_byname, &myhome); + if (!home) { + cf_log_err(cf_pairtoitem(cp), + "Internal error %d adding home server \"%s\".", + __LINE__, name); + return 0; + } + + *phome = home; + return 1; +} + + +static int server_pool_add(realm_config_t *rc, + CONF_SECTION *cs, int server_type, int do_print) { const char *name2; home_pool_t *pool = NULL; const char *value; CONF_PAIR *cp; int num_home_servers; + home_server *home; name2 = cf_section_name1(cs); - if (!name2 || (strcasecmp(name2, "server_pool") != 0)) { + if (!name2 || ((strcasecmp(name2, "server_pool") != 0) && + (strcasecmp(name2, "home_server_pool") != 0))) { cf_log_err(cf_sectiontoitem(cs), - "Section is not a server_pool."); + "Section is not a home_server_pool."); return 0; } @@ -480,41 +893,10 @@ static int server_pool_add(CONF_SECTION *cs, int server_type) for (cp = cf_pair_find(cs, "home_server"); cp != NULL; cp = cf_pair_find_next(cs, cp, "home_server")) { - home_server myhome, *home; - CONF_SECTION *server_cs; - num_home_servers++; - value = cf_pair_value(cp); - if (!value) { - cf_log_err(cf_pairtoitem(cp), - "No value given for home_server."); - return 0;; - } - - myhome.name = value; - myhome.type = server_type; - home = rbtree_finddata(home_servers_byname, &myhome); - if (home) continue; - - server_cs = cf_section_sub_find_name2(cf_section_parent(cs), - "home_server", - value); - if (!server_cs) { - cf_log_err(cf_pairtoitem(cp), - "Unknown home_server \"%s\".", - value); - return 0; - } - - if (!home_server_add(server_cs, server_type)) { - return 0; - } - - home = rbtree_finddata(home_servers_byname, &myhome); - if (!home) { - radlog(L_ERR, "Internal sanity check failed %d", - __LINE__); + if (!pool_check_home_server(rc, cp, cf_pair_value(cp), + server_type, &home)) { return 0; } } @@ -526,24 +908,48 @@ static int server_pool_add(CONF_SECTION *cs, int server_type) goto error; } - pool = rad_malloc(sizeof(*pool) + num_home_servers * sizeof(pool->servers[0])); - memset(pool, 0, sizeof(*pool) + num_home_servers * sizeof(pool->servers[0])); + pool = server_pool_alloc(name2, HOME_POOL_FAIL_OVER, server_type, + num_home_servers); + pool->cs = cs; - pool->type = HOME_POOL_FAIL_OVER; - pool->name = name2; - pool->server_type = server_type; - DEBUG2(" server_pool %s {", name2); + /* + * Fallback servers must be defined, and must be + * virtual servers. + */ + cp = cf_pair_find(cs, "fallback"); + if (cp) { +#ifdef WITH_COA + if (server_type == HOME_TYPE_COA) { + cf_log_err(cf_sectiontoitem(cs), "Home server pools of type \"coa\" cannot have a fallback virtual server."); + goto error; + } +#endif + + if (!pool_check_home_server(rc, cp, cf_pair_value(cp), + server_type, &pool->fallback)) { + + goto error; + } + + if (!pool->fallback->server) { + cf_log_err(cf_sectiontoitem(cs), "Fallback home_server %s does NOT contain a virtual_server directive.", pool->fallback->name); + goto error; + } + } + + if (do_print) cf_log_info(cs, " home_server_pool %s {", name2); cp = cf_pair_find(cs, "type"); if (cp) { - static LRAD_NAME_NUMBER pool_types[] = { + static FR_NAME_NUMBER pool_types[] = { { "load-balance", HOME_POOL_LOAD_BALANCE }, { "fail-over", HOME_POOL_FAIL_OVER }, { "round_robin", HOME_POOL_LOAD_BALANCE }, { "fail_over", HOME_POOL_FAIL_OVER }, { "client-balance", HOME_POOL_CLIENT_BALANCE }, { "client-port-balance", HOME_POOL_CLIENT_PORT_BALANCE }, + { "keyed-balance", HOME_POOL_KEYED_BALANCE }, { NULL, 0 } }; @@ -554,7 +960,7 @@ static int server_pool_add(CONF_SECTION *cs, int server_type) goto error; } - pool->type = lrad_str2int(pool_types, value, 0); + pool->type = fr_str2int(pool_types, value, 0); if (!pool->type) { cf_log_err(cf_pairtoitem(cp), "Unknown type \"%s\".", @@ -562,21 +968,39 @@ static int server_pool_add(CONF_SECTION *cs, int server_type) goto error; } - DEBUG2("\ttype = %s", value); + if (do_print) cf_log_info(cs, "\ttype = %s", value); } + cp = cf_pair_find(cs, "virtual_server"); + if (cp) { + pool->virtual_server = cf_pair_value(cp); + if (!pool->virtual_server) { + cf_log_err(cf_pairtoitem(cp), "No value given for virtual_server"); + goto error; + } + + if (do_print) { + cf_log_info(cs, "\tvirtual_server = %s", pool->virtual_server); + } + + if (!cf_section_sub_find_name2(rc->cs, "server", + pool->virtual_server)) { + cf_log_err(cf_pairtoitem(cp), "No such server %s", + pool->virtual_server); + goto error; + } + + } + + num_home_servers = 0; for (cp = cf_pair_find(cs, "home_server"); cp != NULL; cp = cf_pair_find_next(cs, cp, "home_server")) { - home_server myhome, *home; + home_server myhome; value = cf_pair_value(cp); - if (!value) { - cf_log_err(cf_pairtoitem(cp), - "No value given for home_server."); - goto error; - } + memset(&myhome, 0, sizeof(&myhome)); myhome.name = value; myhome.type = server_type; @@ -591,38 +1015,53 @@ static int server_pool_add(CONF_SECTION *cs, int server_type) continue; } - DEBUG2("\thome_server = %s", home->name); - pool->servers[pool->num_home_servers] = home; - pool->num_home_servers++; + if (do_print) cf_log_info(cs, "\thome_server = %s", home->name); + pool->servers[num_home_servers++] = home; } /* loop over home_server's */ + if (pool->fallback && do_print) { + cf_log_info(cs, "\tfallback = %s", pool->fallback->name); + } + if (!rbtree_insert(home_pools_byname, pool)) { rad_assert("Internal sanity check failed"); goto error; } - DEBUG2(" }"); + if (do_print) cf_log_info(cs, " }"); + + cf_data_add(cs, "home_server_pool", pool, free); rad_assert(pool->server_type != 0); return 1; error: - DEBUG2(" }"); + if (do_print) cf_log_info(cs, " }"); free(pool); return 0; } +#endif - -static int old_server_add(CONF_SECTION *cs, const char *realm, +static int old_server_add(realm_config_t *rc, CONF_SECTION *cs, + const char *realm, const char *name, const char *secret, home_pool_type_t ldflag, home_pool_t **pool_p, - int type) + int type, const char *server) { +#ifdef WITH_PROXY int i, insert_point, num_home_servers; home_server myhome, *home; home_pool_t mypool, *pool; CONF_SECTION *subcs; +#else + rc = rc; /* -Wunused */ + realm = realm; + secret = secret; + ldflag = ldflag; + type = type; + server = server; +#endif /* * LOCAL realms get sanity checked, and nothing else happens. @@ -635,6 +1074,10 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, return 1; } +#ifndef WITH_PROXY + return 0; /* Not proxying. Can't do non-LOCAL realms */ + +#else mypool.name = realm; mypool.server_type = type; pool = rbtree_finddata(home_pools_byname, &mypool); @@ -654,7 +1097,7 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, myhome.type = type; home = rbtree_finddata(home_servers_byname, &myhome); if (home) { - if (strcmp(home->secret, secret) != 0) { + if (secret && (strcmp(home->secret, secret) != 0)) { cf_log_err(cf_sectiontoitem(cs), "Inconsistent shared secret for home server \"%s\"", name); return 0; } @@ -714,6 +1157,8 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, home->hostname = name; home->type = type; home->secret = secret; + home->cs = cs; + home->proto = IPPROTO_UDP; p = strchr(name, ':'); if (!p) { @@ -749,13 +1194,19 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, p = q; } - if (ip_hton(p, AF_UNSPEC, &home->ipaddr) < 0) { - cf_log_err(cf_sectiontoitem(cs), - "Failed looking up hostname %s.", - p); - free(home); - free(q); - return 0; + if (!server) { + if (ip_hton(p, AF_UNSPEC, &home->ipaddr) < 0) { + cf_log_err(cf_sectiontoitem(cs), + "Failed looking up hostname %s.", + p); + free(home); + free(q); + return 0; + } + home->src_ipaddr.af = home->ipaddr.af; + } else { + home->ipaddr.af = AF_UNSPEC; + home->server = server; } free(q); @@ -763,32 +1214,47 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, * Use the old-style configuration. */ home->max_outstanding = 65535*16; - home->zombie_period = mainconfig.proxy_retry_delay * mainconfig.proxy_retry_count; + home->zombie_period = rc->retry_delay * rc->retry_count; if (home->zombie_period == 0) home->zombie_period =30; home->response_window = home->zombie_period - 1; home->ping_check = HOME_PING_CHECK_NONE; - home->revive_interval = mainconfig.proxy_dead_time; + home->revive_interval = rc->dead_time; if (rbtree_finddata(home_servers_byaddr, home)) { - cf_log_err(cf_sectiontoitem(cs), "Home server %s has the same IP address as another home server.", name); + cf_log_err(cf_sectiontoitem(cs), "Home server %s has the same IP address and/or port as another home server.", name); free(home); return 0; } if (!rbtree_insert(home_servers_byname, home)) { - cf_log_err(cf_sectiontoitem(cs), "Internal error adding home server %s.", name); + cf_log_err(cf_sectiontoitem(cs), "Internal error %d adding home server %s.", __LINE__, name); free(home); return 0; } if (!rbtree_insert(home_servers_byaddr, home)) { rbtree_deletebydata(home_servers_byname, home); - cf_log_err(cf_sectiontoitem(cs), "Internal error adding home server %s.", name); + cf_log_err(cf_sectiontoitem(cs), "Internal error %d adding home server %s.", __LINE__, name); + free(home); + return 0; + } + +#ifdef WITH_STATS + home->number = home_server_max_number++; + if (!rbtree_insert(home_servers_bynumber, home)) { + rbtree_deletebydata(home_servers_byname, home); + if (home->ipaddr.af != AF_UNSPEC) { + rbtree_deletebydata(home_servers_byname, home); + } + cf_log_err(cf_sectiontoitem(cs), + "Internal error %d adding home server %s.", + __LINE__, name); free(home); return 0; } +#endif } /* @@ -808,22 +1274,24 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, * Count the old-style realms of this name. */ num_home_servers = 0; - for (subcs = cf_subsection_find_next(cs, NULL, "realm"); + for (subcs = cf_section_find_next(cs, NULL, "realm"); subcs != NULL; - subcs = cf_subsection_find_next(cs, subcs, "realm")) { + subcs = cf_section_find_next(cs, subcs, "realm")) { const char *this = cf_section_name2(subcs); if (!this || (strcmp(this, realm) != 0)) continue; num_home_servers++; } - pool = rad_malloc(sizeof(*pool) + num_home_servers * sizeof(pool->servers[0])); - memset(pool, 0, sizeof(*pool) + num_home_servers * sizeof(pool->servers[0])); + if (num_home_servers == 0) { + cf_log_err(cf_sectiontoitem(cs), "Internal error counting pools for home server %s.", name); + free(home); + return 0; + } + + pool = server_pool_alloc(realm, ldflag, type, num_home_servers); + pool->cs = cs; - pool->name = realm; - pool->type = ldflag; - pool->server_type = type; - pool->num_home_servers = num_home_servers; pool->servers[0] = home; if (!rbtree_insert(home_pools_byname, pool)) { @@ -834,75 +1302,137 @@ static int old_server_add(CONF_SECTION *cs, const char *realm, *pool_p = pool; return 1; +#endif } -static int old_realm_config(CONF_SECTION *cs, REALM *r) +static int old_realm_config(realm_config_t *rc, CONF_SECTION *cs, REALM *r) { - char *host; - const char *secret; + const char *host; + const char *secret = NULL; home_pool_type_t ldflag; + CONF_PAIR *cp; - secret = cf_section_value_find(cs, "secret"); - - host = cf_section_value_find(cs, "ldflag"); - if (!host || - (strcasecmp(host, "fail_over") == 0)) { - ldflag = HOME_POOL_FAIL_OVER; - DEBUG2("\tldflag = fail_over"); - - } else if (strcasecmp(host, "round_robin") == 0) { - ldflag = HOME_POOL_LOAD_BALANCE; - DEBUG2("\tldflag = round_robin"); + cp = cf_pair_find(cs, "ldflag"); + ldflag = HOME_POOL_FAIL_OVER; + if (cp) { + host = cf_pair_value(cp); + if (!host) { + cf_log_err(cf_pairtoitem(cp), "No value specified for ldflag"); + return 0; + } - } else { - cf_log_err(cf_sectiontoitem(cs), "Unknown value \"%s\" for ldflag", host); - return 0; - } + if (strcasecmp(host, "fail_over") == 0) { + cf_log_info(cs, "\tldflag = fail_over"); + + } else if (strcasecmp(host, "round_robin") == 0) { + ldflag = HOME_POOL_LOAD_BALANCE; + cf_log_info(cs, "\tldflag = round_robin"); + + } else { + cf_log_err(cf_sectiontoitem(cs), "Unknown value \"%s\" for ldflag", host); + return 0; + } + } /* else don't print it. */ /* * Allow old-style if it doesn't exist, or if it exists and * it's LOCAL. */ - if (((host = cf_section_value_find(cs, "authhost")) != NULL) && - (strcmp(host, "LOCAL") != 0)) { - if (!secret) { - cf_log_err(cf_sectiontoitem(cs), "No shared secret supplied for realm: %s", r->name); + cp = cf_pair_find(cs, "authhost"); + if (cp) { + host = cf_pair_value(cp); + if (!host) { + cf_log_err(cf_pairtoitem(cp), "No value specified for authhost"); + return 0; + } + + if (strcmp(host, "LOCAL") != 0) { + cp = cf_pair_find(cs, "secret"); + if (!cp) { + cf_log_err(cf_sectiontoitem(cs), "No shared secret supplied for realm: %s", r->name); + return 0; + } + + secret = cf_pair_value(cp); + if (!secret) { + cf_log_err(cf_pairtoitem(cp), "No value specified for secret"); + return 0; + } + } + + cf_log_info(cs, "\tauthhost = %s", host); + + if (!old_server_add(rc, cs, r->name, host, secret, ldflag, + &r->auth_pool, HOME_TYPE_AUTH, NULL)) { + return 0; + } + } + + cp = cf_pair_find(cs, "accthost"); + if (cp) { + host = cf_pair_value(cp); + if (!host) { + cf_log_err(cf_pairtoitem(cp), "No value specified for accthost"); return 0; } - DEBUG2("\tauthhost = %s", host); + /* + * Don't look for a secret again if it was found + * above. + */ + if ((strcmp(host, "LOCAL") != 0) && !secret) { + cp = cf_pair_find(cs, "secret"); + if (!cp) { + cf_log_err(cf_sectiontoitem(cs), "No shared secret supplied for realm: %s", r->name); + return 0; + } + + secret = cf_pair_value(cp); + if (!secret) { + cf_log_err(cf_pairtoitem(cp), "No value specified for secret"); + return 0; + } + } + + cf_log_info(cs, "\taccthost = %s", host); - if (!old_server_add(cs, r->name, host, secret, ldflag, - &r->auth_pool, HOME_TYPE_AUTH)) { + if (!old_server_add(rc, cs, r->name, host, secret, ldflag, + &r->acct_pool, HOME_TYPE_ACCT, NULL)) { return 0; } } - if (((host = cf_section_value_find(cs, "accthost")) != NULL) && - (strcmp(host, "LOCAL") != 0)) { - if (!secret) { - cf_log_err(cf_sectiontoitem(cs), "No shared secret supplied for realm: %s", r->name); + cp = cf_pair_find(cs, "virtual_server"); + if (cp) { + host = cf_pair_value(cp); + if (!host) { + cf_log_err(cf_pairtoitem(cp), "No value specified for virtual_server"); return 0; } - DEBUG2("\taccthost = %s", host); + cf_log_info(cs, "\tvirtual_server = %s", host); - if (!old_server_add(cs, r->name, host, secret, ldflag, - &r->acct_pool, HOME_TYPE_ACCT)) { + if (!old_server_add(rc, cs, r->name, host, "", ldflag, + &r->auth_pool, HOME_TYPE_AUTH, host)) { + return 0; + } + if (!old_server_add(rc, cs, r->name, host, "", ldflag, + &r->acct_pool, HOME_TYPE_ACCT, host)) { return 0; } } - if (secret) DEBUG2("\tsecret = %s", secret); + if (secret) cf_log_info(cs, "\tsecret = %s", secret); return 1; } -static int add_pool_to_realm(CONF_SECTION *cs, +#ifdef WITH_PROXY +static int add_pool_to_realm(realm_config_t *rc, CONF_SECTION *cs, const char *name, home_pool_t **dest, - int server_type) + int server_type, int do_print) { home_pool_t mypool, *pool; @@ -913,15 +1443,20 @@ static int add_pool_to_realm(CONF_SECTION *cs, if (!pool) { CONF_SECTION *pool_cs; - pool_cs = cf_section_sub_find_name2(cf_section_parent(cs), - "server_pool", + pool_cs = cf_section_sub_find_name2(rc->cs, + "home_server_pool", name); if (!pool_cs) { - cf_log_err(cf_sectiontoitem(cs), "Failed to find server_pool \"%s\"", name); + pool_cs = cf_section_sub_find_name2(rc->cs, + "server_pool", + name); + } + if (!pool_cs) { + cf_log_err(cf_sectiontoitem(cs), "Failed to find home_server_pool \"%s\"", name); return 0; } - if (!server_pool_add(pool_cs, server_type)) { + if (!server_pool_add(rc, pool_cs, server_type, do_print)) { return 0; } @@ -933,7 +1468,7 @@ static int add_pool_to_realm(CONF_SECTION *cs, } if (pool->server_type != server_type) { - cf_log_err(cf_sectiontoitem(cs), "Incompatible server_pool \"%s\" (mixed auth_pool / acct_pool)", name); + cf_log_err(cf_sectiontoitem(cs), "Incompatible home_server_pool \"%s\" (mixed auth_pool / acct_pool)", name); return 0; } @@ -941,14 +1476,18 @@ static int add_pool_to_realm(CONF_SECTION *cs, return 1; } +#endif -int realm_add(CONF_SECTION *cs) + +static int realm_add(realm_config_t *rc, CONF_SECTION *cs) { const char *name2; REALM *r = NULL; CONF_PAIR *cp; +#ifdef WITH_PROXY home_pool_t *auth_pool, *acct_pool; const char *auth_pool_name, *acct_pool_name; +#endif name2 = cf_section_name1(cs); if (!name2 || (strcasecmp(name2, "realm") != 0)) { @@ -962,6 +1501,7 @@ int realm_add(CONF_SECTION *cs) return 0; } +#ifdef WITH_PROXY auth_pool = acct_pool = NULL; auth_pool_name = acct_pool_name = NULL; @@ -969,17 +1509,18 @@ int realm_add(CONF_SECTION *cs) * Prefer new configuration to old one. */ cp = cf_pair_find(cs, "pool"); + if (!cp) cp = cf_pair_find(cs, "home_server_pool"); if (cp) auth_pool_name = cf_pair_value(cp); if (cp && auth_pool_name) { acct_pool_name = auth_pool_name; - if (!add_pool_to_realm(cs, + if (!add_pool_to_realm(rc, cs, auth_pool_name, &auth_pool, - HOME_TYPE_AUTH)) { + HOME_TYPE_AUTH, 1)) { return 0; } - if (!add_pool_to_realm(cs, + if (!add_pool_to_realm(rc, cs, auth_pool_name, &acct_pool, - HOME_TYPE_ACCT)) { + HOME_TYPE_ACCT, 0)) { return 0; } } @@ -991,9 +1532,9 @@ int realm_add(CONF_SECTION *cs) cf_log_err(cf_sectiontoitem(cs), "Cannot use \"pool\" and \"auth_pool\" at the same time."); return 0; } - if (!add_pool_to_realm(cs, + if (!add_pool_to_realm(rc, cs, auth_pool_name, &auth_pool, - HOME_TYPE_AUTH)) { + HOME_TYPE_AUTH, 1)) { return 0; } } @@ -1001,57 +1542,96 @@ int realm_add(CONF_SECTION *cs) cp = cf_pair_find(cs, "acct_pool"); if (cp) acct_pool_name = cf_pair_value(cp); if (cp && acct_pool_name) { + int do_print = TRUE; + if (acct_pool) { cf_log_err(cf_sectiontoitem(cs), "Cannot use \"pool\" and \"acct_pool\" at the same time."); return 0; } - if (!add_pool_to_realm(cs, + + if (!auth_pool || + (strcmp(auth_pool_name, acct_pool_name) != 0)) { + do_print = TRUE; + } + + if (!add_pool_to_realm(rc, cs, acct_pool_name, &acct_pool, - HOME_TYPE_ACCT)) { + HOME_TYPE_ACCT, do_print)) { return 0; } } +#endif - DEBUG2(" realm %s {", name2); + cf_log_info(cs, " realm %s {", name2); +#ifdef WITH_PROXY /* * The realm MAY already exist if it's an old-style realm. * In that case, merge the old-style realm with this one. */ - r = realm_find(name2); - if (r) { + r = realm_find2(name2); + if (r && (strcmp(r->name, name2) == 0)) { if (cf_pair_find(cs, "auth_pool") || cf_pair_find(cs, "acct_pool")) { cf_log_err(cf_sectiontoitem(cs), "Duplicate realm \"%s\"", name2); goto error; } - if (!old_realm_config(cs, r)) { + if (!old_realm_config(rc, cs, r)) { goto error; } - DEBUG2(" } # realm %s", name2); + cf_log_info(cs, " } # realm %s", name2); return 1; } +#endif + +#ifdef HAVE_REGEX_H + if (name2[0] == '~') { + int rcode; + regex_t reg; + + /* + * Include substring matches. + */ + rcode = regcomp(®, name2 + 1, + REG_EXTENDED | REG_NOSUB | REG_ICASE); + if (rcode != 0) { + char buffer[256]; + + regerror(rcode, ®, buffer, sizeof(buffer)); + + cf_log_err(cf_sectiontoitem(cs), + "Invalid regex \"%s\": %s", + name2 + 1, buffer); + goto error; + } + regfree(®); + } +#endif r = rad_malloc(sizeof(*r)); memset(r, 0, sizeof(*r)); r->name = name2; + r->striprealm = 1; +#ifdef WITH_PROXY r->auth_pool = auth_pool; r->acct_pool = acct_pool; - r->striprealm = 1; - - if (auth_pool_name == acct_pool_name) { /* yes, ptr comparison */ - DEBUG2("\tpool = %s", auth_pool_name); + + if (auth_pool_name && + (auth_pool_name == acct_pool_name)) { /* yes, ptr comparison */ + cf_log_info(cs, "\tpool = %s", auth_pool_name); } else { - if (auth_pool_name) DEBUG2("\tauth_pool = %s", auth_pool_name); - if (acct_pool_name) DEBUG2("\tacct_pool = %s", acct_pool_name); + if (auth_pool_name) cf_log_info(cs, "\tauth_pool = %s", auth_pool_name); + if (acct_pool_name) cf_log_info(cs, "\tacct_pool = %s", acct_pool_name); } +#endif - if ((cf_section_value_find(cs, "nostrip")) != NULL) { + cp = cf_pair_find(cs, "nostrip"); + if (cp && (cf_pair_value(cp) == NULL)) { r->striprealm = 0; - DEBUG2("\tnostrip"); + cf_log_info(cs, "\tnostrip"); } /* @@ -1072,25 +1652,260 @@ int realm_add(CONF_SECTION *cs) * was no auth_pool or acct_pool. Double-check * it, just to be safe. */ - } else if (!old_realm_config(cs, r)) { + } else if (!old_realm_config(rc, cs, r)) { goto error; } +#ifdef HAVE_REGEX_H + /* + * It's a regex. Add it to a separate list. + */ + if (name2[0] == '~') { + realm_regex_t *rr, **last; + + rr = rad_malloc(sizeof(*rr)); + + last = &realms_regex; + while (*last) last = &((*last)->next); /* O(N^2)... sue me. */ + + r->name = name2; + rr->realm = r; + rr->next = NULL; + + *last = rr; + + cf_log_info(cs, " }"); + return 1; + } +#endif + if (!rbtree_insert(realms_byname, r)) { rad_assert("Internal sanity check failed"); goto error; } - DEBUG2(" }"); + cf_log_info(cs, " }"); return 1; error: - DEBUG2(" } # realm %s", name2); + cf_log_info(cs, " } # realm %s", name2); free(r); return 0; } +#ifdef WITH_COA +static const FR_NAME_NUMBER home_server_types[] = { + { "auth", HOME_TYPE_AUTH }, + { "auth+acct", HOME_TYPE_AUTH }, + { "acct", HOME_TYPE_ACCT }, + { "coa", HOME_TYPE_COA }, + { NULL, 0 } +}; + +static int pool_peek_type(CONF_SECTION *config, CONF_SECTION *cs) +{ + int home; + const char *name, *type; + CONF_PAIR *cp; + CONF_SECTION *server_cs; + + cp = cf_pair_find(cs, "home_server"); + if (!cp) { + cf_log_err(cf_sectiontoitem(cs), "Pool does not contain a \"home_server\" entry"); + return HOME_TYPE_INVALID; + } + + name = cf_pair_value(cp); + if (!name) { + cf_log_err(cf_pairtoitem(cp), "home_server entry does not reference a home server"); + return HOME_TYPE_INVALID; + } + + server_cs = cf_section_sub_find_name2(config, "home_server", name); + if (!server_cs) { + cf_log_err(cf_pairtoitem(cp), "home_server \"%s\" does not exist", name); + return HOME_TYPE_INVALID; + } + + cp = cf_pair_find(server_cs, "type"); + if (!cp) { + cf_log_err(cf_sectiontoitem(server_cs), "home_server %s does not contain a \"type\" entry", name); + return HOME_TYPE_INVALID; + } + + type = cf_pair_value(cp); + if (!type) { + cf_log_err(cf_sectiontoitem(server_cs), "home_server %s contains an empty \"type\" entry", name); + return HOME_TYPE_INVALID; + } + + home = fr_str2int(home_server_types, type, HOME_TYPE_INVALID); + if (home == HOME_TYPE_INVALID) { + cf_log_err(cf_sectiontoitem(server_cs), "home_server %s contains an invalid \"type\" entry of value \"%s\"", name, type); + return HOME_TYPE_INVALID; + } + + return home; /* 'cause we miss it so much */ +} +#endif + +int realms_init(CONF_SECTION *config) +{ + CONF_SECTION *cs; + realm_config_t *rc, *old_rc; + + if (realms_byname) return 1; + + realms_byname = rbtree_create(realm_name_cmp, free, 0); + if (!realms_byname) { + realms_free(); + return 0; + } + +#ifdef WITH_PROXY + home_servers_byaddr = rbtree_create(home_server_addr_cmp, free, 0); + if (!home_servers_byaddr) { + realms_free(); + return 0; + } + + home_servers_byname = rbtree_create(home_server_name_cmp, NULL, 0); + if (!home_servers_byname) { + realms_free(); + return 0; + } + +#ifdef WITH_STATS + home_servers_bynumber = rbtree_create(home_server_number_cmp, NULL, 0); + if (!home_servers_bynumber) { + realms_free(); + return 0; + } +#endif + + home_pools_byname = rbtree_create(home_pool_name_cmp, NULL, 0); + if (!home_pools_byname) { + realms_free(); + return 0; + } +#endif + + rc = rad_malloc(sizeof(*rc)); + memset(rc, 0, sizeof(*rc)); + rc->cs = config; + +#ifdef WITH_PROXY + cs = cf_subsection_find_next(config, NULL, "proxy"); + if (cs) { + cf_section_parse(cs, rc, proxy_config); + } else { + rc->dead_time = DEAD_TIME; + rc->retry_count = RETRY_COUNT; + rc->retry_delay = RETRY_DELAY; + rc->fallback = 0; + rc->wake_all_if_all_dead= 0; + } +#endif + + for (cs = cf_subsection_find_next(config, NULL, "realm"); + cs != NULL; + cs = cf_subsection_find_next(config, cs, "realm")) { + if (!realm_add(rc, cs)) { + free(rc); + realms_free(); + return 0; + } + } + +#ifdef WITH_COA + /* + * CoA pools aren't tied to realms. + */ + for (cs = cf_subsection_find_next(config, NULL, "home_server_pool"); + cs != NULL; + cs = cf_subsection_find_next(config, cs, "home_server_pool")) { + int type; + + /* + * Pool was already loaded. + */ + if (cf_data_find(cs, "home_server_pool")) continue; + + type = pool_peek_type(config, cs); + if (type == HOME_TYPE_INVALID) return 0; + + if (!server_pool_add(rc, cs, type, TRUE)) { + return 0; + } + } + + /* + * CoA home servers aren't tied to realms. + */ + for (cs = cf_subsection_find_next(config, NULL, "home_server"); + cs != NULL; + cs = cf_subsection_find_next(config, cs, "home_server")) { + /* + * Server was already loaded. + */ + if (cf_data_find(cs, "home_server")) continue; + + if (!home_server_add(rc, cs, HOME_TYPE_COA)) { + return 0; + } + } +#endif + + +#ifdef WITH_PROXY + xlat_register("home_server", xlat_home_server, NULL); + xlat_register("home_server_pool", xlat_server_pool, NULL); +#endif + + /* + * Swap pointers atomically. + */ + old_rc = realm_config; + realm_config = rc; + free(old_rc); + + return 1; +} + +/* + * Find a realm where "name" might be the regex. + */ +REALM *realm_find2(const char *name) +{ + REALM myrealm; + REALM *realm; + + if (!name) name = "NULL"; + + myrealm.name = name; + realm = rbtree_finddata(realms_byname, &myrealm); + if (realm) return realm; + +#ifdef HAVE_REGEX_H + if (realms_regex) { + realm_regex_t *this; + + for (this = realms_regex; this != NULL; this = this->next) { + if (strcmp(this->realm->name, name) == 0) { + return this->realm; + } + } + } +#endif + + /* + * Couldn't find a realm. Look for DEFAULT. + */ + myrealm.name = "DEFAULT"; + return rbtree_finddata(realms_byname, &myrealm); +} + /* * Find a realm in the REALM list. @@ -1098,22 +1913,55 @@ int realm_add(CONF_SECTION *cs) REALM *realm_find(const char *name) { REALM myrealm; - + REALM *realm; + if (!name) name = "NULL"; myrealm.name = name; + realm = rbtree_finddata(realms_byname, &myrealm); + if (realm) return realm; + +#ifdef HAVE_REGEX_H + if (realms_regex) { + realm_regex_t *this; + + for (this = realms_regex; this != NULL; this = this->next) { + int compare; + regex_t reg; + + /* + * Include substring matches. + */ + if (regcomp(®, this->realm->name + 1, + REG_EXTENDED | REG_NOSUB | REG_ICASE) != 0) { + continue; + } + + compare = regexec(®, name, 0, NULL, 0); + regfree(®); + + if (compare == 0) return this->realm; + } + } +#endif + + /* + * Couldn't find a realm. Look for DEFAULT. + */ + myrealm.name = "DEFAULT"; return rbtree_finddata(realms_byname, &myrealm); } +#ifdef WITH_PROXY home_server *home_server_ldb(const char *realmname, home_pool_t *pool, REQUEST *request) { int start; int count; home_server *found = NULL; - - start = 0; + home_server *zombie = NULL; + VALUE_PAIR *vp; /* * Determine how to pick choose the home server. @@ -1132,11 +1980,11 @@ home_server *home_server_ldb(const char *realmname, case HOME_POOL_CLIENT_BALANCE: switch (request->packet->src_ipaddr.af) { case AF_INET: - hash = lrad_hash(&request->packet->src_ipaddr.ipaddr.ip4addr, + hash = fr_hash(&request->packet->src_ipaddr.ipaddr.ip4addr, sizeof(request->packet->src_ipaddr.ipaddr.ip4addr)); break; case AF_INET6: - hash = lrad_hash(&request->packet->src_ipaddr.ipaddr.ip6addr, + hash = fr_hash(&request->packet->src_ipaddr.ipaddr.ip6addr, sizeof(request->packet->src_ipaddr.ipaddr.ip6addr)); break; default: @@ -1149,28 +1997,39 @@ home_server *home_server_ldb(const char *realmname, case HOME_POOL_CLIENT_PORT_BALANCE: switch (request->packet->src_ipaddr.af) { case AF_INET: - hash = lrad_hash(&request->packet->src_ipaddr.ipaddr.ip4addr, + hash = fr_hash(&request->packet->src_ipaddr.ipaddr.ip4addr, sizeof(request->packet->src_ipaddr.ipaddr.ip4addr)); break; case AF_INET6: - hash = lrad_hash(&request->packet->src_ipaddr.ipaddr.ip6addr, + hash = fr_hash(&request->packet->src_ipaddr.ipaddr.ip6addr, sizeof(request->packet->src_ipaddr.ipaddr.ip6addr)); break; default: hash = 0; break; } - lrad_hash_update(&request->packet->src_port, + fr_hash_update(&request->packet->src_port, sizeof(request->packet->src_port), hash); start = hash % pool->num_home_servers; break; + case HOME_POOL_KEYED_BALANCE: + if ((vp = pairfind(request->config_items, PW_LOAD_BALANCE_KEY, 0)) != NULL) { + hash = fr_hash(vp->vp_strvalue, vp->length); + start = hash % pool->num_home_servers; + break; + } + /* FALL-THROUGH */ + case HOME_POOL_LOAD_BALANCE: - found = pool->servers[0]; + case HOME_POOL_FAIL_OVER: + start = 0; + break; - default: + default: /* this shouldn't happen... */ start = 0; break; + } /* @@ -1183,6 +2042,11 @@ home_server *home_server_ldb(const char *realmname, for (count = 0; count < pool->num_home_servers; count++) { home_server *home = pool->servers[(start + count) % pool->num_home_servers]; + if (!home) continue; + + /* + * Skip dead home servers. + */ if (home->state == HOME_STATE_IS_DEAD) { continue; } @@ -1194,20 +2058,56 @@ home_server *home_server_ldb(const char *realmname, continue; } +#ifdef WITH_DETAIL + /* + * We read the packet from a detail file, AND it + * came from this server. Don't re-proxy it + * there. + */ + if ((request->listener->type == RAD_LISTEN_DETAIL) && + (request->packet->code == PW_ACCOUNTING_REQUEST) && + (fr_ipaddr_cmp(&home->ipaddr, &request->packet->src_ipaddr) == 0)) { + continue; + } +#endif + + /* + * It's zombie, so we remember the first zombie + * we find, but we don't mark it as a "live" + * server. + */ + if (home->state == HOME_STATE_ZOMBIE) { + if (!zombie) zombie = home; + continue; + } + + /* + * We've found the first "live" one. Use that. + */ if (pool->type != HOME_POOL_LOAD_BALANCE) { - return home; + found = home; + break; + } + + /* + * Otherwise we're doing some kind of load balancing. + * If we haven't found one yet, pick this one. + */ + if (!found) { + found = home; + continue; } - DEBUG3("PROXY %s %d\t%s %d", + RDEBUG3("PROXY %s %d\t%s %d", found->name, found->currently_outstanding, home->name, home->currently_outstanding); /* * Prefer this server if it's less busy than the - * one we previously found. + * one we had previously found. */ if (home->currently_outstanding < found->currently_outstanding) { - DEBUG3("Choosing %s: It's less busy than %s", + RDEBUG3("PROXY Choosing %s: It's less busy than %s", home->name, found->name); found = home; continue; @@ -1218,7 +2118,7 @@ home_server *home_server_ldb(const char *realmname, * we found. */ if (home->currently_outstanding > found->currently_outstanding) { - DEBUG3("Skipping %s: It's busier than %s", + RDEBUG3("PROXY Skipping %s: It's busier than %s", home->name, found->name); continue; } @@ -1227,13 +2127,90 @@ home_server *home_server_ldb(const char *realmname, * From the list of servers which have the same * load, choose one at random. */ - if (((count + 1) * (lrad_rand() & 0xffff)) < (uint32_t) 0x10000) { + if (((count + 1) * (fr_rand() & 0xffff)) < (uint32_t) 0x10000) { found = home; } - } /* loop over the home servers */ - if (found) return found; + /* + * We have no live servers, BUT we have a zombie. Use + * the zombie as a last resort. + */ + if (!found && zombie) { + found = zombie; + zombie = NULL; + } + + /* + * There's a fallback if they're all dead. + */ + if (!found && pool->fallback) { + found = pool->fallback; + } + + if (found) { + update_and_return: + /* + * Allocate the proxy packet, only if it wasn't + * already allocated by a module. This check is + * mainly to support the proxying of EAP-TTLS and + * EAP-PEAP tunneled requests. + * + * In those cases, the EAP module creates a + * "fake" request, and recursively passes it + * through the authentication stage of the + * server. The module then checks if the request + * was supposed to be proxied, and if so, creates + * a proxy packet from the TUNNELED request, and + * not from the EAP request outside of the + * tunnel. + * + * The proxy then works like normal, except that + * the response packet is "eaten" by the EAP + * module, and encapsulated into an EAP packet. + */ + if (!request->proxy) { + if ((request->proxy = rad_alloc(TRUE)) == NULL) { + radlog(L_ERR|L_CONS, "no memory"); + exit(1); + } + + /* + * Copy the request, then look up name + * and plain-text password in the copy. + * + * Note that the User-Name attribute is + * the *original* as sent over by the + * client. The Stripped-User-Name + * attribute is the one hacked through + * the 'hints' file. + */ + request->proxy->vps = paircopy(request->packet->vps); + } + + /* + * Update the various fields as appropriate. + */ + request->proxy->src_ipaddr = found->src_ipaddr; + request->proxy->src_port = 0; + request->proxy->dst_ipaddr = found->ipaddr; + request->proxy->dst_port = found->port; + request->home_server = found; + + /* + * We're supposed to add a Message-Authenticator + * if it doesn't exist, and it doesn't exist. + */ + if (found->message_authenticator && + (request->packet->code == PW_AUTHENTICATION_REQUEST) && + !pairfind(request->proxy->vps, PW_MESSAGE_AUTHENTICATOR, 0)) { + radius_pairmake(request, &request->proxy->vps, + "Message-Authenticator", "0x00", + T_OP_SET); + } + + return found; + } /* * No live match found, and no fallback to the "DEFAULT" @@ -1242,28 +2219,28 @@ home_server *home_server_ldb(const char *realmname, * "pings", as they will be marked live when they * actually are live. */ - if (!mainconfig.proxy_fallback && - mainconfig.wake_all_if_all_dead) { - home_server *lb = NULL; - + if (!realm_config->fallback && + realm_config->wake_all_if_all_dead) { for (count = 0; count < pool->num_home_servers; count++) { home_server *home = pool->servers[count]; + if (!home) continue; + if ((home->state == HOME_STATE_IS_DEAD) && (home->ping_check == HOME_PING_CHECK_NONE)) { home->state = HOME_STATE_ALIVE; - if (!lb) lb = home; + if (!found) found = home; } } - if (lb) return lb; + if (found) goto update_and_return; } /* * Still nothing. Look up the DEFAULT realm, but only * if we weren't looking up the NULL or DEFAULT realms. */ - if (mainconfig.proxy_fallback && + if (realm_config->fallback && realmname && (strcmp(realmname, "NULL") != 0) && (strcmp(realmname, "DEFAULT") != 0)) { @@ -1280,7 +2257,7 @@ home_server *home_server_ldb(const char *realmname, } if (!pool) return NULL; - DEBUG2(" Realm %s has no live home servers. Falling back to the DEFAULT realm.", realmname); + RDEBUG2("PROXY - realm %s has no live home servers. Falling back to the DEFAULT realm.", realmname); return home_server_ldb(rd->name, pool, request); } @@ -1291,12 +2268,57 @@ home_server *home_server_ldb(const char *realmname, } -home_server *home_server_find(lrad_ipaddr_t *ipaddr, int port) +home_server *home_server_find(fr_ipaddr_t *ipaddr, int port, int proto) { home_server myhome; + memset(&myhome, 0, sizeof(myhome)); myhome.ipaddr = *ipaddr; myhome.port = port; +#ifdef WITH_TCP + myhome.proto = proto; +#else + myhome.proto = IPPROTO_UDP; +#endif + myhome.server = NULL; /* we're not called for internal proxying */ return rbtree_finddata(home_servers_byaddr, &myhome); } + +#ifdef WITH_COA +home_server *home_server_byname(const char *name, int type) +{ + home_server myhome; + + memset(&myhome, 0, sizeof(myhome)); + myhome.type = type; + myhome.name = name; + + return rbtree_finddata(home_servers_byname, &myhome); +} +#endif + +#ifdef WITH_STATS +home_server *home_server_bynumber(int number) +{ + home_server myhome; + + memset(&myhome, 0, sizeof(myhome)); + myhome.number = number; + myhome.server = NULL; /* we're not called for internal proxying */ + + return rbtree_finddata(home_servers_bynumber, &myhome); +} +#endif + +home_pool_t *home_pool_byname(const char *name, int type) +{ + home_pool_t mypool; + + memset(&mypool, 0, sizeof(mypool)); + mypool.name = name; + mypool.server_type = type; + return rbtree_finddata(home_pools_byname, &mypool); +} + +#endif