summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle IPsec Advanced Settings save before IPsec is enabledPhil Davis2015-07-221-12/+16
| | | | | | | | | | If the Advanced Settings are saved before any other IPsec is set up then $config['ipsec'] can be just the empty string. As a result you can get: a) If you select some debug settings then those are not saved. The code to save those settings was only executed when $config['ipsec'] was already an array. Actually the code already did the necessary "if isset() then unset()" stuuf. So I just took the the "if is_array()" away from the code block. b) Some potential unset() can go wrong with errors like: Fatal error: Cannot unset string offsets in /usr/local/www/vpn_ipsec_settings.php on line 168 This is corrected by adding more "if (isset())" checks. Fixes Redmine #4865
* Merge pull request #1774 from phil-davis/interfaces-widgetChris Buechler2015-07-212-5/+5
|\
| * Interfaces widget use more obscure separatorPhil Davis2015-07-222-5/+5
|/ | | | | when acquiring the interface data. In particular the media information can have commas in it already as reported in Redmine bug #4859
* Merge pull request #1770 from phil-davis/patch-1Chris Buechler2015-07-211-0/+10
|\
| * Unset old CA and Cert in left system configPhil Davis2015-07-211-0/+8
| | | | | | Unset any old CA and Cert in the system section that might still be there from when upgrade_066_to_067 did not unset them. That will tidy up old configs that had the conversion done originally but these old sections were left behind.
| * Unset old CA and Cert in system configPhil Davis2015-07-211-0/+2
| | | | | | | | | | This looked odd. Why would we leave behind the old "ca" and "cert" section in $config["system"]? I guess it would do no harm, but seems confusing for the future to have some unused entries like this remaining in the config. Should a piece of code be put into the latest upgrade function to clean out these in any current config?
* | Merge pull request #1771 from phil-davis/patch-2Renato Botelho2015-07-211-3/+4
|\ \
| * | Allocate dnpipe and dnqueue numbers even if no filter rulesPhil Davis2015-07-211-3/+4
| |/ | | | | It would be quite unusual to have no filter rules array, but if that is indeed the case then the first part of this code that sets dnpipe and dnqueue numbers should execute anyway.
* | Merge pull request #1772 from phil-davis/patch-3Renato Botelho2015-07-211-1/+1
|\ \ | |/ |/|
| * Captive Portal zoneid upgrade fix var name typoPhil Davis2015-07-211-1/+1
|/ | | With the typo, this empty() test would always have been true. So maybe on upgrade some existing captive portal zoneid values have been getting overwritten by this even number counter? Or?
* Add "netstat -ni" to status.phpjim-p2015-07-211-0/+1
|
* Allow pre-filling (but no automatic action) of the download filename on ↵jim-p2015-07-212-2/+3
| | | | exec.php. Setup a link to download the status output.tgz in status.php
* Reverting this for master, needs review in context of uniqid changes. ↵Chris Buechler2015-07-211-47/+33
| | | | | | Opening redmine ticket. Revert "sync up rc.carpmaster with RELENG_2_2. Ticket #4854, plus removal of unnecessary loop that'll amplify notifications unnecessarily." This reverts commit 401adacfefbc6006bc2270ccc1640e1b15f767c1.
* Going back to prior to earlier commit. Revert "fix indent my editor broke in ↵Chris Buechler2015-07-211-26/+26
| | | | | | an earlier commit." This reverts commit 948bbc9baf77b47e636c904faf677a698c13a293.
* fix indent my editor broke in an earlier commit.Chris Buechler2015-07-211-26/+26
|
* Add IPsec IKE Intermediate EKU to server certificates. The serverAuth EKU ↵Chris Buechler2015-07-201-2/+2
| | | | already added suffices for Windows clients, though strongswan docs suggest setting this as well.
* Specify keyUsage and extendedKeyUsage in openssl.cnf, use crl_ext.Chris Buechler2015-07-201-6/+6
|
* Merge pull request #1764 from doktornotor/patch-2Renato Botelho2015-07-193-4/+4
|\
| * Fix capsdoktornotor2015-07-181-1/+1
| |
| * Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUIdoktornotor2015-07-181-2/+2
| | | | | | Clarify that this applies to DNS Resolver as well. Update the translations template.
| * Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUIdoktornotor2015-07-181-1/+1
| | | | | | Clarify that this applies to DNS Resolver as well.
| * Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUIdoktornotor2015-07-181-1/+1
|/ | | Clarify that this applies to DNS Resolver as well.
* Merge pull request #1738 from phil-davis/Static-RoutesRenato Botelho2015-07-185-30/+88
|\
| * Switch logic of $disabled tests system_gatewaysPhil Davis2015-07-181-10/+8
| |
| * Static routes merge "else" and "if" into "else if"Phil Davis2015-07-122-26/+22
| | | | | | | | As suggested by Renato.
| * Fix #4813 validation of enable/disable of gateways and static routesPhil Davis2015-07-055-30/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) A disabled gateway can always be enabled - no extra validation needed. 2) When disabling an enabled gateway, check to see that the gateway is not used in any gateway group or enabled static route (similar tests to what is already checked before deleting a gateway). 3) A static route can always be disabled - no extra checks needed. 4) When enabling a static route, check that the selected gateway is enabled - you cannot have a static route enabled on a disabled gateway. 5) Do the address family cross-check between static route and gateway even when the static route is disabled - we do not want to save mismatched IP address families in any case. This covers all the cases I can see to ensure that the enable/disable status combinations of Gateways and Static Routes is always valid.
* | Merge pull request #1763 from doktornotor/patch-4Renato Botelho2015-07-181-4/+4
|\ \
| * | Add labels to some default firewall rulesdoktornotor2015-07-181-4/+4
| | | | | | | | | ... so that people can get useful descriptions in the System Logs - Firewall GUI, instead of useless tracker numbers. This is for master branch.
* | | Merge pull request #1759 from phil-davis/patch-2Renato Botelho2015-07-181-1/+2
|\ \ \
| * | | Really avoid error loading rules for numeric host name in aliasPhil Davis2015-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a host-type alias. Put just a number in "IP or FQDN" - e.g. I made alias name "Zqw" and a single host "23". The webGUI reports: There were error(s) loading the rules: /tmp/rules.debug:44: syntax error - The line in question reads [44]: table { 23 } and /tmp/rules.debug has: table { 23 } Zqw = "" which pf does not cope with. This change will differentiate between a number in the context of a port alias and a number that is_hostname. This time I think it really works :) The call to alias_get_type() needed to send the alias name as parameter. alias_get_type() is a bit expensive - it scans through the whole list of aliases looking for a match on the name. So I made this code just call it once for the name and then use that $alias_type var each time as it loops through all the addresses in an alias. I have tried this successfully with a few combinations of nested port/host/network aliases. But maybe there is some wacky combination of nested aliases possible that could still break this? I don't see how, but it needs testing on some configs that have all sorts of nested alias types.
* | | | Merge pull request #1760 from doktornotor/patch-1Renato Botelho2015-07-181-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix Firewall - Aliases GUI inconsistencies for URL Table type aliasesdoktornotor2015-07-171-4/+4
| | | | | | | | | | | | The GUI should show descriptions according to what's selected from the dropdown, but currently does not for URL Table (IPs) and URL Table (Ports) type of aliases.
* | | | sync up rc.carpmaster with RELENG_2_2. Ticket #4854, plus removal of ↵Chris Buechler2015-07-181-33/+47
|/ / / | | | | | | | | | unnecessary loop that'll amplify notifications unnecessarily.
* | | Fixes for IPSec ASN1.DN, ticket #4792Renato Botelho2015-07-171-7/+17
| | | | | | | | | | | | | | | | | | - Do not add leftid to confir when value is empty - When asn1dn param is in binary form, explicit type - Always add double quotes for asn1dn
* | | only add outgoing-interface if it's an IP. Ticket #4852Chris Buechler2015-07-171-2/+2
|/ /
* | Fix #4794:Renato Botelho2015-07-173-3/+24
| | | | | | | | | | - Add a upgrade code to fix asn1dn string format to match strongSwan needs - Bump config version to 11.8
* | Merge pull request #1758 from phil-davis/patch-2Renato Botelho2015-07-171-4/+4
|\ \
| * | Restrict serial ports glob to cua followed by alphaPhil Davis2015-07-161-3/+3
| | | | | | | | | Improve this a little more to match only alpha after /dev/cua (/dev/cuau for example)
| * | Make serial ports glob cope with many more possibilitiesPhil Davis2015-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It originally coped with things like cuau1 cuau1.1 Then I made it cope with things like cuau1 cuau11 but it stopped working for cuau1.1 This one copes with: cuau1 cuau1.1 cuau1.11 cuau11 cuau11.1 cuau11.11 That should allow for all sorts of reasonable device name files without matching other stuff in /dev (like cuau1.init cuau1.lock) that we need to ignore. Please think if I have covered the bases here.
* | | Revert "myid_data and peerid_data fields are not relevant with asn1dn."Chris Buechler2015-07-161-5/+1
| | | | | | | | | | | | This reverts commit 0e19c4bba659a5f4d28f9c8b20c80717a90964b9.
* | | myid_data and peerid_data fields are not relevant with asn1dn.Chris Buechler2015-07-161-1/+5
| | | | | | | | | | | | | | | Conflicts: usr/local/www/vpn_ipsec_phase1.php
* | | Add leftid and rightid value between double quotes on ipsec config when type ↵Renato Botelho2015-07-162-3/+8
| | | | | | | | | | | | is asn1dn. Ticket #4792
* | | Remove old, unused NetUtils.jsChris Buechler2015-07-162-114/+1
|/ /
* | Revert "Avoid error loading rules for numeric host name in alias"Renato Botelho2015-07-151-1/+1
| | | | | | | | This reverts commit 81a73bcba3b3a79bb3a7add2e14a46e6af748f50.
* | Merge pull request #1741 from phil-davis/patch-2Renato Botelho2015-07-151-6/+6
|\ \
| * | Fix issue_ip_type var name spellingPhil Davis2015-07-121-6/+6
| | | | | | | | | Actually there was no real problem, but having a mis-spelling like this means that English speakers will waste time (like I did) double-checking to see if the mis-spelling would cause a real problem.
* | | Merge pull request #1742 from phil-davis/patch-3Renato Botelho2015-07-151-1/+1
|\ \ \
| * | | Firewall Aliases Import display error message for invalid alias namePhil Davis2015-07-121-1/+1
| |/ / | | | | | | | | | If you open firewall_aliases_import and enter just an invalid Alias Name (e.g. a$b) and press save or press save with all fields empty, then the screen redraws but the input error(s) is not displayed. This fixes it.
* | | Merge pull request #1743 from phil-davis/patch-4Renato Botelho2015-07-151-0/+1
|\ \ \
| * | | Firewall Aliases Edit ensure input_addresses array existsPhil Davis2015-07-121-0/+1
| |/ / | | | | | | | | | | | | | | | If you click "+" to add an alias, then press Save without entering anything, you get: Warning: Invalid argument supplied for foreach() in /usr/local/www/firewall_aliases_edit.php on line 402 as well as the various messages related to $input_errors. This change ensures that $input_addresses array always exists (even if it has no real entries) so that the foreach() warning does not happen.
OpenPOWER on IntegriCloud