/*
- * Copyright (c) 2012, JANET(UK)
+ * Copyright (c) 2012, 2015, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
TID_RESP *resp;
if ((NULL == (resp = talloc_zero(req, TID_RESP)))) {
- fprintf(stderr, "tids_create_response: Error allocating response structure.\n");
+ tr_crit("tids_create_response: Error allocating response structure.");
return NULL;
}
if ((NULL == (resp->rp_realm = tr_dup_name(req->rp_realm))) ||
(NULL == (resp->realm = tr_dup_name(req->realm))) ||
(NULL == (resp->comm = tr_dup_name(req->comm)))) {
- fprintf(stderr, "tids_create_response: Error allocating fields in response.\n");
+ tr_crit("tids_create_response: Error allocating fields in response.");
return NULL;
}
if (req->orig_coi) {
if (NULL == (resp->orig_coi = tr_dup_name(req->orig_coi))) {
- fprintf(stderr, "tids_create_response: Error allocating fields in response.\n");
+ tr_crit("tids_create_response: Error allocating fields in response.");
return NULL;
}
}
} addr;
struct sockaddr_in *saddr = (struct sockaddr_in *) &addr.in4;
-
+
saddr->sin_port = htons (port);
saddr->sin_family = AF_INET;
saddr->sin_addr.s_addr = INADDR_ANY;
if (0 > (conn = socket (AF_INET, SOCK_STREAM, 0)))
return conn;
-
+
setsockopt(conn, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
if (0 > (rc = bind (conn, (struct sockaddr *) saddr, sizeof(struct sockaddr_in))))
return rc;
-
+
if (0 > (rc = listen(conn, 512)))
return rc;
-
- fprintf (stdout, "tids_listen: TID Server listening on port %d\n", port);
- return conn;
+
+ tr_debug("tids_listen: TID Server listening on port %d", port);
+ return conn;
}
+/* returns EACCES if authorization is denied */
static int tids_auth_cb(gss_name_t clientName, gss_buffer_t displayName,
void *data)
{
struct tids_instance *inst = (struct tids_instance *) data;
TR_NAME name ={(char *) displayName->value,
displayName->length};
- return inst->auth_handler(clientName, &name, inst->cookie);
+ int result=0;
+
+ if (0!=inst->auth_handler(clientName, &name, inst->cookie)) {
+ tr_debug("tids_auth_cb: client '%.*s' denied authorization.", name.len, name.buf);
+ result=EACCES; /* denied */
+ }
+
+ return result;
}
+/* returns 0 on authorization success, 1 on failure, or -1 in case of error */
static int tids_auth_connection (struct tids_instance *inst,
int conn, gss_ctx_id_t *gssctx)
{
nameBuffer.value = name;
if (rc = gsscon_passive_authenticate(conn, nameBuffer, gssctx, tids_auth_cb, inst)) {
- fprintf(stderr, "tids_auth_connection: Error from gsscon_passive_authenticate(), rc = %d.\n", rc);
+ tr_debug("tids_auth_connection: Error from gsscon_passive_authenticate(), rc = %d.", rc);
return -1;
}
if (rc = gsscon_authorize(*gssctx, &auth, &autherr)) {
- fprintf(stderr, "tids_auth_connection: Error from gsscon_authorize, rc = %d, autherr = %d.\n",
+ tr_debug("tids_auth_connection: Error from gsscon_authorize, rc = %d, autherr = %d.",
rc, autherr);
return -1;
}
if (auth)
- fprintf(stdout, "tids_auth_connection: Connection authenticated, conn = %d.\n", conn);
+ tr_debug("tids_auth_connection: Connection authenticated, conn = %d.", conn);
else
- fprintf(stderr, "tids_auth_connection: Authentication failed, conn %d.\n", conn);
+ tr_debug("tids_auth_connection: Authentication failed, conn %d.", conn);
return !auth;
}
return -1;
}
- fprintf(stdout, "tids_read_request():Request Received, %u bytes.\n", (unsigned) buflen);
+ tr_debug("tids_read_request():Request Received, %u bytes.", (unsigned) buflen);
/* Parse request */
if (NULL == ((*mreq) = tr_msg_decode(buf, buflen))) {
- fprintf(stderr, "tids_read_request():Error decoding request.\n");
+ tr_debug("tids_read_request():Error decoding request.");
free (buf);
return -1;
}
/* If this isn't a TID Request, just drop it. */
if (TID_REQUEST != (*mreq)->msg_type) {
- fprintf(stderr, "tids_read_request(): Not a TID Request, dropped.\n");
+ tr_debug("tids_read_request(): Not a TID Request, dropped.");
return -1;
}
(!tr_msg_get_req(mreq)->rp_realm) ||
(!tr_msg_get_req(mreq)->realm) ||
(!tr_msg_get_req(mreq)->comm)) {
- fprintf(stderr, "tids_handle_request():Not a valid TID Request.\n");
+ tr_notice("tids_handle_request(): Not a valid TID Request.");
resp->result = TID_ERROR;
resp->err_msg = tr_new_name("Bad request format");
return -1;
}
+ tid_req_add_path(tr_msg_get_req(mreq), tids->hostname, tids->tids_port);
+
/* Call the caller's request handler */
/* TBD -- Handle different error returns/msgs */
if (0 > (rc = (*tids->req_handler)(tids, tr_msg_get_req(mreq), resp, tids->cookie))) {
return 0;
if (NULL == (resp = tids_create_response(tids, req))) {
- fprintf(stderr, "tids_send_err_response: Can't create response.\n");
+ tr_crit("tids_send_err_response: Can't create response.");
return -1;
}
+
/* mark this as an error response, and include the error message */
resp->result = TID_ERROR;
resp->err_msg = tr_new_name((char *)err_msg);
+ resp->error_path = req->path;
rc = tids_send_response(tids, req, resp);
char *resp_buf;
if ((!tids) || (!req) || (!resp))
- fprintf (stderr, "tids_send_response: Invalid parameters.\n");
+ tr_debug("tids_send_response: Invalid parameters.");
/* Never send a second response if we already sent one. */
if (req->resp_sent)
mresp.msg_type = TID_RESPONSE;
tr_msg_set_resp(&mresp, resp);
-
+
if (NULL == (resp_buf = tr_msg_encode(&mresp))) {
+
fprintf(stderr, "tids_send_response: Error encoding json response.\n");
tr_audit_req(req);
return -1;
}
- fprintf(stderr, "tids_send_response: Encoded response:\n%s\n", resp_buf);
-
+ tr_debug("tids_send_response: Encoded response: %s", resp_buf);
+
/* If external logging is enabled, fire off a message */
/* TODO Can be moved to end once segfault in gsscon_write_encrypted_token fixed */
tr_audit_resp(resp);
/* Send the response over the connection */
if (err = gsscon_write_encrypted_token (req->conn, req->gssctx, resp_buf,
strlen(resp_buf) + 1)) {
- fprintf(stderr, "tids_send_response: Error sending response over connection.\n");
+ tr_notice("tids_send_response: Error sending response over connection.");
tr_audit_req(req);
gss_ctx_id_t gssctx = GSS_C_NO_CONTEXT;
if (tids_auth_connection(tids, conn, &gssctx)) {
- fprintf(stderr, "tids_handle_connection: Error authorizing TID Server connection.\n");
+ tr_notice("tids_handle_connection: Error authorizing TID Server connection.");
close(conn);
return;
}
- fprintf(stdout, "tids_handle_connection: Connection authorized!\n");
+ tr_debug("tids_handle_connection: Connection authorized!");
while (1) { /* continue until an error breaks us out */
if (0 > (rc = tids_read_request(tids, conn, &gssctx, &mreq))) {
- fprintf(stderr, "tids_handle_connection: Error from tids_read_request(), rc = %d.\n", rc);
+ tr_debug("tids_handle_connection: Error from tids_read_request(), rc = %d.", rc);
return;
} else if (0 == rc) {
continue;
/* Allocate a response structure and populate common fields */
if (NULL == (resp = tids_create_response (tids, tr_msg_get_req(mreq)))) {
- fprintf(stderr, "tids_handle_connection: Error creating response structure.\n");
+ tr_crit("tids_handle_connection: Error creating response structure.");
/* try to send an error */
- tids_send_err_response(tids, tr_msg_get_req(mreq), "Error creating response.\n");
+ tids_send_err_response(tids, tr_msg_get_req(mreq), "Error creating response.");
return;
}
if (0 > (rc = tids_handle_request(tids, mreq, resp))) {
- fprintf(stderr, "tids_handle_connection: Error from tids_handle_request(), rc = %d.\n", rc);
+ tr_debug("tids_handle_connection: Error from tids_handle_request(), rc = %d.", rc);
/* Fall through, to send the response, either way */
}
if (0 > (rc = tids_send_response(tids, tr_msg_get_req(mreq), resp))) {
- fprintf(stderr, "tids_handle_connection: Error from tids_send_response(), rc = %d.\n", rc);
+ tr_debug("tids_handle_connection: Error from tids_send_response(), rc = %d.", rc);
/* if we didn't already send a response, try to send a generic error. */
if (!tr_msg_get_req(mreq)->resp_sent)
- tids_send_err_response(tids, tr_msg_get_req(mreq), "Error sending response.\n");
+ tids_send_err_response(tids, tr_msg_get_req(mreq), "Error sending response.");
/* Fall through to free the response, either way. */
}
return tids;
}
+/* Process tids requests forever. Should not return except on error. */
int tids_start (TIDS_INSTANCE *tids,
TIDS_REQ_FUNC *req_handler,
tids_auth_func *auth_handler,
int conn = -1;
pid_t pid;
+ tids->tids_port = port;
if (0 > (listen = tids_listen(tids, port)))
perror ("Error from tids_listen()");
close(listen);
tids_handle_connection(tids, conn);
close(conn);
- return 0;
+ exit(0); /* exit to kill forked child process */
} else {
close(conn);
}
void tids_destroy (TIDS_INSTANCE *tids)
{
- /* close syslog connection if syslog is enabled */
+ /* clean up logfiles */
tr_log_close();
if (tids)
free(tids);
}
-
-