ben.carrasco/jambonz-webapp
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-webapp.git synced 2026-10-04 02:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from jambonz/ip_cidr

Browse Source 
allow cidr ip range in sip gateway
This commit is contained in:
Dave Horton
2021-03-11 07:20:28 -05:00
committed by GitHub
parent 42872e9878 7e2488a9c3
commit 25a93edeac
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/forms/SipTrunkForm.js
+24 -6
View File
@@ -303,6 +303,7 @@ const SipTrunkForm = props => {
}
const regIp = /^((25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])$/;
const regIpCidr = /^((25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])(\/(([1-2]?[0-9])|(3[0-2])))?$/;
const regFqdn = /^([a-zA-Z0-9][^.]*)(\.[^.]+){2,}$/;
const regFqdnTopLevel = /^([a-zA-Z][^.]*)(\.[^.]+)$/;
const regPort = /^[0-9]+$/;
@@ -313,11 +314,13 @@ const SipTrunkForm = props => {
//-----------------------------------------------------------------------------
const type = regIp.test(gateway.ip.trim())
? 'ip'
: regFqdn.test(gateway.ip.trim())
? 'fqdn'
: regFqdnTopLevel.test(gateway.ip.trim())
? 'fqdn-top-level'
: 'invalid';
:regIpCidr.test(gateway.ip.trim())
? 'ip-cidr'
: regFqdn.test(gateway.ip.trim())
? 'fqdn'
: regFqdnTopLevel.test(gateway.ip.trim())
? 'fqdn-top-level'
: 'invalid';
if (!gateway.ip) {
errorMessages.push('The IP Address cannot be blank. Please provide an IP address or delete the row.');
@@ -367,7 +370,22 @@ const SipTrunkForm = props => {
//-----------------------------------------------------------------------------
// inbound/outbound validation
//-----------------------------------------------------------------------------
if (type === 'fqdn' && (!gateway.outbound || gateway.inbound)) {
if (type === 'ip-cidr' && (!gateway.inbound || gateway.outbound)){
errorMessages.push('A CIDR IP address may only be used for inbound calls.');
updateSipGateways(null, i, 'invalidIp');
if (!gateway.inbound) updateSipGateways(null, i, 'invalidInbound');
if (gateway.outbound) updateSipGateways(null, i, 'invalidOutbound');
if (!focusHasBeenSet) {
if (!gateway.inbound) {
refInbound.current[i].focus();
} else {
refOutbound.current[i].focus();
}
focusHasBeenSet = true;
}
}
else if (type === 'fqdn' && (!gateway.outbound || gateway.inbound)) {
errorMessages.push('A fully qualified domain name may only be used for outbound calls.');
updateSipGateways(null, i, 'invalidIp');
if (gateway.inbound) updateSipGateways(null, i, 'invalidInbound');