Skip to content

Framed-IP-Address / Framed-IP-Netmask support and make motp_enable optional #767

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

Merged
merged 1 commit into from
Oct 25, 2025
Merged

Framed-IP-Address / Framed-IP-Netmask support and make motp_enable optional #767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/FreeRADIUSUser.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use RESTAPI\Fields\IntegerField;
use RESTAPI\Fields\StringField;
use RESTAPI\Responses\ValidationError;
use RESTAPI\Validators\RegexValidator;
use RESTAPI\Validators\IPAddressValidator;

/**
* Defines a Model that represents FreeRADIUS Users
Expand Down Expand Up @@ -58,7 +59,8 @@ class FreeRADIUSUser extends Model {
help_text: 'The encryption method for the password.',
);
$this->motp_enable = new BooleanField(
required: true,
required: false,
default: false,
indicates_true: 'on',
indicates_false: '',
internal_name: 'varusersmotpenable',
Expand Down Expand Up @@ -110,6 +112,24 @@ class FreeRADIUSUser extends Model {
],
help_text: 'A description for this user.',
);
$this->framed_ip_address = new StringField(
required: false,
default: '',
internal_name: 'varusersframedipaddress',
allow_empty: true,
validators: [new IPAddressValidator(allow_ipv4: true, allow_ipv6: false)],
help_text: 'Framed-IP-Address MUST be supported by NAS. ' .
'If the OpenVPN server uses a subnet style Topology the RADIUS server MUST ' .
'also send back an appropriate Framed-IP-Netmask value matching the VPN Tunnel Network.'
);
$this->framed_ip_netmask = new StringField(
required: false,
default: '',
internal_name: 'varusersframedipnetmask',
allow_empty: true,
validators: [new IPAddressValidator(allow_ipv4: true, allow_ipv6: false)],
help_text: 'Framed-IP-Netmask MUST be supported by NAS'
);

parent::__construct($id, $parent_id, $data, ...$options);
}
Expand Down