mirror of
https://github.com/billz/raspap-webgui.git
synced 2025-12-27 07:31:09 +01:00
Implement buildConfig, saveConfig, getInterfaceConfig methods
This commit is contained in:
billz
@@ -2,46 +2,229 @@
|
||||
|
||||
namespace RaspAP\Networking\Hotspot;
|
||||
|
||||
use RaspAP\Messages\StatusMessage;
|
||||
|
||||
/**
|
||||
* Handles dhcpcd.conf interface configuration.
|
||||
*/
|
||||
class DhcpcdManager
|
||||
{
|
||||
private const CONF_DEFAULT = RASPI_DHCPCD_CONFIG;
|
||||
private const CONF_TMP = '/tmp/dhcpddata';
|
||||
|
||||
/**
|
||||
* Get dhcpcd settings for an interface.
|
||||
* Builds a dhcpcd config for an interface
|
||||
*
|
||||
* @param string $iface
|
||||
* @return array
|
||||
* @param string $ap_iface
|
||||
* @param bool $bridgedEnable
|
||||
* @param bool $repeaterEnable
|
||||
* @param bool $wifiAPEnable
|
||||
* @param bool $dualAPEnable
|
||||
* @param StatusMessage $status
|
||||
* @return string
|
||||
*/
|
||||
public function getInterfaceSection(string $iface): array
|
||||
public function buildConfig(
|
||||
string $ap_iface,
|
||||
bool $bridgedEnable,
|
||||
bool $repeaterEnable,
|
||||
bool $wifiAPEnable,
|
||||
bool $dualAPEnable,
|
||||
StatusMessage $status
|
||||
): bool
|
||||
{
|
||||
// TODO: parse dhcpcd.conf
|
||||
return [];
|
||||
// determine static IP, routers, DNS
|
||||
$jsonData = $this->getInterfaceConfig($ap_iface);
|
||||
//error_log("DhcpcdManager::buildConfig() jsonData =" . print_r($jsonData, true));
|
||||
$ip_address = empty($jsonData['StaticIP'])
|
||||
? getDefaultNetValue('dhcp', $ap_iface, 'static ip_address')
|
||||
: $jsonData['StaticIP'];
|
||||
$domain_name_server = empty($jsonData['StaticDNS'])
|
||||
? getDefaultNetValue('dhcp', $ap_iface, 'static domain_name_server')
|
||||
: $jsonData['StaticDNS'];
|
||||
$routers = empty($jsonData['StaticRouters'])
|
||||
? getDefaultNetValue('dhcp', $ap_iface, 'static routers')
|
||||
: $jsonData['StaticRouters'];
|
||||
$netmask = (empty($jsonData['SubnetMask']) || $jsonData['SubnetMask'] === '0.0.0.0')
|
||||
? getDefaultNetValue('dhcp', $ap_iface, 'subnetmask')
|
||||
: $jsonData['SubnetMask'];
|
||||
if (!preg_match('/.*\/\d+/', $ip_address)) {
|
||||
$ip_address .= '/' . mask2cidr($netmask);
|
||||
}
|
||||
$config = [];
|
||||
|
||||
if ($bridgedEnable) {
|
||||
$config = array_keys(getDefaultNetOpts('dhcp', 'options'));
|
||||
$config[] = '# RaspAP br0 configuration';
|
||||
$config[] = 'denyinterfaces eth0 wlan0';
|
||||
$config[] = 'interface br0';
|
||||
} elseif ($repeaterEnable) {
|
||||
$config = [
|
||||
'# RaspAP ' . $ap_iface . ' configuration',
|
||||
'interface ' . $ap_iface,
|
||||
'static ip_address=' . $ip_address,
|
||||
'static routers=' . $routers,
|
||||
'static domain_name_server=' . $domain_name_server
|
||||
];
|
||||
$client_metric = getIfaceMetric($_SESSION['wifi_client_interface']);
|
||||
if (is_int($client_metric)) {
|
||||
$config[] = 'metric ' . ((int)$client_metric + 1);
|
||||
} else {
|
||||
$status->addMessage(
|
||||
'Unable to obtain metric value for client interface. Repeater mode inactive.',
|
||||
'warning'
|
||||
);
|
||||
}
|
||||
} elseif ($wifiAPEnable) {
|
||||
$config = array_keys(getDefaultNetOpts('dhcp', 'options'));
|
||||
$config[] = '# RaspAP uap0 configuration';
|
||||
$config[] = 'interface uap0';
|
||||
$config[] = 'static ip_address=' . $ip_address;
|
||||
$config[] = 'nohook wpa_supplicant';
|
||||
} elseif ($dualAPEnable) {
|
||||
$config = [
|
||||
'# RaspAP ' . $ap_iface . ' configuration',
|
||||
'interface ' . $ap_iface,
|
||||
'static ip_address=' . $ip_address,
|
||||
'static routers=' . $routers,
|
||||
'static domain_name_server=' . $domain_name_server,
|
||||
'nogateway'
|
||||
];
|
||||
} else {
|
||||
$config = $this->updateDhcpcdConfig(
|
||||
$ap_iface,
|
||||
$jsonData,
|
||||
$ip_address,
|
||||
$routers,
|
||||
$domain_name_server
|
||||
);
|
||||
}
|
||||
$dhcp_cfg = file_get_contents(SELF::CONF_DEFAULT);
|
||||
|
||||
if (preg_match('/wlan[3-9]\d*|wlan[1-9]\d+/', $ap_iface)) {
|
||||
$skip_dhcp = true;
|
||||
} elseif ($bridgedEnable == 1 || $wifiAPEnable == 1) {
|
||||
$dhcp_cfg = join(PHP_EOL, $config);
|
||||
$status->addMessage(sprintf(_('DHCP configuration for %s enabled.'), $ap_iface), 'success');
|
||||
} elseif (!preg_match('/^interface\s'.$ap_iface.'$/m', $dhcp_cfg)) {
|
||||
$config[] = PHP_EOL;
|
||||
$config= join(PHP_EOL, $config);
|
||||
$dhcp_cfg = removeDHCPIface($dhcp_cfg,'br0');
|
||||
$dhcp_cfg = removeDHCPIface($dhcp_cfg,'uap0');
|
||||
$dhcp_cfg .= $config;
|
||||
} else {
|
||||
$config = join(PHP_EOL, $config);
|
||||
$dhcp_cfg = removeDHCPIface($dhcp_cfg,'br0');
|
||||
$dhcp_cfg = removeDHCPIface($dhcp_cfg,'uap0');
|
||||
if (!strpos($dhcp_cfg, 'metric')) {
|
||||
$dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$ap_iface.'\s.*?(?=(?:\s*^\s*$|\s*nogateway))/ms', $config, $dhcp_cfg, 1);
|
||||
} else {
|
||||
$metrics = true;
|
||||
}
|
||||
}
|
||||
if ($repeaterEnable && $metrics) {
|
||||
$status->addMessage(_('WiFi repeater mode: A metric value is already defined for DHCP.'), 'warning');
|
||||
} else if ($repeaterEnable && !$metrics) {
|
||||
$status->addMessage(sprintf(_('Metric value configured for the %s interface.'), $ap_iface), 'success');
|
||||
$status->addMessage('Restart hotspot to enable WiFi repeater mode.', 'success');
|
||||
$this->saveConfig($dhcp_cfg, $ap_iface, $status);
|
||||
} elseif (!$skip_dhcp) {
|
||||
$this->saveConfig($dhcp_cfg, $ap_iface, $status);
|
||||
} else {
|
||||
$status->addMessage('WiFi hotspot settings saved.', 'success');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Write or update interface section.
|
||||
* Saves a dhcpcd configuration
|
||||
*
|
||||
* @param string $iface
|
||||
* @param array $kv
|
||||
* @param string $config
|
||||
* @param StatusMessage $status
|
||||
* @return bool
|
||||
* @throws \RuntimeException
|
||||
*/
|
||||
public function writeInterfaceSection(string $iface, array $kv): bool
|
||||
public function saveConfig(string $config, string $iface, StatusMessage $status): bool
|
||||
{
|
||||
// TODO: update config
|
||||
return false;
|
||||
if (file_put_contents(self::CONF_TMP, $config) === false) {
|
||||
throw new \RuntimeException("Failed to write temporary dhcpcd config");
|
||||
}
|
||||
|
||||
exec(sprintf('sudo cp %s %s', escapeshellarg(self::CONF_TMP), escapeshellarg(self::CONF_DEFAULT)), $o, $rc);
|
||||
if ($rc !== 0) {
|
||||
$status->addMessage('Unable to save DHCP configuration.', 'danger');
|
||||
return false;
|
||||
}
|
||||
$status->addMessage(sprintf(_('DHCP configuration for %s updated.'), $iface), 'success');
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove interface section from dhcpcd.conf.
|
||||
*
|
||||
* @param string $iface
|
||||
* @return bool
|
||||
*/
|
||||
public function removeInterface(string $iface): bool
|
||||
* Updates the dhcpcd configuration for a given interface, preserving existing settings
|
||||
*
|
||||
* @param string $ap_iface
|
||||
* @param array $jsonData
|
||||
* @param string $ip_address
|
||||
* @param string $routers
|
||||
* @param string $domain_name_server
|
||||
* @return array updated configuration
|
||||
*/
|
||||
private function updateDhcpcdConfig(
|
||||
string $ap_iface,
|
||||
array $jsonData,
|
||||
string $ip_address,
|
||||
string $routers,
|
||||
string $domain_name_server): array
|
||||
{
|
||||
// TODO: delete section
|
||||
return false;
|
||||
$dhcp_cfg = file_get_contents(self::CONF_DEFAULT);
|
||||
$existing_config = [];
|
||||
$section_regex = '/^#\sRaspAP\s'.preg_quote($ap_iface, '/').'\s.*?(?=\s*^\s*$)/ms';
|
||||
|
||||
// extract existing interface configuration
|
||||
if (preg_match($section_regex, $dhcp_cfg, $matches)) {
|
||||
$lines = explode(PHP_EOL, $matches[0]);
|
||||
foreach ($lines as $line) {
|
||||
$line = trim($line);
|
||||
if (preg_match('/^(interface|static|metric|nogateway|nohook)/', $line)) {
|
||||
$existing_config[] = $line;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// initialize with comment
|
||||
$config = [ '# RaspAP '.$ap_iface.' configuration' ];
|
||||
$config[] = 'interface '.$ap_iface;
|
||||
$static_settings = [
|
||||
'static ip_address' => $ip_address,
|
||||
'static routers' => $routers,
|
||||
'static domain_name_server' => $domain_name_server
|
||||
];
|
||||
|
||||
// merge existing settings with updates
|
||||
foreach ($existing_config as $line) {
|
||||
$matched = false;
|
||||
foreach ($static_settings as $key => $value) {
|
||||
if (strpos($line, $key) === 0) {
|
||||
$config[] = "$key=$value";
|
||||
$matched = true;
|
||||
unset($static_settings[$key]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!$matched && !preg_match('/^interface/', $line)) {
|
||||
$config[] = $line;
|
||||
}
|
||||
}
|
||||
|
||||
// add any new static settings
|
||||
foreach ($static_settings as $key => $value) {
|
||||
$config[] = "$key=$value";
|
||||
}
|
||||
|
||||
// add metric if provided
|
||||
if (!empty($jsonData['Metric']) && !in_array('metric '.$jsonData['Metric'], $config)) {
|
||||
$config[] = 'metric '.$jsonData['Metric'];
|
||||
}
|
||||
return $config;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -61,6 +244,142 @@ class DhcpcdManager
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets current dhcpcd info for an interface
|
||||
*
|
||||
* @param string $iface
|
||||
* @return array
|
||||
*/
|
||||
public function getInterfaceConfig(string $iface): array
|
||||
{
|
||||
$result = [
|
||||
'DHCPEnabled' => false,
|
||||
'RangeStart' => null,
|
||||
'RangeEnd' => null,
|
||||
'RangeMask' => null,
|
||||
'leaseTime' => null,
|
||||
'leaseTimeInterval' => null,
|
||||
'dhcpHost' => [],
|
||||
'upstreamServersEnabled' => false,
|
||||
'upstreamServers' => [],
|
||||
'DNS1' => null,
|
||||
'DNS2' => null,
|
||||
'Metric' => null,
|
||||
'StaticIP' => null,
|
||||
'SubnetMask' => null,
|
||||
'StaticRouters' => null,
|
||||
'StaticDNS' => null,
|
||||
'FallbackEnabled' => false,
|
||||
'DefaultRoute' => false,
|
||||
'NoHookWPASupplicant' => false,
|
||||
];
|
||||
|
||||
// dnsmasq
|
||||
$dnsmasqFile = RASPI_DNSMASQ_PREFIX . $iface . '.conf';
|
||||
if (file_exists($dnsmasqFile) && is_readable($dnsmasqFile)) {
|
||||
$lines = [];
|
||||
exec('cat ' . escapeshellarg($dnsmasqFile), $lines);
|
||||
if (!function_exists('ParseConfig')) {
|
||||
// ensure legacy parser available
|
||||
require_once RASPI_CONFIG . '/functions.php';
|
||||
}
|
||||
$conf = ParseConfig($lines);
|
||||
|
||||
if (!empty($conf)) {
|
||||
$result['DHCPEnabled'] = true;
|
||||
|
||||
// dhcp-range may be multi-value
|
||||
$rangeRaw = $conf['dhcp-range'] ?? null;
|
||||
if (is_array($rangeRaw)) {
|
||||
$rangeRaw = $rangeRaw[0] ?? null;
|
||||
}
|
||||
if (is_string($rangeRaw)) {
|
||||
$rangeParts = explode(',', $rangeRaw);
|
||||
$result['RangeStart'] = $rangeParts[0] ?? null;
|
||||
$result['RangeEnd'] = $rangeParts[1] ?? null;
|
||||
$result['RangeMask'] = $rangeParts[2] ?? null;
|
||||
$leaseSpec = $rangeParts[3] ?? null;
|
||||
if ($leaseSpec) {
|
||||
if (preg_match('/^(\d+)([smhd])?$/i', $leaseSpec, $m)) {
|
||||
$result['leaseTime'] = $m[1];
|
||||
$result['leaseTimeInterval'] = $m[2] ?? 'h'; // default to hours if missing
|
||||
} else {
|
||||
$result['leaseTime'] = $leaseSpec;
|
||||
$result['leaseTimeInterval'] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// dhcp-host entries (array or scalar)
|
||||
$hosts = $conf['dhcp-host'] ?? [];
|
||||
if (!is_array($hosts) && $hosts !== null) {
|
||||
$hosts = [$hosts];
|
||||
}
|
||||
$result['dhcpHost'] = array_values(array_filter($hosts));
|
||||
|
||||
// upstream DNS servers (server= lines)
|
||||
$servers = $conf['server'] ?? [];
|
||||
if (!is_array($servers) && !empty($servers)) {
|
||||
$servers = [$servers];
|
||||
}
|
||||
$servers = array_filter($servers);
|
||||
if (!empty($servers)) {
|
||||
$result['upstreamServersEnabled'] = true;
|
||||
$result['upstreamServers'] = $servers;
|
||||
}
|
||||
|
||||
// dhcp-option=6,<dns1>[,<dns2>]
|
||||
if (isset($conf['dhcp-option'])) {
|
||||
$optsRaw = $conf['dhcp-option'];
|
||||
// may be multiple dhcp-option lines; coalesce
|
||||
$optLines = is_array($optsRaw) ? $optsRaw : [$optsRaw];
|
||||
foreach ($optLines as $optLine) {
|
||||
$parts = explode(',', $optLine);
|
||||
if ($parts[0] === '6') {
|
||||
$result['DNS1'] = $parts[1] ?? null;
|
||||
$result['DNS2'] = $parts[2] ?? null;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// dhcpcd
|
||||
if (file_exists(self::CONF_DEFAULT) && is_readable(self::CONF_DEFAULT)) {
|
||||
$dhcpcd = file_get_contents(self::CONF_DEFAULT);
|
||||
|
||||
// match interface block starting with '# RaspAP <iface> configuration'
|
||||
$sectionPattern = '/^#\sRaspAP\s' . preg_quote($iface, '/') . '\sconfiguration.*?(?=^(?:#\sRaspAP\s|\s*$))/ms';
|
||||
if (preg_match($sectionPattern, $dhcpcd, $match)) {
|
||||
$block = $match[0];
|
||||
|
||||
$result['Metric'] = $this->matchFirst('/\bmetric\s+(\d+)/i', $block);
|
||||
$staticIPLine = $this->matchFirst('/static\s+ip_address=([^\r\n]+)/i', $block);
|
||||
$staticRouters = $this->matchFirst('/static\s+routers=([^\r\n]+)/i', $block);
|
||||
$staticDNS = $this->matchFirst('/static\s+domain_name_server=([^\r\n]+)/i', $block);
|
||||
|
||||
$result['StaticIP'] = $staticIPLine ? (strpos($staticIPLine,'/') !== false
|
||||
? substr($staticIPLine, 0, strpos($staticIPLine,'/'))
|
||||
: $staticIPLine) : null;
|
||||
$result['SubnetMask'] = $staticIPLine && function_exists('cidr2mask') && strpos($staticIPLine,'/')
|
||||
? cidr2mask($staticIPLine)
|
||||
: ($result['SubnetMask'] ?? null);
|
||||
$result['StaticRouters'] = $staticRouters;
|
||||
$result['StaticDNS'] = $staticDNS;
|
||||
|
||||
$result['FallbackEnabled'] = (bool) preg_match('/fallback\s+static_' . preg_quote($iface, '/') . '/i', $block);
|
||||
$result['DefaultRoute'] = (bool) preg_match('/\bgateway\b/', $block);
|
||||
$result['NoHookWPASupplicant'] = (bool) preg_match('/nohook\s+wpa_supplicant/i', $block);
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
private function matchFirst(string $pattern, string $subject): ?string
|
||||
{
|
||||
return preg_match($pattern, $subject, $m) ? trim($m[1]) : null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user