net/freeradius: change pw validator, add login-time and sim-use (#944)

This commit is contained in:
Michael
2018-10-30 09:27:26 +01:00
committed by Franco Fichtner
parent 43c40bca08
commit 42a2d5faca
4 changed files with 27 additions and 4 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= freeradius
PLUGIN_VERSION= 1.8.1
PLUGIN_VERSION= 1.8.2
PLUGIN_COMMENT= RADIUS Authentication, Authorization and Accounting Server
PLUGIN_DEPENDS= freeradius3
PLUGIN_MAINTAINER= m.muenz@gmail.com
@@ -55,6 +55,20 @@
<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.logintime</id>
<label>Login-Time</label>
<type>text</type>
<advanced>true</advanced>
<help>With this option you can set a time frame how long the user is allowed to be logged in.</help>
</field>
<field>
<id>user.simuse</id>
<label>Simultaneous-Use</label>
<type>text</type>
<advanced>true</advanced>
<help>Set how many times one account is allowed to login at the same time.</help>
</field>
<field>
<id>user.wispr_bw_min_up</id>
<label>WISPr Bandwith Min UP</label>
@@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/freeradius/user</mount>
<description>FreeRADIUS user configuration</description>
<version>1.0.1</version>
<version>1.0.2</version>
<items>
<users>
<user type="ArrayField">
@@ -15,7 +15,7 @@
</username>
<password type="TextField">
<Required>Y</Required>
<mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){1,128}$/u</mask>
<mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=\{\}]){1,128}$/u</mask>
</password>
<description type="TextField">
<Required>N</Required>
@@ -40,6 +40,15 @@
<MinimumValue>1</MinimumValue>
<MaximumValue>4096</MaximumValue>
</vlan>
<logintime type="TextField">
<Required>N</Required>
<mask>/^([0-9a-zA-Z\-]){1,128}$/u</mask>
</logintime>
<simuse type="IntegerField">
<Required>N</Required>
<MinimumValue>0</MinimumValue>
<MaximumValue>1024</MaximumValue>
</simuse>
<wispr_bw_min_up type="IntegerField">
<Required>N</Required>
</wispr_bw_min_up>
@@ -3,7 +3,7 @@
{% for user_list in helpers.toList('OPNsense.freeradius.user.users.user') %}
{% if user_list.enabled == '1' %}
{{ user_list.username }} Cleartext-Password := "{{ user_list.password }}"{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}{% if user_list.sessionlimit_max_session_limit is defined %}, Max-Daily-Session := {{ user_list.sessionlimit_max_session_limit }}{% endif %}{% endif %}
{{ user_list.username }} Cleartext-Password := "{{ user_list.password }}"{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}{% if user_list.sessionlimit_max_session_limit is defined %}, Max-Daily-Session := {{ user_list.sessionlimit_max_session_limit }}{% endif %}{% endif %}{% if user_list.simuse is defined %}, Simultaneous-Use := "{{ user_list.simuse }}"{% endif %}{% if user_list.logintime is defined %}, Login-Time := "{{ user_list.logintime }}"{% endif %}
{% if user_list.ip is defined %}
Framed-IP-Address = {{ user_list.ip }},