Changeset

13036:1612c7f7dd55

mod_admin_shell: More dynamic widths calculations
author Kim Alvefur <zash@zash.se>
date Fri, 07 Apr 2023 12:48:17 +0200
parents 13035:93c1590b5951
children 13037:635ed9a362ee
files plugins/mod_admin_shell.lua
diffstat 1 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_admin_shell.lua	Thu Apr 06 17:07:09 2023 +0200
+++ b/plugins/mod_admin_shell.lua	Fri Apr 07 12:48:17 2023 +0200
@@ -815,8 +815,19 @@
 			if dir == "incoming" then return "<--"; end
 		end;
 	};
-	id = { title = "Session ID"; description = "Internal session ID used in logging"; width = 20; key = "id" };
-	type = { title = "Type"; description = "Session type"; width = #"c2s_unauthed"; key = "type" };
+	id = {
+		title = "Session ID";
+		description = "Internal session ID used in logging";
+		-- Depends on log16(?) of pointers which may vary over runtime, so + some margin
+		width = math.max(#"c2s", #"s2sin", #"s2sout") + #(tostring({}):match("%x+$")) + 2;
+		key = "id";
+	};
+	type = {
+		title = "Type";
+		description = "Session type";
+		width = math.max(#"c2s_unauthed", #"s2sout_unauthed");
+		key = "type";
+	};
 	method = {
 		title = "Method";
 		description = "Connection method";
@@ -870,7 +881,7 @@
 		title = "Encryption";
 		description = "Encryption algorithm used (TLS cipher suite)";
 		-- openssl ciphers 'ALL:COMPLEMENTOFALL' | tr : \\n | awk 'BEGIN {n=1} length() > n {n=length()} END {print(n)}'
-		width = 30;
+		width = #"ECDHE-ECDSA-CHACHA20-POLY1305";
 		key = "conn";
 		mapper = function(conn)
 			local info = conn and conn.ssl_info and conn:ssl_info();