Merge pull request #5400 from systemcrash/wg_pubkey

luci-proto-wireguard: display interface public key

diff --git a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
index ef4712dc6ef6aa3b80ade572c4d554fe0b05c258..74327f3001d73229b584ad975f22a1cae69810f4 100644 (file)
--- a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
+++ b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
@@ -11,6 +11,13 @@ var generateKey = rpc.declare({
        expect: { keys: {} }
 });
 
+var getPublicAndPrivateKeyFromPrivate = rpc.declare({
+       object: 'luci.wireguard',
+       method: 'getPublicAndPrivateKeyFromPrivate',
+       params: ['privkey'],
+       expect: { keys: {} }
+});
+
 var generateQrCode = rpc.declare({
        object: 'luci.wireguard',
        method: 'generateQrCode',
@@ -88,14 +95,34 @@ return network.registerProtocol('wireguard', {
                o.validate = validateBase64;
                o.rmempty = false;
 
+               var sections = uci.sections('network');
+               var serverName = this.getIfname();
+               var server = findSection(sections, serverName);
+
+               o = s.taboption('general', form.Value, 'public_key', _('Public Key'), _('Base64-encoded public key of this interface for sharing.'));
+               o.rmempty = false;
+               o.write = function() {/* write nothing */};
+
+               o.load = function(s) {
+                       return getPublicAndPrivateKeyFromPrivate(server.private_key).then(
+                               function(keypair) {
+                                       return keypair.pub || '';
+                               }, 
+                               function(error){
+                                       return _('Error getting PublicKey');
+                       }, this)
+               };
+
                o = s.taboption('general', form.Button, 'generate_key', _('Generate Key'));
                o.inputstyle = 'apply';
                o.onclick = ui.createHandlerFn(this, function(section_id, ev) {
                         return generateKey().then(function(keypair) {
                                var keyInput = document.getElementById('widget.cbid.network.%s.private_key'.format(section_id)),
-                                   changeEvent = new Event('change');
+                                       changeEvent = new Event('change'),
+                                       pubKeyInput = document.getElementById('widget.cbid.network.%s.public_key'.format(section_id));
 
                                keyInput.value = keypair.priv || '';
+                               pubKeyInput.value = keypair.pub || '';
                                keyInput.dispatchEvent(changeEvent);
                        });
                }, s.section);

diff --git a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard b/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
index 681e98e5c4dd14381536b0f9ec607a33228519d9..bbe91cdd6a8d7629eb1a6f8df53e329b937de4a6 100755 (executable)
--- a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
+++ b/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
@@ -16,6 +16,14 @@ local methods = {
                        return {keys = {priv = prv, pub = pub}}
                end
        },
+       getPublicAndPrivateKeyFromPrivate = {
+               args = {privkey = "privkey"},
+               call = function(args)
+                       local pubkey = sys.exec("echo %s | wg pubkey 2>/dev/null" % util.shellquote(args.privkey)):sub(1, -2)
+
+                       return {keys = {priv = args.privkey, pub = pubkey}}
+               end
+       },
        generateQrCode = {
                args = {privkey = "privkey", psk = "psk", allowed_ips = {"allowed_ips"}},
                call = function(args)

diff --git a/protocols/luci-proto-wireguard/root/usr/share/rpcd/acl.d/luci-wireguard.json b/protocols/luci-proto-wireguard/root/usr/share/rpcd/acl.d/luci-wireguard.json
index 04877d4f490464c8f51c0c882e5ebdc45736a6c3..aa949b9d1486de07275fefcba3f1f71cd74dc876 100644 (file)
--- a/protocols/luci-proto-wireguard/root/usr/share/rpcd/acl.d/luci-wireguard.json
+++ b/protocols/luci-proto-wireguard/root/usr/share/rpcd/acl.d/luci-wireguard.json
@@ -5,6 +5,7 @@
                        "ubus": {
                                "luci.wireguard": [
                                        "generateKeyPair",
+                                       "getPublicAndPrivateKeyFromPrivate",
                                        "generateQrCode"
                                ]
                        }