From e09e78c220ce4756eddd0fef86fe1470b0d9d0d7 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 16 Feb 2017 02:31:57 +0100 Subject: [PATCH] Add input validation (Bug #7263) Improve a couple of descriptions while here. --- .../files/usr/local/pkg/freeradiusauthorizedmacs.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradiusauthorizedmacs.xml b/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradiusauthorizedmacs.xml index 31d81768e07d..76c7c0a27ca7 100644 --- a/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradiusauthorizedmacs.xml +++ b/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradiusauthorizedmacs.xml @@ -224,7 +224,7 @@ Framed-Route must be supported by NAS. - Required format: Subnet Gateway Metric (e.g. 192.168.10.0 192.168.10.1 1) + Required format: Subnet Gateway Metric(s) (e.g. 192.168.10.0/24 192.168.10.1 1) ]]> input @@ -280,8 +280,10 @@ - Every time string contains a day (Mo, Tu, We, Th, Fr, Sa, Su) or all weekdays which is from monday till friday (Wk).
- Wk0855-2305,Sa,Su2230-0230 - weekdays after 8:55 AM and before 11:05 PM | any time on Saturday | Sunday after 10:30 PM and before 02:30 AM. + Each simple time string must begin with a day definition. That can be just one day, multiple days, or a range of days separated by a hyphen.
+ A day is Mo, Tu, We, Th, Fr, Sa or Su, or Wk for Mo-Fr. Any or Al means all days.
+ After that, a range of hours follows in hhmm-hhmm format. A time string may be a list of simple time strings separated by ,

+ Example: Wk0855-2305,Sa,Su2230-0230 - weekdays after 8:55 AM and before 11:05 PM | any time on Saturday | Sunday after 10:30 PM and before 02:30 AM. ]]> @@ -445,4 +447,7 @@ freeradius_authorizedmacs_resync(); + + freeradius_validate_macs($_POST, $input_errors); +