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

luci-app-yggdrasil: support public key in config generation

Browse source 
Signed-off-by: William Fleurant <meshnet@protonmail.com>
This commit is contained in:
William Fleurant 2023-11-18 09:38:47 +01:00
parent e6a1f119e6
commit 6fdafc4155
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
protocols/luci-proto-yggdrasil/htdocs/luci-static/resources/protocol/yggdrasil.js
View file

@ -50,10 +50,12 @@ var cbiKeyPairGenerate = form.DummyValue.extend({
'class':'btn', 'class':'btn',
'click':ui.createHandlerFn(this, function(section_id,ev) { 'click':ui.createHandlerFn(this, function(section_id,ev) {
var prv = this.section.getUIElement(section_id,'private_key'), var prv = this.section.getUIElement(section_id,'private_key'),
pub = this.section.getUIElement(section_id,'public_key'),
map = this.map; map = this.map;
return generateKey().then(function(keypair){ return generateKey().then(function(keypair){
prv.setValue(keypair.priv); prv.setValue(keypair.priv);
pub.setValue(keypair.pub);
map.save(null,true); map.save(null,true);
}); });
},section_id) },section_id)
@ -189,6 +191,10 @@ return network.registerProtocol('yggdrasil',
o.password=true; o.password=true;
o.validate=validatePrivateKey; o.validate=validatePrivateKey;
o=s.taboption('general',form.Value,'public_key',_('Public key'),_('The public key for your Yggdrasil node'));
o.optional=true;
o.validate=validatePublicKey;
s.taboption('general',cbiKeyPairGenerate,'_gen_server_keypair',' '); s.taboption('general',cbiKeyPairGenerate,'_gen_server_keypair',' ');
o=s.taboption('advanced',form.Value,'mtu',_('MTU'),_('A default MTU of 65535 is set by Yggdrasil. It is recomended to utilize the default.')); o=s.taboption('advanced',form.Value,'mtu',_('MTU'),_('A default MTU of 65535 is set by Yggdrasil. It is recomended to utilize the default.'));

4
protocols/luci-proto-yggdrasil/root/usr/libexec/rpcd/luci.yggdrasil
View file

@ -16,12 +16,12 @@ case "$1" in
case "$2" in case "$2" in
generateKeyPair) generateKeyPair)
json_load "$(yggdrasil -genconf -json)" json_load "$(yggdrasil -genconf -json)"
json_get_vars PublicKey PrivateKey json_get_vars PrivateKey
json_cleanup json_cleanup
json_init json_init
json_add_object "keys" json_add_object "keys"
json_add_string "priv" "$PrivateKey" json_add_string "priv" "$PrivateKey"
json_add_string "pub" "$PublicKey" json_add_string "pub" "${PrivateKey:64}"
json_close_object json_close_object
json_dump json_dump
;; ;;