X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=common%2Ftr_msg.c;h=5754f0cb210ba4a620c85636466bf3954c7df429;hb=39c2dec6054da6fb692b40f6b5ac374795b17092;hp=28e29208f094f0d7881a8d7efeec02af65ac1c48;hpb=1a04603d88385536e5de4034819dd04bb7f673e9;p=trust_router.git diff --git a/common/tr_msg.c b/common/tr_msg.c index 28e2920..5754f0c 100644 --- a/common/tr_msg.c +++ b/common/tr_msg.c @@ -38,6 +38,8 @@ #include #include #include +#include + #include #include @@ -57,22 +59,28 @@ void tr_msg_set_msg_type(TR_MSG *msg, enum msg_type type) TID_REQ *tr_msg_get_req(TR_MSG *msg) { - return msg->tid_req; + if (msg->msg_type == TID_REQUEST) + return (TID_REQ *)msg->msg_rep; + return NULL; } void tr_msg_set_req(TR_MSG *msg, TID_REQ *req) { - msg->tid_req = req; + msg->msg_rep = req; + msg->msg_type = TID_REQUEST; } TID_RESP *tr_msg_get_resp(TR_MSG *msg) { - return msg->tid_resp; + if (msg->msg_type == TID_RESPONSE) + return (TID_RESP *)msg->msg_rep; + return NULL; } void tr_msg_set_resp(TR_MSG *msg, TID_RESP *resp) { - msg->tid_resp = resp; + msg->msg_rep = resp; + msg->msg_type = TID_RESPONSE; } static json_t *tr_msg_encode_dh(DH *dh) @@ -105,7 +113,7 @@ static DH *tr_msg_decode_dh(json_t *jdh) json_t *jpub_key = NULL; if (!(dh = malloc(sizeof(DH)))) { - fprintf (stderr, "tr_msg_decode_dh(): Error allocating DH structure.\n"); + tr_crit("tr_msg_decode_dh(): Error allocating DH structure."); return NULL; } @@ -115,7 +123,7 @@ static DH *tr_msg_decode_dh(json_t *jdh) if ((NULL == (jp = json_object_get(jdh, "dh_p"))) || (NULL == (jg = json_object_get(jdh, "dh_g"))) || (NULL == (jpub_key = json_object_get(jdh, "dh_pub_key")))) { - fprintf (stderr, "tr_msg_decode_dh(): Error parsing dh_info.\n"); + tr_debug("tr_msg_decode_dh(): Error parsing dh_info."); free(dh); return NULL; } @@ -169,7 +177,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq) json_t *jdh = NULL; if (!(treq =tid_req_new())) { - fprintf (stderr, "tr_msg_decode_tidreq(): Error allocating TID_REQ structure.\n"); + tr_crit("tr_msg_decode_tidreq(): Error allocating TID_REQ structure."); return NULL; } @@ -177,7 +185,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq) if ((NULL == (jrp_realm = json_object_get(jreq, "rp_realm"))) || (NULL == (jrealm = json_object_get(jreq, "target_realm"))) || (NULL == (jcomm = json_object_get(jreq, "community")))) { - fprintf (stderr, "tr_msg_decode(): Error parsing required fields.\n"); + tr_debug("tr_msg_decode(): Error parsing required fields."); tid_req_free(treq); return NULL; } @@ -188,7 +196,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq) /* Get DH Info from the request */ if (NULL == (jdh = json_object_get(jreq, "dh_info"))) { - fprintf (stderr, "tr_msg_decode(): Error parsing dh_info.\n"); + tr_debug("tr_msg_decode(): Error parsing dh_info."); tid_req_free(treq); return NULL; } @@ -202,7 +210,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq) treq->cons = (TR_CONSTRAINT_SET *) json_object_get(jreq, "constraints"); if (treq->cons) { if (!tr_constraint_set_validate(treq->cons)) { - tr_debug("Constraint set validation failed\n"); + tr_debug("Constraint set validation failed"); tid_req_free(treq); return NULL; } @@ -216,8 +224,9 @@ static json_t *tr_msg_encode_one_server(TID_SRVR_BLK *srvr) { json_t *jsrvr = NULL; json_t *jstr = NULL; + gchar *time_str = g_time_val_to_iso8601(&srvr->key_expiration); - fprintf(stderr, "Encoding one server.\n"); + tr_debug("Encoding one server."); jsrvr = json_object(); @@ -225,96 +234,89 @@ static json_t *tr_msg_encode_one_server(TID_SRVR_BLK *srvr) jstr = json_string(inet_ntoa(srvr->aaa_server_addr)); json_object_set_new(jsrvr, "server_addr", jstr); + json_object_set_new(jsrvr, + "key_expiration", json_string(time_str)); + g_free(time_str); /* Server DH Block */ jstr = json_string(srvr->key_name->buf); json_object_set_new(jsrvr, "key_name", jstr); json_object_set_new(jsrvr, "server_dh", tr_msg_encode_dh(srvr->aaa_server_dh)); - - // fprintf(stderr,"tr_msg_encode_one_server(): jsrvr contains:\n"); - // fprintf(stderr,"%s\n", json_dumps(jsrvr, 0)); + if (srvr->path) + /* The path is owned by the srvr, so grab an extra ref*/ + json_object_set(jsrvr, "path", srvr->path); return jsrvr; } -static TID_SRVR_BLK *tr_msg_decode_one_server(json_t *jsrvr) +static int tr_msg_decode_one_server(json_t *jsrvr, TID_SRVR_BLK *srvr) { - TID_SRVR_BLK *srvr; json_t *jsrvr_addr = NULL; json_t *jsrvr_kn = NULL; json_t *jsrvr_dh = NULL; if (jsrvr == NULL) - return NULL; + return -1; - if (NULL == (srvr = malloc(sizeof(TID_SRVR_BLK)))) - return NULL; - memset(srvr, 0, sizeof(TID_SRVR_BLK)); if ((NULL == (jsrvr_addr = json_object_get(jsrvr, "server_addr"))) || (NULL == (jsrvr_kn = json_object_get(jsrvr, "key_name"))) || (NULL == (jsrvr_dh = json_object_get(jsrvr, "server_dh")))) { - fprintf (stderr, "tr_msg_decode_one_server(): Error parsing required fields.\n"); - free(srvr); - return NULL; + tr_debug("tr_msg_decode_one_server(): Error parsing required fields."); + return -1; } /* TBD -- handle IPv6 Addresses */ inet_aton(json_string_value(jsrvr_addr), &(srvr->aaa_server_addr)); srvr->key_name = tr_new_name((char *)json_string_value(jsrvr_kn)); srvr->aaa_server_dh = tr_msg_decode_dh(jsrvr_dh); - - return srvr; + return 0; } -static json_t *tr_msg_encode_servers(TID_SRVR_BLK *servers) +static json_t *tr_msg_encode_servers(TID_RESP *resp) { json_t *jservers = NULL; json_t *jsrvr = NULL; TID_SRVR_BLK *srvr = NULL; + size_t index; jservers = json_array(); - for (srvr = servers; srvr != NULL; srvr = srvr->next) { + tid_resp_servers_foreach(resp, srvr, index) { if ((NULL == (jsrvr = tr_msg_encode_one_server(srvr))) || (-1 == json_array_append_new(jservers, jsrvr))) { return NULL; } } - // fprintf(stderr,"tr_msg_encode_servers(): servers contains:\n"); - // fprintf(stderr,"%s\n", json_dumps(jservers, 0)); + // tr_debug("tr_msg_encode_servers(): servers contains:"); + // tr_debug("%s", json_dumps(jservers, 0)); return jservers; } -static TID_SRVR_BLK *tr_msg_decode_servers(json_t *jservers) +static TID_SRVR_BLK *tr_msg_decode_servers(void * ctx, json_t *jservers, size_t *out_len) { TID_SRVR_BLK *servers = NULL; - TID_SRVR_BLK *next = NULL; - TID_SRVR_BLK *srvr = NULL; json_t *jsrvr; size_t i, num_servers; num_servers = json_array_size(jservers); - fprintf(stderr, "tr_msg_decode_servers(): Number of servers = %u.\n", (unsigned) num_servers); + tr_debug("tr_msg_decode_servers(): Number of servers = %u.", (unsigned) num_servers); if (0 == num_servers) { - fprintf(stderr, "tr_msg_decode_servers(): Server array is empty.\n"); + tr_debug("tr_msg_decode_servers(): Server array is empty."); return NULL; } + servers = talloc_zero_array(ctx, TID_SRVR_BLK, num_servers); for (i = 0; i < num_servers; i++) { jsrvr = json_array_get(jservers, i); - srvr = tr_msg_decode_one_server(jsrvr); - - /* skip to the end of the list, and add srvr to list of servers */ - if (NULL == servers) { - servers = srvr; - } - else { - for (next = servers; next->next != NULL; next = next->next); - next->next = srvr; + if (0 != tr_msg_decode_one_server(jsrvr, &servers[i])) { + talloc_free(servers); + return NULL; } - } + + } + *out_len = num_servers; return servers; } @@ -357,10 +359,10 @@ static json_t * tr_msg_encode_tidresp(TID_RESP *resp) } if (NULL == resp->servers) { - fprintf(stderr, "tr_msg_encode_tidresp(): No servers to encode.\n"); + tr_debug("tr_msg_encode_tidresp(): No servers to encode."); return jresp; } - jservers = tr_msg_encode_servers(resp->servers); + jservers = tr_msg_encode_servers(resp); json_object_set_new(jresp, "servers", jservers); return jresp; @@ -377,12 +379,11 @@ static TID_RESP *tr_msg_decode_tidresp(json_t *jresp) json_t *jservers = NULL; json_t *jerr_msg = NULL; - if (!(tresp = malloc(sizeof(TID_RESP)))) { - fprintf (stderr, "tr_msg_decode_tidresp(): Error allocating TID_RESP structure.\n"); + if (!(tresp = talloc_zero(NULL, TID_RESP))) { + tr_crit("tr_msg_decode_tidresp(): Error allocating TID_RESP structure."); return NULL; } - memset(tresp, 0, sizeof(TID_RESP)); /* store required fields from response */ if ((NULL == (jresult = json_object_get(jresp, "result"))) || @@ -393,25 +394,26 @@ static TID_RESP *tr_msg_decode_tidresp(json_t *jresp) (!json_is_string(jrealm)) || (NULL == (jcomm = json_object_get(jresp, "comm"))) || (!json_is_string(jcomm))) { - fprintf (stderr, "tr_msg_decode_tidresp(): Error parsing response.\n"); - free(tresp); + tr_debug("tr_msg_decode_tidresp(): Error parsing response."); + talloc_free(tresp); return NULL; } if (0 == (strcmp(json_string_value(jresult), "success"))) { - fprintf(stderr, "tr_msg_decode_tidresp(): Success! result = %s.\n", json_string_value(jresult)); + tr_debug("tr_msg_decode_tidresp(): Success! result = %s.", json_string_value(jresult)); if ((NULL != (jservers = json_object_get(jresp, "servers"))) || (!json_is_array(jservers))) { - tresp->servers = tr_msg_decode_servers(jservers); + tresp->servers = tr_msg_decode_servers(tresp, jservers, &tresp->num_servers); } else { + talloc_free(tresp); return NULL; } tresp->result = TID_SUCCESS; } else { tresp->result = TID_ERROR; - fprintf(stderr, "tr_msg_decode_tidresp(): Error! result = %s.\n", json_string_value(jresult)); + tr_debug("tr_msg_decode_tidresp(): Error! result = %s.", json_string_value(jresult)); if ((NULL != (jerr_msg = json_object_get(jresp, "err_msg"))) || (!json_is_string(jerr_msg))) { tresp->err_msg = tr_new_name((char *)json_string_value(jerr_msg)); @@ -444,13 +446,13 @@ char *tr_msg_encode(TR_MSG *msg) case TID_REQUEST: jmsg_type = json_string("tid_request"); json_object_set_new(jmsg, "msg_type", jmsg_type); - json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidreq(msg->tid_req)); + json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidreq(tr_msg_get_req(msg))); break; case TID_RESPONSE: jmsg_type = json_string("tid_response"); json_object_set_new(jmsg, "msg_type", jmsg_type); - json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidresp(msg->tid_resp)); + json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidresp(tr_msg_get_resp(msg))); break; /* TBD -- Add TR message types */ @@ -473,12 +475,12 @@ TR_MSG *tr_msg_decode(char *jbuf, size_t buflen) const char *mtype = NULL; if (NULL == (jmsg = json_loadb(jbuf, buflen, JSON_DISABLE_EOF_CHECK, &rc))) { - fprintf (stderr, "tr_msg_decode(): error loading object\n"); + tr_debug("tr_msg_decode(): error loading object"); return NULL; } if (!(msg = malloc(sizeof(TR_MSG)))) { - fprintf (stderr, "tr_msg_decode(): Error allocating TR_MSG structure.\n"); + tr_debug("tr_msg_decode(): Error allocating TR_MSG structure."); json_decref(jmsg); return NULL; } @@ -487,7 +489,7 @@ TR_MSG *tr_msg_decode(char *jbuf, size_t buflen) if ((NULL == (jtype = json_object_get(jmsg, "msg_type"))) || (NULL == (jbody = json_object_get(jmsg, "msg_body")))) { - fprintf (stderr, "tr_msg_decode(): Error parsing message header.\n"); + tr_debug("tr_msg_decode(): Error parsing message header."); json_decref(jmsg); tr_msg_free_decoded(msg); return NULL; @@ -497,15 +499,15 @@ TR_MSG *tr_msg_decode(char *jbuf, size_t buflen) if (0 == strcmp(mtype, "tid_request")) { msg->msg_type = TID_REQUEST; - msg->tid_req = tr_msg_decode_tidreq(jbody); + tr_msg_set_req(msg, tr_msg_decode_tidreq(jbody)); } else if (0 == strcmp(mtype, "tid_response")) { msg->msg_type = TID_RESPONSE; - msg->tid_resp = tr_msg_decode_tidresp(jbody); + tr_msg_set_resp(msg, tr_msg_decode_tidresp(jbody)); } else { msg->msg_type = TR_UNKNOWN; - msg->tid_req = NULL; + msg->msg_rep = NULL; } return msg; }