Commit Graph

13038 Commits

Author SHA1 Message Date
jim-p
83a05b663a Add "sockstat" output to status.php 2015-07-29 11:40:38 -04:00
Renato Botelho
31e66b412d Move cleargpt.sh and cleargmirror.sh scripts to main repo 2015-07-27 17:05:05 -03:00
Chris Buechler
b099481141 Add 'any' option for peer ID, for mobile IPsec scenarios where you can't or don't want to check peer ID.
Conflicts:
	usr/local/www/vpn_ipsec_phase1.php
2015-07-25 17:00:57 -05:00
Chris Buechler
4d7568404c Remove "auto", it's just a synonym for IKEv2. Ticket #4873
Conflicts:
	usr/local/www/vpn_ipsec_phase1.php
2015-07-23 14:47:56 -05:00
Chris Buechler
0dea741f39 include vpn.inc so IPsec CRL reload works. require_once filter.inc in
vpn.inc for callers there that haven't already included it.
2015-07-23 14:31:05 -05:00
Chris Buechler
d55f6326c4 Most of the flowtable bits were removed some time ago, take out the last of them too. 2015-07-23 00:34:14 -05:00
Chris Buechler
6141f51ac4 When a CRL is updated, refresh strongswan's CRLs. 2015-07-23 00:21:23 -05:00
Phil Davis
a95acf1210 Add isset check for strictcrlpolicy
To be consistent with the checks in the rest of this code.
2015-07-23 06:39:27 +05:45
Chris Buechler
df4de32d34 Add IPsec advanced option for strict CRL checking 2015-07-22 15:03:56 -05:00
Chris Buechler
0be67fe5fe fix typo 2015-07-22 13:31:41 -05:00
Phil Davis
a607968ab4 Handle IPsec Advanced Settings save before IPsec is enabled
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
2015-07-22 19:36:09 +05:45
Phil Davis
9cbdb6e3c3 Interfaces widget use more obscure separator
when acquiring the interface data. In particular the media information
can have commas in it already as reported in Redmine bug #4859
2015-07-22 09:36:27 +05:45
jim-p
775b46fa4b Add "netstat -ni" to status.php 2015-07-21 08:48:24 -04:00
jim-p
abad402c6b Allow pre-filling (but no automatic action) of the download filename on exec.php. Setup a link to download the status output.tgz in status.php 2015-07-21 08:47:59 -04:00
doktornotor
7b2811fb46 Fix caps 2015-07-18 21:59:49 +02:00
doktornotor
4dbd95d451 Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUI
Clarify that this applies to DNS Resolver as well. Update the translations template.
2015-07-18 21:44:02 +02:00
doktornotor
896607c3a5 Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUI
Clarify that this applies to DNS Resolver as well.
2015-07-18 20:34:43 +02:00
doktornotor
612da35583 Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUI
Clarify that this applies to DNS Resolver as well.
2015-07-18 20:32:54 +02:00
Renato Botelho
117948fdaa Merge pull request #1738 from phil-davis/Static-Routes 2015-07-18 14:36:05 -03:00
Phil Davis
205178aa82 Switch logic of $disabled tests system_gateways 2015-07-18 23:02:10 +05:45
doktornotor
0f12516093 Fix Firewall - Aliases GUI inconsistencies for URL Table type aliases
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.
2015-07-17 22:29:17 +02:00
Renato Botelho
f84945f329 Merge pull request #1758 from phil-davis/patch-2 2015-07-17 09:29:38 -03:00
Chris Buechler
a296286b43 Revert "myid_data and peerid_data fields are not relevant with asn1dn."
This reverts commit 0e19c4bba6.
2015-07-16 17:24:32 -05:00
Chris Buechler
0e19c4bba6 myid_data and peerid_data fields are not relevant with asn1dn.
Conflicts:
	usr/local/www/vpn_ipsec_phase1.php
2015-07-16 17:17:48 -05:00
Chris Buechler
348c7c8751 Remove old, unused NetUtils.js 2015-07-16 11:45:06 -05:00
Phil Davis
8235e7304e Restrict serial ports glob to cua followed by alpha
Improve this a little more to match only alpha after /dev/cua (/dev/cuau for example)
2015-07-16 21:35:51 +05:45
Phil Davis
72b2811532 Make serial ports glob cope with many more possibilities
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.
2015-07-16 10:52:28 +05:45
Renato Botelho
d8b221ebb5 Merge pull request #1742 from phil-davis/patch-3 2015-07-15 12:03:23 -03:00
Renato Botelho
41ec196dea Merge pull request #1743 from phil-davis/patch-4 2015-07-15 12:00:30 -03:00
Renato Botelho
124bf68c6d Merge pull request #1745 from phil-davis/patch-6 2015-07-15 10:30:54 -03:00
Renato Botelho
a9d6ae1734 Merge pull request #1746 from phil-davis/patch-7 2015-07-15 10:20:52 -03:00
Renato Botelho
fe05aacf24 Merge pull request #1747 from phil-davis/patch-8 2015-07-15 10:18:24 -03:00
Renato Botelho
5e3999791f Merge pull request #1749 from phil-davis/cancel-referer 2015-07-15 10:16:07 -03:00
Chris Buechler
ccf504fc30 Merge pull request #1752 from phil-davis/patch-9 2015-07-14 18:25:17 -05:00
Chris Buechler
e65ebe325e Fix adding of VoIP rules from traffic shaper wizard where IP/alias is not
specified.
2015-07-14 17:55:05 -05:00
Phil Davis
cc4d13683e Fix glob for serial device names
Removing the "." that was in {,.[0-9]} allows it to match /dev/cuau10 and onward.
I added lots of comments on the glob expression, because the format of the glob expression is not the same as an ordinary regex.
2015-07-14 19:09:01 +05:45
Phil Davis
5eabad3db3 Cancel button after input error
If there is an input error then the edit page is redrawn showing the
input errors. The HTTP_REFERER becomes the current page, rather than the
true original referer. Then if you click Cancel the current page is just
redrawn.
This change makes the code remember the original referer, so if the user
enters some invalid data, presses Save, reads the input error messages
then presses Cancel they are taken back out to the original page - the
same as if Cancel was used before Save.
2015-07-13 10:53:03 +05:45
Phil Davis
b45537f75b Fix references to Load Balancer Virtual Server redirect_mode
When adding a Virtual Server, if you press Save with blank fields, the validation does not show. That was because the switch statement selecting the fields to validate had wrong case values. Actually the "mode" here is locked to "redirect_mode" (later code to allow the mode to be selected by the user is commented out - not implemented.
I fixed the reqdfieldsn array also for relay_mode case, even though it is never used. It looked dodgy the way it was.
2015-07-13 01:25:07 +05:45
Phil Davis
ec4112ddcf Interfaces PPPs edit avoid foreach() warning
If you go to Interfaces, assign, PPPs, press "+" to add an entry, then press Save without entering anything then you get a warning about the foreach() here.
The is_array() check fixes it.
2015-07-13 00:45:37 +05:45
Phil Davis
2f0e31b1aa Interfaces GRE Edit fix required fields text
The reqdfields had only 4 entries but reqdfieldsn has 5 entries and the field names to text descriptions did not match up.
Fixed it.
2015-07-13 00:28:04 +05:45
Phil Davis
e2db25ccd9 Interfaces GIF Edit fix do_input_validation
Make the required fields be correct and match thier text names, which should each have their own gettext() cal so as to build a proper array at line 81. Basically it was all broken and the errors displayed when field/s were left empty were rubbish.
2015-07-13 00:16:01 +05:45
Phil Davis
0c53abc2b7 Firewall Aliases Edit ensure input_addresses array exists
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.
2015-07-12 14:38:46 +05:45
Phil Davis
a36692592c Firewall Aliases Import display error message for invalid alias name
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.
2015-07-12 14:25:02 +05:45
Phil Davis
9a01d22d4f Static routes merge "else" and "if" into "else if"
As suggested by Renato.
2015-07-12 11:34:17 +05:45
Aydın Yakar
1a1d9a8c59 Update index.php 2015-07-07 13:42:28 +03:00
Aydın Yakar
c4b85119f9 Update index.php 2015-07-07 13:39:00 +03:00
Chris Buechler
f2265d88c7 Fix dashboard hardware crypto display where AES-NI is enabled. Ticket 2015-07-06 17:05:19 -05:00
Chris Buechler
10c65c480c Don't check whether the QinQ interface exists when deleting. Unnecessarily
makes QinQ un-deletable where the parent interface no longer exists
(removed, config restored from diff hardware, etc.).
2015-07-06 15:41:49 -05:00
Phil Davis
028ff8f8a3 Fix #4813 validation of enable/disable of gateways and static routes
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.
2015-07-05 23:18:04 +05:45
Phil Davis
6135a11fd9 Fix put static route destination in config change description
When enabling or disabling a route by using the enable/disable button on the Routes page, the destination network was not being put in the config change description, although the code intended it to be there.
This fixes it.
2015-07-04 00:20:29 +05:45