* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include <string.h>
#include <openssl/dh.h>
#include <jansson.h>
#include <tr_msg.h>
-#include <tpq.h>
+#include <trust_router/tr_name.h>
+#include <trust_router/tid.h>
+
static json_t *tr_msg_encode_dh(DH *dh)
{
json_t *jdh = NULL;
static DH *tr_msg_decode_dh(json_t *jdh)
{
DH *dh = NULL;
+ json_t *jp = NULL;
+ json_t *jg = NULL;
+ json_t *jpub_key = NULL;
+
+ if (!(dh = malloc(sizeof(DH)))) {
+ fprintf (stderr, "tr_msg_decode_dh(): Error allocating DH structure.\n");
+ return NULL;
+ }
+
+ memset(dh, 0, sizeof(DH));
+
+ /* store required fields from dh object */
+ 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");
+ free(dh);
+ return NULL;
+ }
+
+ BN_hex2bn(&(dh->p), json_string_value(jp));
+ BN_hex2bn(&(dh->g), json_string_value(jg));
+ BN_hex2bn(&(dh->pub_key), json_string_value(jpub_key));
return dh;
}
-json_t *tr_msg_encode_tpqreq(TPQ_REQ *req)
+static json_t * tr_msg_encode_tidreq(TID_REQ *req)
{
json_t *jreq = NULL;
json_t *jstr = NULL;
- if ((!req) || (!req->rp_realm) || (!req->realm) || !(req->coi))
+ if ((!req) || (!req->rp_realm) || (!req->realm) || !(req->comm))
return NULL;
jreq = json_object();
jstr = json_string(req->realm->buf);
json_object_set_new(jreq, "target_realm", jstr);
- jstr = json_string(req->coi->buf);
+ jstr = json_string(req->comm->buf);
json_object_set_new(jreq, "community", jstr);
- json_object_set_new(jreq, "dh_info", tr_msg_encode_dh(req->tpqc_dh));
+ json_object_set_new(jreq, "dh_info", tr_msg_encode_dh(req->tidc_dh));
return jreq;
}
-TPQ_REQ *tr_msg_decode_tpqreq(json_t *jreq)
+static TID_REQ *tr_msg_decode_tidreq(json_t *jreq)
{
- TPQ_REQ *req = NULL;
+ TID_REQ *treq = NULL;
+ json_t *jrp_realm = NULL;
+ json_t *jrealm = NULL;
+ json_t *jcomm = NULL;
+ json_t *jorig_coi = NULL;
+ json_t *jdh = NULL;
- return req;
+ if (!(treq = malloc(sizeof(TID_REQ)))) {
+ fprintf (stderr, "tr_msg_decode_tidreq(): Error allocating TID_REQ structure.\n");
+ return NULL;
+ }
+
+ memset(treq, 0, sizeof(TID_REQ));
+
+ /* store required fields from request */
+ 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");
+ free(treq);
+ return NULL;
+ }
+
+ treq->rp_realm = tr_new_name((char *)json_string_value(jrp_realm));
+ treq->realm = tr_new_name((char *)json_string_value(jrealm));
+ treq->comm = tr_new_name((char *)json_string_value(jcomm));
+
+ /* 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");
+ free(treq);
+ return NULL;
+ }
+ treq->tidc_dh = tr_msg_decode_dh(jdh);
+
+ /* store optional "orig_coi" field */
+ if (NULL != (jorig_coi = json_object_get(jreq, "orig_coi"))) {
+ treq->orig_coi = tr_new_name((char *)json_string_value(jorig_coi));
+ }
+
+ return treq;
}
-json_t *tr_msg_encode_tpqresp(TPQ_RESP *resp)
+static json_t *tr_msg_encode_one_server(TID_SRVR_BLK *srvr)
{
- json_t *jresp = NULL;
+ json_t *jsrvr = NULL;
+ json_t *jstr = NULL;
- return jresp;
-}
+ fprintf(stderr, "Encoding one server.\n");
+
+ jsrvr = json_object();
+
+ /* Server IP Address -- TBD handle IPv6 */
+ jstr = json_string(inet_ntoa(srvr->aaa_server_addr));
+ json_object_set_new(jsrvr, "server_addr", jstr);
+ /* 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));
+ return jsrvr;
+}
-TPQ_RESP *tr_msg_decode_tpqresp(json_t *jresp)
+static TID_SRVR_BLK *tr_msg_decode_one_server(json_t *jsrvr)
{
- TPQ_RESP *resp = NULL;
+ TID_SRVR_BLK *srvr;
+ json_t *jsrvr_addr = NULL;
+ json_t *jsrvr_kn = NULL;
+ json_t *jsrvr_dh = NULL;
+
+ if (jsrvr == NULL)
+ return NULL;
+
+ if (NULL == (srvr = malloc(sizeof(TID_SRVR_BLK))))
+ return NULL;
+ memset(srvr, 0, sizeof(TID_SRVR_BLK));
- return resp;
+ 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;
+ }
+
+ /* 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;
}
-json_t *tr_msg_encode_tidrreq(TIDR_REQ *req)
+static json_t *tr_msg_encode_servers(TID_SRVR_BLK *servers)
{
- json_t *jreq = NULL;
+ json_t *jservers = NULL;
+ json_t *jsrvr = NULL;
+ TID_SRVR_BLK *srvr = NULL;
- return jreq;
+ jservers = json_array();
+ for (srvr = servers; srvr != NULL; srvr = srvr->next) {
+ 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));
+ return jservers;
}
-TIDR_REQ *tr_msg_decode_tidrreq(json_t *jreq)
+static TID_SRVR_BLK *tr_msg_decode_servers(json_t *jservers)
{
- TIDR_REQ *req = NULL;
+ 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 = %d.\n", num_servers);
+
+ if (0 == num_servers) {
+ fprintf(stderr, "tr_msg_decode_servers(): Server array is empty.\n");
+ return NULL;
+ }
+
+ for (i = 0; i < num_servers; i++) {
+ jsrvr = json_array_get(jservers, i);
+ srvr = tr_msg_decode_one_server(jsrvr);
- return req;
+ /* 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;
+ }
+ }
+
+ return servers;
}
-json_t *tr_msg_encode_tidrresp(TIDR_RESP *resp)
+static json_t * tr_msg_encode_tidresp(TID_RESP *resp)
{
json_t *jresp = NULL;
+ json_t *jstr = NULL;
+ json_t *jservers = NULL;
+
+ if ((!resp) || (!resp->rp_realm) || (!resp->realm) || !(resp->comm))
+ return NULL;
+
+ jresp = json_object();
+
+ if (TID_ERROR == resp->result) {
+ jstr = json_string("error");
+ json_object_set_new(jresp, "result", jstr);
+ if (resp->err_msg) {
+ jstr = json_string(resp->err_msg->buf);
+ json_object_set_new(jresp, "err_msg", jstr);
+ }
+ }
+ else {
+ jstr = json_string("success");
+ json_object_set_new(jresp, "result", jstr);
+ }
+ jstr = json_string(resp->rp_realm->buf);
+ json_object_set_new(jresp, "rp_realm", jstr);
+
+ jstr = json_string(resp->realm->buf);
+ json_object_set_new(jresp, "target_realm", jstr);
+
+ jstr = json_string(resp->comm->buf);
+ json_object_set_new(jresp, "comm", jstr);
+
+ if (resp->orig_coi) {
+ jstr = json_string(resp->orig_coi->buf);
+ json_object_set_new(jresp, "orig_coi", jstr);
+ }
+
+ if (NULL == resp->servers) {
+ fprintf(stderr, "tr_msg_encode_tidresp(): No servers to encode.\n");
+ return jresp;
+ }
+ jservers = tr_msg_encode_servers(resp->servers);
+ json_object_set_new(jresp, "servers", jservers);
+
return jresp;
}
-TIDR_RESP *tr_msg_decode_tidrresp(json_t *jresp)
+static TID_RESP *tr_msg_decode_tidresp(json_t *jresp)
{
- TIDR_RESP *resp = NULL;
+ TID_RESP *tresp = NULL;
+ json_t *jresult = NULL;
+ json_t *jerr_msg = NULL;
+ json_t *jrp_realm = NULL;
+ json_t *jrealm = NULL;
+ json_t *jcomm = NULL;
+ json_t *jorig_coi = NULL;
+ json_t *jservers = NULL;
+
+ if (!(tresp = malloc(sizeof(TID_RESP)))) {
+ fprintf (stderr, "tr_msg_decode_tidresp(): Error allocating TID_RESP structure.\n");
+ return NULL;
+ }
+
+ memset(tresp, 0, sizeof(TID_RESP));
+
+ /* store required fields from request */
+ if ((NULL == (jresult = json_object_get(jresp, "result"))) ||
+ (NULL == (jrp_realm = json_object_get(jresp, "rp_realm"))) ||
+ (NULL == (jrealm = json_object_get(jresp, "target_realm"))) ||
+ (NULL == (jcomm = json_object_get(jresp, "comm"))) ||
+ (NULL == (jservers = json_object_get(jresp, "servers")))) {
+ fprintf (stderr, "tr_msg_decode_tidresp(): Error parsing response.\n");
+ free(tresp);
+ return NULL;
+ }
- return resp;
+ if (0 == (strcmp(json_string_value(jresult), "success"))) {
+ fprintf(stderr, "tr_msg_decode_tidresp(): Success! result = %s.\n", json_string_value(jresult));
+ tresp->result = TID_SUCCESS;
+ }
+ else {
+ tresp->result = TID_ERROR;
+ fprintf(stderr, "tr_msg_decode_tidresp(): Error! result = %s.\n", json_string_value(jresult));
+ if (NULL != (jerr_msg = json_object_get(jresp, "err_msg"))) {
+ tresp->err_msg = tr_new_name((char *)json_string_value(jerr_msg));
+ }
+ }
+
+ tresp->rp_realm = tr_new_name((char *)json_string_value(jrp_realm));
+ tresp->realm = tr_new_name((char *)json_string_value(jrealm));
+ tresp->comm = tr_new_name((char *)json_string_value(jcomm));
+
+ /* store optional "orig_coi" field */
+ if ((NULL != (jorig_coi = json_object_get(jresp, "orig_coi"))) &&
+ (!json_is_object(jorig_coi))) {
+ tresp->orig_coi = tr_new_name((char *)json_string_value(jorig_coi));
+ }
+
+ tresp->servers = tr_msg_decode_servers(jservers);
+
+ return tresp;
}
char *tr_msg_encode(TR_MSG *msg)
switch (msg->msg_type)
{
- case TPQ_REQUEST:
- jmsg_type = json_string("TPQRequest");
- json_object_set_new(jmsg, "msg_type", jmsg_type);
- json_object_set_new(jmsg, "msg_body", tr_msg_encode_tpqreq(msg->tpq_req));
- break;
-
- case TPQ_RESPONSE:
- jmsg_type = json_string("TPQResponse");
+ 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_tpqresp(msg->tpq_resp));
+ json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidreq(msg->tid_req));
break;
- case TIDR_REQUEST:
- jmsg_type = json_string("TIDRequest");
+ 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_tidrreq(msg->tidr_req));
- break;
-
- case TIDR_RESPONSE:
- jmsg_type = json_string("TIDResponse");
- json_object_set_new(jmsg, "msg_type", jmsg_type);
- json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidrresp(msg->tidr_resp));
+ json_object_set_new(jmsg, "msg_body", tr_msg_encode_tidresp(msg->tid_resp));
break;
/* TBD -- Add TR message types */
return(json_dumps(jmsg, 0));
}
-TR_MSG *tr_msg_decode(char *jmsg)
+TR_MSG *tr_msg_decode(char *jbuf, size_t buflen)
{
TR_MSG *msg;
+ json_t *jmsg = NULL;
+ json_error_t rc;
+ json_t *jtype;
+ json_t *jbody;
+ 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");
+ return NULL;
+ }
- if (!(msg = malloc(sizeof(TR_MSG *)))) {
+ if (!(msg = malloc(sizeof(TR_MSG)))) {
fprintf (stderr, "tr_msg_decode(): Error allocating TR_MSG structure.\n");
+ json_decref(jmsg);
return NULL;
}
+
+ memset(msg, 0, sizeof(TR_MSG));
+
+ 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");
+ json_decref(jmsg);
+ tr_msg_free_decoded(msg);
+ return NULL;
+ }
+
+ mtype = json_string_value(jtype);
+ if (0 == strcmp(mtype, "tid_request")) {
+ msg->msg_type = TID_REQUEST;
+ msg->tid_req = 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);
+ }
+ else {
+ msg->msg_type = TR_UNKNOWN;
+ msg->tid_req = NULL;
+ }
return msg;
}
projects / trust_router.git / blobdiff