From e856da6018a2259667752af6fdbcb9d10899da70 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sat, 10 Apr 2021 10:13:30 +0200
Subject: [PATCH] net/freeradius: Add IPv6 support to client IP and harden
 loose model (#2301)

* Update Client.xml

* Update clients.conf
---
 .../opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml    | 4 ++--
 .../service/templates/OPNsense/Freeradius/clients.conf        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
index 0fa4d9c52..da69e00e9 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/freeradius/client</mount>
     <description>FreeRADIUS client configuration</description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <items>
         <clients>
             <client type="ArrayField">
@@ -15,7 +15,7 @@
                 <secret type="TextField">
                     <Required>Y</Required>
                 </secret>
-                <ip type="TextField">
+                <ip type="HostnameField">
                     <Required>N</Required>
                 </ip>
             </client>
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/clients.conf b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/clients.conf
index a220e557f..8a7896a86 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/clients.conf
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/clients.conf
@@ -6,7 +6,11 @@
 client "{{ client_list.name }}" {
        secret    = {{ client_list.secret }}
        shortname = "{{ client_list.name }}"
+{%       if ':' in client_list.ip %}
+       ipv6addr  = {{ client_list.ip }}
+{%       else %}       
        ipaddr    = {{ client_list.ip }}
+{%       endif %}
 }
 
 {%     endif %}