Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2204 from dibdot/wg-qrfix

Browse source 
luci-app-wireguard: clean up QR Code generation
This commit is contained in:
Dirk Brenken 2018-10-12 15:30:18 +02:00 committed by GitHub
commit 57bdcbebda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
applications/luci-app-wireguard/luasrc/view/wireguard.htm
View file

@ -9,6 +9,13 @@
local last_device = "" local last_device = ""
local enc = { } local enc = { }
local function wg_clean(value)
if value and value == "(none)" then
value = ""
end
return value
end
local wg_dump = io.popen("wg show all dump") local wg_dump = io.popen("wg show all dump")
if wg_dump then if wg_dump then
local line local line
@ -33,7 +40,7 @@
address = value address = value
end end
end end
enc[line[1]] = "[Interface]\nPrivateKey = " ..line[2].. "\nAddress = " ..address enc[line[1]] = "[Interface]\nPrivateKey = " ..wg_clean(line[2]).. "\nAddress = " ..address
else else
local peer = { local peer = {
public_key = line[2], public_key = line[2],
@ -53,7 +60,7 @@
end end
end end
table.insert(data[line[1]].peers, peer) table.insert(data[line[1]].peers, peer)
enc[line[1]] = enc[line[1]].. "\n\n[Peer]\nEndpoint = " ..line[4].. "\nPublicKey = " ..line[2].. "\nAllowedIPs = " ..line[5] enc[line[1]] = enc[line[1]].. "\n\n[Peer]\nEndpoint = " ..wg_clean(line[4]).. "\nPublicKey = " ..wg_clean(line[2]).. "\nAllowedIPs = " ..wg_clean(line[5])
end end
end end
end end
@ -194,7 +201,7 @@ for ikey, iface in pairs(data) do
<%- <%-
local qrcode local qrcode
if fs.access("/usr/bin/qrencode") then if fs.access("/usr/bin/qrencode") then
if enc[ikey]:sub(26,31) ~= "(none)" then if enc[ikey]:sub(26, 26) ~= "\n" then
qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- '" ..enc[ikey].. "'") qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- '" ..enc[ikey].. "'")
end end
else else