From 2ee2ffbd2478301bfb3c03478f237ac7a13576ba Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Sat, 13 Aug 2022 13:04:34 +0200
Subject: [PATCH] Add the public IP information to the WebUI #2105

---
 .../js/components/plugin-ip/controller.js     |   1 +
 .../static/js/components/plugin-ip/view.html  |   8 +++-
 glances/outputs/static/public/glances.js      | Bin 2388268 -> 2388461 bytes
 glances/outputs/static/public/glances.map.js  | Bin 2785993 -> 2786199 bytes
 glances/plugins/glances_ip.py                 |  36 +++++++++++-------
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/glances/outputs/static/js/components/plugin-ip/controller.js b/glances/outputs/static/js/components/plugin-ip/controller.js
index 427b7023..7cfb972c 100644
--- a/glances/outputs/static/js/components/plugin-ip/controller.js
+++ b/glances/outputs/static/js/components/plugin-ip/controller.js
@@ -25,5 +25,6 @@ export default function GlancesPluginIpController($scope, GlancesStats, ARGUMENT
         vm.mask = ipStats.mask;
         vm.maskCidr = ipStats.mask_cidr;
         vm.publicAddress = ipStats.public_address
+        vm.publicInfo = ipStats.public_info_human
     }
 }
diff --git a/glances/outputs/static/js/components/plugin-ip/view.html b/glances/outputs/static/js/components/plugin-ip/view.html
index d96387c0..d68f4835 100644
--- a/glances/outputs/static/js/components/plugin-ip/view.html
+++ b/glances/outputs/static/js/components/plugin-ip/view.html
@@ -1,4 +1,8 @@
 <section id="ip" ng-if="vm.address != undefined && !vm.arguments.disable_ip">
-    &nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ vm.address }}/{{ vm.maskCidr }}</span>&nbsp;<span
-        ng-if="vm.publicAddress" class="title">Pub</span>&nbsp;<span>{{ vm.publicAddress }}</span>
+    -
+    <span ng-if="vm.address != undefined" class="title">IP</span>
+    <spanng-if="vm.address != undefined">{{ vm.address }}/{{ vm.maskCidr }}</span>
+    <span ng-if="vm.publicAddress" class="title">Pub</span>
+    <span ng-if="vm.publicAddress">{{ vm.publicAddress }}</span>
+    <span ng-if="vm.publicInfo">({{ vm.publicInfo }})</span>
 </section>
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 094fb65743d24c67220397588ae7070d86795559..9e5dacb4471bc9c064640339198a01443bab66ad 100644
GIT binary patch
delta 318
zcmY+=J4?f06vlCqcx}C=(Q3W)ZQcx}kU|zGb$4)b4U{N|0ULw8EFB%3vv>przkoxx
z;_f%d(phH*Cs+Rk5qjVUhv!V^dHu+Yug}aF9^}4a`t4@gJHL)EPLj(Tb)@3-tQ&PZ
ze_<;oZC&-+QF0gL_d#yJgoPQ*Vh;0Iz#<ALVhPJw!7A3U4jUyn*uW;r*upj{*ugIL
zu#YMfYNH@`3-5+6FQ!)(Q?z4-uAGXl6vJfl&|xQy68U-1)yd&jbVKTv=g6CA|9`XP
eTeOmf<=M5V2156^J{U~5BF~m5qo+rmjeh|lcX*os

delta 273
zcmYkxyAHu%00rQby43wzcgimY2{sFncn?df1_@20VG)zTC{2f-p>NQ^<^jBbqzP8c
z7Ej<LU7Y00NzVDab;f$>%&BV|-$}=a-Mw4W-kCN7E^q@29`J$>{J=o~f)Ii*L?8+=
zh(iLBkb*Sukbx}ZAP)s7LJ7)H0RgIK)2>}F;f5k<YOm!K-QNgLElRkcGxRl8ROpkE
tX6kPkDS{KqA4s?M_YBr+VKr~7OKCP84`q2V(KKPRp(0y1&Z8sIA3p#AdgA~9

diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js
index d967382ff80be0a80f44ad36bad33839015f389c..089f0f265850422185b58d5a47d64a476cbdf7a9 100644
GIT binary patch
delta 491
zcmY+=O-lk%6b4|%)XFTiY^D#(ne4-vCL=2%O6%&TL5QI3l#Eg)=``TjrbR@A%N9f3
zAX-O3(9Yk`u4OG+YTJH6^-e_4g$Leq4qQ0r>Fl1NwR`4qg|(gyx3$W$j`@_e?X{?(
zJN?#i$Zvhjc&uzdvUo3xdHB@iY9_~k16sgYH#yhc=R$m)kodZ+5u(WoA&Q(QBror;
z5wgD~ms5n4Q}Se*kjb=MKvhUB5t3fa(LmU}P`_f`=a*AF-eEarRCA?bUeR|C_yk`x
zHcic}{5G>ibhCTavZmLB2RF1r8?=K5I=~B^&;>s5Ljby=2ZGQGEO5{V{V)K75P~5X
zhA{9Tzz9TO6vkj2CLmfD9z<r5nWArsG(ejTF&I--b%f8Cv`QsmN3&>_cI=Q;HkPL=
zhNdS~Rks&jwhQ{&5Cx|_r&~=?qRx!O(c7jt`<H^W(G&&x^&+~cHzWBX{|@!@bM)xw
Q|M}=iM!KnAyo+<!-(xMRMF0Q*

delta 400
zcmYkxJ5R!36b9hb%cltS3a$0VMMMfU5*JM%m_sFm!PEpt7G!adTEfI^Ok-k#NfW;i
zCszjIWM?;>^bfd-g9HCSU(<z?Jm>NrZuf+@>z?p*C^<i(>{znT=_<EZL&+XW0*t{p
zOt?d7a_{%3T_S3iG=s>{nmSQa*D6F6twvPS%0y+YPE_~KOpz#4^!|+kQKOJ0($7!%
zOOWlmcM|K|^T7qv`D>qvJp0UU>~x>O6ikB;X21^t5MdVPU>+7=5tbkbA&@|ZWl&%R
zR$&d+VFSVtfhfda6XLK13D}0Do9?Tz12JKqwXE!pH~7b+s)X|8liY60s+oB&&HeBE
q{Yy=SMuKY9jCjS3fg0v<H2=t-n*%k<KaW!#-p#Rqd-<&<AN~M=nvXRA

diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py
index 71320a75..47ba94f1 100644
--- a/glances/plugins/glances_ip.py
+++ b/glances/plugins/glances_ip.py
@@ -128,6 +128,7 @@ class Plugin(GlancesPlugin):
             else:
                 stats['public_address'] = self.public_address
                 stats['public_info'] = self.public_info
+                stats['public_info_human'] = self.public_info_for_human(stats['public_info'])
 
         elif self.input_method == 'snmp':
             # Not implemented yet
@@ -174,23 +175,30 @@ class Plugin(GlancesPlugin):
                 ret.append(self.curse_add_line(msg, 'TITLE', optional=True))
                 ret.append(self.curse_add_line(msg_pub, optional=True))
 
-        if 'public_info' in self.stats and self.stats['public_info']:
-            field_result = []
-            for f in self.censys_fields:
-                field = f.split(':')
-                if len(field) == 1 and field[0] in self.stats['public_info']:
-                    field_result.append('{}'.format(self.stats['public_info'][field[0]]))
-                elif (
-                    len(field) == 2
-                    and field[0] in self.stats['public_info']
-                    and field[1] in self.stats['public_info'][field[0]]
-                ):
-                    field_result.append('{}'.format(self.stats['public_info'][field[0]][field[1]]))
-            ret.append(self.curse_add_line(' ', optional=True))
-            ret.append(self.curse_add_line('/'.join(field_result), optional=True))
+            if self.stats['public_info_human']:
+                ret.append(self.curse_add_line(' {}'.format(self.stats['public_info_human']),
+                                               optional=True))
 
         return ret
 
+    def public_info_for_human(self, public_info):
+        """Return the data to pack to the client."""
+        if not public_info:
+            return ''
+
+        field_result = []
+        for f in self.censys_fields:
+            field = f.split(':')
+            if len(field) == 1 and field[0] in public_info:
+                field_result.append('{}'.format(public_info[field[0]]))
+            elif (
+                len(field) == 2
+                and field[0] in public_info
+                and field[1] in public_info[field[0]]
+            ):
+                field_result.append('{}'.format(public_info[field[0]][field[1]]))
+        return '/'.join(field_result)
+
     @staticmethod
     def ip_to_cidr(ip):
         """Convert IP address to CIDR.