Message ID | 20200104173919.9567-1-fff@chrisi01.de |
---|---|
State | Superseded |
Headers | show |
diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html index f18a3b4..67345fa 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html @@ -46,6 +46,8 @@ else internet_active="Nein" fi +fastd_pub=$(echo "secret \"$(uci get fastd.fff.secret)\";" > /tmp/sec && fastd --show-key --machine-readable -c /tmp/sec && rm /tmp/sec) + %> <table style="width: 100%;"> <tr><td> @@ -58,6 +60,7 @@ fi <tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr> <tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr> <tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr> + <tr><th>fastd public key:</th><td><%= ${fastd_pub} %></td></tr> <tr><th>Laufzeit:</th><td><%= ${uptime} %></td></tr> <tr><th>Auslastung:</th><td><%= ${load} %></td></tr> <tr><th>Uhrzeit:</th><td><% date %></td></tr>
On 04.01.20 18:39, Christian Dresel wrote: > User can see the fastd public key in the webui > > Signed-off-by: Christian Dresel <fff@chrisi01.de> > --- > src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html > index f18a3b4..67345fa 100755 > --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html > +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html > @@ -46,6 +46,8 @@ else > internet_active="Nein" > fi > > +fastd_pub=$(echo "secret \"$(uci get fastd.fff.secret)\";" > /tmp/sec && fastd --show-key --machine-readable -c /tmp/sec && rm /tmp/sec) Hmm. Das ist ja eklig. Zumindest ohne die Datei: echo "secret \"$(uci -q get fastd.fff.secret)\";" | fastd -c - --show-key --machine-readable Falls kein fastd existiert, wäre ein "-" oder so in der fastd_pub Variable gut. Zusammen schlage ich also vor: if ! fastd_pub=$(echo "secret \"$(uci -q get fastd.fff.secret)\";" | fastd -c - --show-key --machine-readable); then fastd_pub="-" fi Fabian
User can see the fastd public key in the webui Signed-off-by: Christian Dresel <fff@chrisi01.de> --- src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html | 3 +++ 1 file changed, 3 insertions(+)