netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #313 from mimugmail/freeradius_att

Browse Source 
net/freeradius: Add more attributes to users and remove radiusd.conf
This commit is contained in:
Ad Schellevis
2017-10-11 11:26:18 +02:00
committed by GitHub
parent 57e7268040 da2025c86d
commit 3e062a6f2f
11 changed files with 96 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/freeradius/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= freeradius
PLUGIN_VERSION= 1.0.1
PLUGIN_VERSION= 1.1.0
PLUGIN_COMMENT= RADIUS Authentication, Authorization and Accounting Server
PLUGIN_DEPENDS= freeradius3
PLUGIN_MAINTAINER= m.muenz@gmail.com
net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
+37 -1
View File
@@ -14,7 +14,7 @@
<field>
<id>user.password</id>
<label>Password</label>
<type>text</type>
<type>password</type>
<help>Set the password for the user.</help>
</field>
<field>
@@ -41,4 +41,40 @@
<type>text</type>
<help>VLAN ID the user receives, e.g. for 802.1X. Leave empty if you don't know what it is.</help>
</field>
<field>
<id>user.wispr_bw_min_up</id>
<label>WISPr Bandwith Min UP</label>
<type>text</type>
<help>Set the minimum upload bandwith for WISPr attribute. The value is treated as bits/s.</help>
</field>
<field>
<id>user.wispr_bw_max_up</id>
<label>WISPr Bandwith Max UP</label>
<type>text</type>
<help>Set the maximum upload bandwith for WISPr attribute. The value is treated as bits/s.</help>
</field>
<field>
<id>user.wispr_bw_min_down</id>
<label>WISPr Bandwith Min DOWN</label>
<type>text</type>
<help>Set the minimum download bandwith for WISPr attribute. The value is treated as bits/s.</help>
</field>
<field>
<id>user.wispr_bw_max_down</id>
<label>WISPr Bandwith Max DOWN</label>
<type>text</type>
<help>Set the maximum download bandwith for WISPr attribute. The value is treated as bits/s.</help>
</field>
<field>
<id>user.chillispot_bw_max_up</id>
<label>ChilliSpot Bandwith Max UP</label>
<type>text</type>
<help>Set the maximum upload bandwith for ChilliSpot attribute. The value is treated as kbits/s.</help>
</field>
<field>
<id>user.chillispot_bw_max_down</id>
<label>ChilliSpot Bandwith Max DOWN</label>
<type>text</type>
<help>Set the maximum download bandwith for ChilliSpot attribute. The value is treated as kbits/s.</help>
</field>
</form>
net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/general.xml
+12
View File
@@ -11,4 +11,16 @@
<type>checkbox</type>
<help>This allows you to dynamically assign VLANs on your physical switch ports.</help>
</field>
<field>
<id>general.wispr</id>
<label>Enable WISPr attributes</label>
<type>checkbox</type>
<help>This enables the WISPr attributes assignment via users tab.</help>
</field>
<field>
<id>general.chillispot</id>
<label>Enable ChilliSpot attributes</label>
<type>checkbox</type>
<help>This enables the ChilliSpot attributes assignment via users tab.</help>
</field>
</form>
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
+1
View File
@@ -1,6 +1,7 @@
<model>
<mount>//OPNsense/freeradius/client</mount>
<description>FreeRADIUS client configuration</description>
<version>1.0.0</version>
<items>
<clients>
<client type="ArrayField">
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
+9
View File
@@ -1,6 +1,7 @@
<model>
<mount>//OPNsense/freeradius/general</mount>
<description>FreeRADIUS configuration</description>
<version>1.0.0</version>
<items>
<enabled type="BooleanField">
<default>0</default>
@@ -10,5 +11,13 @@
<default>0</default>
<Required>N</Required>
</vlanassign>
<wispr type="BooleanField">
<default>0</default>
<Required>N</Required>
</wispr>
<chillispot type="BooleanField">
<default>0</default>
<Required>N</Required>
</chillispot>
</items>
</model>
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
+25
View File
@@ -1,6 +1,7 @@
<model>
<mount>//OPNsense/freeradius/user</mount>
<description>FreeRADIUS user configuration</description>
<version>1.0.0</version>
<items>
<users>
<user type="ArrayField">
@@ -38,6 +39,30 @@
<MinimumValue>1</MinimumValue>
<MaximumValue>4096</MaximumValue>
</vlan>
<wispr_bw_min_up type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_min_up>
<wispr_bw_max_up type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_max_up>
<wispr_bw_min_down type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_min_down>
<wispr_bw_max_down type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_max_down>
<chillispot_bw_max_up type="IntegerField">
<default></default>
<Required>N</Required>
</chillispot_bw_max_up>
<chillispot_bw_max_down type="IntegerField">
<default></default>
<Required>N</Required>
</chillispot_bw_max_down>
</user>
</users>
</items>
net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
+3 -3
View File
@@ -87,11 +87,11 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="username" data-type="string" data-visible="true">{{ lang._('Username') }}</th>
<th data-column-id="password" data-type="string" data-visible="true">{{ lang._('Password') }}</th>
<th data-column-id="password" data-type="string" data-visible="false">{{ lang._('Password') }}</th>
<th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
<th data-column-id="ip" data-type="string" data-visible="true">{{ lang._('IP Address') }}</th>
<th data-column-id="subnet" data-type="string" data-visible="true">{{ lang._('Subnet') }}</th>
<th data-column-id="vlan" data-type="string" data-visible="true">{{ lang._('VLAN ID') }}</th>
<th data-column-id="subnet" data-type="string" data-visible="false">{{ lang._('Subnet') }}</th>
<th data-column-id="vlan" data-type="string" data-visible="false">{{ lang._('VLAN ID') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th> </tr>
</thead>
net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/+TARGETS
-1
View File
@@ -1,6 +1,5 @@
clients.conf:/usr/local/etc/raddb/clients.conf
mods-enabled-eap:/usr/local/etc/raddb/mods-enabled/eap
radiusd.conf:/usr/local/etc/raddb/radiusd.conf
radiusd:/etc/rc.conf.d/radiusd
sites-enabled-default:/usr/local/etc/raddb/sites-enabled/default
sites-enabled-inner-tunnel:/usr/local/etc/raddb/sites-enabled/inner-tunnel
net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/clients.conf
+1 -1
View File
@@ -5,7 +5,7 @@
{% if client_list.enabled == '1' %}
client {{ client_list.ip }} {
secret = {{ client_list.secret }}
shortname = {{ client_list.name }}
shortname = "{{ client_list.name }}"
}
{% endif %}
net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd.conf
-830
View File
File diff suppressed because it is too large Load Diff
net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
+7 -1
View File
@@ -9,7 +9,13 @@
Framed-IP-Netmask = {{ user_list.subnet }}{% endif %}{% if user_list.vlan is defined %},
Tunnel-Type = VLAN,
Tunnel-Medium-Type = IEEE-802,
Tunnel-Private-Group-Id = {{ user_list.vlan }}
Tunnel-Private-Group-Id = {{ user_list.vlan }}{% endif %}{% if user_list.wispr_bw_min_up is defined %},
WISPr-Bandwidth-Min-Up = {{ user_list.wispr_bw_min_up }}{% endif %}{% if user_list.wispr_bw_max_up is defined %},
WISPr-Bandwidth-Max-Up = {{ user_list.wispr_bw_max_up }}{% endif %}{% if user_list.wispr_bw_min_down is defined %},
WISPr-Bandwidth-Min-Down = {{ user_list.wispr_bw_min_down }}{% endif %}{% if user_list.wispr_bw_max_down is defined %},
WISPr-Bandwidth-Max-Down = {{ user_list.wispr_bw_max_down }}{% endif %}{% if user_list.chillispot_bw_max_up is defined %},
ChilliSpot-Bandwidth-Max-Up = {{ user_list.chillispot_bw_max_up }}{% endif %}{% if user_list.chillispot_bw_max_down is defined %},
ChilliSpot-Bandwidth-Max-Down = {{ user_list.chillispot_bw_max_down }}
{% endif %}
{% endif %}