Add support for "show rp_clients" monitoring request

diff --git a/Makefile.am b/Makefile.am
index 7a94721..1178798 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ common_srcs = common/tr_name.c \
        common/tr_comm_encoders.c \
        common/tr_rp.c \
        common/tr_rp_client.c \
+       common/tr_rp_client_encoders.c \
        common/tr_idp.c \
        common/tr_idp_encoders.c \
        common/tr_filter.c \

diff --git a/common/tr_gss_names.c b/common/tr_gss_names.c
index ef66d31..970efdb 100644 (file)
--- a/common/tr_gss_names.c
+++ b/common/tr_gss_names.c
@@ -131,7 +131,7 @@ void tr_gss_names_iter_free(TR_GSS_NAMES_ITER *iter)
   talloc_free(iter);
 }
 
-json_t *gss_names_to_json_array(TR_GSS_NAMES *gss_names)
+json_t *tr_gss_names_to_json_array(TR_GSS_NAMES *gss_names)
 {
   TR_GSS_NAMES_ITER *iter = tr_gss_names_iter_new(NULL);
   json_t *jarray = json_array();

diff --git a/common/tr_rp_client_encoders.c b/common/tr_rp_client_encoders.c
new file mode 100644 (file)
index 0000000..c97065b
--- /dev/null
+++ b/common/tr_rp_client_encoders.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2018, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <talloc.h>
+#include <jansson.h>
+
+#include <tr_gss_names.h>
+#include <tr_rp_client.h>
+
+/* helper for below */
+#define OBJECT_SET_OR_FAIL(jobj, key, val)     \
+do {                                           \
+  if (val)                                     \
+    json_object_set_new((jobj),(key),(val));   \
+  else                                         \
+    goto cleanup;                              \
+} while (0)
+
+#define ARRAY_APPEND_OR_FAIL(jary, val)        \
+do {                                           \
+  if (val)                                     \
+    json_array_append_new((jary),(val));       \
+  else                                         \
+    goto cleanup;                              \
+} while (0)
+
+static json_t *tr_rp_client_to_json(TR_RP_CLIENT *rp_client)
+{
+  json_t *client_json = NULL;
+  json_t *retval = NULL;
+
+  client_json = json_object();
+  if (client_json == NULL)
+    goto cleanup;
+
+  OBJECT_SET_OR_FAIL(client_json, "gss_names", tr_gss_names_to_json_array(rp_client->gss_names));
+
+  /* succeeded - set the return value and increment the reference count */
+  retval = client_json;
+  json_incref(retval);
+
+cleanup:
+  if (client_json)
+    json_decref(client_json);
+  return retval;
+}
+
+json_t *tr_rp_clients_to_json(TR_RP_CLIENT *rp_clients)
+{
+  json_t *jarray = json_array();
+  json_t *retval = NULL;
+  TR_RP_CLIENT_ITER *iter = tr_rp_client_iter_new(NULL);
+  TR_RP_CLIENT *rp_client = NULL;
+
+  if ((jarray == NULL) || (iter == NULL))
+    goto cleanup;
+
+  rp_client = tr_rp_client_iter_first(iter, rp_clients);
+  while (rp_client) {
+    ARRAY_APPEND_OR_FAIL(jarray, tr_rp_client_to_json(rp_client));
+    rp_client = tr_rp_client_iter_next(iter);
+  }
+
+  /* succeeded - set the return value and increment the reference count */
+  retval = jarray;
+  json_incref(retval);
+
+cleanup:
+  if (jarray)
+    json_decref(jarray);
+
+  if (iter)
+    tr_rp_client_iter_free(iter);
+  
+  return retval;
+}

diff --git a/include/tr_gss_names.h b/include/tr_gss_names.h
index 33590a3..7585798 100644 (file)
--- a/include/tr_gss_names.h
+++ b/include/tr_gss_names.h
@@ -59,6 +59,6 @@ TR_NAME *tr_gss_names_iter_first(TR_GSS_NAMES_ITER *iter, TR_GSS_NAMES *gn);
 TR_NAME *tr_gss_names_iter_next(TR_GSS_NAMES_ITER *iter);
 void tr_gss_names_iter_free(TR_GSS_NAMES_ITER *iter);
 
-json_t *gss_names_to_json_array(TR_GSS_NAMES *gss_names);
+json_t *tr_gss_names_to_json_array(TR_GSS_NAMES *gss_names);
 
 #endif /* __TR_GSS_H__ */

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 1b8da2b..6260bbb 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -145,20 +145,30 @@ static void configure_signals(void)
   pthread_sigmask(SIG_BLOCK, &signals, NULL);
 }
 
-/* TODO move this function */
-static MON_RC tr_mon_handle_version(void *cookie, json_t **result_ptr)
+/* Monitoring handlers */
+static MON_RC tr_handle_version(void *cookie, json_t **result_ptr)
 {
   *result_ptr = json_string(PACKAGE_VERSION);
   return (*result_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
 }
 
-static MON_RC tr_mon_handle_uptime(void *cookie, json_t **result_ptr)
+static MON_RC tr_handle_uptime(void *cookie, json_t **result_ptr)
 {
   time_t *start_time = cookie;
   *result_ptr = json_integer(time(NULL) - (*start_time));
   return (*result_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
 }
 
+static MON_RC tr_handle_show_rp_clients(void *cookie, json_t **response_ptr)
+{
+  TR_CFG_MGR *cfg_mgr = talloc_get_type_abort(cookie, TR_CFG_MGR);
+
+  *response_ptr = tr_rp_clients_to_json(cfg_mgr->active->rp_clients);
+  return (*response_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
+}
+
+
+
 int main(int argc, char *argv[])
 {
   TALLOC_CTX *main_ctx=NULL;
@@ -230,9 +240,10 @@ int main(int argc, char *argv[])
   tr->mons->tids = tr->tids;
   tr->mons->trps = tr->trps;
 
-  /* TODO do this more systematically */
-  mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_VERSION, tr_mon_handle_version, NULL);
-  mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_UPTIME, tr_mon_handle_uptime, &start_time);
+  /* Register monitoring handlers */
+  mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_VERSION, tr_handle_version, NULL);
+  mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_UPTIME, tr_handle_uptime, &start_time);
+  mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_RP_CLIENTS, tr_handle_show_rp_clients, tr->cfg_mgr);
   tr_tid_register_mons_handlers(tr->tids, tr->mons);
   tr_trp_register_mons_handlers(tr->trps, tr->mons);
 

diff --git a/trp/trp_peer_encoders.c b/trp/trp_peer_encoders.c
index 6c8a4bf..4e8d57e 100644 (file)
--- a/trp/trp_peer_encoders.c
+++ b/trp/trp_peer_encoders.c
@@ -111,7 +111,7 @@ json_t *trp_peer_to_json(TRP_PEER *peer)
   OBJECT_SET_OR_FAIL(peer_json, "last_connection_attempt",
                      last_attempt_to_json_string(peer));
   OBJECT_SET_OR_FAIL(peer_json, "allowed_credentials",
-                     gss_names_to_json_array(trp_peer_get_gss_names(peer)));
+                     tr_gss_names_to_json_array(trp_peer_get_gss_names(peer)));
 
   /* succeeded - set the return value and increment the reference count */
   retval = peer_json;