ipsec: fix faulty "-" usage in URIs

This commit is contained in:
Franco Fichtner 2024-05-14 09:12:32 +02:00
parent 7a3e55a863
commit 6a0da2725a
4 changed files with 14 additions and 14 deletions

View File

@ -4,9 +4,9 @@
<name>VPN: IPsec: Key Pairs</name>
<description>Allow access to the IPsec Key Pairs</description>
<patterns>
<pattern>ui/ipsec/key-pairs/*</pattern>
<pattern>api/ipsec/key-pairs/*</pattern>
<pattern>api/ipsec/legacy-subsystem/*</pattern>
<pattern>ui/ipsec/key_pairs/*</pattern>
<pattern>api/ipsec/key_pairs/*</pattern>
<pattern>api/ipsec/legacy_subsystem/*</pattern>
</patterns>
</page-vpn-ipsec-keypairs>
<page-vpn-ipsec>
@ -14,7 +14,7 @@
<patterns>
<pattern>ui/ipsec/tunnels</pattern>
<pattern>api/ipsec/tunnel/*</pattern>
<pattern>api/ipsec/legacy-subsystem/*</pattern>
<pattern>api/ipsec/legacy_subsystem/*</pattern>
</patterns>
</page-vpn-ipsec>
<page-vpn-ipsec-connections>
@ -25,7 +25,7 @@
<pattern>api/ipsec/connections/*</pattern>
<pattern>api/ipsec/pools/*</pattern>
<pattern>api/ipsec/vti/*</pattern>
<pattern>api/ipsec/legacy-subsystem/*</pattern>
<pattern>api/ipsec/legacy_subsystem/*</pattern>
</patterns>
</page-vpn-ipsec-connections>

View File

@ -10,7 +10,7 @@
<Act url="/vpn_ipsec_mobile.php*" visibility="hidden"/>
</Mobile>
<Keys order="30" VisibleName="Pre-Shared Keys" url="/ui/ipsec/pre_shared_keys/"/>
<KeyPairs order="40" VisibleName="Key Pairs" url="/ui/ipsec/key-pairs" />
<KeyPairs order="40" VisibleName="Key Pairs" url="/ui/ipsec/key_pairs" />
<Settings order="50" VisibleName="Advanced Settings" url="/vpn_ipsec_settings.php"/>
<Status order="60" VisibleName="Status Overview" url="/ui/ipsec/sessions"/>
<Leases order="70" VisibleName="Lease Status" url="/ui/ipsec/leases"/>

View File

@ -27,11 +27,11 @@
<script>
$( document ).ready(function() {
$('#grid-key-pairs').UIBootgrid({
search: '/api/ipsec/key-pairs/searchItem',
get: '/api/ipsec/key-pairs/getItem/',
set: '/api/ipsec/key-pairs/setItem/',
add: '/api/ipsec/key-pairs/addItem/',
del: '/api/ipsec/key-pairs/delItem/',
search: '/api/ipsec/key_pairs/searchItem',
get: '/api/ipsec/key_pairs/getItem/',
set: '/api/ipsec/key_pairs/setItem/',
add: '/api/ipsec/key_pairs/addItem/',
del: '/api/ipsec/key_pairs/delItem/',
});
// move "generate key" inside form dialog
@ -51,7 +51,7 @@
$("#keygen").click(function(){
let ktype = $("#keyPair\\.keyType").val();
let ksize = $("#keysize").val();
ajaxGet("/api/ipsec/key-pairs/gen_key_pair/" + ktype + "/" + ksize, {}, function(data, status){
ajaxGet("/api/ipsec/key_pairs/gen_key_pair/" + ktype + "/" + ksize, {}, function(data, status){
if (data.status && data.status === 'ok') {
$("#keyPair\\.publicKey").val(data.pubkey);
$("#keyPair\\.privateKey").val(data.privkey);

View File

@ -68,7 +68,7 @@
// Helper method to fetch the current status of the legacy subsystem for viewing/hiding the "pending changes" alert
function updateLegacyStatus() {
ajaxCall('/api/ipsec/legacy-subsystem/status', {}, function (data, status) {
ajaxCall('/api/ipsec/legacy_subsystem/status', {}, function (data, status) {
$("#enable").prop('checked', data['enabled']);
$("#enable").prop('disabled', false);
$("#enable").removeClass("pending");
@ -88,7 +88,7 @@
$applyLegacyConfig.prop('disabled', true);
$applyLegacyConfigProgress.addClass('fa fa-spinner fa-pulse');
ajaxCall('/api/ipsec/legacy-subsystem/applyConfig', {}, function (data, status) {
ajaxCall('/api/ipsec/legacy_subsystem/applyConfig', {}, function (data, status) {
// Preliminarily hide the "pending changes" alert and display the response message if available
if (data['message']) {
$dirtySubsystemMsg.addClass('hidden');