From 7771d72802c805dbb602e3e3a0f299a58ac64b1c Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 11 Dec 2011 17:12:59 +0000 Subject: just some cosmetic GUI changes. --- config/freeradius2/freeradius.xml | 141 ++++++++++++++-------------- config/freeradius2/freeradiusclients.xml | 13 ++- config/freeradius2/freeradiusinterfaces.xml | 23 +++-- config/freeradius2/freeradiussettings.xml | 126 ++++++++++++++----------- 4 files changed, 165 insertions(+), 138 deletions(-) diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml index 40685657..c58f35d7 100755 --- a/config/freeradius2/freeradius.xml +++ b/config/freeradius2/freeradius.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. freeradius - 1.1.2 + 2.1.12 FreeRADIUS: Users /usr/local/pkg/freeradius.inc @@ -92,7 +92,7 @@ description - IP address + IP Address ip @@ -100,19 +100,19 @@ subnetmask - Multiple Connection + Simultaneous Connections multiconnect - Expiration + Expiration Time expiration - Session time + Session Time sessiontime - Online time + Online Time onlinetime @@ -141,6 +141,10 @@ http://www.pfsense.org/packages/config/freeradius2/freeradius.inc + + GENERAL CONFIGURATION + listtopic + Username username @@ -156,102 +160,93 @@ + Number of simultaneous connections + multiconnect + The maximum of simultaneous connections with this username. + + input + + + NETWORK CONFIGURATION + listtopic + + + IP Address ip - IP address - + Framed-IP-Address must be supported by NAS.
+ If you want this user to be assigned a specific IP address from radius, enter the IP address here.
+ Continuous IP address is available with "+" suffix (e.g. 192.168.1.5+). Could be useful for simultaneous connections.
+ IMPORTANT: You must enter an IP address here if you checked "RADIUS issued IP" on VPN PPTP or VPN PPPoE configuration.]]> input - subnetmask - subnetmask - Framed-IP-Netmask. Needs support of the NAS (Switch) Example: 255.255.255.0 + Subnet Mask + subnetmask + Framed-IP-Netmask must be supported by NAS. (e.g. 255.255.255.0)]]> input - gateway - gateway - Framed-Route. Needs support of the NAS (Switch). Order is: Subnet Gateway Metric Example: 192.168.10.0 192.168.10.1 1 + Gateway + gateway + Framed-Route must be supported by NAS. Format is: Subnet Gateway Metric (e.g. 192.168.10.0 192.168.10.1 1).]]> input - multiconnect - Number of Multiple connection - The available number of multiple simultaneous connections with this username. - + VLAN ID + vlanid + + Must be supported by the NAS.
+ This setting can be used for a NAS that supports the following RADIUS parameters:

+ Tunnel-Type = VLAN
+ Tunnel-Medium-Type = IEEE-802
+ Tunnel-Private-Group-ID = "THIS IS YOUR INPUT"]]> + input + + + TIME CONFIGURATION + listtopic - expiration - Expiration - You may enter the date that this account will stop working here.use Mmm dd yyyy example: 01 Jan 2007 will be Jan 01 2007 + Expiration Time + expiration + Enter the date when this account should expire. Format is: Mmm dd yyyy (e.g. Jan 01 2012). input - sessiontime - Session time - Time this user has until relogin in seconds + Session Time + sessiontime + Enter the time this user has until relogin in seconds. input - onlinetime Online time - + onlinetime + + 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

+ This means weekdays after 8:55 AM and before 11:05 PM | any time on saturday | sunday after 10:30 PM and before 02:30 AM.]]> input - description - Description - You may enter a description here for your reference (not parsed). - input - + MISCELLANEOUS CONFIGURATION + listtopic + - vlanid - VLAN ID -
- - This setting can be used for switches/wireless access points that support the following radius parameters:
- Tunnel-Type = VLAN
- Tunnel-Medium-Type = IEEE-802
- Tunnel-Private-Group-ID = "insert vlan identifier here"

- - This was implemented and tested with HP Procurve Switches (3500yl, and 2626). HP Procurve switches support using either the VLAN ID or the VLAN name, while other switches will only work using the VLAN ID. - ]]> - + Description + description + Enter any description for this user you like. input - additionaloptions Additional RADIUS Options - - You may append extra custom RADIUS options to this user account (separated by commas).
- IMPORTANT: If you don't format this field correctly, FreeRADIUS may not properly start because the users file will contain a syntax error. - ]]> + additionaloptions + + You may append (after all options from above) custom RADIUS options to this user account (separated by commas).
+ IMPORTANT: If you don't format this field correctly freeRADIUS will not start because of syntax errors.
+ Verify your changes by checking users file (/usr/local/etc/raddb/users).]]> textarea 10 diff --git a/config/freeradius2/freeradiusclients.xml b/config/freeradius2/freeradiusclients.xml index 6719c6b4..2b5d9d0c 100755 --- a/config/freeradius2/freeradiusclients.xml +++ b/config/freeradius2/freeradiusclients.xml @@ -86,7 +86,7 @@ varclientproto - Client NAS Type + Client Type varclientnastype @@ -103,6 +103,10 @@ + + GENERAL CONFIGURATION + listtopic + Client IP Address varclientip @@ -135,6 +139,10 @@ password + + MISCELLANEOUS CONFIGURATION + listtopic + Client Protocol varclientproto @@ -145,10 +153,9 @@ - - Client NAS Type + Client Type varclientnastype Enter the NAS type of the client. This is used by checkrad.pl for simultaneous use checks. (Default: other) select diff --git a/config/freeradius2/freeradiusinterfaces.xml b/config/freeradius2/freeradiusinterfaces.xml index f2de1008..c00cd6b1 100755 --- a/config/freeradius2/freeradiusinterfaces.xml +++ b/config/freeradius2/freeradiusinterfaces.xml @@ -11,7 +11,7 @@ part of pfSense (http://www.pfSense.com) Copyright (C) 2007 to whom it may belong All rights reserved. - + Based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2006 Manuel Kasper . All rights reserved. @@ -42,7 +42,7 @@ /* ========================================================================== */ ]]> - Describe your package here. + Describe your package here Describe your package requirements here Currently there are no FAQ items provided. freeradiusinterfaces @@ -70,7 +70,7 @@ - Listening Interface + Interface IP Address varinterfaceip @@ -92,9 +92,13 @@ - Listening Interface + GENERAL CONFIGURATION + listtopic + + + Interface IP Address varinterfaceip - Enter the IP address of the listening interface. e.g. 192.168.100.1 (Default: *) + input * @@ -102,7 +106,12 @@ Port varinterfaceport - Enter the port number of the listening interface. e.g. 1812 (Default: 1812) + + You could use this as an example:
+ auth = 1812
+ acct = 1813
+ proxy = 1814
+ IMPORTANT: For every interface type listening on the same IP address you need different ports.]]> input 1812 @@ -148,4 +157,4 @@ freeradius_settings_resync(); - + \ No newline at end of file diff --git a/config/freeradius2/freeradiussettings.xml b/config/freeradius2/freeradiussettings.xml index 286cc1fd..e918c249 100755 --- a/config/freeradius2/freeradiussettings.xml +++ b/config/freeradius2/freeradiussettings.xml @@ -71,61 +71,8 @@ - Logging Destination of RADIUS - varsettingslogdir - Choose the destination where freeRADIUS should log. Logging must be enabled.(Default: radius.log) - select - files - - - - - - - - - RADIUS Logging - varsettingsauth - Choose if you want to enable logging. (Default: Disabled) - select - no - - - - - - - Log Bad Authentication Attempts - varsettingsauthbadpass - Choose if you want to log bad authentication attempts. Logging must be enabled. (Default: no) - select - no - - - - - - - Log good authentication attempts? - varsettingsauthgoodpass - Choose if you want to log good authentication attempts. Logging must be enabled. (Default: no) - select - no - - - - - - - Log Stripped Names - varsettingsstrippednames - Choose if you want to log the full User-Name attribute as it was found in the request. Logging must be enabled. (Default: no) - select - no - - - - + GENERAL CONFIGURATION + listtopic Maximum Requests Server @@ -192,6 +139,71 @@ + + LOGGING CONFIGURATION + listtopic + + + Logging Destination of RADIUS + varsettingslogdir + Choose the destination where freeRADIUS should log. Logging must be enabled.(Default: radius.log) + select + files + + + + + + + + + RADIUS Logging + varsettingsauth + Choose if you want to enable logging. (Default: Disabled) + select + no + + + + + + + Log Bad Authentication Attempts + varsettingsauthbadpass + Choose if you want to log bad authentication attempts. Logging must be enabled. (Default: no) + select + no + + + + + + + Log good authentication attempts? + varsettingsauthgoodpass + Choose if you want to log good authentication attempts. Logging must be enabled. (Default: no) + select + no + + + + + + + Log Stripped Names + varsettingsstrippednames + Choose if you want to log the full User-Name attribute as it was found in the request. Logging must be enabled. (Default: no) + select + no + + + + + + + SECURITY CONFIGURATION + listtopic + Maximum Number of Attributes varsettingsmaxattributes @@ -206,6 +218,10 @@ input 1 + + THREAD POOL CONFIGURATION + listtopic + Number of Threads After Start varsettingsstartservers -- cgit v1.2.3 From 12596a898f50ee156570aae081eadd28426a6b36 Mon Sep 17 00:00:00 2001 From: Nachtfalke Date: Sun, 11 Dec 2011 18:28:37 +0100 Subject: cleanup log files after deinstallation --- config/freeradius2/freeradius.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 762a2200..2a83911c 100755 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -9,6 +9,7 @@ function freeradius_deinstall_command() { exec("rm -rf /usr/local/etc/raddb/"); exec("rm -rf /var/log/raddb/"); exec("rm -rf /var/log/radacct/"); + exec("rm -f /var/log/radius.log"); } function freeradius_install_command() { @@ -58,7 +59,6 @@ function freeradius_settings_resync() { $varsettingsallowcoredumps = $varsettings['varsettingsallowcoredumps']; $varsettingsregularexpressions = $varsettings['varsettingsregularexpressions']; $varsettingsextendedexpressions = $varsettings['varsettingsextendedexpressions']; - $varsettingsmaxattributes = $varsettings['varsettingsmaxattributes']; $varsettingsrejectdelay = $varsettings['varsettingsrejectdelay']; $varsettingsstartservers = $varsettings['varsettingsstartservers']; @@ -104,6 +104,7 @@ hostname_lookups = $varsettingshostnamelookups allow_core_dumps = $varsettingsallowcoredumps regular_expressions = $varsettingsregularexpressions extended_expressions = $varsettingsextendedexpressions +proxy_requests = yes EOD; @@ -144,9 +145,8 @@ checkrad = \${sbindir}/checkrad security { max_attributes = $varsettingsmaxattributes reject_delay = $varsettingsrejectdelay - status_server = no ### Needs additional config in raddb/sites-available/status + status_server = no ### Needs additional config in raddb/sites-available/status } - proxy_requests = yes \$INCLUDE \${confdir}/proxy.conf \$INCLUDE \${confdir}/clients.conf @@ -490,7 +490,7 @@ post-proxy { EOD; - conf_mount_rw(); + conf_mount_rw(); file_put_contents(RADDB . '/radiusd.conf', $conf); conf_mount_ro(); restart_service("freeradius"); -- cgit v1.2.3 From aae966ff5d0e9bb1c77d240b35667353d8583ac2 Mon Sep 17 00:00:00 2001 From: Nachtfalke Date: Sun, 11 Dec 2011 18:30:44 +0100 Subject: some chmod changes --- config/freeradius2/freeradius.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml index c58f35d7..60d3a3ce 100755 --- a/config/freeradius2/freeradius.xml +++ b/config/freeradius2/freeradius.xml @@ -122,22 +122,22 @@ /usr/local/pkg/ - 0775 + 0755 http://www.pfsense.org/packages/config/freeradius2/freeradiusclients.xml /usr/local/pkg/ - 0775 + 0755 http://www.pfsense.org/packages/config/freeradius2/freeradiussettings.xml /usr/local/pkg/ - 0775 + 0755 http://www.pfsense.org/packages/config/freeradius2/freeradiusinterfaces.xml /usr/local/pkg/ - 0775 + 0755 http://www.pfsense.org/packages/config/freeradius2/freeradius.inc -- cgit v1.2.3 From e89d7596bea25ea1b3860ac5c8dcef30f644a91c Mon Sep 17 00:00:00 2001 From: Nachtfalke Date: Sun, 11 Dec 2011 18:33:19 +0100 Subject: bump version - some cosmetic changes --- pkg_config.8.xml.amd64 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index c075eeb8..d47af518 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -801,11 +801,10 @@ freeradius2 http://www.freeradius.org/ - Do not use together with freeradius package. Both are using the same config files.
- Should be now as stable as freeradius package but needs more testing.]]> + Do not use together with freeradius package. Both are using the same XML files.]]> http://forum.pfsense.org/index.php/topic,43675.0.html System - 2.1.12 pkg v1.0 + 2.1.12 pkg v1.0.1 BETA 2.0 Nachtfalke -- cgit v1.2.3 From c2882ca2aec890ad6e737efff7c01ec9a370f8c8 Mon Sep 17 00:00:00 2001 From: Nachtfalke Date: Sun, 11 Dec 2011 18:34:23 +0100 Subject: bump version - some cosmetic GUI changes --- pkg_config.8.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 6fdf8af0..652293eb 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -759,11 +759,10 @@ freeradius2 http://www.freeradius.org/ - Do not use together with freeradius package. Both are using the same config files.
- Should be now as stable as freeradius package but needs more testing.]]> + Do not use together with freeradius package. Both are using the same XML files.]]> http://forum.pfsense.org/index.php/topic,43675.0.html System - 2.1.12 pkg v1.0 + 2.1.12 pkg v1.0.1 BETA 2.0 Nachtfalke -- cgit v1.2.3