Update boolean provision
This commit is contained in:
@@ -179,7 +179,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//get http_domain_filter from global settings only (can't be used per domain)
|
//get http_domain_filter from global settings only (can't be used per domain)
|
||||||
$domain_filter = (new settings(['database' => $database]))->get('provision', 'http_domain_filter', 'true') == 'true' ? true : false;
|
$domain_filter = (new settings(['database' => $database]))->get('provision', 'http_domain_filter', true);
|
||||||
|
|
||||||
//get the domain_uuid, domain_name, device_name and device_vendor
|
//get the domain_uuid, domain_name, device_name and device_vendor
|
||||||
$sql = "select d.device_uuid, d.domain_uuid, d.device_vendor, n.domain_name ";
|
$sql = "select d.device_uuid, d.domain_uuid, d.device_vendor, n.domain_name ";
|
||||||
@@ -234,7 +234,7 @@
|
|||||||
$settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid]);
|
$settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid]);
|
||||||
|
|
||||||
//check if provisioning has been enabled
|
//check if provisioning has been enabled
|
||||||
if ($settings->get('provision', 'enabled', 'false') !== "true") {
|
if (!$settings->get('provision', 'enabled', false)) {
|
||||||
syslog(LOG_WARNING, '['.$_SERVER['REMOTE_ADDR']."] provision attempt but provisioning is not enabled for ".escape($_REQUEST['mac']));
|
syslog(LOG_WARNING, '['.$_SERVER['REMOTE_ADDR']."] provision attempt but provisioning is not enabled for ".escape($_REQUEST['mac']));
|
||||||
http_error('404');
|
http_error('404');
|
||||||
}
|
}
|
||||||
@@ -242,6 +242,11 @@
|
|||||||
//get all provision settings
|
//get all provision settings
|
||||||
$provision = $settings->get('provision', null, []);
|
$provision = $settings->get('provision', null, []);
|
||||||
|
|
||||||
|
//check for a valid match
|
||||||
|
if (empty($device_uuid) && $settings->get('provision', 'auto_insert_enabled', false)) {
|
||||||
|
http_error(403);
|
||||||
|
}
|
||||||
|
|
||||||
//check the cidr range
|
//check the cidr range
|
||||||
if (!empty($provision['cidr'])) {
|
if (!empty($provision['cidr'])) {
|
||||||
$found = false;
|
$found = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user