update ziti_dump

- show current time
- show external signers and tokens

Author: ekoby

inc_internal/utils.h

@@ -172,6 +172,8 @@ int load_file(const char *path, size_t pathlen, char **content, size_t *size);
 
 uint64_t next_backoff(int *count, int max, uint64_t base);
 
+const char *get_utc_time();
+
 tlsuv_http_req_t* ziti_json_request(
     tlsuv_http_t *clt, const char *method, const char *path,
     void (*cb)(tlsuv_http_resp_t *resp, const char *err, json_object *content, void *ctx),

library/utils.c

@@ -126,8 +126,6 @@ static const char *(*get_elapsed)();
 
 static const char *get_elapsed_time();
 
-static const char *get_utc_time();
-
 static void default_log_writer(int level, const char *loc, const char *msg, size_t msglen);
 
 static uv_loop_t *ts_loop;
@@ -397,22 +395,24 @@ static const char *get_elapsed_time() {
     return log_timestamp;
 }
 
-static const char *get_utc_time() {
+const char *get_utc_time() {
     uint64_t now = uv_now(ts_loop);
-    if (now > last_update) {
-        last_update = now;
+    static uint64_t utc_last_update = 0;
+    static char utc_timestamp[64];
+    if (now > utc_last_update) {
+        utc_last_update = now;
 
         uv_timeval64_t ts;
         uv_gettimeofday(&ts);
         time_t t = ts.tv_sec;
         struct tm *tm = gmtime(&t);
 
-        snprintf(log_timestamp, sizeof(log_timestamp), "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
+        snprintf(utc_timestamp, sizeof(utc_timestamp), "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
                  1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
                  tm->tm_hour, tm->tm_min, tm->tm_sec, ts.tv_usec / 1000
         );
     }
-    return log_timestamp;
+    return utc_timestamp;
 }
 
 int lt_zero(int v) { return v < 0; }

library/ziti.c

@@ -858,6 +858,9 @@ int ziti_get_appdata(ziti_context ztx, const char *key, void *data,
 
 void ziti_dump(ziti_context ztx, int (*printer)(void *arg, const char *fmt, ...), void *ctx) {
     uint64_t now = uv_now(ztx->loop);
+    uv_timeval64_t now_ts = {};
+    uv_gettimeofday(&now_ts);
+
     printer(ctx, "\n======= Application Info ==========\n");
     printer(ctx, "Application:\t%s@%s\n", APP_ID ? APP_ID : "<unset>", APP_VERSION ? APP_VERSION : "<unknown>");
     const ziti_version *sdk_ver = ziti_get_version();
@@ -871,8 +874,10 @@ void ziti_dump(ziti_context ztx, int (*printer)(void *arg, const char *fmt, ...)
     if (info->device_id) {
         printer(ctx, "Device ID: %s\n", info->device_id);
     }
-    printer(ctx, "OS/arch:  %s %s (%s/%s)\n", info->os, info->arch, info->os_release, info->os_version);
-    printer(ctx, "Hostname: %s/%s\n", info->hostname, info->domain);
+    printer(ctx, "OS/arch:      %s %s (%s/%s)\n", info->os, info->arch, info->os_release, info->os_version);
+    printer(ctx, "Hostname:     %s/%s\n", info->hostname, info->domain);
+    printer(ctx, "Current time: %s (%" PRIu64 ".%0" PRIu64 ")",
+            get_utc_time(), now_ts.tv_sec, now_ts.tv_usec / 1000);
 
     printer(ctx, "\n=================\nZiti Context:\n");
     printer(ctx, "ID:\t%d\n", ztx->id);
@@ -922,6 +927,25 @@ void ziti_dump(ziti_context ztx, int (*printer)(void *arg, const char *fmt, ...)
         printer(ctx, "No Session found\n");
     }
 
+    printer(ctx, "\n=================\nExternal Credentials:\n");
+    const char *signer_name;
+    ziti_jwt_signer *signer;
+    printer(ctx, "ext signers[%zd]:\n", model_map_size(&ztx->ext_signers));
+    MODEL_MAP_FOREACH(signer_name, signer, &ztx->ext_signers) {
+        printer(ctx, "\t%s: id[%s] provider[%s]\n",
+                signer_name, signer->id,
+                signer->provider_url ? signer->provider_url : "(none)");
+    }
+
+    const char *iss;
+    zt_jwt *jwt;
+    printer(ctx, "ext jwt tokens[%zd]:\n", model_map_size(&ztx->ext_jwt_tokens));
+    MODEL_MAP_FOREACH(iss, jwt, &ztx->ext_jwt_tokens) {
+        printer(ctx, "\tissuer[%s] expiration[%" PRIu64 "]%s\n",
+                iss, jwt->expiration,
+                (jwt->expiration != 0 && jwt->expiration < now_ts.tv_sec) ? " EXPIRED" : "");
+    }
+
     printer(ctx, "\n=================\nServices:\n");
     ziti_service *zs;
     const char *name;