diff options
| -rw-r--r-- | applications/luci-app-wireguard/Makefile | 2 | ||||
| -rw-r--r-- | applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js | 2 | ||||
| -rw-r--r-- | applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard (renamed from applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status) | 8 | ||||
| -rw-r--r-- | applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json | 2 | ||||
| -rw-r--r-- | protocols/luci-proto-wireguard/Makefile | 2 | ||||
| -rwxr-xr-x | protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard | 26 |
6 files changed, 12 insertions, 30 deletions
diff --git a/applications/luci-app-wireguard/Makefile b/applications/luci-app-wireguard/Makefile index ee260a982a..fe6a2c66ef 100644 --- a/applications/luci-app-wireguard/Makefile +++ b/applications/luci-app-wireguard/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=WireGuard Status -LUCI_DEPENDS:=+wireguard-tools +luci-proto-wireguard +LUCI_DEPENDS:=+wireguard-tools LUCI_PKGARCH:=all include ../../luci.mk diff --git a/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js b/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js index ca4ca9fd17..8614db018e 100644 --- a/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js +++ b/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js @@ -6,7 +6,7 @@ var callGetWgInstances = rpc.declare({ - object: 'luci.wireguard_status', + object: 'luci.wireguard', method: 'getWgInstances' }); diff --git a/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status b/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard index 892e74dbf1..7354ad4922 100644 --- a/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status +++ b/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard @@ -6,6 +6,14 @@ local io = require "io" local uci = require "uci" local methods = { + generateKeyPair = { + call = function() + local prv = sys.exec("wg genkey 2>/dev/null"):sub(1, -2) + local pub = sys.exec("echo '" .. prv .. "' | wg pubkey 2>/dev/null"):sub(1, -2) + + return {keys = {priv = prv, pub = pub}} + end + }, getWgInstances = { call = function() local data = {} diff --git a/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json b/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json index f0938e5b00..cd38bcf8ec 100644 --- a/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json +++ b/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json @@ -3,7 +3,7 @@ "description": "Grant access to LuCI app wireguard", "read": { "ubus": { - "luci.wireguard_status": [ + "luci.wireguard": [ "getWgInstances" ] } diff --git a/protocols/luci-proto-wireguard/Makefile b/protocols/luci-proto-wireguard/Makefile index f88b90bbfa..45ec1921cc 100644 --- a/protocols/luci-proto-wireguard/Makefile +++ b/protocols/luci-proto-wireguard/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for WireGuard VPN -LUCI_DEPENDS:=+wireguard-tools +LUCI_DEPENDS:=+wireguard-tools +luci-app-wireguard LUCI_PKGARCH:=all include ../../luci.mk diff --git a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard b/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard deleted file mode 100755 index a6c951f3de..0000000000 --- a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -. /usr/share/libubox/jshn.sh - -case "$1" in - list) - json_init - json_add_object "generateKeyPair" - json_close_object - json_dump - ;; - call) - case "$2" in - generateKeyPair) - prv=$(wg genkey) - pub=$(echo $prv | wg pubkey) - json_init - json_add_object "keys" - json_add_string "priv" "$prv" - json_add_string "pub" "$pub" - json_close_object - json_dump - ;; - esac - ;; -esac |