/*
- * Copyright (c) 2012, JANET(UK)
+ * Copyright (c) 2012, 2014-2015, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <stdio.h>
#include <jansson.h>
+#include <talloc.h>
#include <trust_router/tr_dh.h>
#include <tid_internal.h>
#include <tr_msg.h>
#include <gsscon.h>
+#include <tr_debug.h>
+#include <tr_rand_id.h>
+
int tmp_len = 32;
-TIDC_INSTANCE *tidc_create ()
+static int tidc_destructor(void *obj)
{
- TIDC_INSTANCE *tidc = NULL;
-
- if (tidc = malloc(sizeof(TIDC_INSTANCE)))
- memset(tidc, 0, sizeof(TIDC_INSTANCE));
- else
- return NULL;
+ TIDC_INSTANCE *tidc=talloc_get_type_abort(obj, TIDC_INSTANCE);
+ if (NULL!=tidc) {
+ if (NULL!=tidc->client_dh)
+ tr_destroy_dh_params(tidc->client_dh);
+ }
+ return 0;
+}
+/* creates struct in talloc null context */
+TIDC_INSTANCE *tidc_create(void)
+{
+ TIDC_INSTANCE *tidc=talloc(NULL, TIDC_INSTANCE);
+ if (tidc!=NULL) {
+ tidc->client_dh=NULL;
+ talloc_set_destructor((void *)tidc, tidc_destructor);
+ }
return tidc;
}
-void tidc_destroy (TIDC_INSTANCE *tidc)
+void tidc_destroy(TIDC_INSTANCE *tidc)
{
- if (tidc)
- free(tidc);
+ talloc_free(tidc);
}
int tidc_open_connection (TIDC_INSTANCE *tidc,
- char *server,
+ const char *server,
unsigned int port,
gss_ctx_id_t *gssctx)
{
if (0 == port)
use_port = TID_PORT;
- else
+ else
use_port = port;
+ tr_debug("tidc_open_connection: opening tidc connection to %s:%d", server, port);
err = gsscon_connect(server, use_port, "trustidentity", &conn, gssctx);
if (!err)
return -1;
}
-int tidc_send_request (TIDC_INSTANCE *tidc,
- int conn,
+int tidc_send_request (TIDC_INSTANCE *tidc,
+ int conn,
gss_ctx_id_t gssctx,
- char *rp_realm,
- char *realm,
- char *comm,
+ const char *rp_realm,
+ const char *realm,
+ const char *comm,
TIDC_RESP_FUNC *resp_handler,
void *cookie)
-
{
TID_REQ *tid_req = NULL;
+ char *request_id = NULL;
+ int rc;
/* Create and populate a TID req structure */
if (!(tid_req = tid_req_new()))
if ((NULL == (tid_req->rp_realm = tr_new_name(rp_realm))) ||
(NULL == (tid_req->realm = tr_new_name(realm))) ||
(NULL == (tid_req->comm = tr_new_name(comm)))) {
- fprintf (stderr, "tidc_send_request: Error duplicating names.\n");
- return -1;
+ tr_err ( "tidc_send_request: Error duplicating names.\n");
+ goto error;
}
- tid_req->tidc_dh = tidc->client_dh;
-
- return (tidc_fwd_request(tidc, tid_req, resp_handler, cookie));
+ tid_req->tidc_dh = tr_dh_dup(tidc->client_dh);
+
+ /* generate an ID */
+ request_id = tr_random_id(NULL);
+ if (request_id) {
+ if (tid_req->request_id = tr_new_name(request_id))
+ tr_debug("tidc_send_request: Created TID request ID: %s", request_id);
+ else
+ tr_debug("tidc_send_request: Unable to set request ID, proceeding without one");
+ talloc_free(request_id);
+ } else
+ tr_debug("tidc_send_request: Failed to generate a TID request ID, proceeding without one");
+
+ rc = tidc_fwd_request(tidc, tid_req, resp_handler, cookie);
+ goto cleanup;
+ error:
+ rc = -1;
+ cleanup:
+ tid_req_free(tid_req);
+ return rc;
}
-int tidc_fwd_request (TIDC_INSTANCE *tidc,
- TID_REQ *tid_req,
- TIDC_RESP_FUNC *resp_handler,
- void *cookie)
-
+int tidc_fwd_request(TIDC_INSTANCE *tidc,
+ TID_REQ *tid_req,
+ TIDC_RESP_FUNC *resp_handler,
+ void *cookie)
{
char *req_buf = NULL;
char *resp_buf = NULL;
size_t resp_buflen = 0;
TR_MSG *msg = NULL;
TR_MSG *resp_msg = NULL;
+ TID_RESP *tid_resp = NULL;
int err;
+ int rc = 0;
/* Create and populate a TID msg structure */
- if (!(msg = malloc(sizeof(TR_MSG))))
- return -1;
+ if (!(msg = talloc_zero(tid_req, TR_MSG)))
+ goto error;
msg->msg_type = TID_REQUEST;
tr_msg_set_req(msg, tid_req);
/* store the response function and cookie */
// tid_req->resp_func = resp_handler;
// tid_req->cookie = cookie;
-
+
/* Encode the request into a json string */
if (!(req_buf = tr_msg_encode(msg))) {
- fprintf(stderr, "tidc_fwd_request: Error encoding TID request.\n");
- return -1;
+ tr_err("tidc_fwd_request: Error encoding TID request.\n");
+ goto error;
}
- fprintf (stderr, "tidc_fwd_request: Sending TID request:\n");
- fprintf (stderr, "%s\n", req_buf);
+ tr_debug( "tidc_fwd_request: Sending TID request:\n");
+ tr_debug( "%s\n", req_buf);
/* Send the request over the connection */
- if (err = gsscon_write_encrypted_token (tid_req->conn, tid_req->gssctx, req_buf,
+ if (err = gsscon_write_encrypted_token (tid_req->conn, tid_req->gssctx, req_buf,
strlen(req_buf))) {
- fprintf(stderr, "tidc_fwd_request: Error sending request over connection.\n");
- return -1;
+ tr_err( "tidc_fwd_request: Error sending request over connection.\n");
+ goto error;
}
/* TBD -- queue request on instance, read resps in separate thread */
if (err = gsscon_read_encrypted_token(tid_req->conn, tid_req->gssctx, &resp_buf, &resp_buflen)) {
if (resp_buf)
free(resp_buf);
- return -1;
+ goto error;
}
- fprintf(stdout, "tidc_fwd_request: Response Received (%u bytes).\n", (unsigned) resp_buflen);
- fprintf(stdout, "%s\n", resp_buf);
+ tr_debug( "tidc_fwd_request: Response Received (%u bytes).\n", (unsigned) resp_buflen);
+ tr_debug( "%s\n", resp_buf);
if (NULL == (resp_msg = tr_msg_decode(resp_buf, resp_buflen))) {
- fprintf(stderr, "tidc_fwd_request: Error decoding response.\n");
- return -1;
+ tr_err( "tidc_fwd_request: Error decoding response.\n");
+ goto error;
}
/* TBD -- Check if this is actually a valid response */
- if (TID_RESPONSE != tr_msg_get_msg_type(resp_msg)) {
- fprintf(stderr, "tidc_fwd_request: Error, no response in the response!\n");
- return -1;
+ tid_resp = tr_msg_get_resp(resp_msg);
+ if (tid_resp == NULL) {
+ tr_err( "tidc_fwd_request: Error, no response in the response!\n");
+ goto error;
+ }
+
+ /* Check whether the request IDs matched and warn if not. Do nothing if we don't get
+ * an ID on the return - it is not mandatory to preserve that field. */
+ if (tid_req->request_id) {
+ if ((tid_resp->request_id)
+ && (tr_name_cmp(tid_resp->request_id, tid_req->request_id) != 0)) {
+ /* Requests present but do not match */
+ tr_warning("tidc_fwd_request: Sent request ID %.*s, received response for %.*s",
+ tid_req->request_id->len, tid_req->request_id->buf,
+ tid_resp->request_id->len, tid_resp->request_id->buf);
+ }
+ } else if (tid_resp->request_id) {
+ tr_warning("tidc_fwd_request: Sent request without ID, received response for %.*s",
+ tid_resp->request_id->len, tid_resp->request_id->buf);
}
-
- if (resp_handler)
- /* Call the caller's response function */
+
+ if (resp_handler) {
+ /* Call the caller's response function. It must copy any data it needs before returning. */
+ tr_debug("tidc_fwd_request: calling response callback function.");
(*resp_handler)(tidc, tid_req, tr_msg_get_resp(resp_msg), cookie);
- else
- fprintf(stderr, "tidc_fwd_request: NULL response function.\n");
+ }
+
+ goto cleanup;
+ error:
+ rc = -1;
+ cleanup:
if (msg)
- free(msg);
- if (tid_req)
- tid_req_free(tid_req);
+ talloc_free(msg);
if (req_buf)
free(req_buf);
if (resp_buf)
free(resp_buf);
-
- /* TBD -- free the decoded response */
-
- return 0;
+ if (resp_msg)
+ tr_msg_free_decoded(resp_msg);
+ return rc;
}
projects / trust_router.git / blobdiff