X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=common%2Ftr_config.c;h=83eddf77abb095d2474461a9b86774bb84b38951;hb=e427f7d366115d72ded50c2d8de7e7c4c37a773f;hp=713ddb892e04234dde91ed5c276d41f03271744e;hpb=657c44ae5407bbd971afa6e9d0904209fa9c137e;p=trust_router.git diff --git a/common/tr_config.c b/common/tr_config.c index 713ddb8..83eddf7 100644 --- a/common/tr_config.c +++ b/common/tr_config.c @@ -36,159 +36,493 @@ #include #include #include +#include +#include #include +#include +#include +#include +#include #include -void tr_print_config (FILE *stream, TR_CFG *cfg) { - fprintf(stream, "tr_print_config: Not yet implemented.\n"); - return; +void tr_print_config (TR_CFG *cfg) { + tr_notice("tr_print_config: Logging running trust router configuration."); + tr_print_comms(cfg->comms); +} + +void tr_print_comms (TR_COMM *comm_list) { + TR_COMM *comm = NULL; + + for (comm = comm_list; NULL != comm; comm = comm->next) { + tr_notice("tr_print_config: Community %s:", comm->id->buf); + + tr_notice("tr_print_config: - Member IdPs:"); + tr_print_comm_idps(comm->idp_realms); + + tr_notice("tr_print_config: - Member RPs:"); + tr_print_comm_rps(comm->rp_realms); + } +} + +void tr_print_comm_idps (TR_IDP_REALM *idp_list) { + TR_IDP_REALM *idp = NULL; + + for (idp = idp_list; NULL != idp; idp = idp->comm_next) { + tr_notice("tr_print_config: - @%s", idp->realm_id->buf); + } +} + +void tr_print_comm_rps(TR_RP_REALM *rp_list) { + TR_RP_REALM *rp = NULL; + + for (rp = rp_list; NULL != rp; rp = rp->next) { + tr_notice("tr_print_config: - %s", rp->realm_name->buf); + } +} + +TR_CFG *tr_cfg_new(TALLOC_CTX *mem_ctx) +{ + return talloc_zero(mem_ctx, TR_CFG); } void tr_cfg_free (TR_CFG *cfg) { - /* TBD -- need to deallocate memory as part of dynamic config */ - return; + talloc_free(cfg); } -TR_CFG_RC tr_apply_new_config (TR_INSTANCE *tr) { +TR_CFG_MGR *tr_cfg_mgr_new(TALLOC_CTX *mem_ctx) +{ + return talloc_zero(mem_ctx, TR_CFG_MGR); +} + +void tr_cfg_mgr_free (TR_CFG_MGR *cfg_mgr) { + talloc_free(cfg_mgr); +} - if (!tr) +TR_CFG_RC tr_apply_new_config (TR_CFG_MGR *cfg_mgr) +{ + /* cfg_mgr->active is allowed to be null, but new cannot be */ + if ((cfg_mgr==NULL) || (cfg_mgr->new==NULL)) return TR_CFG_BAD_PARAMS; - if (tr->active_cfg) - tr_cfg_free(tr->active_cfg); + if (cfg_mgr->active != NULL) + tr_cfg_free(cfg_mgr->active); + + cfg_mgr->active = cfg_mgr->new; + cfg_mgr->new=NULL; /* only keep a single handle on the new configuration */ + + tr_log_threshold(cfg_mgr->active->internal->log_threshold); + tr_console_threshold(cfg_mgr->active->internal->console_threshold); - tr->active_cfg = tr->new_cfg; return TR_CFG_SUCCESS; } -static TR_CFG_RC tr_cfg_parse_internal (TR_INSTANCE *tr, json_t *jcfg) { +static TR_CFG_RC tr_cfg_parse_internal (TR_CFG *trc, json_t *jcfg) { json_t *jint = NULL; json_t *jmtd = NULL; - - if ((!tr) || (!tr->new_cfg) || (!jcfg)) + json_t *jtidsp = NULL; + json_t *jtrpsp = NULL; + json_t *jhname = NULL; + json_t *jlog = NULL; + json_t *jconthres = NULL; + json_t *jlogthres = NULL; + json_t *jcfgpoll = NULL; + json_t *jcfgsettle = NULL; + json_t *jroutesweep = NULL; + json_t *jrouteupdate = NULL; + json_t *jrouteconnect = NULL; + + if ((!trc) || (!jcfg)) return TR_CFG_BAD_PARAMS; - if (NULL == (tr->new_cfg->internal = malloc(sizeof(TR_CFG_INTERNAL)))) - return TR_CFG_NOMEM; + if (NULL == trc->internal) { + if (NULL == (trc->internal = talloc_zero(trc, TR_CFG_INTERNAL))) + return TR_CFG_NOMEM; + } - memset(tr->new_cfg->internal, 0, sizeof(TR_CFG_INTERNAL)); + if (NULL != (jint = json_object_get(jcfg, "tr_internal"))) { + if (NULL != (jmtd = json_object_get(jint, "max_tree_depth"))) { + if (json_is_number(jmtd)) { + trc->internal->max_tree_depth = json_integer_value(jmtd); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, max_tree_depth is not a number."); + return TR_CFG_NOPARSE; + } + } else { + /* If not configured, use the default */ + trc->internal->max_tree_depth = TR_DEFAULT_MAX_TREE_DEPTH; + } + if (NULL != (jtidsp = json_object_get(jint, "tids_port"))) { + if (json_is_number(jtidsp)) { + trc->internal->tids_port = json_integer_value(jtidsp); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, tids_port is not a number."); + return TR_CFG_NOPARSE; + } + } else { + /* If not configured, use the default */ + trc->internal->tids_port = TR_DEFAULT_TIDS_PORT; + } + if (NULL != (jtrpsp = json_object_get(jint, "trps_port"))) { + if (json_is_number(jtrpsp)) { + trc->internal->trps_port = json_integer_value(jtrpsp); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, trps_port is not a number."); + return TR_CFG_NOPARSE; + } + } else { + /* If not configured, use the default */ + trc->internal->trps_port = TR_DEFAULT_TRPS_PORT; + } + if (NULL != (jhname = json_object_get(jint, "hostname"))) { + if (json_is_string(jhname)) { + trc->internal->hostname = json_string_value(jhname); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, hostname is not a string."); + return TR_CFG_NOPARSE; + } + } + if (NULL != (jcfgpoll = json_object_get(jint, "cfg_poll_interval"))) { + if (json_is_number(jcfgpoll)) { + trc->internal->cfg_poll_interval = json_integer_value(jcfgpoll); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, cfg_poll_interval is not a number."); + return TR_CFG_NOPARSE; + } + } else { + trc->internal->cfg_poll_interval = TR_CFGWATCH_DEFAULT_POLL; + } - if ((NULL != (jint = json_object_get(jcfg, "tr_internal"))) && - (NULL != (jmtd = json_object_get(jint, "max_tree_depth")))) { - if (json_is_number(jmtd)) { - tr->new_cfg->internal->max_tree_depth = json_integer_value(jmtd); + if (NULL != (jcfgsettle = json_object_get(jint, "cfg_settling_time"))) { + if (json_is_number(jcfgsettle)) { + trc->internal->cfg_settling_time = json_integer_value(jcfgsettle); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, cfg_settling_time is not a number."); + return TR_CFG_NOPARSE; + } } else { - fprintf(stderr,"tr_cfg_parse_internal: Parsing error, max_tree_depth is not a number.\n"); - return TR_CFG_NOPARSE; + trc->internal->cfg_settling_time = TR_CFGWATCH_DEFAULT_SETTLE; } - } else { - /* If not configured, use the default */ - tr->new_cfg->internal->max_tree_depth = TR_DEFAULT_MAX_TREE_DEPTH; + + if (NULL != (jrouteconnect = json_object_get(jint, "trp_connect_interval"))) { + if (json_is_number(jrouteconnect)) { + trc->internal->trp_connect_interval = json_integer_value(jrouteconnect); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, trp_connect_interval is not a number."); + return TR_CFG_NOPARSE; + } + } else { + /* if not configured, use the default */ + trc->internal->trp_connect_interval=TR_DEFAULT_TRP_CONNECT_INTERVAL; + } + + if (NULL != (jroutesweep = json_object_get(jint, "trp_sweep_interval"))) { + if (json_is_number(jroutesweep)) { + trc->internal->trp_sweep_interval = json_integer_value(jroutesweep); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, trp_sweep_interval is not a number."); + return TR_CFG_NOPARSE; + } + } else { + /* if not configured, use the default */ + trc->internal->trp_sweep_interval=TR_DEFAULT_TRP_SWEEP_INTERVAL; + } + + if (NULL != (jrouteupdate = json_object_get(jint, "trp_update_interval"))) { + if (json_is_number(jrouteupdate)) { + trc->internal->trp_update_interval = json_integer_value(jrouteupdate); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, trp_update_interval is not a number."); + return TR_CFG_NOPARSE; + } + } else { + /* if not configured, use the default */ + trc->internal->trp_update_interval=TR_DEFAULT_TRP_UPDATE_INTERVAL; + } + + if (NULL != (jlog = json_object_get(jint, "logging"))) { + if (NULL != (jlogthres = json_object_get(jlog, "log_threshold"))) { + if (json_is_string(jlogthres)) { + trc->internal->log_threshold = str2sev(json_string_value(jlogthres)); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, log_threshold is not a string."); + return TR_CFG_NOPARSE; + } + } else { + /* If not configured, use the default */ + trc->internal->log_threshold = TR_DEFAULT_LOG_THRESHOLD; + } + + if (NULL != (jconthres = json_object_get(jlog, "console_threshold"))) { + if (json_is_string(jconthres)) { + trc->internal->console_threshold = str2sev(json_string_value(jconthres)); + } else { + tr_debug("tr_cfg_parse_internal: Parsing error, console_threshold is not a string."); + return TR_CFG_NOPARSE; + } + } else { + /* If not configured, use the default */ + trc->internal->console_threshold = TR_DEFAULT_CONSOLE_THRESHOLD; + } + } else { + /* If not configured, use the default */ + trc->internal->console_threshold = TR_DEFAULT_CONSOLE_THRESHOLD; + trc->internal->log_threshold = TR_DEFAULT_LOG_THRESHOLD; + } + + tr_debug("tr_cfg_parse_internal: Internal config parsed."); + return TR_CFG_SUCCESS; } - fprintf(stderr, "tr_cfg_parse_internal: Internal config parsed.\n"); return TR_CFG_SUCCESS; } -static TR_RP_CLIENT *tr_cfg_parse_one_rp_client (TR_INSTANCE *tr, json_t *jrp, TR_CFG_RC *rc) +static TR_CONSTRAINT *tr_cfg_parse_one_constraint (TR_CFG *trc, char *ctype, json_t *jc, TR_CFG_RC *rc) { - TR_RP_CLIENT *rp = NULL; - json_t *jgns = NULL; - json_t *jfilt = NULL; - json_t *jfls = NULL; - json_t *jftype = NULL; - json_t *jfact = NULL; - json_t *jfspecs = NULL; - json_t *jffield = NULL; - json_t *jfrealm = NULL; - int i = 0; + TR_CONSTRAINT *cons; + int i; - if ((!jrp) || (!rc)) { - fprintf(stderr, "tr_cfg_parse_one_rp_realm: Bad parameters.\n"); - if (rc) - *rc = TR_CFG_BAD_PARAMS; + if ((!trc) || (!ctype) || (!jc) || (!rc) || + (!json_is_array(jc)) || + (0 >= json_array_size(jc)) || + (TR_MAX_CONST_MATCHES < json_array_size(jc)) || + (!json_is_string(json_array_get(jc, 0)))) { + tr_debug("tr_cfg_parse_one_constraint: config error."); + *rc = TR_CFG_NOPARSE; return NULL; } - if (NULL == (rp = malloc(sizeof(TR_RP_CLIENT)))) { - fprintf(stderr, "tr_config_parse_one_rp_realm: Out of memory.\n"); + if (NULL == (cons = talloc_zero(trc, TR_CONSTRAINT))) { + tr_debug("tr_cfg_parse_one_constraint: Out of memory (cons)."); *rc = TR_CFG_NOMEM; return NULL; } - - memset(rp, 0, sizeof(TR_RP_CLIENT)); - if ((NULL == (jfilt = json_object_get(jrp, "filter"))) || - (NULL == (jfls = json_object_get(jfilt, "filter_lines"))) || - (!json_is_array(jfls)) || - (NULL == (jgns = json_object_get(jrp, "gss_names"))) || - (!json_is_array(jgns))) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client configuration.\n"); - free(rp); + if (NULL == (cons->type = tr_new_name(ctype))) { + tr_debug("tr_cfg_parse_one_constraint: Out of memory (type)."); + *rc = TR_CFG_NOMEM; + return NULL; + } + + for (i = 0; i < json_array_size(jc); i++) { + cons->matches[i] = tr_new_name((char *)(json_string_value(json_array_get(jc, i)))); + } + + return cons; +} + +static TR_FILTER *tr_cfg_parse_one_filter (TR_CFG *trc, json_t *jfilt, TR_CFG_RC *rc) +{ + TR_FILTER *filt = NULL; + json_t *jftype = NULL; + json_t *jfls = NULL; + json_t *jfaction = NULL; + json_t *jfspecs = NULL; + json_t *jffield = NULL; + json_t *jfmatch = NULL; + json_t *jrc = NULL; + json_t *jdc = NULL; + int i = 0, j = 0; + + if ((NULL == (jftype = json_object_get(jfilt, "type"))) || + (!json_is_string(jftype))) { + tr_debug("tr_cfg_parse_one_filter: Error parsing filter type."); *rc = TR_CFG_NOPARSE; return NULL; } - if (0 == json_array_size(jfls)) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: RP Client has no filter lines.\n"); + if ((NULL == (jfls = json_object_get(jfilt, "filter_lines"))) || + (!json_is_array(jfls))) { + tr_debug("tr_cfg_parse_one_filter: Error parsing filter type."); *rc = TR_CFG_NOPARSE; return NULL; } - if ((NULL == (jftype = json_object_get(jfilt, "type"))) || - (!json_is_string(jftype)) || - (strcmp(json_string_value(jftype), "rp_permitted"))) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client filter type.\n"); + if (TR_MAX_FILTER_LINES < json_array_size(jfls)) { + tr_debug("tr_cfg_parse_one_filter: Filter has too many filter_lines, maximimum of %d.", TR_MAX_FILTER_LINES); *rc = TR_CFG_NOPARSE; return NULL; } + if (NULL == (filt = talloc_zero(trc, TR_FILTER))) { + tr_debug("tr_cfg_parse_one_filter: Out of memory."); + *rc = TR_CFG_NOMEM; + return NULL; + } - /* Right now, we only accept one type of filter, and we only care - * about one per rp_client. */ - if ((NULL == (jfact = json_object_get(json_array_get(jfls, 0), "action"))) || - (!json_is_string(jfact)) || - (strcmp(json_string_value(jfact), "accept"))) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client filter action.\n"); + if (!strcmp(json_string_value(jftype), "rp_permitted")) { + filt->type = TR_FILTER_TYPE_RP_PERMITTED; + } + else { + tr_debug("tr_cfg_parse_one_filter: Error parsing filter type, unknown type '%s'.", json_string_value(jftype)); *rc = TR_CFG_NOPARSE; + tr_filter_free(filt); return NULL; - } + } - if ((NULL == (jfspecs = json_object_get(json_array_get(jfls, 0), "filter_specs"))) || - (!json_is_array(jfspecs)) || - (0 == json_array_size(jfspecs))) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client filter specs.\n"); + /* For each filter line... */ + for (i = 0; i < json_array_size(jfls); i++) { + + if ((NULL == (jfaction = json_object_get(json_array_get(jfls, i), "action"))) || + (!json_is_string(jfaction))) { + tr_debug("tr_cfg_parse_one_filter: Error parsing filter action."); *rc = TR_CFG_NOPARSE; + tr_filter_free(filt); return NULL; - } + } + + if ((NULL == (jfspecs = json_object_get(json_array_get(jfls, i), "filter_specs"))) || + (!json_is_array(jfspecs)) || + (0 == json_array_size(jfspecs))) { + tr_debug("tr_cfg_parse_one_filter: Error parsing filter specs."); + *rc = TR_CFG_NOPARSE; + tr_filter_free(filt); + return NULL; + } + + if (TR_MAX_FILTER_SPECS < json_array_size(jfspecs)) { + tr_debug("tr_cfg_parse_one_filter: Filter has too many filter_specs, maximimum of %d.", TR_MAX_FILTER_SPECS); + *rc = TR_CFG_NOPARSE; + tr_filter_free(filt); + return NULL; + } + + if (NULL == (filt->lines[i] = talloc_zero(trc, TR_FLINE))) { + tr_debug("tr_cfg_parse_one_filter: Out of memory (fline)."); + *rc = TR_CFG_NOMEM; + tr_filter_free(filt); + return NULL; + } - if ((NULL == (jffield = json_object_get(json_array_get(jfspecs, 0), "field"))) || - (!json_is_string(jffield)) || - (strcmp(json_string_value(jffield), "rp_realm")) || - (NULL == (jfrealm = json_object_get(json_array_get(jfspecs, 0), "match"))) || - (!json_is_string(jfrealm))) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client filter field and match.\n"); + if (!strcmp(json_string_value(jfaction), "accept")) { + filt->lines[i]->action = TR_FILTER_ACTION_ACCEPT; + } + else if (!strcmp(json_string_value(jfaction), "reject")) { + filt->lines[i]->action = TR_FILTER_ACTION_REJECT; + } + else { + tr_debug("tr_cfg_parse_one_filter: Error parsing filter action, unknown action' %s'.", json_string_value(jfaction)); *rc = TR_CFG_NOPARSE; + tr_filter_free(filt); return NULL; + } + + if ((NULL != (jrc = json_object_get(json_array_get(jfls, i), "realm_constraints"))) && + (json_is_array(jrc)) && + (0 != json_array_size(jrc)) && + (TR_MAX_CONST_MATCHES >= json_array_size(jrc))) { + + if (NULL == (filt->lines[i]->realm_cons = tr_cfg_parse_one_constraint(trc, "realm", jrc, rc))) { + tr_debug("tr_cfg_parse_one_filter: Error parsing realm constraint"); + tr_filter_free(filt); + return NULL; + } + } + + if ((NULL != (jdc = json_object_get(json_array_get(jfls, i), "domain_constraints"))) && + (json_is_array(jdc)) && + (0 != json_array_size(jdc)) && + (TR_MAX_CONST_MATCHES >= json_array_size(jdc))) { + + if (NULL == (filt->lines[i]->domain_cons = tr_cfg_parse_one_constraint(trc, "domain", jdc, rc))) { + tr_debug("tr_cfg_parse_one_filter: Error parsing domain constraint"); + tr_filter_free(filt); + return NULL; + } + } + + /*For each filter spec within the filter line... */ + for (j = 0; j lines[i]->specs[j] = talloc_zero(trc, TR_FSPEC))) { + tr_debug("tr_cfg_parse_one_filter: Out of memory."); + *rc = TR_CFG_NOMEM; + tr_filter_free(filt); + return NULL; + } + + if ((NULL == (filt->lines[i]->specs[j]->field = tr_new_name((char *)json_string_value(jffield)))) || + (NULL == (filt->lines[i]->specs[j]->match = tr_new_name((char *)json_string_value(jfmatch))))) { + tr_debug("tr_cfg_parse_one_filter: Out of memory."); + *rc = TR_CFG_NOMEM; + tr_filter_free(filt); + return NULL; + } + } + } + + return filt; +} + +static TR_RP_CLIENT *tr_cfg_parse_one_rp_client (TR_CFG *trc, json_t *jrp, TR_CFG_RC *rc) +{ + TR_RP_CLIENT *rp = NULL; + json_t *jgns = NULL; + json_t *jfilt = NULL; + json_t *jftype = NULL; + int i = 0; + + if ((!trc) || (!jrp) || (!rc)) { + tr_debug("tr_cfg_parse_one_rp_realm: Bad parameters."); + if (rc) + *rc = TR_CFG_BAD_PARAMS; + return NULL; } - rp->rp_match = tr_new_name((char *)json_string_value(jfrealm)); + if ((NULL == (jgns = json_object_get(jrp, "gss_names"))) || + (!json_is_array(jgns))) { + tr_debug("tr_cfg_parse_one_rp_client: Error parsing RP client configuration, no GSS names."); + *rc = TR_CFG_NOPARSE; + return NULL; + } - if (0 == json_array_size(jgns)) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: RP Client has no GSS Names.\n"); + /* TBD -- Support more than one filter per RP client? */ + if (NULL == (jfilt = json_object_get(jrp, "filter"))) { + tr_debug("tr_cfg_parse_one_rp_client: Error parsing RP client configuration, no filter."); + *rc = TR_CFG_NOPARSE; + return NULL; + } + + /* We only support rp_permitted filters for RP clients */ + if ((NULL == (jftype = json_object_get(jfilt, "type"))) || + (!json_is_string(jftype)) || + (strcmp(json_string_value(jftype), "rp_permitted"))) { + tr_debug("tr_cfg_parse_one_rp_client: Error parsing RP client filter type."); *rc = TR_CFG_NOPARSE; return NULL; } if (TR_MAX_GSS_NAMES < json_array_size(jgns)) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: RP Client has too many GSS Names.\n"); + tr_debug("tr_cfg_parse_one_rp_client: RP Client has too many GSS Names."); *rc = TR_CFG_NOPARSE; return NULL; } + if (NULL == (rp = talloc_zero(trc, TR_RP_CLIENT))) { + tr_debug("tr_cfg_parse_one_rp_realm: Out of memory."); + *rc = TR_CFG_NOMEM; + return NULL; + } + + /* TBD -- support more than one filter entry per RP Client? */ + if (NULL == (rp->filter = tr_cfg_parse_one_filter(trc, jfilt, rc))) { + tr_debug("tr_cfg_parse_one_rp_client: Error parsing filter."); + *rc = TR_CFG_NOPARSE; + return NULL; + } + for (i = 0; i < json_array_size(jgns); i++) { if (NULL == (rp->gss_names[i] = tr_new_name ((char *)json_string_value(json_array_get(jgns, i))))) { - fprintf(stderr, "tr_cfg_parse_one_rp_client: No memory for GSS Name.\n"); + tr_debug("tr_cfg_parse_one_rp_client: No memory for GSS Name."); *rc = TR_CFG_NOMEM; return NULL; } @@ -197,211 +531,284 @@ static TR_RP_CLIENT *tr_cfg_parse_one_rp_client (TR_INSTANCE *tr, json_t *jrp, T return rp; } -static TR_CFG_RC tr_cfg_parse_rp_clients (TR_INSTANCE *tr, json_t *jcfg) { +static TR_CFG_RC tr_cfg_parse_rp_clients (TR_CFG *trc, json_t *jcfg) { json_t *jrps = NULL; TR_RP_CLIENT *rp = NULL; TR_CFG_RC rc = TR_CFG_SUCCESS; int i = 0; - if ((!tr) || (!tr->new_cfg) || (!jcfg)) + if ((!trc) || (!jcfg)) return TR_CFG_BAD_PARAMS; - if ((NULL == (jrps = json_object_get(jcfg, "rp_clients"))) || - (!json_is_array(jrps))) { - return TR_CFG_NOPARSE; - } + if (NULL != (jrps = json_object_get(jcfg, "rp_clients"))) { - for (i = 0; i < json_array_size(jrps); i++) { - if (NULL == (rp = tr_cfg_parse_one_rp_client(tr, - json_array_get(jrps, i), - &rc))) { - return rc; + if (!json_is_array(jrps)) { + return TR_CFG_NOPARSE; + } + + for (i = 0; i < json_array_size(jrps); i++) { + if (NULL == (rp = tr_cfg_parse_one_rp_client(trc, + json_array_get(jrps, i), + &rc))) { + return rc; + } + tr_debug("tr_cfg_parse_rp_clients: RP client configured -- first gss: %s", rp->gss_names[0]->buf); + rp->next = trc->rp_clients; + trc->rp_clients = rp; } - fprintf(stderr, "tr_cfg_parse_rp_clients: RP client configured -- first gss: %s, rp_realm: %s\n", rp->gss_names[0]->buf, rp->rp_match->buf); - rp->next = tr->new_cfg->rp_clients; - tr->new_cfg->rp_clients = rp; } + tr_debug("tr_cfg_parse_rp_clients: Finished (rc=%d)", rc); return rc; } -static TR_AAA_SERVER *tr_cfg_parse_one_aaa_server (TR_INSTANCE *tr, json_t *jaddr, TR_CFG_RC *rc) { +static TR_AAA_SERVER *tr_cfg_parse_one_aaa_server (TALLOC_CTX *mem_ctx, TR_CFG *trc, json_t *jaddr, TR_CFG_RC *rc) { TR_AAA_SERVER *aaa = NULL; + TR_NAME *name=NULL; - if ((!tr) || (!tr->new_cfg) || (!jaddr) || (!json_is_string(jaddr))) { - fprintf(stderr, "tr_cfg_parse_one_aaa_server: Bad parameters.\n"); + if ((!trc) || (!jaddr) || (!json_is_string(jaddr))) { + tr_debug("tr_cfg_parse_one_aaa_server: Bad parameters."); *rc = TR_CFG_BAD_PARAMS; return NULL; } - if (NULL == (aaa = malloc(sizeof(TR_AAA_SERVER)))) { - fprintf(stderr, "tr_config_parse_one_aaa_server: Out of memory.\n"); + name=tr_new_name((char *)(json_string_value(jaddr))); + if (name==NULL) { + tr_debug("tr_cfg_parse_one_aaa_server: Out of memory allocating hostname."); *rc = TR_CFG_NOMEM; return NULL; } - memset(aaa, 0, sizeof(TR_AAA_SERVER)); - - /* TBD -- Handle IPv6 addresses */ - inet_aton(json_string_value(jaddr), &(aaa->aaa_server_addr)); + aaa=tr_aaa_server_new(mem_ctx, name); + if (aaa==NULL) { + tr_free_name(name); + tr_debug("tr_cfg_parse_one_aaa_server: Out of memory allocating AAA server."); + *rc = TR_CFG_NOMEM; + return NULL; + } return aaa; } - -static TR_AAA_SERVER *tr_cfg_parse_aaa_servers (TR_INSTANCE *tr, json_t *jaaas, TR_CFG_RC *rc) +static TR_AAA_SERVER *tr_cfg_parse_aaa_servers (TALLOC_CTX *mem_ctx, TR_CFG *trc, json_t *jaaas, TR_CFG_RC *rc) { + TALLOC_CTX *tmp_ctx=NULL; TR_AAA_SERVER *aaa = NULL; TR_AAA_SERVER *temp_aaa = NULL; int i = 0; for (i = 0; i < json_array_size(jaaas); i++) { - if (NULL == (temp_aaa = tr_cfg_parse_one_aaa_server(tr, json_array_get(jaaas, i), rc))) { + if (NULL == (temp_aaa = tr_cfg_parse_one_aaa_server(mem_ctx, trc, json_array_get(jaaas, i), rc))) { + talloc_free(tmp_ctx); return NULL; } /* TBD -- IPv6 addresses */ - // fprintf(stderr, "tr_cfg_parse_aaa_servers: Configuring AAA Server: ip_addr = %s.\n", inet_ntoa(temp_aaa->aaa_server_addr)); + // tr_debug("tr_cfg_parse_aaa_servers: Configuring AAA Server: ip_addr = %s.", inet_ntoa(temp_aaa->aaa_server_addr)); temp_aaa->next = aaa; aaa = temp_aaa; } + tr_debug("tr_cfg_parse_aaa_servers: Finished (rc=%d)", *rc); + + for (temp_aaa=aaa; temp_aaa!=NULL; temp_aaa=temp_aaa->next) + talloc_steal(mem_ctx, temp_aaa); + talloc_free(tmp_ctx); return aaa; } -static TR_APC *tr_cfg_parse_apcs (TR_INSTANCE *tr, json_t *japcs, TR_CFG_RC *rc) +static TR_APC *tr_cfg_parse_apcs (TALLOC_CTX *mem_ctx, TR_CFG *trc, json_t *japcs, TR_CFG_RC *rc) { TR_APC *apc; *rc = TR_CFG_SUCCESS; /* presume success */ - if ((!japcs) || (!rc)) { - fprintf(stderr, "tr_cfg_parse_apcs: Bad parameters.\n"); + if ((!trc) || (!japcs) || (!rc)) { + tr_debug("tr_cfg_parse_apcs: Bad parameters."); if (rc) *rc = TR_CFG_BAD_PARAMS; return NULL; } - if (NULL == (apc = malloc(sizeof(TR_APC)))) { - fprintf (stderr, "tr_cfg_parse_apcs: Out of memory.\n"); + apc=tr_apc_new(mem_ctx); + if (apc==NULL) { + tr_debug("tr_cfg_parse_apcs: Out of memory."); *rc = TR_CFG_NOMEM; return NULL; } - memset(apc, 0, sizeof(TR_APC)); - /* TBD, deal with more than one APC. In the meantime, though... */ /* Only parse the first APC, because we only know how to deal with one, anyway. */ - if (0 == json_array_size(japcs)) + if (0 == json_array_size(japcs)) { + talloc_free(apc); return NULL; + } if (NULL == (apc->id = tr_new_name((char *)json_string_value(json_array_get(japcs, 0))))) { - fprintf(stderr, "tr_cfg_parse_apcs: No memory for APC name.\n"); + tr_debug("tr_cfg_parse_apcs: No memory for APC name."); *rc = TR_CFG_NOMEM; + talloc_free(apc); return NULL; } + tr_debug("tr_cfg_parse_apcs: Finished (rc=%d)", *rc); return apc; } -static TR_IDP_REALM *tr_cfg_parse_one_idp_realm (TR_INSTANCE *tr, json_t *jidp, TR_CFG_RC *rc) { +static TR_IDP_REALM *tr_cfg_parse_one_idp_realm (TR_CFG *trc, json_t *jidp, TR_CFG_RC *rc) { + TALLOC_CTX *tmp_ctx=talloc_new(NULL); TR_IDP_REALM *idp = NULL; + json_t *jremote = NULL; json_t *jrid = NULL; json_t *jscfg = NULL; json_t *jsrvrs = NULL; json_t *japcs = NULL; - if ((!jidp) || (!rc)) { - fprintf(stderr, "tr_cfg_parse_one_idp_realm: Bad parameters.\n"); + if ((!trc) || (!jidp) || (!rc)) { + tr_debug("tr_cfg_parse_one_idp_realm: Bad parameters."); if (rc) *rc = TR_CFG_BAD_PARAMS; return NULL; } - if (NULL == (idp = malloc(sizeof(TR_IDP_REALM)))) { - fprintf(stderr, "tr_config_parse_one_idp_realm: Out of memory.\n"); + if (NULL == (idp = tr_idp_realm_new(tmp_ctx))) { + tr_debug("tr_cfg_parse_one_idp_realm: Out of memory."); *rc = TR_CFG_NOMEM; + talloc_free(tmp_ctx); return NULL; } - memset(idp, 0, sizeof(TR_IDP_REALM)); - - if ((NULL == (jrid = json_object_get(jidp, "realm_id"))) || - (!json_is_string(jrid)) || - (NULL == (jscfg = json_object_get(jidp, "shared_config"))) || - (!json_is_string(jscfg)) || - (NULL == (jsrvrs = json_object_get(jidp, "aaa_servers"))) || - (!json_is_array(jsrvrs)) || - (NULL == (japcs = json_object_get(jidp, "apcs"))) || - (!json_is_array(japcs))) { - fprintf(stderr, "tr_cfg_parse_one_idp_realm: Error parsing IDP realm configuration.\n"); - free(idp); - *rc = TR_CFG_NOPARSE; + /* Assume local route unless specified as remote. */ + jremote = json_object_get(jidp, "remote"); + if ((jremote!=NULL) && (!json_is_number(jremote))) { + tr_debug("tr_cfg_parse_one_idp_realm: Error parsing IDP realm configuration (remote is not a number)."); + *rc=TR_CFG_NOPARSE; + talloc_free(tmp_ctx); return NULL; } - if (0 == strcmp(json_string_value(jscfg), "no")) { - idp->shared_config = 0; - } else { - idp->shared_config = 1; + if ((NULL == (jrid = json_object_get(jidp, "realm_id"))) || + (!json_is_string(jrid))) { + tr_debug("tr_cfg_parse_one_idp_realm: Error parsing IDP realm configuration (realm_id missing or invalid)."); + *rc = TR_CFG_NOPARSE; + talloc_free(tmp_ctx); + return NULL; } + + if ((jremote==NULL) || (0==json_integer_value(jremote))) { + idp->origin=TR_REALM_LOCAL; + + if ((NULL == (jscfg = json_object_get(jidp, "shared_config"))) || + (!json_is_string(jscfg)) || + (NULL == (jsrvrs = json_object_get(jidp, "aaa_servers"))) || + (!json_is_array(jsrvrs))) { + tr_debug("tr_cfg_parse_one_idp_realm: Error parsing IDP realm configuration."); + *rc = TR_CFG_NOPARSE; + talloc_free(tmp_ctx); + return NULL; + } + + if (0 == strcmp(json_string_value(jscfg), "no")) { + idp->shared_config = 0; + } else { + idp->shared_config = 1; + } + } else + idp->origin=TR_REALM_REMOTE_INCOMPLETE; if (NULL == (idp->realm_id = tr_new_name((char *)json_string_value(jrid)))) { - free(idp); - fprintf(stderr, "tr_cfg_parse_one_idp_realm: No memory for realm id.\n"); + tr_debug("tr_cfg_parse_one_idp_realm: No memory for realm id."); *rc = TR_CFG_NOMEM; + talloc_free(tmp_ctx); return NULL; } - if (NULL == (idp->aaa_servers = tr_cfg_parse_aaa_servers(tr, jsrvrs, rc))) { - fprintf(stderr, "tr_cfg_parse_one_idp_realm: Can't parse AAA servers for realm %s.\n", idp->realm_id->buf); - tr_free_name(idp->realm_id); - free(idp); - return NULL; - } - if (NULL == (idp->apcs = tr_cfg_parse_apcs(tr, japcs, rc))) { - fprintf(stderr, "tr_cfg_parse_one_idp_realm: Can't parse APCs for realm %s .\n", idp->realm_id->buf); - tr_free_name(idp->realm_id); - /* TBD -- free aaa_servers */; - free(idp); + if ((NULL != (japcs = json_object_get(jidp, "apcs"))) && + (json_is_array(japcs))) { + if (NULL == (idp->apcs = tr_cfg_parse_apcs(idp, trc, japcs, rc))) { + tr_debug("tr_cfg_parse_one_idp_realm: Can't parse APCs for realm %s .", idp->realm_id->buf); + talloc_free(tmp_ctx); + return NULL; + } + } + + if ((idp->origin==TR_REALM_LOCAL) && + (NULL == (idp->aaa_servers = tr_cfg_parse_aaa_servers(idp, trc, jsrvrs, rc)))) { + tr_debug("tr_cfg_parse_one_idp_realm: Can't parse AAA servers for realm %s.", idp->realm_id->buf); + talloc_free(tmp_ctx); return NULL; } -return idp; + talloc_steal(trc, idp); + talloc_free(tmp_ctx); + return idp; } -static TR_CFG_RC tr_cfg_parse_idp_realms (TR_INSTANCE *tr, json_t *jcfg) +static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg) { - json_t *jidps = NULL; + json_t *jdss = NULL; TR_CFG_RC rc = TR_CFG_SUCCESS; - TR_IDP_REALM *idp = NULL; + TR_AAA_SERVER *ds = NULL; int i = 0; - if ((!tr) || (!tr->new_cfg) || (!jcfg)) + if ((!trc) || (!jcfg)) return TR_CFG_BAD_PARAMS; - if ((NULL == (jidps = json_object_get(jcfg, "idp_realms"))) || - (!json_is_array(jidps))) { - return TR_CFG_NOPARSE; - } + /* If there are default servers, store them */ + if ((NULL != (jdss = json_object_get(jcfg, "default_servers"))) && + (json_is_array(jdss)) && + (0 < json_array_size(jdss))) { - for (i = 0; i < json_array_size(jidps); i++) { - if (NULL == (idp = tr_cfg_parse_one_idp_realm(tr, - json_array_get(jidps, i), + for (i = 0; i < json_array_size(jdss); i++) { + if (NULL == (ds = tr_cfg_parse_one_aaa_server(trc, trc, + json_array_get(jdss, i), &rc))) { - return rc; + return rc; + } + tr_debug("tr_cfg_parse_default_servers: Default server configured: %s", ds->hostname->buf); + ds->next = trc->default_servers; + trc->default_servers = ds; + } + } + + tr_debug("tr_cfg_parse_default_servers: Finished (rc=%d)", rc); + return rc; +} + +static TR_CFG_RC tr_cfg_parse_idp_realms (TR_CFG *trc, json_t *jcfg) +{ + json_t *jidps = NULL; + TR_CFG_RC rc = TR_CFG_SUCCESS; + TR_IDP_REALM *idp = NULL; + int i = 0; + + if ((!trc) || (!jcfg)) + return TR_CFG_BAD_PARAMS; + + /* If there are any IDP Realms, parse them */ + if ((NULL != (jidps = json_object_get(jcfg, "idp_realms"))) && + (json_is_array(jidps))) { + for (i = 0; i < json_array_size(jidps); i++) { + if (NULL == (idp = tr_cfg_parse_one_idp_realm(trc, + json_array_get(jidps, i), + &rc))) { + return rc; + } + tr_debug("tr_cfg_parse_idp_realms: IDP realm configured: %s.", idp->realm_id->buf); + idp->next = trc->idp_realms; + trc->idp_realms = idp; } - fprintf(stderr, "tr_cfg_parse_idp_realms: IDP realm configured: %s.\n", idp->realm_id->buf); - idp->next = tr->new_cfg->idp_realms; - tr->new_cfg->idp_realms = idp; } + + tr_debug("tr_cfg_parse_idp_realms: Finished (rc=%d)", rc); return rc; } -static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_INSTANCE *tr, json_t *jidps, TR_CFG_RC *rc) +static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_CFG *trc, json_t *jidps, TR_CFG_RC *rc) { TR_IDP_REALM *idp = NULL; + TR_IDP_REALM *found_idp = NULL; TR_IDP_REALM *temp_idp = NULL; int i = 0; - if ((!tr) || + if ((!trc) || (!jidps) || (!json_is_array(jidps))) { if (rc) @@ -410,14 +817,25 @@ static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_INSTANCE *tr, json_t *jidps, TR_ } for (i = 0; i < json_array_size(jidps); i++) { - if (NULL == (temp_idp = (tr_cfg_find_idp(tr->new_cfg, + if (NULL == (temp_idp = talloc(trc, TR_IDP_REALM))) { + tr_debug("tr_cfg_parse_comm_idps: Can't allocate memory for IdP Realm."); + if (rc) + *rc = TR_CFG_NOMEM; + return NULL; + } + memset (temp_idp, 0, sizeof(TR_IDP_REALM)); + + if (NULL == (found_idp = (tr_cfg_find_idp(trc, tr_new_name((char *)json_string_value(json_array_get(jidps, i))), rc)))) { - fprintf(stderr, "tr_cfg_parse_comm_idps: Unknown IDP %s.\n", + tr_debug("tr_cfg_parse_comm_idps: Unknown IDP %s.", (char *)json_string_value(json_array_get(jidps, i))); return NULL; } + // We *MUST* do a dereferenced copy here or the second community will corrupt the linked list we create here. + *temp_idp = *found_idp; + temp_idp->comm_next = idp; idp = temp_idp; } @@ -425,13 +843,13 @@ static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_INSTANCE *tr, json_t *jidps, TR_ return idp; } -static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_INSTANCE *tr, json_t *jrps, TR_CFG_RC *rc) +static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_CFG *trc, json_t *jrps, TR_CFG_RC *rc) { TR_RP_REALM *rp = NULL; TR_RP_REALM *temp_rp = NULL; int i = 0; - if ((!tr) || + if ((!trc) || (!jrps) || (!json_is_array(jrps))) { if (rc) @@ -440,16 +858,15 @@ static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_INSTANCE *tr, json_t *jrps, TR_CFG } for (i = (json_array_size(jrps)-1); i >= 0; i--) { - if (NULL == (temp_rp = malloc(sizeof(TR_RP_REALM)))) { - fprintf(stderr, "tr_cfg_parse_comm_rps: Can't allocate memory for RP Realm.\n"); + if (NULL == (temp_rp = talloc_zero(trc, TR_RP_REALM))) { + tr_debug("tr_cfg_parse_comm_rps: Can't allocate memory for RP Realm."); if (rc) *rc = TR_CFG_NOMEM; return NULL; } - memset (temp_rp, 0, sizeof(TR_RP_REALM)); if (NULL == (temp_rp->realm_name = tr_new_name((char *)json_string_value(json_array_get(jrps, i))))) { - fprintf(stderr, "tr_cfg_parse_comm_rps: No memory for RP Realm Name.\n"); + tr_debug("tr_cfg_parse_comm_rps: No memory for RP Realm Name."); if (rc) *rc = TR_CFG_NOMEM; return NULL; @@ -462,7 +879,7 @@ static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_INSTANCE *tr, json_t *jrps, TR_CFG return rp; } -static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC *rc) { +static TR_COMM *tr_cfg_parse_one_comm (TR_CFG *trc, json_t *jcomm, TR_CFG_RC *rc) { TR_COMM *comm = NULL; json_t *jid = NULL; json_t *jtype = NULL; @@ -470,20 +887,19 @@ static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC json_t *jidps = NULL; json_t *jrps = NULL; - if ((!jcomm) || (!rc)) { - fprintf(stderr, "tr_cfg_parse_one_comm: Bad parameters.\n"); + if ((!trc) || (!jcomm) || (!rc)) { + tr_debug("tr_cfg_parse_one_comm: Bad parameters."); if (rc) *rc = TR_CFG_BAD_PARAMS; return NULL; } - if (NULL == (comm = malloc(sizeof(TR_COMM)))) { - fprintf(stderr, "tr_config_parse_one_comm: Out of memory.\n"); + if (NULL == (comm = talloc_zero(trc, TR_COMM))) { + tr_crit("tr_cfg_parse_one_comm: Out of memory."); *rc = TR_CFG_NOMEM; return NULL; } - memset(comm, 0, sizeof(TR_COMM)); if ((NULL == (jid = json_object_get(jcomm, "community_id"))) || (!json_is_string(jid)) || @@ -495,15 +911,13 @@ static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC (!json_is_array(jidps)) || (NULL == (jrps = json_object_get(jcomm, "rp_realms"))) || (!json_is_array(jrps))) { - fprintf(stderr, "tr_cfg_parse_one_comm: Error parsing Communities configuration.\n"); - free(comm); + tr_debug("tr_cfg_parse_one_comm: Error parsing Communities configuration."); *rc = TR_CFG_NOPARSE; return NULL; } if (NULL == (comm->id = tr_new_name((char *)json_string_value(jid)))) { - free(comm); - fprintf(stderr, "tr_cfg_parse_one_comm: No memory for community id.\n"); + tr_debug("tr_cfg_parse_one_comm: No memory for community id."); *rc = TR_CFG_NOMEM; return NULL; } @@ -512,96 +926,194 @@ static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC comm->type = TR_COMM_APC; } else if (0 == strcmp(json_string_value(jtype), "coi")) { comm->type = TR_COMM_COI; - if (NULL == (comm->apcs = tr_cfg_parse_apcs(tr, japcs, rc))) { - fprintf(stderr, "tr_cfg_parse_one_comm: Can't parse APCs for COI %s.\n", comm->id->buf); + if (NULL == (comm->apcs = tr_cfg_parse_apcs(trc, trc, japcs, rc))) { + tr_debug("tr_cfg_parse_one_comm: Can't parse APCs for COI %s.", comm->id->buf); tr_free_name(comm->id); - free(comm); return NULL; } } else { - fprintf(stderr, "tr_cfg_parse_one_comm: Invalid community type, comm = %s, type = %s\n", comm->id->buf, json_string_value(jtype)); + tr_debug("tr_cfg_parse_one_comm: Invalid community type, comm = %s, type = %s", comm->id->buf, json_string_value(jtype)); tr_free_name(comm->id); - free(comm); *rc = TR_CFG_NOPARSE; return NULL; } - comm->idp_realms = tr_cfg_parse_comm_idps(tr, jidps, rc); + comm->idp_realms = tr_cfg_parse_comm_idps(trc, jidps, rc); if (TR_CFG_SUCCESS != *rc) { - fprintf(stderr, "tr_cfg_parse_one_comm: Can't parse IDP realms for comm %s.\n", comm->id->buf); + tr_debug("tr_cfg_parse_one_comm: Can't parse IDP realms for comm %s.", comm->id->buf); tr_free_name(comm->id); - free(comm); return NULL; } - comm->rp_realms = tr_cfg_parse_comm_rps(tr, jrps, rc); + comm->rp_realms = tr_cfg_parse_comm_rps(trc, jrps, rc); if (TR_CFG_SUCCESS != *rc) { - fprintf(stderr, "tr_cfg_parse_comm: Can't parse RP realms for comm %s .\n", comm->id->buf); + tr_debug("tr_cfg_parse_comm: Can't parse RP realms for comm %s .", comm->id->buf); tr_free_name(comm->id); - /* TBD -- free idps? */; - free(comm); return NULL; } + if (TR_COMM_APC == comm->type) { + json_t *jexpire = json_object_get(jcomm, "expiration_interval"); + comm->expiration_interval = 43200; /*30 days*/ + if (jexpire) { + if (!json_is_integer(jexpire)) { + fprintf(stderr, "tr_parse_comm: expirae_interval is not an integer\n"); + return NULL; + } + comm->expiration_interval = json_integer_value(jexpire); + if (comm->expiration_interval <= 10) + comm->expiration_interval = 11; /* Freeradius waits 10 minutes between successful TR queries*/ + if (comm->expiration_interval > 129600) /* 90 days*/ + comm->expiration_interval = 129600; + } + } + return comm; } -static TR_CFG_RC tr_cfg_parse_comms (TR_INSTANCE *tr, json_t *jcfg) +static TR_CFG_RC tr_cfg_parse_comms (TR_CFG *trc, json_t *jcfg) { json_t *jcomms = NULL; TR_CFG_RC rc = TR_CFG_SUCCESS; TR_COMM *comm = NULL; int i = 0; - if ((!tr) || (!tr->new_cfg) || (!jcfg)) { - fprintf(stderr, "tr_config_parse_comms: Bad Parameters.\n"); + if ((!trc) || (!jcfg)) { + tr_debug("tr_cfg_parse_comms: Bad Parameters."); return TR_CFG_BAD_PARAMS; } - if (NULL == (comm = malloc(sizeof(TR_COMM)))) { - fprintf(stderr, "tr_cfg_parse_comms: Out of Memory\n"); - return TR_CFG_NOMEM; + if (NULL != (jcomms = json_object_get(jcfg, "communities"))) { + if (!json_is_array(jcomms)) { + return TR_CFG_NOPARSE; + } + + for (i = 0; i < json_array_size(jcomms); i++) { + if (NULL == (comm = tr_cfg_parse_one_comm(trc, + json_array_get(jcomms, i), + &rc))) { + return rc; + } + tr_debug("tr_cfg_parse_comms: Community configured: %s.", comm->id->buf); + comm->next = trc->comms; + trc->comms = comm; + } } - memset (comm, 0, sizeof(TR_COMM)); + tr_debug("tr_cfg_parse_comms: Finished (rc=%d)", rc); + return rc; +} - if ((NULL == (jcomms = json_object_get(jcfg, "communities"))) || - (!json_is_array(jcomms))) { - return TR_CFG_NOPARSE; +TR_CFG_RC tr_cfg_validate (TR_CFG *trc) { + TR_CFG_RC rc = TR_CFG_SUCCESS; + + if (!trc) + return TR_CFG_BAD_PARAMS; + + if ((NULL == trc->internal)|| + (NULL == trc->internal->hostname)) { + tr_debug("tr_cfg_validate: Error: No internal configuration, or no hostname."); + rc = TR_CFG_ERROR; } - for (i = 0; i < json_array_size(jcomms); i++) { - if (NULL == (comm = tr_cfg_parse_one_comm(tr, - json_array_get(jcomms, i), - &rc))) { - return rc; - } - fprintf(stderr, "tr_cfg_parse_comms: Community configured: %s.\n", comm->id->buf); - comm->next = tr->new_cfg->comms; - tr->new_cfg->comms = comm; + if (NULL == trc->rp_clients) { + tr_debug("tr_cfg_validate: Error: No RP Clients configured"); + rc = TR_CFG_ERROR; + } + + if (NULL == trc->comms) { + tr_debug("tr_cfg_validate: Error: No Communities configured"); + rc = TR_CFG_ERROR; } + + if ((NULL == trc->default_servers) && (NULL == trc->idp_realms)) { + tr_debug("tr_cfg_validate: Error: No default servers or IDPs configured."); + rc = TR_CFG_ERROR; + } + return rc; } -TR_CFG_RC tr_parse_config (TR_INSTANCE *tr, json_t *jcfg) { +/* Join two paths and return a pointer to the result. This should be freed + * via talloc_free. Returns NULL on failure. */ +static char *join_paths(TALLOC_CTX *mem_ctx, const char *p1, const char *p2) { + return talloc_asprintf(mem_ctx, "%s/%s", p1, p2); /* returns NULL on a failure */ +} - /* If there is a partial/abandoned config lying around, free it */ - if (tr->new_cfg) { - tr_cfg_free(tr->new_cfg); +/* Reads configuration files in config_dir ("" or "./" will use the current directory). */ +TR_CFG_RC tr_parse_config (TR_CFG_MGR *cfg_mgr, const char *config_dir, int n, struct dirent **cfg_files) +{ + TALLOC_CTX *tmp_ctx=talloc_new(NULL); + json_t *jcfg; + json_t *jser; + json_error_t rc; + char *file_with_path; + int ii; + TR_CFG_RC cfg_rc=TR_CFG_ERROR; + + if ((!cfg_mgr) || (!cfg_files) || (n<=0)) { + cfg_rc=TR_CFG_BAD_PARAMS; + goto cleanup; } - - if (NULL == (tr->new_cfg = malloc(sizeof(TR_CFG)))) - return TR_CFG_NOMEM; - memset(tr->new_cfg, 0, sizeof(TR_CFG)); + if (cfg_mgr->new != NULL) + tr_cfg_free(cfg_mgr->new); + cfg_mgr->new=tr_cfg_new(tmp_ctx); /* belongs to the temporary context for now */ + if (cfg_mgr->new == NULL) { + cfg_rc=TR_CFG_NOMEM; + goto cleanup; + } + + /* Parse configuration information from each config file */ + for (ii=0; iid_name); /* must free result with talloc_free */ + if(file_with_path == NULL) { + tr_crit("tr_parse_config: error joining path."); + cfg_rc=TR_CFG_NOMEM; + goto cleanup; + } + tr_debug("tr_parse_config: Parsing %s.", cfg_files[ii]->d_name); /* print the filename without the path */ + if (NULL == (jcfg = json_load_file(file_with_path, + JSON_DISABLE_EOF_CHECK, &rc))) { + tr_debug("tr_parse_config: Error parsing config file %s.", + cfg_files[ii]->d_name); + cfg_rc=TR_CFG_NOPARSE; + goto cleanup; + } + talloc_free(file_with_path); /* done with filename */ + + // Look for serial number and log it if it exists + if (NULL != (jser = json_object_get(jcfg, "serial_number"))) { + if (json_is_number(jser)) { + tr_notice("tr_read_config: Attempting to load revision %" JSON_INTEGER_FORMAT " of '%s'.", + json_integer_value(jser), + cfg_files[n]->d_name); + } + } + + if ((TR_CFG_SUCCESS != tr_cfg_parse_internal(cfg_mgr->new, jcfg)) || + (TR_CFG_SUCCESS != tr_cfg_parse_rp_clients(cfg_mgr->new, jcfg)) || + (TR_CFG_SUCCESS != tr_cfg_parse_idp_realms(cfg_mgr->new, jcfg)) || + (TR_CFG_SUCCESS != tr_cfg_parse_default_servers(cfg_mgr->new, jcfg)) || + (TR_CFG_SUCCESS != tr_cfg_parse_comms(cfg_mgr->new, jcfg))) { + cfg_rc=TR_CFG_ERROR; + goto cleanup; + } + } - if ((TR_CFG_SUCCESS != tr_cfg_parse_internal(tr, jcfg)) || - (TR_CFG_SUCCESS != tr_cfg_parse_rp_clients(tr, jcfg)) || - (TR_CFG_SUCCESS != tr_cfg_parse_idp_realms(tr, jcfg)) || - (TR_CFG_SUCCESS != tr_cfg_parse_comms(tr, jcfg))) { - tr_cfg_free(tr->new_cfg); - return TR_CFG_ERROR; + /* make sure we got a complete, consistent configuration */ + if (TR_CFG_SUCCESS != tr_cfg_validate(cfg_mgr->new)) { + tr_err("tr_parse_config: Error: INVALID CONFIGURATION"); + cfg_rc=TR_CFG_ERROR; + goto cleanup; } - return TR_CFG_SUCCESS; + + /* success! */ + talloc_steal(cfg_mgr, cfg_mgr->new); /* hand this over to the cfg_mgr context */ + cfg_rc=TR_CFG_SUCCESS; + +cleanup: + talloc_free(tmp_ctx); + return cfg_rc; } TR_IDP_REALM *tr_cfg_find_idp (TR_CFG *tr_cfg, TR_NAME *idp_id, TR_CFG_RC *rc) @@ -617,7 +1129,7 @@ TR_IDP_REALM *tr_cfg_find_idp (TR_CFG *tr_cfg, TR_NAME *idp_id, TR_CFG_RC *rc) for (cfg_idp = tr_cfg->idp_realms; NULL != cfg_idp; cfg_idp = cfg_idp->next) { if (!tr_name_cmp (idp_id, cfg_idp->realm_id)) { - fprintf(stderr, "tr_cfg_find_idp: Found %s.\n", idp_id->buf); + tr_debug("tr_cfg_find_idp: Found %s.", idp_id->buf); return cfg_idp; } } @@ -639,7 +1151,7 @@ TR_RP_CLIENT *tr_cfg_find_rp (TR_CFG *tr_cfg, TR_NAME *rp_gss, TR_CFG_RC *rc) for (cfg_rp = tr_cfg->rp_clients; NULL != cfg_rp; cfg_rp = cfg_rp->next) { for (i = 0; i < TR_MAX_GSS_NAMES; i++) { if (!tr_name_cmp (rp_gss, cfg_rp->gss_names[i])) { - fprintf(stderr, "tr_cfg_find_rp: Found %s.\n", rp_gss->buf); + tr_debug("tr_cfg_find_rp: Found %s.", rp_gss->buf); return cfg_rp; } } @@ -648,43 +1160,26 @@ TR_RP_CLIENT *tr_cfg_find_rp (TR_CFG *tr_cfg, TR_NAME *rp_gss, TR_CFG_RC *rc) return NULL; } -json_t *tr_read_config (int n, struct dirent **cfg_files) { - json_t *jcfg = NULL; - json_t *temp = NULL; - json_error_t err; - - if (!cfg_files) - return NULL; +static int is_cfg_file(const struct dirent *dent) { + int n; - while (n--) { - fprintf(stderr, "tr_read_config: Parsing %s.\n", cfg_files[n]->d_name); - if (NULL == (temp = json_load_file(cfg_files[n]->d_name, JSON_DISABLE_EOF_CHECK, &err))) { - fprintf (stderr, "tr_read_config: Error parsing config file %s.\n", cfg_files[n]->d_name); - return NULL; - } + /* Only accept filenames ending in ".cfg" and starting with a character + * other than an ASCII '.' */ - /* TBD -- instead of using json_object_update, iterate through files for non-overlap config? */ - if (!jcfg) { - jcfg = temp; - }else { - if (-1 == json_object_update(jcfg, temp)) { - fprintf(stderr, "tr_read_config: Error merging config information.\n"); - return NULL; - } - } + /* filename must be at least 4 characters long to be acceptable */ + n=strlen(dent->d_name); + if (n < 4) { + return 0; } - // fprintf(stderr, "tr_read_config: Merged configuration complete:\n%s\n", json_dumps(jcfg, 0)); - - return jcfg; -} - -static int is_cfg_file(const struct dirent *dent) { - int n; + /* filename must not start with '.' */ + if ('.' == dent->d_name[0]) { + return 0; + } - /* if the last four letters of the filename are .cfg, return true. */ - if ((4 <= (n = strlen(dent->d_name))) && - (0 == strcmp(&(dent->d_name[n-4]), ".cfg"))) { + /* If the above passed and the last four characters of the filename are .cfg, accept. + * (n.b., assumes an earlier test checked that the name is >= 4 chars long.) */ + if (0 == strcmp(&(dent->d_name[n-4]), ".cfg")) { return 1; } @@ -692,26 +1187,36 @@ static int is_cfg_file(const struct dirent *dent) { return 0; } -int tr_find_config_files (struct dirent ***cfg_files) { - int n = 0, i = 0; +/* Find configuration files in a particular directory. Returns the + * number of entries found, 0 if none are found, or <0 for some + * errors. If n>=0, the cfg_files parameter will contain a newly + * allocated array of pointers to struct dirent entries, as returned + * by scandir(). These can be freed with tr_free_config_file_list(). + */ +int tr_find_config_files (const char *config_dir, struct dirent ***cfg_files) { + int n = 0; - n = scandir(".", cfg_files, &is_cfg_file, 0); + n = scandir(config_dir, cfg_files, is_cfg_file, alphasort); if (n < 0) { perror("scandir"); - fprintf(stderr, "tr_find_config: scandir error.\n"); - return 0; - } + tr_debug("tr_find_config: scandir error trying to scan %s.", config_dir); + } - if (n == 0) { - fprintf (stderr, "tr_find_config: No config files found.\n"); - return 0; - } + return n; +} - i = n; - while(i--) { - fprintf(stderr, "tr_find_config: Config file found (%s).\n", (*cfg_files)[i]->d_name); +/* Free memory allocated for configuration file list returned from tr_find_config_files(). + * This can be called regardless of the return value of tr_find_config_values(). */ +void tr_free_config_file_list(int n, struct dirent ***cfg_files) { + int ii; + + /* if n < 0, then scandir did not allocate anything because it failed */ + if((n>=0) && (*cfg_files != NULL)) { + for(ii=0; ii