From f9302ab8e3a6e0f0949f277e393f5df59ba0f619 Mon Sep 17 00:00:00 2001 From: Reza Ebrahimi Date: Tue, 2 Oct 2018 08:57:42 +0330 Subject: [PATCH] [net/freeradius] Add attribute enabled check in config files (#881) --- net/freeradius/Makefile | 2 +- .../templates/OPNsense/Freeradius/dictionary | 2 + .../templates/OPNsense/Freeradius/users | 52 +++++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 64f8c20aa..ff1e2d4ce 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= freeradius -PLUGIN_VERSION= 1.8.0 +PLUGIN_VERSION= 1.8.1 PLUGIN_COMMENT= RADIUS Authentication, Authorization and Accounting Server PLUGIN_DEPENDS= freeradius3 PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/dictionary b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/dictionary index 44a94a2d0..6ccc0a2e2 100644 --- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/dictionary +++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/dictionary @@ -1,2 +1,4 @@ +{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %} #ATTRIBUTE Daily-Session-Time 3000 integer ATTRIBUTE Max-Daily-Session 3001 integer +{% endif %} diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users index cc7881d9b..5c0071505 100644 --- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users +++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users @@ -1,9 +1,9 @@ {% if helpers.exists('OPNsense.freeradius.general.enabled') and OPNsense.freeradius.general.enabled == '1' %} +{% if helpers.exists('OPNsense.freeradius.user.users.user') %} +{% for user_list in helpers.toList('OPNsense.freeradius.user.users.user') %} +{% if user_list.enabled == '1' %} -{% if helpers.exists('OPNsense.freeradius.user.users.user') %} -{% 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 user_list.sessionlimit_max_session_limit is defined %}, Max-Daily-Session := {{ user_list.sessionlimit_max_session_limit }}{% 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.ip is defined %} Framed-IP-Address = {{ user_list.ip }}, @@ -19,41 +19,48 @@ {% if user_list.ip6 is defined %} Framed-IPv6-Address = {{ user_list.ip6 }}, {% endif %} -{% if user_list.vlan is defined %} +{% if helpers.exists('OPNsense.freeradius.general.vlanassign') and OPNsense.freeradius.general.vlanassign == '1' %} +{% if user_list.vlan is defined %} Tunnel-Type = VLAN, Tunnel-Medium-Type = IEEE-802, Tunnel-Private-Group-Id = {{ user_list.vlan }}, +{% endif %} {% endif %} -{% if user_list.wispr_bw_min_up is defined %} +{% if helpers.exists('OPNsense.freeradius.general.wispr') and OPNsense.freeradius.general.wispr == '1' %} +{% 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 %} +{% 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 %} +{% 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 %} +{% endif %} +{% if user_list.wispr_bw_max_down is defined %} WISPr-Bandwidth-Max-Down = {{ user_list.wispr_bw_max_down }}, +{% endif %} {% endif %} -{% if user_list.chillispot_bw_max_up is defined %} +{% if helpers.exists('OPNsense.freeradius.general.chillispot') and OPNsense.freeradius.general.chillispot == '1' %} +{% 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 %} +{% endif %} +{% if user_list.chillispot_bw_max_down is defined %} ChilliSpot-Bandwidth-Max-Down = {{ user_list.chillispot_bw_max_down }}, +{% endif %} {% endif %} -{% if user_list.mikrotik_vlan_id_number is defined %} +{% if helpers.exists('OPNsense.freeradius.general.mikrotik') and OPNsense.freeradius.general.mikrotik == '1' %} +{% if user_list.mikrotik_vlan_id_number is defined %} Mikrotik-Wireless-VLANID = {{ user_list.mikrotik_vlan_id_number }}, -{% endif %} -{% if user_list.mikrotik_vlan_id_type is defined %} +{% endif %} +{% if user_list.mikrotik_vlan_id_type is defined %} Mikrotik-Wireless-VLANID-Type = {{ user_list.mikrotik_vlan_id_type }}, +{% endif %} {% endif %} Framed-Protocol = PPP -{% endif %} - -{% endfor %} -{% endif %} +{% endif %} +{% endfor %} +{% endif %} DEFAULT Framed-Protocol == PPP Framed-Protocol = PPP, @@ -65,5 +72,4 @@ DEFAULT Hint == "CSLIP" DEFAULT Hint == "SLIP" Framed-Protocol = SLIP - {% endif %}