diff --git a/README.md b/README.md index 1c3498347..37d4592b4 100644 --- a/README.md +++ b/README.md @@ -4445,7 +4445,7 @@ URL: https://{{$hostname}}/api/v1/services/dhcpd/stop Update the current DHCPd configuration.
-_Requires at least one of the following privileges:_ [`page-all`, `page-services-dhcpserverpage-services-dhcpserver`] +_Requires at least one of the following privileges:_ [`page-all`, `page-services-dhcpserver`] ***Endpoint:*** @@ -4463,14 +4463,15 @@ URL: https://{{$hostname}}/api/v1/services/dhcpd | --- | ------|-------------| | interface | string | Specify which interface's DHCP configuration to update. You may specify either the interface's descriptive name, the pfSense ID (wan, lan, optx), or the physical interface id (e.g. igb0). This Interface must host a static IPv4 subnet that has more than one available within the subnet. | | enable | boolean | Enable or disable the DHCP server for this Interface (optional) | -| range_from | string | Update the DHCP pool's start IPv4 address. This must be an available address within the Interface's subnet and be less than the `range_to` value. (optional) | -| range_to | string | Update the DHCP pool's end IPv4 address. This must be an available address within the Interface's subnet and be greater than the `range_from` value. (optional) | +| range_from | string | Update the DHCP pool's start IPv4 address. This must be an available address within the Interface's subnet and be less than the `range_to` value. This field is required if no DHCP range has been set previously. (conditional) | +| range_to | string | Update the DHCP pool's end IPv4 address. This must be an available address within the Interface's subnet and be greater than the `range_from` value. This field is required if no DHCP range has been set previously. (conditional) | | dnsserver | string or array | Update the DNS servers to include In DHCP leases. Multiple values may be passed in as an array or single values may be passed in as a string. Each value must be a valid IPv4 address. Alternatively, you may pass In an empty array to revert to the system default. (optional) | | domain | string | Update the domain name to Include In the DHCP lease. This must be a valid domain name or an empty string to assume the system default (optional) | | domainsearchlist | string or array | Update the search domains to include In the DHCP lease. You may pass In an array for multiple entries or a string for single entries. Each entry must be a valid domain name. (optional) | | mac_allow | string or array | Update the list of allowed MAC addresses. You may pass In an array for multiple entries or a string for single entries. Each entry must be a full or partial MAC address. Alternatively, you may specify an empty array to revert to default (optional) | | mac_deny | string or array | Update the list of denied MAC addresses. You may pass In an array for multiple entries or a string for single entries. Each entry must be a full or partial MAC address. Alternatively, you may specify an empty array to revert to default (optional) | | gateway | string | Update the gateway to include In DHCP leases. This value must be a valid IPv4 address within the Interface's subnet. Alternatively, you can pass In an empty string to revert to the system default. (optional) | +| staticarp | boolean | Update whether the system should use static ARP entries on the associated interface. This option will persist even when DHCP is disabled. *Note: issues have been reported when interacting with this field via API, a separate call to initiate `/etc/rc.reload_interfaces` may be required afterwards which can be done via the /api/v1/diagnostics/command_prompt endpoint.* (optional) | | ignorebootp | boolean | Update whether or not to ignore BOOTP requests. True to Ignore, false to allow. (optional) | | denyunknown | boolean | Update whether or not to ignore unknown MAC addresses. If true, you must specify MAC addresses in the `mac_allow` field or add a static DHCP entry to receive DHCP requests. (optional) | diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIAccessToken.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIAccessToken.inc index 79e001787..d89c947ac 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIAccessToken.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIAccessToken.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIDiagnosticsCommandPrompt.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIDiagnosticsCommandPrompt.inc index 391ed6cb9..8e76d6c34 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIDiagnosticsCommandPrompt.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIDiagnosticsCommandPrompt.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallAliasEntry.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallAliasEntry.inc index aeb5e723d..9f3acf46e 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallAliasEntry.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallAliasEntry.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallApply.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallApply.inc index 9e63551f1..d64bf94c7 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallApply.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallApply.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOneToOne.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOneToOne.inc index 44a82a131..e5d44ebaf 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOneToOne.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOneToOne.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutbound.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutbound.inc index 22bc982bb..f615d1467 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutbound.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutbound.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutboundMapping.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutboundMapping.inc index 01266d41d..25e321003 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutboundMapping.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATOutboundMapping.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATPortForward.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATPortForward.inc index 5a7bf6ee1..9c442b32d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATPortForward.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallNATPortForward.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRule.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRule.inc index a8e384918..621affb98 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRule.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRule.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRuleFlush.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRuleFlush.inc index 1290659a6..6d0482e36 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRuleFlush.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallRuleFlush.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallScheduleTimeRange.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallScheduleTimeRange.inc index 9d8951eb6..991d2e45d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallScheduleTimeRange.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallScheduleTimeRange.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStates.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStates.inc index 22d654417..6e6bf475a 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStates.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStates.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStatesSize.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStatesSize.inc index 32cb06dfd..79621f3d7 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStatesSize.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallStatesSize.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaper.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaper.inc index 82d3eb8c7..c271d591c 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaper.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaper.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiter.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiter.inc index de8ba2dd2..e36323eac 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiter.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiter.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterBandwidth.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterBandwidth.inc index db351c639..840325495 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterBandwidth.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterBandwidth.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterQueue.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterQueue.inc index 267b37716..9d8d2190e 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterQueue.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperLimiterQueue.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperQueue.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperQueue.inc index 8929f4e37..c12a79863 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperQueue.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallTrafficShaperQueue.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallVirtualIP.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallVirtualIP.inc index 9233e9015..dccf19643 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallVirtualIP.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIFirewallVirtualIP.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterface.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterface.inc index 2194aded4..bb813c3da 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterface.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterface.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceApply.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceApply.inc index e33806544..75bfa2cfb 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceApply.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceApply.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceBridge.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceBridge.inc index 2bd68aeff..f66ef362f 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceBridge.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIInterfaceBridge.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingApply.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingApply.inc index fbbd5059c..a168a13c0 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingApply.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingApply.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingGateway.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingGateway.inc index c0aa21e47..e0cad9924 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingGateway.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIRoutingGateway.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServices.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServices.inc index 16e23845a..fabd70fe2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServices.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServices.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDDNS.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDDNS.inc index 9e2b0a29f..8726c93d4 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDDNS.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDDNS.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPd.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPd.inc index 458c8c868..418c31e4f 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPd.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPd.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdLease.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdLease.inc index f74e0ca6c..c22285b3d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdLease.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdLease.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdRestart.inc index 2900b4206..70abe5672 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStart.inc index f04e1cef8..0426f2413 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStaticMapping.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStaticMapping.inc index 540247364..1d779edb1 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStaticMapping.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStaticMapping.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStop.inc index ba1c1b47e..8eeecdee5 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDHCPdStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasq.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasq.inc index 77458552b..37f07d0c3 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasq.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasq.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverride.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverride.inc index 7b522b233..3f29f9c4f 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverride.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverride.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverrideAlias.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverrideAlias.inc index 832ddd9b0..fcb381381 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverrideAlias.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqHostOverrideAlias.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqRestart.inc index 3c285d75c..1da0c1ce2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStart.inc index 90adbfb93..abd935ee4 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStop.inc index c96bea28b..f6066f296 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDnsmasqStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerRestart.inc index 1b0c187cc..843aa1a5a 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStart.inc index c39841566..ad390be27 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStop.inc index 97350cb10..c4d6ce911 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesDpingerStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPd.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPd.inc index 65cc148cd..03bc7e9bf 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPd.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPd.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdRestart.inc index 3d861b25d..1e84df6cf 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStart.inc index 1eba31ab8..8218bb9a2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStop.inc index 10fb99a39..e8020b7b1 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdTimeServer.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdTimeServer.inc index f06f42189..05cdecaa6 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdTimeServer.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPdTimeServer.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesOpenVPNClientSpecificOverrides.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesOpenVPNClientSpecificOverrides.inc index b16b6d25b..cb0c83fc0 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesOpenVPNClientSpecificOverrides.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesOpenVPNClientSpecificOverrides.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHd.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHd.inc index bd2e5ccdc..7112868e0 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHd.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHd.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdRestart.inc index 6b4aa76f5..bc180889c 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStart.inc index 3c9f8463b..9a37557a4 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStop.inc index f7ed57a42..34b2cf232 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSSHdStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStart.inc index d0dde0995..f84de4236 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStop.inc index f1dfa3190..21099b937 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdRestart.inc index 5375f33b2..2f2b68d94 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStart.inc index cf758f800..9d4194335 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStop.inc index b872c6919..87424c32f 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesSyslogdStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnbound.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnbound.inc index f56019478..ba8801dfe 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnbound.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnbound.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundAccessList.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundAccessList.inc index db0d0c251..0ab870106 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundAccessList.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundAccessList.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverride.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverride.inc index dbfc5b394..c8de5c253 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverride.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverride.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverrideAlias.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverrideAlias.inc index 7c1228500..69ab61d0e 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverrideAlias.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundHostOverrideAlias.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundRestart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundRestart.inc index 68eb0bc8a..13d9c0f2c 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundRestart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundRestart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStart.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStart.inc index 4d17a960f..80e98ab6a 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStart.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStart.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStop.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStop.inc index 620315f27..61db19c8d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStop.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesUnboundStop.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusCARP.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusCARP.inc index 9fc0c7c47..1554b3457 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusCARP.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusCARP.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusGateway.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusGateway.inc index eb5f6001d..5ebebe340 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusGateway.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusGateway.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusInterface.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusInterface.inc index 02b5f8787..8c0959aec 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusInterface.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusInterface.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogConfigHistory.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogConfigHistory.inc index 1900983dc..614df74e2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogConfigHistory.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogConfigHistory.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogDHCP.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogDHCP.inc index 3e72b0761..b3ce61b99 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogDHCP.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogDHCP.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogFirewall.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogFirewall.inc index 348867dd9..557a51130 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogFirewall.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogFirewall.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogSystem.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogSystem.inc index 75077e7f4..eb0163365 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogSystem.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusLogSystem.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusOpenVPN.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusOpenVPN.inc index 257ad2d4f..7d5495e4b 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusOpenVPN.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIStatusOpenVPN.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPI.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPI.inc index a00d2ed71..5ef18a44d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPI.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPI.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPIError.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPIError.inc index bb52bfeab..c11115587 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPIError.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPIError.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPISync.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPISync.inc index 3d20ec101..81a7cd24f 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPISync.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemAPISync.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemCA.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemCA.inc index 4e8fd839a..f433f9702 100755 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemCA.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemCA.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemConfig.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemConfig.inc index 48da9f823..589251ee7 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemConfig.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemConfig.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemDNSServer.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemDNSServer.inc index 463944aba..0fffca80b 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemDNSServer.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemDNSServer.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHalt.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHalt.inc index 4aeeb156f..644b4cc23 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHalt.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHalt.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHostname.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHostname.inc index 09b088d3c..a16478d66 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHostname.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemHostname.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemNotificationsEmail.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemNotificationsEmail.inc index 543de0584..36cc6edc7 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemNotificationsEmail.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemNotificationsEmail.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTable.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTable.inc index 34069af4a..e037b7642 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTable.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTable.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTunable.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTunable.inc index 4aea41888..4a701fed7 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTunable.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemTunable.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemVersion.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemVersion.inc index 492703de0..d530132f2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemVersion.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APISystemVersion.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUser.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUser.inc index 9f381f95b..239559976 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUser.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUser.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServer.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServer.inc index 165a162d4..a0d71eb2d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServer.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServer.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerLDAP.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerLDAP.inc index 93a51454a..9155f51d7 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerLDAP.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerLDAP.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerRADIUS.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerRADIUS.inc index cb91585c9..c55a17054 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerRADIUS.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserAuthServerRADIUS.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserGroup.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserGroup.inc index a61b8afcb..7cee4acfe 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserGroup.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserGroup.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserPrivilege.inc b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserPrivilege.inc index d6aaa1a89..4aa79bbed 100644 --- a/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserPrivilege.inc +++ b/pfSense-pkg-API/files/etc/inc/api/endpoints/APIUserPrivilege.inc @@ -1,5 +1,5 @@ call(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/framework/APIAuth.inc b/pfSense-pkg-API/files/etc/inc/api/framework/APIAuth.inc index afbce39d7..512b8a8e9 100644 --- a/pfSense-pkg-API/files/etc/inc/api/framework/APIAuth.inc +++ b/pfSense-pkg-API/files/etc/inc/api/framework/APIAuth.inc @@ -1,5 +1,5 @@ validated_data); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOneToOneUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOneToOneUpdate.inc index c2109db92..4135d0f4a 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOneToOneUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOneToOneUpdate.inc @@ -1,5 +1,5 @@ validated_data); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingUpdate.inc index 0944246ad..febf3df69 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingUpdate.inc @@ -1,5 +1,5 @@ validated_data); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundUpdate.inc index bff23873b..e82dad05b 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundUpdate.inc @@ -1,5 +1,5 @@ validated_data); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATPortForwardUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATPortForwardUpdate.inc index b5d04f815..469df96f9 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATPortForwardUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATPortForwardUpdate.inc @@ -1,5 +1,5 @@ config['schedules']['schedule'], ["APIFirewallScheduleCreate", "__compare_schedules"]); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleDelete.inc index a858f03a1..065e80669 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleDelete.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleDelete.inc @@ -1,5 +1,5 @@ config['schedules']['schedule'], ["APIFirewallScheduleCreate", "__compare_schedules"]); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleRead.inc index 8491b6a4a..c1de2d5bf 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallScheduleRead.inc @@ -1,5 +1,5 @@ config['schedules']['schedule'], ["APIFirewallScheduleCreate", "__compare_schedules"]); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallStatesRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallStatesRead.inc index 1cc44aa9b..6bd70a759 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallStatesRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallStatesRead.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(4072); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperCreate.inc index 1f5c6ac6e..6383453c5 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperCreate.inc @@ -1,5 +1,5 @@ config["dnshaper"]["queue"][$this->id]["queue"]["item"] = []; } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperLimiterBandwidthDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperLimiterBandwidthDelete.inc index 109c6c859..9c7732d08 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperLimiterBandwidthDelete.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallTrafficShaperLimiterBandwidthDelete.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(4017); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallVirtualIPRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallVirtualIPRead.inc index e01e9b223..9a2d7f132 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallVirtualIPRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallVirtualIPRead.inc @@ -1,5 +1,5 @@ config["interfaces"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc index 664cfb68b..4662baf6c 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStartCreate.inc index 247287b0f..8dd34f721 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingCreate.inc index a0b1b577b..42ccd7963 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingCreate.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(2017); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingUpdate.inc index c86c6a361..1c6465d4a 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdStaticMappingUpdate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdUpdate.inc index dd16e8545..06d671180 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDHCPdUpdate.inc @@ -1,5 +1,5 @@ privileges = ["page-all", "page-services-dhcpserver"]; $this->change_note = "Modified DHCP server via API"; + $this->__if_conf = []; } public function action() { - $this->__init_config(); $this->config["dhcpd"][$this->id] = $this->validated_data; $this->write_config(); $this->reload_dhcpd(); @@ -34,15 +35,32 @@ class APIServicesDHCPdUpdate extends APIModel { } public function validate_payload() { + $this->__validate_interface(); + $this->__validate_enable(); + $this->__validate_range_from(); + $this->__validate_range_to(); + $this->__validate_domain(); + $this->__validate_mac_allow(); + $this->__validate_mac_deny(); + $this->__validate_domainsearchlist(); + $this->__validate_gateway(); + $this->__validate_dnsserver(); + $this->__validate_staticarp(); + $this->__validate_ignorebootp(); + $this->__validate_denyunknown(); + } + + private function __validate_interface() { # Check for our required 'interface' payload value if (isset($this->initial_data["interface"])) { $this->initial_data["interface"] = APITools\get_pfsense_if_id($this->initial_data["interface"]); # Check that interface exists if (is_string($this->initial_data["interface"])) { - $if_conf = $this->config["interfaces"][$this->initial_data["interface"]]; + $this->__if_conf = $this->config["interfaces"][$this->initial_data["interface"]]; # Check that interface hosts a static network with multiple addresses - if (isset($if_conf["enable"]) and is_ipaddrv4($if_conf["ipaddr"]) and $if_conf["subnet"] <= 31) { + if (isset($this->__if_conf["enable"]) and is_ipaddrv4($this->__if_conf["ipaddr"]) and $this->__if_conf["subnet"] <= 31) { $this->id = $this->initial_data["interface"]; + $this->__init_config($this->id); $this->validated_data = $this->config["dhcpd"][$this->id]; } else { $this->errors[] = APIResponse\get(2019); @@ -53,31 +71,24 @@ class APIServicesDHCPdUpdate extends APIModel { } else { $this->errors[] = APIResponse\get(2017); } + } + private function __validate_enable() { # Check for our optional 'enabled' payload value if ($this->initial_data["enable"] === true) { $this->validated_data["enable"] = true; } elseif ($this->initial_data["enable"] === false) { $this->validated_data["enable"] = false; } + } - # Format our range config arrays before validating their inputs - if (!is_array($this->validated_data["range"])) { - $this->config["range"] = []; - } - if (empty($this->initial_data["range_from"])) { - $this->initial_data["range_from"] = $this->validated_data["range"]["from"]; - } - if (empty($this->initial_data["range_to"])) { - $this->initial_data["range_to"] = $this->validated_data["range"]["to"]; - } - + private function __validate_range_from() { # Check for our optional 'range_from' payload value if (isset($this->initial_data["range_from"])) { # Ensure our range_from is an IPv4 address if (is_ipaddrv4($this->initial_data["range_from"])) { $ip = ip2long($this->initial_data["range_from"]); - $start_ip = ip2long(gen_subnetv4($if_conf["ipaddr"], $if_conf["subnet"])); + $start_ip = ip2long(gen_subnetv4($this->__if_conf["ipaddr"], $this->__if_conf["subnet"])); $end_ip = ip2long($this->initial_data["range_to"]); # Ensure our range_from is within our available range if ($ip > $start_ip and $ip < $end_ip) { @@ -91,14 +102,16 @@ class APIServicesDHCPdUpdate extends APIModel { } elseif (!isset($this->validated_data["range"]["from"])) { $this->errors[] = APIResponse\get(2020); } + } + private function __validate_range_to() { # Check for our optional 'range_to' payload value if (isset($this->initial_data["range_to"])) { # Ensure our range_to is an IPv4 address if (is_ipaddrv4($this->initial_data["range_to"])) { $ip = ip2long($this->initial_data["range_to"]); $start_ip = ip2long($this->validated_data["range_from"]); - $end_ip = ip2long(gen_subnetv4_max($if_conf["ipaddr"], $if_conf["subnet"])); + $end_ip = ip2long(gen_subnetv4_max($this->__if_conf["ipaddr"], $this->__if_conf["subnet"])); # Ensure our range_to is within our available range if ($ip > $start_ip and $ip < $end_ip) { $this->validated_data["range"]["to"] = $this->initial_data["range_to"]; @@ -111,7 +124,9 @@ class APIServicesDHCPdUpdate extends APIModel { } elseif (!isset($this->validated_data["range"]["to"])) { $this->errors[] = APIResponse\get(2023); } + } + private function __validate_domain() { # Check for our optional 'domain' value if (isset($this->initial_data["domain"])) { # Ensure domain is a hostname or default @@ -121,7 +136,9 @@ class APIServicesDHCPdUpdate extends APIModel { $this->errors[] = APIResponse\get(2030); } } + } + private function __validate_mac_allow() { # Check for our optional 'mac_allow' value if (isset($this->initial_data["mac_allow"])) { # Ensure value is an array @@ -146,7 +163,9 @@ class APIServicesDHCPdUpdate extends APIModel { $this->validated_data["mac_allow"] = ""; } } + } + private function __validate_mac_deny() { # Check for our optional 'mac_deny' value if (isset($this->initial_data["mac_deny"])) { # Ensure value is an array @@ -171,7 +190,9 @@ class APIServicesDHCPdUpdate extends APIModel { $this->validated_data["mac_deny"] = ""; } } + } + private function __validate_domainsearchlist() { # Check for our optional 'domainsearchlist' value if (isset($this->initial_data["domainsearchlist"])) { # Ensure value is an array @@ -196,28 +217,32 @@ class APIServicesDHCPdUpdate extends APIModel { $this->validated_data["domainsearchlist"] = ""; } } + } + private function __validate_gateway() { # Check for our optional 'gateway' payload value if (isset($this->initial_data["gateway"])) { # Ensure our gateway is an IPv4 address if (is_ipaddrv4($this->initial_data["gateway"])) { $ip = ip2long($this->initial_data["gateway"]); - $start_ip = ip2long(gen_subnetv4($if_conf["ipaddr"], $if_conf["subnet"])); - $end_ip = ip2long(gen_subnetv4_max($if_conf["ipaddr"], $if_conf["subnet"])); + $start_ip = ip2long(gen_subnetv4($this->__if_conf["ipaddr"], $this->__if_conf["subnet"])); + $end_ip = ip2long(gen_subnetv4_max($this->__if_conf["ipaddr"], $this->__if_conf["subnet"])); # Ensure our gateway is within our available range if ($ip > $start_ip and $ip < $end_ip) { $this->validated_data["gateway"] = $this->initial_data["gateway"]; } else { $this->errors[] = APIResponse\get(2029); } - # Allow empty string to revert gateway to default + # Allow empty string to revert gateway to default } elseif ($this->initial_data["gateway"] === "") { $this->validated_data["gateway"] = $this->initial_data["gateway"]; } else { $this->errors[] = APIResponse\get(2028); } } + } + private function __validate_dnsserver() { # Check for our optional 'dnsserver' payload value if (isset($this->initial_data["dnsserver"])) { # Ensure this value is an array @@ -241,14 +266,30 @@ class APIServicesDHCPdUpdate extends APIModel { $this->errors[] = APIResponse\get(2026); } } + } + private function __validate_staticarp() { + # TODO: issues with DHCP reloads and this field have been reported that may be fixed by calling + # TODO: reload_interfaces() which does not seem to be present within pfSense itself (#129). Current workaround + # TODO: is to call rc.reload_interfaces after interacting with this field until a root cause can be verified. + # Check for our optional 'staticarp' payload value + if ($this->initial_data["staticarp"] === true) { + $this->validated_data["staticarp"] = true; + } elseif ($this->initial_data["staticarp"] === false) { + $this->validated_data["staticarp"] = false; + } + } + + private function __validate_ignorebootp() { # Check for our optional 'ignorebootp' payload value if ($this->initial_data["ignorebootp"] === true) { $this->validated_data["ignorebootp"] = true; } elseif ($this->initial_data["ignorebootp"] === false) { $this->validated_data["ignorebootp"] = false; } + } + private function __validate_denyunknown() { # Check for our optional 'denyunknown' payload value if ($this->initial_data["denyunknown"] === true) { $this->validated_data["denyunknown"] = true; @@ -310,10 +351,43 @@ class APIServicesDHCPdUpdate extends APIModel { filter_configure(); } - private function __init_config() { + private function __init_config($interface) { # Initialize the DHCP configuration if it does not exist - if (!isset($this->config["dhcpd"])) { + if (empty($this->config["dhcpd"])) { $this->config["dhcpd"] = []; } + + # Initialize the default interface DHCP configuration if it does not exist + if (!isset($this->config["dhcpd"][$interface])) { + $this->config["dhcpd"][$interface] = [ + "range" => ["from" => "", "to" => ""], + "failover_peerip" => "", + "defaultleasetime" => "", + "maxleasetime" => "", + "netmask" => "", + "gateway" => "", + "domain" => "", + "domainsearchlist" => "", + "ddnsdomain" => "", + "ddnsdomainprimary" => "", + "ddnsdomainsecondary" => "", + "ddnsdomainkeyname" => "", + "ddnsdomainkeyalgorithm" => "hmac-md5", + "ddnsdomainkey" => "", + "mac_allow" => "", + "mac_deny" => "", + "ddnsclientupdates" => "allow", + "tftp" => "", + "ldap" => "", + "nextserver" => "", + "filename" => "", + "filename32" => "", + "filename64" => "", + "filename32arm" => "", + "filename64arm" => "", + "rootpath" => "", + "numberoptions" => "" + ]; + } } } diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqApplyCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqApplyCreate.inc index c99d9c8b4..c430f74cd 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqApplyCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqApplyCreate.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStartCreate.inc index daa4e8231..e19dac218 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStopCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStopCreate.inc index 82eabaa12..512da16f1 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStopCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDnsmasqStopCreate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerRestartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerRestartCreate.inc index cfb3cdd86..a56bc23e1 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerRestartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerRestartCreate.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStartCreate.inc index fd53d2937..e0d80dacf 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStopCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStopCreate.inc index 2314ec576..d9fe787d2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStopCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesDpingerStopCreate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdRead.inc index df9862af3..495eef6bb 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdRead.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStartCreate.inc index aa752be6a..f4aeaa886 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStopCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStopCreate.inc index bca2f5474..e50259149 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStopCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdStopCreate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdTimeServerCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdTimeServerCreate.inc index 78c1a202f..d94ce92c1 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdTimeServerCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdTimeServerCreate.inc @@ -1,5 +1,5 @@ create_timeserver->action(); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesOpenVPNClientSpecificOverridesCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesOpenVPNClientSpecificOverridesCreate.inc index c9677a28c..2fe489455 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesOpenVPNClientSpecificOverridesCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesOpenVPNClientSpecificOverridesCreate.inc @@ -1,5 +1,5 @@ validated_data["name"] = $this->initial_data['name']; } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesRestartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesRestartCreate.inc index 375eb321f..2b309b8f4 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesRestartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesRestartCreate.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStartCreate.inc index 898468dba..8c9810127 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStopCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStopCreate.inc index 9fa1a8211..e6b269f43 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStopCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdStopCreate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdUpdate.inc index 487aa078d..dffd8bec9 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSSHdUpdate.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStartCreate.inc index f3f49b830..5543d0f7d 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStopCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStopCreate.inc index 6ead59b75..c1744ec36 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStopCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesSyslogdStopCreate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundAccessListCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundAccessListCreate.inc index b5a18b539..512245835 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundAccessListCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundAccessListCreate.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(2015); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundHostOverrideRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundHostOverrideRead.inc index 8b0a28e71..b10326860 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundHostOverrideRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundHostOverrideRead.inc @@ -1,5 +1,5 @@ "restarted"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStartCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStartCreate.inc index 0b3728bd7..b5972f7a0 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStartCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStartCreate.inc @@ -1,5 +1,5 @@ "started"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStopCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStopCreate.inc index 84f281580..9639203e6 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStopCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIServicesUnboundStopCreate.inc @@ -1,5 +1,5 @@ "stopped"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIStatusCARPRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIStatusCARPRead.inc index 09b1bb4a8..0d12dc19e 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIStatusCARPRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIStatusCARPRead.inc @@ -1,5 +1,5 @@ validated_data["enable"]); return APIResponse\get(0, $this->validated_data); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIStatusGatewayRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIStatusGatewayRead.inc index cab6a8e54..b87aacb5f 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIStatusGatewayRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIStatusGatewayRead.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(1006); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APISystemARPRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APISystemARPRead.inc index 40aa9a58d..5dea60514 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APISystemARPRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APISystemARPRead.inc @@ -1,5 +1,5 @@ config); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APISystemConfigUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APISystemConfigUpdate.inc index 19049cf43..545dee66a 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APISystemConfigUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APISystemConfigUpdate.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(1016); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APISystemTunableRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APISystemTunableRead.inc index b813b15f2..55343e6b6 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APISystemTunableRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APISystemTunableRead.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(5025); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPCreate.inc index 7dac1199c..51cee3a32 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPCreate.inc @@ -1,5 +1,5 @@ initial_data["active"] = true; } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPDelete.inc index 88bdf2f11..d4c00d237 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPDelete.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPDelete.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(5025); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPRead.inc index d88a998df..642e2dbe2 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerLDAPRead.inc @@ -1,5 +1,5 @@ validated_data["radius_nasip_attribute"] = "wan"; } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSDelete.inc index c625a5cc9..11d4d85e0 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSDelete.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSDelete.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(5025); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSRead.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSRead.inc index 377b8a528..490bf3c3e 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSRead.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserAuthServerRADIUSRead.inc @@ -1,5 +1,5 @@ __validate_username(); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupCreate.inc index bd3d3a8a1..9fd364c16 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupCreate.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(5007); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupDelete.inc index 3a21163e0..0e9e82c91 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupDelete.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserGroupDelete.inc @@ -1,5 +1,5 @@ errors[] = APIResponse\get(5009); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeCreate.inc index 0e2eb140d..0b8b0ce60 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeCreate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeCreate.inc @@ -1,5 +1,5 @@ validated_data["priv"] = array($this->validated_data["priv"]); } } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeDelete.inc index 8d6a4c319..440a3f373 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeDelete.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserPrivilegeDelete.inc @@ -1,5 +1,5 @@ config["system"]["user"]); } -} \ No newline at end of file +} diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIUserUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIUserUpdate.inc index 4918d2f3f..916f5e084 100644 --- a/pfSense-pkg-API/files/etc/inc/api/models/APIUserUpdate.inc +++ b/pfSense-pkg-API/files/etc/inc/api/models/APIUserUpdate.inc @@ -1,5 +1,5 @@ @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php b/pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php index aa5078d6f..773011360 100644 --- a/pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php +++ b/pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php @@ -1,6 +1,6 @@ #!/usr/local/bin/php -f

Update DHCPd Service Configuration  |  PUT   -https:///api/v1/services/dhcpd

Description

Update the current DHCPd configuration.

Requires at least one of the following privileges: [page-all, page-services-dhcpserverpage-services-dhcpserver]

Fields
KeyTypeDescription
interfacestring

Specify which interface’s DHCP configuration to update. You may specify either the interface’s descriptive name, the pfSense ID (wan, lan, optx), or the physical interface id (e.g. igb0). This Interface must host a static IPv4 subnet that has more than one available within the subnet.

enableboolean

Enable or disable the DHCP server for this Interface (optional)

range_fromstring

Update the DHCP pool’s start IPv4 address. This must be an available address within the Interface’s subnet and be less than the range_to value. (optional)

range_tostring

Update the DHCP pool’s end IPv4 address. This must be an available address within the Interface’s subnet and be greater than the range_from value. (optional)

dnsserverstring or array

Update the DNS servers to include In DHCP leases. Multiple values may be passed in as an array or single values may be passed in as a string. Each value must be a valid IPv4 address. Alternatively, you may pass In an empty array to revert to the system default. (optional)

domainstring

Update the domain name to Include In the DHCP lease. This must be a valid domain name or an empty string to assume the system default (optional)

domainsearchliststring or array

Update the search domains to include In the DHCP lease. You may pass In an array for multiple entries or a string for single entries. Each entry must be a valid domain name. (optional)

mac_allowstring or array

Update the list of allowed MAC addresses. You may pass In an array for multiple entries or a string for single entries. Each entry must be a full or partial MAC address. Alternatively, you may specify an empty array to revert to default (optional)

mac_denystring or array

Update the list of denied MAC addresses. You may pass In an array for multiple entries or a string for single entries. Each entry must be a full or partial MAC address. Alternatively, you may specify an empty array to revert to default (optional)

gatewaystring

Update the gateway to include In DHCP leases. This value must be a valid IPv4 address within the Interface’s subnet. Alternatively, you can pass In an empty string to revert to the system default. (optional)

ignorebootpboolean

Update whether or not to ignore BOOTP requests. True to Ignore, false to allow. (optional)

denyunknownboolean

Update whether or not to ignore unknown MAC addresses. If true, you must specify MAC addresses in the mac_allow field or add a static DHCP entry to receive DHCP requests. (optional)

Example Request
{ +https:///api/v1/services/dhcpd
Description

Update the current DHCPd configuration.

Requires at least one of the following privileges: [page-all, page-services-dhcpserver]

Fields
KeyTypeDescription
interfacestring

Specify which interface’s DHCP configuration to update. You may specify either the interface’s descriptive name, the pfSense ID (wan, lan, optx), or the physical interface id (e.g. igb0). This Interface must host a static IPv4 subnet that has more than one available within the subnet.

enableboolean

Enable or disable the DHCP server for this Interface (optional)

range_fromstring

Update the DHCP pool’s start IPv4 address. This must be an available address within the Interface’s subnet and be less than the range_to value. This field is required if no DHCP range has been set previously. (conditional)

range_tostring

Update the DHCP pool’s end IPv4 address. This must be an available address within the Interface’s subnet and be greater than the range_from value. This field is required if no DHCP range has been set previously. (conditional)

dnsserverstring or array

Update the DNS servers to include In DHCP leases. Multiple values may be passed in as an array or single values may be passed in as a string. Each value must be a valid IPv4 address. Alternatively, you may pass In an empty array to revert to the system default. (optional)

domainstring

Update the domain name to Include In the DHCP lease. This must be a valid domain name or an empty string to assume the system default (optional)

domainsearchliststring or array

Update the search domains to include In the DHCP lease. You may pass In an array for multiple entries or a string for single entries. Each entry must be a valid domain name. (optional)

mac_allowstring or array

Update the list of allowed MAC addresses. You may pass In an array for multiple entries or a string for single entries. Each entry must be a full or partial MAC address. Alternatively, you may specify an empty array to revert to default (optional)

mac_denystring or array

Update the list of denied MAC addresses. You may pass In an array for multiple entries or a string for single entries. Each entry must be a full or partial MAC address. Alternatively, you may specify an empty array to revert to default (optional)

gatewaystring

Update the gateway to include In DHCP leases. This value must be a valid IPv4 address within the Interface’s subnet. Alternatively, you can pass In an empty string to revert to the system default. (optional)

staticarpboolean

Update whether the system should use static ARP entries on the associated interface. This option will persist even when DHCP is disabled. Note: issues have been reported when interacting with this field via API, a separate call to initiate /etc/rc.reload_interfaces may be required afterwards which can be done via the /api/v1/diagnostics/command_prompt endpoint. (optional)

ignorebootpboolean

Update whether or not to ignore BOOTP requests. True to Ignore, false to allow. (optional)

denyunknownboolean

Update whether or not to ignore unknown MAC addresses. If true, you must specify MAC addresses in the mac_allow field or add a static DHCP entry to receive DHCP requests. (optional)

Example Request
{ "interface": "lan", "enable": true, "ignorebootp": false, @@ -2315,7 +2315,7 @@ function IsJsonString(str){try{JSON.parse(str);}catch(e){return false;} return true;} String.prototype.replaceAll=function(replaceThis,withThis){var re=new RegExp(RegExp.quote(replaceThis),"g");return this.replace(re,withThis);};RegExp.quote=function(str){return str.replace(/([.?*+^$[\]\\(){}-])/g,"\\$1");};function syntaxHighlight(json){json=json.replace(/&/g,'&').replace(//g,'>');return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g,function(match){var cls='number';if(/^"/.test(match)){if(/:$/.test(match)){cls='key';}else{cls='string';}}else if(/true|false/.test(match)){cls='boolean';}else if(/null/.test(match)){cls='null';} -return ''+match+'';});}

+return ''+match+'';});}