From 8f06fc7ec03af17f0f1f6cd1655c1041bd85102f Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 26 Aug 2019 11:53:04 +0200
Subject: [PATCH] net/freeradius: add Service-Type (#1465)

---
 net/freeradius/Makefile                       |  2 +-
 net/freeradius/pkg-descr                      |  4 +++
 .../forms/dialogEditFreeRADIUSUser.xml        |  7 ++++++
 .../app/models/OPNsense/Freeradius/User.xml   | 25 +++++++++++++++++++
 .../templates/OPNsense/Freeradius/users       |  5 ++++
 5 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index c8093e956..25ae21e74 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		freeradius
-PLUGIN_VERSION=		1.9.3
+PLUGIN_VERSION=		1.9.4
 PLUGIN_COMMENT=		RADIUS Authentication, Authorization and Accounting Server
 PLUGIN_DEPENDS=		freeradius3
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/freeradius/pkg-descr b/net/freeradius/pkg-descr
index 8810940d8..134f325b6 100644
--- a/net/freeradius/pkg-descr
+++ b/net/freeradius/pkg-descr
@@ -15,6 +15,10 @@ The server is fast, feature-rich, modular, and scalable.
 Plugin Changelog
 ================
 
+1.9.4
+
+* Add Service-Type to user form
+
 1.9.0
 
 * Add DHCP support, serving only for DHCP relays
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 124e35601..8e068d7e8 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
@@ -123,4 +123,11 @@
         <type>text</type>
         <help>Set the maximum session limit in seconds. This can be used by the Captive Portal.</help>
     </field>
+    <field>
+        <id>user.servicetype</id>
+        <label>Service Type</label>
+        <type>select_multiple</type>
+        <advanced>true</advanced>
+        <help>Set the Service-Type attributes for this user.</help>
+    </field>
 </form>
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 c10729749..bc98583c0 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
@@ -76,6 +76,31 @@
                 <sessionlimit_max_session_limit type="IntegerField">
                     <Required>N</Required>
                 </sessionlimit_max_session_limit>
+                <servicetype type="OptionField">
+                    <Required>N</Required>
+                    <multiple>Y</multiple>
+                    <OptionValues>
+                        <Option1 value="1">1</Option1>
+                        <Option2 value="2">2</Option2>
+                        <Option3 value="3">3</Option3>
+                        <Option4 value="4">4</Option4>
+                        <Option5 value="5">5</Option5>
+                        <Option6 value="6">6</Option6>
+                        <Option7 value="7">7</Option7>
+                        <Option8 value="8">8</Option8>
+                        <Option9 value="9">9</Option9>
+                        <Option10 value="10">10</Option10>
+                        <Option11 value="11">11</Option11>
+                        <Option12 value="12">12</Option12>
+                        <Option13 value="13">13</Option13>
+                        <Option14 value="14">14</Option14>
+                        <Option15 value="15">15</Option15>
+                        <Option16 value="16">16</Option16>
+                        <Option17 value="17">17</Option17>
+                        <Option18 value="18">18</Option18>
+                        <Option19 value="19">19</Option19>
+                    </OptionValues>
+                </servicetype>
             </user>
         </users>
     </items>
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
index 86610a043..e239570a0 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
@@ -19,6 +19,11 @@
 {%       if user_list.ip6 is defined %}
        Framed-IPv6-Address = {{ user_list.ip6 }},
 {%       endif %}
+{%       if user_list.servicetype is defined %}
+{%         for servicelist in user_list.servicetype.split(',') %}
+       Service-Type = {{ servicelist }},
+{%         endfor %}
+{%       endif %}
 {%       if helpers.exists('OPNsense.freeradius.general.vlanassign') and OPNsense.freeradius.general.vlanassign == '1' %}
 {%         if user_list.vlan is defined %}
        Tunnel-Type = VLAN,