From 42a2d5facabcdb2f6b9a2c8f9eef9870343b1b7d Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Tue, 30 Oct 2018 09:27:26 +0100
Subject: [PATCH] net/freeradius: change pw validator, add login-time and
 sim-use (#944)

---
 net/freeradius/Makefile                            |  2 +-
 .../Freeradius/forms/dialogEditFreeRADIUSUser.xml  | 14 ++++++++++++++
 .../mvc/app/models/OPNsense/Freeradius/User.xml    | 13 +++++++++++--
 .../service/templates/OPNsense/Freeradius/users    |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index ff1e2d4ce..f364536e3 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -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
diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
index d80c6f88c..124e35601 100644
--- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
+++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
@@ -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>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
index 6dd93601b..c10729749 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
@@ -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>
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
index 5c0071505..86610a043 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
@@ -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 }},