Skip to content

Added NAS-IP-Address attribute to radius access server calls #10089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
metmayhem wants to merge 3 commits into from
+35 −3
Closed

Added NAS-IP-Address attribute to radius access server calls #10089

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
843e77e
Added NAS-IP-Address attribute to radius access server calls
metmayhem Apr 4, 2026
6240604
Fixed formatting
metmayhem Apr 5, 2026
82b502c
Moved NAS-IP-Address setting to getConfigurationOptions as suggested …
metmayhem Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions src/opnsense/mvc/app/library/OPNsense/Auth/Radius.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

namespace OPNsense\Auth;
require_once("interfaces.inc");
Copy link
Copy Markdown
Member

@AdSchellevis AdSchellevis Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not allowed to insert legacy files inside new MVC based code, but I also don't think we need it to be honest. If we just validate the input for validity, we don't have to select a static list of addresses (and make sure the user can also use virtual addresses as well).

I'll have a look at the code and see if I can fix the concerns.


/**
* Class Radius connector
Expand Down Expand Up @@ -69,6 +70,11 @@ class Radius extends Base implements IAuthConnector
*/
private $callingStationId = null;

/**
* @var string ip addess to use for NAS-IP-Address attribute
*/
private $nasIpAddress = null;

/**
* @var int timeout to use
*/
Expand Down Expand Up @@ -165,6 +171,7 @@ public function setProperties($config)
'radius_acct_port' => 'acctPort',
'radius_protocol' => 'protocol',
'radius_stationid' => 'calledStationId',
'radius_nasipaddress' => 'nasIpAddress',
'refid' => 'nasIdentifier'
);

Expand Down Expand Up @@ -210,6 +217,31 @@ public function getConfigurationOptions()
return [];
}
};

$options['radius_nasipaddress'] = [];
$options['radius_nasipaddress']['name'] = gettext('NAS IP address');
$options['radius_nasipaddress']['type'] = 'dropdown';
$options['radius_nasipaddress']['default'] = '';
$options['radius_nasipaddress']['options'] = [null => ''];
$interfaces = get_configured_interface_with_descr();

// Create options list using interface IPs
foreach($interfaces as $if => $descr) {
$ip = get_interface_ip($if);
$options['radius_nasipaddress']['options'] += [$ip => "$descr - $ip"];
}

$options['radius_nasipaddress']['validate'] = function ($value) {
$interfaces = get_configured_interface_with_descr();
$ips = [];
foreach($interfaces as $if => $descr)
$ips[] = get_interface_ip($if);
if(!empty($value) && !in_array($value, $ips)) {
return [gettext('Invalid address specified')];
} else {
return [];
}
};
return $options;
}

Expand Down Expand Up @@ -501,18 +533,18 @@ public function authenticate($username, $password)
$error = radius_strerror($radius);
} elseif (!radius_put_int($radius, RADIUS_SERVICE_TYPE, RADIUS_LOGIN)) {
$error = radius_strerror($radius);
} elseif (!radius_put_int($radius, RADIUS_FRAMED_PROTOCOL, RADIUS_ETHERNET)) {
$error = radius_strerror($radius);
} elseif (!radius_put_string($radius, RADIUS_NAS_IDENTIFIER, $this->nasIdentifier)) {
$error = radius_strerror($radius);
} elseif (!radius_put_int($radius, RADIUS_NAS_PORT, 0)) {
$error = radius_strerror($radius);
} elseif (!radius_put_int($radius, RADIUS_NAS_PORT_TYPE, RADIUS_ETHERNET)) {
} elseif (!radius_put_int($radius, RADIUS_NAS_PORT_TYPE, RADIUS_VIRTUAL)) {
$error = radius_strerror($radius);
} elseif (!empty($this->calledStationId) && !radius_put_string($radius, RADIUS_CALLED_STATION_ID, $this->calledStationId)) {
$error = radius_strerror($radius);
} elseif (!empty($this->callingStationId) && !radius_put_string($radius, RADIUS_CALLING_STATION_ID, $this->callingStationId)) {
$error = radius_strerror($radius);
} elseif (!empty($this->nasIpAddress) && !radius_put_addr($radius, RADIUS_NAS_IP_ADDRESS, $this->nasIpAddress)) {
$error = radius_stderror($radius);
} else {
// Implement extra protocols in this section.
switch ($this->protocol) {
Expand Down