Commit Graph

25342 Commits

Author SHA1 Message Date
Sjon Hortensius
46bb8a0bd8 Merge remote-tracking branch 'upstream/master' into origin/master 2015-03-22 14:55:52 +01:00
Sjon Hortensius
7818caff03 Button - fix title when not <a>, Input - no need for tempvar 2015-03-22 13:41:11 +01:00
Sjon Hortensius
d957567242 Add copyright headers to Form classes 2015-03-22 13:40:25 +01:00
Sjon Hortensius
a0165602b2 Convert System > Auth servers
refs #18
2015-03-22 13:37:40 +01:00
Renato Botelho
90e5c03a5d Merge pull request #1486 from jlduran/patch-1 2015-03-20 16:03:21 -03:00
Chris Buechler
d325e90818 Add option for wireless standard "auto", to omit "mode" entirely from ifconfig. This shouldn't be necessary, but specifying mode has proven to trigger driver problems that don't exist if it's left unspecified (such as FreeBSD PR 198680). Chosing "auto" fixes ath(4) BSS mode issues otherwise preventing it from connecting. 2015-03-18 23:55:53 -05:00
Jared Dillard
eb94d976dd change the location of jquery-ui images in each theme's css file 2015-03-18 14:04:16 -05:00
Jose Luis Duran
106f345133 Use none instead of a whitespace in sshd_config
Use the `none` keyword instead of a whitespace to disable the FreeBSD version in sshd_config.
2015-03-18 12:47:10 -05:00
Renato Botelho
86e41adf98 Merge pull request #1571 from phil-davis/patch-2 2015-03-18 10:58:49 -03:00
Renato Botelho
2d78048e72 Merge pull request #1569 from phil-davis/patch-1 2015-03-18 10:57:23 -03:00
Phil Davis
926e0a2fca Cleanup code path when adding a new user
1) Only attempt to delete the oldusername if it actually was non-empty - at the moment errors are logged in the system log when adding a new user, because the code was trying to delete the user name "".
2) Call local_user_set() first to create (change, whatever) the user record. This makes the user record exist for a new user. Then call local_user_set_groups() to sort out what groups the user should be in or not in. The existing code would fail to add a new user to the specified group/s because local_user_set_groups() was called too early, before the user actually existed.

Typical system log errors from the old code:
Mar 18 17:10:31 	php-fpm[9542]: /system_usermanager.php: Tried to remove user but got user pw instead. Bailing.
Mar 18 17:10:31 	php-fpm[9542]: /system_usermanager.php: The command '/usr/sbin/pw groupmod admins -g 1999 -M '0,2003,2006,2008' 2>&1' returned exit code '67', the output was 'pw: user `2008' does not exist'

From looking at the code history, I think this has been this way for a long time, not a new bug at all.

Discussed in forum: https://forum.pfsense.org/index.php?topic=90700.msg501766#msg501766
2015-03-18 17:48:36 +05:45
Phil Davis
e5d58b6827 Do not allow VLAN tag zero
At the moment you can make a VLAN with tag 0. The input validation does not catch it because when $_POST['tag'] = "0" that evaluates to false by PHP.
Always make the checks on 'tag' value whenever the 'tag' key is set at all. If the (required) 'tag' key is not set, then that is already checked for by do_input_validation().
2015-03-16 20:11:00 +05:45
SjonHortensius
3d7f31e209 Merge pull request #14 from psophis/interface-vlans
Migrated Interface > VLANs
2015-03-16 13:59:14 +01:00
Renato Botelho
e554970781 Merge pull request #1564 from phil-davis/patch-2 2015-03-16 08:19:41 -03:00
Renato Botelho
b78655a9cf Merge pull request #1562 from phil-davis/usr-review1 2015-03-16 08:17:03 -03:00
Renato Botelho
aa77c7baf2 Merge pull request #1561 from phil-davis/patch-1 2015-03-16 08:15:43 -03:00
Renato Botelho
bd17a3035f Merge pull request #1560 from phil-davis/get_possible_traffic_source_addresses 2015-03-16 08:13:41 -03:00
Thane Gill
465f17a3c0 Initial commit for Interface > VLANs bootstrap convert 2015-03-15 21:32:29 -07:00
Sjon Hortensius
b52f76e9bf remove custom data-toggle=disable in favor of working but ugly collapse
fixes #24
2015-03-15 22:09:06 +01:00
Sjon Hortensius
845e459de8 pfSense - unbreak javascripts, correct split into methods 2015-03-15 21:59:25 +01:00
Sjon Hortensius
4ee5113170 Convert main Usermanager
refs #18
2015-03-15 21:50:02 +01:00
Sjon Hortensius
0c843a9c1b Minor fixes in forms, introduce Textarea
Button - make sure we correctly escape link & text
Select - with multiple selected values; look at keys instead of values
StaticText - switch Input::__construct args
Textarea - introduce
2015-03-15 21:47:55 +01:00
Phil Davis
44b9fbdc81 Use subnet address in OPT net rules
Example: LAN IP 10.0.1.1/24 OPT1 IP 10.0.2.1/24
Rules with SRC or DST LANnet correctly have 10.0.0.0/24 (the subnet base address) in /tmp/rules.debug
Rules with SRC or DST OPT1net have 10.0.2.1/24 (the OPT1 IP address with OPT1 net mask) in /tmp/rules.debug
It still works (I think) because actually 10.0.2.1/24 and 10.0.2.0/24 interpreted as a subnet still describes the same set of IP addresses, but it looks odd, as reported by: https://forum.pfsense.org/index.php?topic=90096.msg498474#msg498474
Same issue with IPv6 for OPT1net rules.
This fixes the rule generation to that OPT1net uses the base subnet address in the rule, in the same way that LANnet and WANnet does.
2015-03-14 20:24:25 +05:45
Phil Davis
7d61beba45 Code Style sbin tmp usr
Bits and pieces from sbin tmp and usr but not yet usr/local/www
2015-03-13 23:28:12 +05:45
Phil Davis
6fee314bae pfSsh.php readline function return value
This just looks wrong. But I guess the code path never comes through here because function readline() already exists in the environment of this script.
2015-03-13 23:10:14 +05:45
Phil Davis
a08d505596 Update get_possible_traffic_source_addresses returned array format
With this change it looks to me like the way it is intended to be, based
on what was done to get_possible_listen_ips()
Please review and check if this is what was intended for the code. With
this change it should make the returned $sourceips array be in a
consistent format the same way as get_possible_listen_ips()
This is a fix for code that was only committed in master. So at this
time the fix is only needed in master.
2015-03-13 14:30:51 +05:45
Chris Buechler
f2f34088ac txpower was disabled for good reason it would appear, it triggers syntax errors in some configurations. Disable it again since it's been disabled for years, and comment out the user-facing config portion for now since it doesn't do anything. Ticket #4516 2015-03-13 03:16:17 -05:00
Chris Buechler
0a950c4b0a Apply WME input validation to all modes, not just hostap. Ticket #4516 2015-03-13 03:06:36 -05:00
Chris Buechler
141d316c7f Default to 11ng if an option hasn't been configured. Previously we let the browser pick the first in the list (the first the card reported as available), which ended up being 802.11b. Ticket #4516 2015-03-13 02:56:12 -05:00
Chris Buechler
d31517e5fa Default to WPA2, AES for new wireless interface configs. Ticket #4516 2015-03-13 02:31:39 -05:00
Chris Buechler
3fdd9cfa87 Auto-size the interface box on the bridge edit page. 2015-03-13 01:20:15 -05:00
Chris Buechler
1188cdc865 touch up interfaces.php text 2015-03-13 00:15:29 -05:00
Chris Buechler
310ea4e257 Require WPA PSK where WPA-PSK is enabled. Clean up some other text. Ticket #4516 2015-03-12 23:44:40 -05:00
Chris Buechler
4958ca9eed clean up input errors text 2015-03-12 23:26:13 -05:00
Chris Buechler
664aef0be1 correct missing == in ipsec.inc 2015-03-12 22:05:18 -05:00
Chris Buechler
d045f38067 Merge pull request #1557 from phil-davis/patch-3 2015-03-12 22:01:02 -05:00
Chris Buechler
a819eab222 Fix up text, remove "only for Atheros" since the option is only shown if a compatible card exists. 2015-03-12 21:02:19 -05:00
Chris Buechler
6f5607f555 "Auto" channel with hostap doesn't work correctly at the moment, force choosing a specific channel with hostap mode for now. 2015-03-12 20:55:46 -05:00
Chris Buechler
ac0c435545 Set txpower since that seems to work fine now. Explicitly set authmode wpa here, though it's also handled by the supplicant/authenticator. Ticket #4516
Conflicts:
	etc/inc/interfaces.inc
2015-03-12 20:47:40 -05:00
Phil Davis
cc229ee94a Missin double equals in captiveportal.inc
Looking at where this is nested inside various if statements, I do not think this error did too much harm - only to the $mac['descr'] - in this particular code flow $username is not used for important stuff after this point.
2015-03-13 07:30:52 +05:45
Renato Botelho
f087d45398 Do not start filterdns during boot until a proper fix is done. Ticket #4296 2015-03-12 21:09:46 -03:00
Chris Buechler
aec55f9aa4 add more wireless validation. Ticket #4516 2015-03-12 18:53:14 -05:00
Chris Buechler
6cd14b43ee Add more validation for wireless config settings. Ticket #4516 2015-03-12 18:22:43 -05:00
Chris Buechler
95df2de5aa Add more input validation for wireless parameters. Ticket #4516 2015-03-12 16:49:06 -05:00
Chris Buechler
89e6f7af27 Touch up wifi text 2015-03-12 15:07:20 -05:00
Chris Buechler
6a2eb517c9 If we bail not being able to find the P1 source, log an error.
Conflicts:
	etc/inc/vpn.inc
2015-03-12 14:50:08 -05:00
Chris Buechler
167087b852 Merge pull request #1556 from phil-davis/patch-5 2015-03-12 01:31:53 -05:00
Chris Buechler
2991a9496e Merge pull request #1554 from phil-davis/patch-3 2015-03-12 01:28:11 -05:00
Phil Davis
4736014055 White space in ipsec.inc 2015-03-12 12:02:04 +05:45
Chris Buechler
524a014026 use-compression is no longer a valid config option in lighttpd, it can't be enabled. This just throws an error in the log, remove it. 2015-03-12 00:52:12 -05:00