Commit Graph

25630 Commits

Author SHA1 Message Date
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
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
Chris Buechler
be77d67ced Merge pull request #2061 from phil-davis/patch-7 2015-12-15 21:02:15 -06:00
jim-p
012e80df44 Fix handling of 0-byte files uploaded to the CP file manager. 2015-12-15 15:12:25 -05:00
Renato Botelho
919916d426 Merge pull request #2213 from PiBa-NL/pferrormessage-22 2015-12-14 08:03:07 -02:00
PiBa-NL
55752439f4 fix showing when a error happens parsing pf rules
For example a queue interface speed mismatch could go unnoticed.

backport from 2.3 of #2165
2015-12-12 19:14:52 +01:00
Renato Botelho
c33fd4cc00 Fix typo, gateway entry in config has a field called monitor, not monitorip 2015-12-11 11:06:26 -02:00
Renato Botelho
03fff067bc Merge pull request #2162 from phil-davis/patch-1 2015-12-07 13:24:49 -02:00
Renato Botelho
1b4fd63494 Merge pull request #2166 from phil-davis/pkgsync22 2015-12-07 13:16:14 -02:00
Phil Davis
6ae579b560 Redmine #4279 Package reinstall displayed when shutting down before upgrade
Use a different flag file to indicate that a package reinstall is
required after a reboot is done first. This avoids the possibility that
the user navigates in the webGUI during the time while the shutdown is
in progress and is accidentally presented with the reinstall all
packages GUI button.
Early in rc.bootup switch the flag file to use its ordinary name, so
that all subsequent code in boot scripts and webGUI will work as it
already does to handle the package reinstall and notifying the user that
a package reinstall is about to be done or in progress...
2015-12-07 11:14:16 +05:45
Phil Davis
026e2441bb Fix duplicate syslog messages - Redmine #5606 for RELENG_2_2
The generated syslog.conf needs to have the system.log selections combined into a single line in 2 places. The OP on redmine 5606 just showed 1 place in the diff there.
On my system, this gets rid of the duplicated message on login:
php-fpm[11074]: /index.php: Successful login for user 'my.name' from: 10.11.12.13

Note: for some reason old line 848 includes local4.none - but local4.none does not appear in old line 864. What is that about? Is that another different bug?
I did not mess with that, but I noticed that the OPs diff listing did also add in local4.none where it seems to be missing.
2015-12-06 22:58:31 +05:45
jim-p
2bfa7dbfb4 Include ipsec.inc here otherwise the global is undefined when called when restoring a config in the GUI. 2015-12-04 15:39:43 -05:00
jim-p
3ac0284805 Address a potential LFI in pkg.php and wizard.php without breaking the ability to pass relative paths
Restricts them to files under their intended base directories.
2015-12-04 15:38:39 -05:00
Chris Buechler
dc77f00532 Remove txtsupport from Unbound. Of limited use, and the back end code was never ported over from the package (and is messy to do so). Ticket #5545 2015-12-03 15:26:17 -06:00
Chris Buechler
43180e9c49 Sanitize the session_id/logout_id in captive portal. 2015-12-02 18:22:55 -06:00
Renato Botelho
5245206c6a Merge pull request #2108 from phil-davis/patch-3 2015-11-23 14:21:02 -02:00
Phil Davis
baa4325b0c Backport #5512 RADIUS secret
Another little easy thing to backport just in case.
2015-11-23 21:56:04 +05:45
Renato Botelho
da6e3b6447 Merge pull request #2014 from phil-davis/patch-1 2015-11-19 07:42:37 -02:00
Renato Botelho
fa49ec387e Merge pull request #2069 from jean-m-cyr/RELENG_2_2 2015-11-19 07:26:51 -02:00
Renato Botelho
8d82158408 Merge pull request #2049 from phil-davis/patch-4 2015-11-19 07:18:00 -02:00
Renato Botelho
71714010f7 Merge pull request #2064 from phil-davis/patch-3 2015-11-19 07:16:54 -02:00
Renato Botelho
9996b3e427 Merge pull request #2083 from phil-davis/patch-10 2015-11-19 07:16:17 -02:00
Renato Botelho
e0d520a454 Merge pull request #2082 from phil-davis/patch-9 2015-11-19 07:15:14 -02:00
Renato Botelho
86025b0ecb Merge pull request #2065 from phil-davis/patch-6 2015-11-19 07:13:30 -02:00
Phil Davis
7137664c9c Make block bogon rule display consistent - RELENG_2_2
The block private networks and anti-lockout rules display in the firewall rules display with the schedule column blank. But the block bogon networks has an asterisk. That looks odd. I noticed it just now when looking at firewall rules in 2.3.
Might as well fix it here in RELENG_2_2.
2015-11-18 09:50:48 +05:45
Phil Davis
e889b813a2 Backport fix #5467 to RELENG_2_2 2015-11-18 09:02:23 +05:45
Jean Cyr
f6fb637223 Add missing stratum parameter
Add missing stratum parameter  in ntpd.conf when specified on Serial GPS
page.
2015-11-15 22:36:36 -05:00