summaryrefslogtreecommitdiffstats
path: root/usr/local
Commit message (Collapse)AuthorAgeFilesLines
* Only disable CSRF on diag_backup.php for the download action where it might ↵jim-p2015-12-211-1/+3
| | | | be scripted. Other actions need its protection.
* Encode hostname before printing; remove some related dead code.jim-p2015-12-216-25/+6
|
* Encode gateway attributes before printing.jim-p2015-12-212-5/+5
|
* Encode DNS servers and their associated gateways before printingjim-p2015-12-211-2/+2
|
* Add range validation to CP IP passthrough. Ticket #5655Chris Buechler2015-12-171-3/+10
|
* add validation to MAC passthrough. Ticket #5655Chris Buechler2015-12-171-2/+10
|
* Wrong source of syntax error. Revert "fix syntax error in ipfw command to ↵Chris Buechler2015-12-171-1/+1
| | | | | | disable on inactive interfaces" This reverts commit 6310eaa2c75424da6a322a956bbf228b36222918.
* fix syntax error in ipfw command to disable on inactive interfacesChris Buechler2015-12-171-1/+1
|
* Change status.php state dump to use -vvss for more verbose info, add kenv ↵jim-p2015-12-171-1/+3
| | | | and pbi_info.
* Merge pull request #2061 from phil-davis/patch-7Chris Buechler2015-12-151-6/+20
|\
| * Limit alias info popup size #5415 RELENG_2_2Phil Davis2015-11-111-6/+20
| | | | | | This is code for RELENG_2_2 pfSense 2.2.5 that will limit the number of rows in the alias info popup to 100.
* | Fix typo, gateway entry in config has a field called monitor, not monitoripRenato Botelho2015-12-111-1/+1
| |
* | Redmine #4279 Package reinstall displayed when shutting down before upgradePhil Davis2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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...
* | Address a potential LFI in pkg.php and wizard.php without breaking the ↵jim-p2015-12-042-4/+18
| | | | | | | | | | | | ability to pass relative paths Restricts them to files under their intended base directories.
* | Remove txtsupport from Unbound. Of limited use, and the back end code was ↵Chris Buechler2015-12-031-17/+1
| | | | | | | | never ported over from the package (and is messy to do so). Ticket #5545
* | Sanitize the session_id/logout_id in captive portal.Chris Buechler2015-12-021-1/+3
| |
* | Merge pull request #2049 from phil-davis/patch-4Renato Botelho2015-11-191-1/+1
|\ \
| * | Unbound advanced Invoming TCP Buffers validationPhil Davis2015-11-101-1/+1
| | | | | | | | | | | | There is a variable cut-paste error here. Actually it never makes any difference in practice because outgoing_num_tcp and incoming_num_tcp are both set, so the logic comes out the same. I noticed this while reviewing stuff in master for 2.3-ALPHA - might as well back-port stuff like this so that nobody who notices will worry about it in RELENG_2_2.
* | | Merge pull request #2083 from phil-davis/patch-10Renato Botelho2015-11-191-1/+1
|\ \ \
| * | | Make block bogon rule display consistent - RELENG_2_2Phil Davis2015-11-181-1/+1
| | |/ | |/| | | | | | | 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.
* | | Merge pull request #2082 from phil-davis/patch-9Renato Botelho2015-11-191-1/+1
|\ \ \
| * | | Backport fix #5467 to RELENG_2_2Phil Davis2015-11-181-1/+1
| |/ /
* | | Backport Redmine #5440 to RELENG_2_2Phil Davis2015-11-151-0/+8
|/ / | | | | | | The code in RELENG_2_2 for system_usermanager_settings.php seems to work OK in RELENG_2_2 so I did not touch anything there. But diag_authentication.php had nothing about $pconfig on initial page load. This extra code makes it select a reasonable default auth server when the page first loads. After that, each time the user does "Test", the page comes back with the previously selected auth server, user name and password (like it did already) - so that seems good.
* | diag_ipsec.php - show button for child SAs only when some are established. ↵Matt Smith2015-11-101-2/+2
|/ | | | Fix ID used by child SA disconnect button.
* Fix syntaxRenato Botelho2015-11-091-2/+2
|
* Let the code ready for strongswan 5.3.4, where key used to track nat were ↵Renato Botelho2015-11-091-2/+14
| | | | committed with a different name
* Only call pfSense_ipsec_list_sa() when IPsec is enabledRenato Botelho2015-11-032-2/+2
|
* Remove a redundant if and fix indentation accordingly. Fix is_array that ↵Matt Smith2015-10-301-51/+49
| | | | should be an isset on the remote SPI field.
* Update license on diag_ipsec.php. Keep required attributions and referenceMatt Smith2015-10-301-29/+54
| | | | the original m0n0wall BSD 2 clause.
* Remove port information from diag_ipsec.php since it's not available on ↵Renato Botelho2015-10-301-6/+4
| | | | VICI, also use local-nat-t and remote-nat-t to detect when NAT-T is being used
* Rework ipsec widget to use VICIRenato Botelho2015-10-301-17/+7
|
* Remove diag_ipsec_xml.php, not being usedRenato Botelho2015-10-301-82/+0
|
* Make IPsec status page retrieve status with VICI instead of SMPMatt Smith2015-10-301-107/+117
|
* Fix up descriptive text for logging levels. Ticket #5340Chris Buechler2015-10-261-4/+3
|
* Default log level where none is selected should be 3 here. Ticket #5340Chris Buechler2015-10-261-1/+1
|
* Correct available log levels. Ticket #5340Chris Buechler2015-10-261-16/+16
|
* Logging fixes. Ticket #5340Chris Buechler2015-10-261-1/+3
|
* Merge pull request #1980 from doktornotor/patch-2Renato Botelho2015-10-261-10/+27
|\
| * Fix external interface variable in input error messagedoktornotor2015-10-241-1/+1
| |
| * Properly validate IPv4 for UPnP - RELENG_2_2doktornotor2015-10-241-10/+27
| | | | | | | | | | Since https://redmine.pfsense.org/issues/1835 got exactly nowhere for the past 4 years, the input should be properly validated, instead of allowing people to configure nonfunctional/broken nonsense. P.S. If you don't plan on fixing the above-linked feature for 2.3, let me know and I'll do the same for 2.3
* | Merge pull request #1986 from phil-davis/patch-6Renato Botelho2015-10-261-2/+2
|\ \
| * | Fix Command Prompt Download and Upload when not in English - Redmine #5343 ↵Phil Davis2015-10-251-2/+2
| |/ | | | | | | for RELENG_2_2
* | Merge pull request #1984 from phil-davis/patch-4Renato Botelho2015-10-261-1/+1
|\ \
| * | Fix multi-lingual save of NAT mode Redmine # for RELENG_2_2Phil Davis2015-10-251-1/+1
| |/ | | | | and forum https://forum.pfsense.org/index.php?topic=101276.0
* | Use 1-6 rather than 0-5 for IPsec logging levels, to stay away from ↵Chris Buechler2015-10-261-2/+8
|/ | | | complications of 0 due to PHP stupidity. Upgrade config to add 1 to any configured log levels. Default to 1 as log level where none is configured by the user. Ticket #5340
* interfaces_assign tab_array numberingPhil Davis2015-10-231-4/+4
| | | | | This was fixed in master for 2.3 by https://github.com/pfsense/pfsense/commit/50e6c063e6ec148917ff0bcb0bce8b0a08df5792 - in master all of these $tab_array entries, in each file that they appear in, had been modified to just use the $tab_array[] = form. But in RELENG_2_2 that has not happened. So it seems nicer to just fix the numbering here to match what is already in the other interfaces_*.php files in RELENG_2_2. Note that the code works OK without this "fix" - display_top_tabs() just loops through the existing array keys anyhow and so did not notice the missing number.
* Merge pull request #1971 from doktornotor/patch-5Chris Buechler2015-10-202-0/+9
|\
| * Point people to 'Clear Package Lock' if the reinstall of packages got stuck ↵doktornotor2015-10-201-0/+8
| | | | | | | | (RELENG_2_2)
| * Point people to 'Clear Package Lock' if the reinstall of packages got stuck ↵doktornotor2015-10-201-0/+1
| | | | | | | | (RELENG_2_2)
* | Limit the auth methods where "My Certificate Authority" is displayed/saved forMatt Smith2015-10-201-12/+7
|/ | | | mobile clients. Fixes #5323.
OpenPOWER on IntegriCloud