Commit Graph

25655 Commits

Author SHA1 Message Date
Renato Botelho
eda5cb845f Backport ipsec_dump_mobile() from 2.3 to make it work witn new strongswan port (without stroke_list.c patch) 2016-02-17 20:02:17 -02:00
Renato Botelho
e4449c1977 Merge pull request #2656 from WilliamHiles/patch-1 2016-02-17 07:00:31 -02:00
WilliamHiles
7696b7b642 Fix typo in RCC update 2016-02-17 02:20:02 -06:00
Jeremy Porter
f7c6105b85 add RCC, fix XG-1540 name, ensure serial port is set on RCC 2016-02-15 19:31:49 -06:00
Luiz Otavio O Souza
c3b9b53187 Merge pull request #2634 from nwholloway/eclfix_2_2 2016-02-14 12:58:03 -06:00
Nick Holloway
e7733965b4 Fix #5890 find disk slices as candidates for loading "config.xml" at boot
In commit 873c1701, the call to "/bin/ls /dev/{$disk}s*" was surrounded
with "escapeshellarg" so the wildcard is not expanded.

Use "glob" to find the slices for a disk instead.
2016-02-14 14:05:31 +00:00
Chris Buechler
efebd867ec Prefer dnsmasq's host overrides when it's enabled. Ticket #5883 2016-02-11 17:52:25 -06:00
jim-p
b76fd2a056 Encode parameters in Limiters and L7 before display. Fixes #5877 2016-02-10 13:29:12 -05:00
jim-p
1ab9e48986 Encode gateway name and description before printing. Fixes #5876 2016-02-10 13:29:05 -05:00
jim-p
6a109e3eaf Make RRD lists global, validate graph name using whitelist of known values rather than blacklist of characters, beef up validation and escaping of related values while here. Fixes #5874 for 2.2.x 2016-02-10 12:09:57 -05:00
Chris Buechler
b4bbf1e037 Merge pull request #2607 from phil-davis/patch-5 2016-02-08 20:16:34 -06:00
Phil Davis
ddba2645f9 Fix #3209 editing unassigned VLAN tag can change an assigned interface - RELENG_2_2
Might as well fix this bug in 2.2.* as well, since it is easy and was obviously an error.
2016-02-09 07:35:46 +05:45
Chris Buechler
ec0643f7f1 Merge pull request #2575 from davidjwood/RELENG_2_2-ppp-ipv6-new 2016-01-30 04:06:00 -06:00
Renato Botelho
5559b4a97e Merge pull request #2528 from phil-davis/patch-6 2016-01-26 08:26:03 -02:00
Phil Davis
f155b6e430 pkg.php consolidate else-if statement 2016-01-25 20:59:45 +05:45
Phil Davis
9fa1712002 Wrap pkg_full_path in htmlspecialchars()
Because it contains $xml which is itself wrapped in htmlspecialchars() for display.
2016-01-25 13:59:11 +05:45
Phil Davis
b5b8f8dd2f Enhance error output when package file not found - RELENG_2_2
I had a system that had upgraded but the Notes package had not managed to (re)install. In that situation the Notes item is on the Status menu but there is no notes.xml or other notes code on the the system.
When I go to Status->Notes I get:
Warning: substr_compare(): The start position cannot exceed initial string length in /usr/local/www/pkg.php on line 56 File not found notes.xml

The warning is because realpath() returns false in this case and cannot be used is a parameter to substr_compare().

Handle this case, and make the error message more informative.

Note: In RELENG_2_2 print_info_box_np() puts a "Close" button and has no way to stop that. It looks dumb, but that can be cleaned up in 2.3 master. I am just doing this in RELENG_2_2 to avoid the PHP warning.
2016-01-25 13:34:48 +05:45
Renato Botelho
ca052b35b1 Initialize $stop_time inside foreach to make sure it resets to proper value each iteration since it's changed inside loop. Reported on https://github.com/pfsense/pfsense/pull/2487 2016-01-20 15:22:00 -02:00
Renato Botelho
b5b8f1117b Bump version to 2.2.7-DEVELOPMENT 2016-01-19 12:48:08 -02:00
Renato Botelho
e656d8a3ad Merge pull request #2465 from phil-davis/patch-2 2016-01-18 16:11:04 -02:00
Phil Davis
1d44f99f35 Use current interface description for breadcrumb - RELENG_2_2
If you enter invalid stuff in the interface description - e.g. "123" - and press save, then you get a warning about it, but the breadcrumb changes to "Interfaces: 123" - the wrongly entered description (that was not applied).
If you enter a valid string for 'descr' then by this point $wancfg has the new value anyway and so the breadcrumb will change correctly if you make a valid entry in 'descr' and save.
2016-01-18 22:18:07 +05:45
Phil Davis
b9abac57ec Fix #5778 do not save changes if interface description matches an alias name - RELENG_2_2 2016-01-18 21:49:32 +05:45
Chris Buechler
fdc515af33 Update URL for dyns to match their current docs. Reported by GP^ on IRC 2016-01-11 16:25:58 -06:00
Renato Botelho
c8d37750ff Merge pull request #2362 from phil-davis/patch-2 2016-01-07 10:26:33 -02:00
Phil Davis
587f46f452 Rationalize add and delete buttons for limiter GUI RELENG_2_2
This has annoyed me in the past. I noticed it in 2.3-BETA just now and went to look on a 2.2.6 system and realized it is an issue there also.
1) When you click to add a new limiter or new queue, then the "Add new queue" button is displayed down the bottom. That is dumb - you are already adding and actually you need to enter the data and save first before adding something else.
2) When you are adding something (like in (1)) the Delete button is displayed. That is also dumb - there is nothing to delete until you have press save to add it!
3) When clicking on a Limiter at the top of the tree, the Delete button syas "Delete this queue", but it is the top level limiter that is being edited and could be deleted, The $_GET/$_POST that happens sends "pipe" and "queue" both with the name of the top-level limiter. So in the end $queue always exists. So we only want the text "Delete this queue" if $queue exists and the queue name is NOT the same as the pipe name.

I am submitting this for RELENG_2_2 because I wanted to sort that out anyway to understand what was wrong and how it should behave.

Then I can look at 2.3-BETA and make it work nicely there...
2016-01-07 10:49:59 +05:45
David Wood
0faf330066 Insert missing close brace 2016-01-06 19:17:49 +00:00
David Wood
20d6e88a88 Attempt to ensure interface_dhcpv6_configure() is called at the most appropriate time
* ppp-ipv6 for PPP type with dhcp6usev4iface (or PPP without dhcp6usev4iface, as dhcp6usev4iface appears to be a no-op on this type of connection)
* rc.newwanip for non-PPP type with dhcp6usev4iface (no change in this commit)
* interface_configure() in all other cases
2016-01-06 09:19:52 +00:00
David Wood
5a640581b6 Stop enabling router advertisements by default 2016-01-06 03:49:42 +00:00
David Wood
3bcd4ff623 Prevent ppp-ipv6 from taking any action when dhcp6 is active on the parent interface, not the PPP interface 2016-01-06 02:38:06 +00:00
David Wood
a31457d961 Make ppp-ipv6 the only way interface_dhcpv6_configure() is called on PPP connections using PPP as the IPv6 parent interface 2016-01-06 02:38:06 +00:00
David Wood
e68cb72f3e Set temporary bogon (RFC 5737) IPv4 addresses when initialising PPP interfaces during boot to work round mpd5 IPv6CP issue causing random IPv6 interface identifiers
Details at https://forum.pfsense.org/index.php?topic=101967.msg570519#msg570519 .
2016-01-06 02:23:54 +00:00
David Wood
918b19a62c Set temporary bogon (RFC 5737) IPv4 address to work round mpd5 IPv6CP issue causing random IPv6 interface identifier during boot
Details at https://forum.pfsense.org/index.php?topic=101967.msg570519#msg570519 .
2016-01-06 02:23:54 +00:00
David Wood
682d280755 Make ppp-ipv6 the only way interface_dhcpv6_configure() is called on PPP interfaces 2016-01-06 02:23:54 +00:00
Renato Botelho
1537fc6d02 Merge pull request #2342 from phil-davis/patch-2 2016-01-05 09:45:38 -02:00
Phil Davis
49ad2c22b1 Fix redmine #5722 DHCP validation for RELENG_2_2
Might as well provide the fixes for RELENG_2_2 since it is easy and that is where I first tested. Even if there is never a 2.2.7, at least the fixes are there in GitHub to be seen.
2016-01-01 14:21:22 +05:45
jim-p
c7cd5f1c5e Take this conditional out, it wasn't enough, and we have a script example for how to handle this properly now while respecting CSRF. 2015-12-23 10:08:04 -05:00
jim-p
392796a461 Encode parameters in shaper queues before display. 2015-12-21 15:37:25 -05:00
jim-p
3643958c95 Only disable CSRF on diag_backup.php for the download action where it might be scripted. Other actions need its protection. 2015-12-21 10:47:54 -05:00
jim-p
4fa888b46c Encode hostname before printing; remove some related dead code. 2015-12-21 10:15:30 -05:00
jim-p
49e83995ce Encode gateway attributes before printing. 2015-12-21 09:33:45 -05:00
jim-p
d83a4dfcdb Encode DNS servers and their associated gateways before printing 2015-12-21 09:04:18 -05:00
Chris Buechler
d59733f55e bump to 2.2.6-RELEASE 2015-12-18 18:27:47 -06:00
Chris Buechler
0548783251 Add range validation to CP IP passthrough. Ticket #5655 2015-12-17 22:14:39 -06:00
Chris Buechler
6d05bb9af7 add validation to MAC passthrough. Ticket #5655 2015-12-17 22:10:13 -06:00
Chris Buechler
07917f7df5 Flush zone's tables if its db must be reset to avoid leaving behind any table entries. Ticket #5622 2015-12-17 18:59:08 -06:00
Chris Buechler
75272760ed Wrong source of syntax error. Revert "fix syntax error in ipfw command to disable on inactive interfaces"
This reverts commit 6310eaa2c7.
2015-12-17 17:10:40 -06:00
Chris Buechler
6310eaa2c7 fix syntax error in ipfw command to disable on inactive interfaces 2015-12-17 17:07:34 -06:00
Chris Buechler
7c4b3b2060 Add busytimeout of 60 seconds for CP database access. This matches the default value PHP uses with sqlite 2.x versions (pfSense 2.1.x and earlier) and prevents the issues noted in Ticket #5622 2015-12-17 16:17:59 -06:00
jim-p
fc02b11a9d Change status.php state dump to use -vvss for more verbose info, add kenv and pbi_info. 2015-12-17 10:48:50 -05:00
Chris Buechler
1eb6993723 add these three strongswan libs to the obsoletedfiles list. They haven't been included in any releases, but were briefly included in snapshots in mid April 2015. 2015-12-16 23:21:26 -06:00