upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

OpenVPN: allow multiple domains settings for client connection (#9281)

Browse source 
* OpenVPN: allow multiple domains settings for client connection

* OpenVPN: allow multiple domains settings - update plugin files

---------

Co-authored-by: Krisztian Ivancso <dev@devopsoffice.com>
This commit is contained in:
devopsoffice-ivan 2025-10-12 17:01:04 +02:00 committed by GitHub
parent f469cf8529
commit 3dd24ff4a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/etc/inc/plugins.inc.d/openvpn.inc
View file

@ -365,7 +365,9 @@ function openvpn_validate_cidr($value, $name, $multiple = false, $ipproto = 'ipv
function openvpn_add_dhcpopts(&$settings, &$conf)
{
if (!empty($settings['dns_domain'])) {
$conf .= "push \"dhcp-option DOMAIN {$settings['dns_domain']}\"\n";
foreach (explode(",", $settings['dns_domain']) as $domain) {
$conf .= "push \"dhcp-option DOMAIN {$domain}\"\n";
}
}
if (!empty($settings['dns_domain_search'])) {
foreach (explode(",", $settings['dns_domain_search']) as $domain) {

8
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml
View file

@ -150,9 +150,11 @@
</field>
<field>
<id>cso.dns_domain</id>
<label>DNS Default Domain</label>
<type>text</type>
<help>Set Connection-specific DNS Suffix.</help>
<label>DNS Domain List</label>
<type>select_multiple</type>
<style>tokenize</style>
<allownew>true</allownew>
<help>Set Connection-specific DNS Suffixes.</help>
<grid_view>
<visible>false</visible>
</grid_view>

9
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml
View file

@ -598,10 +598,11 @@ Set to 0 to disable, remember to change your client as well.
</field>
<field>
<id>instance.dns_domain</id>
<label>DNS Default Domain</label>
<type>text</type>
<style>role role_server</style>
<help>Set Connection-specific DNS Suffix.</help>
<label>DNS Domain list</label>
<type>select_multiple</type>
<style>tokenize role role_server</style>
<allownew>true</allownew>
<help>Set Connection-specific DNS Suffixes.</help>
<grid_view>
<visible>false</visible>
</grid_view>

4
src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
View file

@ -664,7 +664,9 @@ class OpenVPN extends BaseModel
$options['push'][] = "\"register-dns\"";
}
if (!$node->dns_domain->isEmpty()) {
$options['push'][] = "\"dhcp-option DOMAIN {$node->dns_domain}\"";
foreach (explode(',', (string)$node->dns_domain) as $opt) {
$options['push'][] = "\"dhcp-option DOMAIN {$opt}\"";
}
}
if (!$node->dns_domain_search->isEmpty()) {
foreach (explode(',', (string)$node->dns_domain_search) as $opt) {

8
src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
View file

@ -57,7 +57,9 @@
<Default>0</Default>
<Required>Y</Required>
</register_dns>
<dns_domain type="HostnameField"/>
<dns_domain type="HostnameField">
<AsList>Y</AsList>
</dns_domain>
<dns_domain_search type="HostnameField">
<AsList>Y</AsList>
</dns_domain_search>
@ -350,7 +352,9 @@
<Default>0</Default>
<Required>Y</Required>
</register_dns>
<dns_domain type="HostnameField"/>
<dns_domain type="HostnameField">
<AsList>Y</AsList>
</dns_domain>
<dns_domain_search type="HostnameField">
<AsList>Y</AsList>
</dns_domain_search>