lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPN: add token generation button for "Auth Token secret" input as implemented in https://github.com/opnsense/core/pull/8396 , also fix a minor glitch around advanced options.

Browse Source
This commit is contained in:
Ad Schellevis 2025-03-05 20:02:06 +01:00
parent 2178e59f05
commit 3e6467758a
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/InstancesController.php
View File

@ -96,14 +96,16 @@ class InstancesController extends ApiMutableModelControllerBase
return $this->delBase('StaticKeys.StaticKey', $uuid);
}
public function genKeyAction()
public function genKeyAction($type='secret')
{
$key = (new Backend())->configdRun("openvpn genkey");
if (strpos($key, '-----BEGIN') > 0) {
return [
'result' => 'ok',
'key' => trim($key)
];
if (in_array($type, ['secret', 'auth-token'])) {
$key = (new Backend())->configdpRun("openvpn genkey", [$type]);
if (strpos($key, '-----BEGIN') !== false) {
return [
'result' => 'ok',
'key' => trim($key)
];
}
}
return ['result' => 'failed'];
}

24
src/opnsense/mvc/app/views/OPNsense/OpenVPN/instances.volt
View File

@ -61,12 +61,11 @@
});
$("#instance\\.role, #instance\\.dev_type").change(function(){
const show_advanced = $("#show_advanced_formDialogDialogInstance").hasClass("fa-toggle-on");
const show_advanced = $("#show_advanced_formDialogdialog_dialogInstance").hasClass("fa-toggle-on");
const this_role = $("#instance\\.role").val();
const this_dev_type = $("#instance\\.dev_type").val();
$(".role").each(function(){
const tr = $(this).closest("tr").hide();
if ((tr.data('advanced') === true && show_advanced) || !tr.data('advanced')) {
if ($(this).hasClass('role_' + this_role) || $(this).hasClass('role_' + this_role + '_' + this_dev_type)) {
tr.show();
@ -79,15 +78,25 @@
});
// move "generate key" inside form dialog
$("#row_statickey\\.mode > td:eq(1) > div:last").before($("#keygen_div").detach().show());
$("#control_label_instance\\.auth-gen-token-secret").before($("#keygen_auth_token_div").detach().show());
$("#keygen").click(function(){
ajaxGet("/api/openvpn/instances/gen_key", {}, function(data, status){
ajaxGet("/api/openvpn/instances/gen_key/secret", {}, function(data, status){
if (data.result && data.result === 'ok') {
$("#statickey\\.key").val(data.key);
}
});
})
});
$("#keygen_auth_token").click(function(){
ajaxGet("/api/openvpn/instances/gen_key/auth-token", {}, function(data, status){
if (data.result && data.result === 'ok') {
$("#instance\\.auth-gen-token-secret").val(data.key);
}
});
});
$("#reconfigureAct").SimpleActionButton();
});
@ -110,6 +119,11 @@
</ul>
<div class="tab-content content-box">
<div id="instances" class="tab-pane fade in active">
<span id="keygen_auth_token_div" style="display:none" class="pull-right">
<button id="keygen_auth_token" type="button" class="btn btn-secondary" title="{{ lang._('Generate new auth-token.') }}" data-toggle="tooltip">
<i class="fa fa-fw fa-gear"></i>
</button>
</span>
{{ partial('layout_partials/base_bootgrid_table', formGridInstance)}}
</div>
<div id="statickeys" class="tab-pane fade in">

6
src/opnsense/service/conf/actions.d/actions_openvpn.conf
View File

@ -11,10 +11,10 @@ type:script_output
message:Kill OpenVPN session %s - %s
[genkey]
command:/usr/local/sbin/openvpn --genkey secret /dev/stdout
parameters:
command:/usr/local/sbin/openvpn
parameters:--genkey %s /dev/stdout
type:script_output
message: Generate new OpenVPN static key
message: Generate new OpenVPN static %s key
[start]
command:/usr/local/opnsense/scripts/openvpn/ovpn_service_control.php