luci-app-wireguard: merge app and proto rpcd

Signed-off-by: lvoegl <redacted>

diff --git a/applications/luci-app-wireguard/Makefile b/applications/luci-app-wireguard/Makefile
index ee260a982aa27b5de66afda1668013bde3cb4b1f..fe6a2c66efd814f1ea5928e73d8553842d24fca2 100644 (file)
--- 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 ca4ca9fd17aeaafeec3e589bb188cb87bc8c0c6b..8614db018ea10593a02a3cde90e0fae28d6fd0ab 100644 (file)
--- 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
similarity index 92%
rename from applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status
rename to applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard
index 892e74dbf112a787346cb5fa9affa38d3848469f..7354ad49223be6ac9301f8c8a49d332692df8a4d 100644 (file)
--- 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 f0938e5b0048e23da912cf9295abf9a0dd2148d4..cd38bcf8ec5334b5b381851332cb56212580529a 100644 (file)
--- 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 f88b90bbfa504303c95c52988849c117a5bd929e..45ec1921cc91f8c1fcbd565d0b71330e34688426 100644 (file)
--- 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 (executable)
index a6c951f..0000000
--- 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