Skip to content

Add new attributes & fix development DBGroup #20

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
jozefrebjak merged 3 commits into from
Feb 24, 2025
Merged

Add new attributes & fix development DBGroup #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0722db
feat: add DBGroup setting for development environment in radius migra…
jozefrebjak Feb 24, 2025
a2aa464
refactor: streamline database connection settings and enhance attribu…
jozefrebjak Feb 24, 2025
63ddf38
fix: correct DBGroup setting retrieval for development environment in…
jozefrebjak Feb 24, 2025
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
9 changes: 7 additions & 2 deletions src/Database/Migrations/2024-01-21-223112_create_radius_tables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ class CreateRadiusTables extends Migration

public function __construct(?Forge $forge = null)
{
$this->tables = setting('FreeRadius.tables');
$this->db = db_connect(setting('FreeRadius.database'));
$this->tables = setting('FreeRadius.tables');

if (ENVIRONMENT === 'development') {
$this->DBGroup = setting('FreeRadius.database');
}

$this->db = db_connect(setting('FreeRadius.database'));

parent::__construct($forge);

Expand Down
79 changes: 51 additions & 28 deletions src/Enums/Attribute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,25 @@ enum Attribute: string
*/
case MSSecondaryDNSServer = 'MS-Secondary-DNS-Server';

/**
* The Mikrotik-Group Attribute is used to assign a user to a specific group in Mikrotik RouterOS.
* More information: https://wiki.mikrotik.com/wiki/Manual:RADIUS_Client/Group_Handling
*/
case MikrotikGroup = 'Mikrotik-Group';

// The Fortinet-Class Attribute is used to assign a user to a specific class in FortiGate.
case FortinetClass = 'Class';

/**
* The Fortinet-Group-Name Attribute is used to assign a user to a specific group in FortiGate.
*/
case FortinetGroupName = 'Fortinet-Group-Name';

/**
* The Fortinet-Access-Profile Attribute defines access profile settings for the user in FortiGate.
*/
case FortinetAccessProfile = 'Fortinet-Access-Profile';

/**
* Returns an array of dropdown values.
*/
Expand All @@ -124,34 +143,38 @@ public static function getDropdownValues(): array
public function toDescription(): string
{
return match ($this) {
self::NasIpAddress => lang('FreeRadius.attributeDescription.nasIpAddress'),
self::CleartextPassword => lang('FreeRadius.attributeDescription.cleartextPassword'),
self::FallThrough => lang('FreeRadius.attributeDescription.fallThrough'),
self::SimultaneousUse => lang('FreeRadius.attributeDescription.simultaneousUse'),
self::ServiceType => lang('FreeRadius.attributeDescription.serviceType'),
self::FramedIPAddress => lang('FreeRadius.attributeDescription.framedIPAddress'),
self::FramedIPNetmask => lang('FreeRadius.attributeDescription.framedIPNetmask'),
self::FramedProtocol => lang('FreeRadius.attributeDescription.framedProtocol'),
self::FramedMTU => lang('FreeRadius.attributeDescription.framedMTU'),
self::CiscoAVPair => lang('FreeRadius.attributeDescription.ciscoAVPair'),
self::CiscoNASPort => lang('FreeRadius.attributeDescription.ciscoNASPort'),
self::CiscoFramedRoute => lang('FreeRadius.attributeDescription.ciscoFramedRoute'),
self::AcctAuthentic => lang('FreeRadius.attributeDescription.acctAuthentic'),
self::AcctTerminateCause => lang('FreeRadius.attributeDescription.acctTerminateCause'),
self::AcctOutputOctets => lang('FreeRadius.attributeDescription.acctOutputOctets'),
self::AcctInterval => lang('FreeRadius.attributeDescription.acctInterval'),
self::AcctSessionId => lang('FreeRadius.attributeDescription.acctSessionId'),
self::AcctUniqueId => lang('FreeRadius.attributeDescription.acctUniqueId'),
self::AcctStartTime => lang('FreeRadius.attributeDescription.acctStartTime'),
self::AcctUpdateTime => lang('FreeRadius.attributeDescription.acctUpdateTime'),
self::AcctStopTime => lang('FreeRadius.attributeDescription.acctStopTime'),
self::AcctSessionTime => lang('FreeRadius.attributeDescription.acctSessionTime'),
self::NasPortId => lang('FreeRadius.attributeDescription.nasPortId'),
self::NasPortType => lang('FreeRadius.attributeDescription.nasPortType'),
self::AcctInputOctets => lang('FreeRadius.attributeDescription.acctInputOctets'),
self::CiscoServiceInfo => lang('FreeRadius.attributeDescription.ciscoServiceInfo'),
self::MSPrimaryDNSServer => lang('FreeRadius.attributeDescription.msPrimaryDNSServer'),
self::MSSecondaryDNSServer => lang('FreeRadius.attributeDescription.msSecondaryDNSServer'),
self::NasIpAddress => lang('FreeRadius.attributeDescription.nasIpAddress'),
self::CleartextPassword => lang('FreeRadius.attributeDescription.cleartextPassword'),
self::FallThrough => lang('FreeRadius.attributeDescription.fallThrough'),
self::SimultaneousUse => lang('FreeRadius.attributeDescription.simultaneousUse'),
self::ServiceType => lang('FreeRadius.attributeDescription.serviceType'),
self::FramedIPAddress => lang('FreeRadius.attributeDescription.framedIPAddress'),
self::FramedIPNetmask => lang('FreeRadius.attributeDescription.framedIPNetmask'),
self::FramedProtocol => lang('FreeRadius.attributeDescription.framedProtocol'),
self::FramedMTU => lang('FreeRadius.attributeDescription.framedMTU'),
self::CiscoAVPair => lang('FreeRadius.attributeDescription.ciscoAVPair'),
self::CiscoNASPort => lang('FreeRadius.attributeDescription.ciscoNASPort'),
self::CiscoFramedRoute => lang('FreeRadius.attributeDescription.ciscoFramedRoute'),
self::AcctAuthentic => lang('FreeRadius.attributeDescription.acctAuthentic'),
self::AcctTerminateCause => lang('FreeRadius.attributeDescription.acctTerminateCause'),
self::AcctOutputOctets => lang('FreeRadius.attributeDescription.acctOutputOctets'),
self::AcctInterval => lang('FreeRadius.attributeDescription.acctInterval'),
self::AcctSessionId => lang('FreeRadius.attributeDescription.acctSessionId'),
self::AcctUniqueId => lang('FreeRadius.attributeDescription.acctUniqueId'),
self::AcctStartTime => lang('FreeRadius.attributeDescription.acctStartTime'),
self::AcctUpdateTime => lang('FreeRadius.attributeDescription.acctUpdateTime'),
self::AcctStopTime => lang('FreeRadius.attributeDescription.acctStopTime'),
self::AcctSessionTime => lang('FreeRadius.attributeDescription.acctSessionTime'),
self::NasPortId => lang('FreeRadius.attributeDescription.nasPortId'),
self::NasPortType => lang('FreeRadius.attributeDescription.nasPortType'),
self::AcctInputOctets => lang('FreeRadius.attributeDescription.acctInputOctets'),
self::CiscoServiceInfo => lang('FreeRadius.attributeDescription.ciscoServiceInfo'),
self::MSPrimaryDNSServer => lang('FreeRadius.attributeDescription.msPrimaryDNSServer'),
self::MSSecondaryDNSServer => lang('FreeRadius.attributeDescription.msSecondaryDNSServer'),
self::MikrotikGroup => lang('FreeRadius.attributeDescription.mikrotikGroup'),
self::FortinetClass => lang('FreeRadius.attributeDescription.fortinetClass'),
self::FortinetGroupName => lang('FreeRadius.attributeDescription.fortinetGroupName'),
self::FortinetAccessProfile => lang('FreeRadius.attributeDescription.fortinetAccessProfile'),
};
}

Expand Down
Loading
Loading