Commit Graph

12797 Commits

Author SHA1 Message Date
Chris Buechler
c03512f5b2 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:34:33 -05:00
Chris Buechler
b0deba232b Most of the flowtable bits were removed some time ago, take out the last of them too. 2015-07-23 00:32:14 -05:00
Chris Buechler
fa944e1dde When a CRL is updated, refresh strongswan's CRLs. 2015-07-23 00:20:46 -05:00
Chris Buechler
85cf3f4f78 Merge pull request #1775 from phil-davis/Interfaces-Widget-2-2 2015-07-22 21:59:01 -05:00
Phil Davis
241c48ef27 Add isset check for strictcrlpolicy
To be consistent with the checks in the rest of this code.
2015-07-22 21:57:54 -05:00
Chris Buechler
7361628b2a Add IPsec advanced option for strict CRL checking 2015-07-22 15:03:20 -05:00
Chris Buechler
cc31dc7a19 fix typo 2015-07-22 13:32:35 -05:00
Phil Davis
b3bcc72952 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
Conflicts:
	usr/local/www/vpn_ipsec_settings.php
2015-07-22 13:24:24 -05:00
Phil Davis
d97992c75c Interfaces widget use more obscure separator RELENG_2_2
Redmine #4859 fix for RELENG_2_2
2015-07-22 10:53:57 +05:45
jim-p
685c323cb1 Add "netstat -ni" to status.php 2015-07-21 08:44:12 -04:00
jim-p
58fb43263a 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:43:17 -04:00
doktornotor
99f89b047c Fix caps 2015-07-19 08:09:41 -03:00
doktornotor
31268c873b 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-19 08:09:23 -03:00
doktornotor
bc8cf469df Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUI
Clarify that this applies to DNS Resolver as well.
2015-07-19 08:09:08 -03:00
doktornotor
f9e30314cb Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUI
Clarify that this applies to DNS Resolver as well.
2015-07-19 08:07:26 -03:00
Renato Botelho
c4f9f44941 Merge pull request #1756 from phil-davis/traffic-graph-widget-2-2 2015-07-18 13:12:14 -03:00
doktornotor
6d854579eb 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.

This is for RELENG_2_2 branch.
2015-07-17 22:37:02 +02:00
Chris Buechler
d6908784ee Contrary to some reports this is actually usable in some cases, just not
mandatory. Revert "myid_data and peerid_data fields are not relevant with asn1dn."

This reverts commit b8754cc85d.
2015-07-16 17:22:59 -05:00
Chris Buechler
b8754cc85d myid_data and peerid_data fields are not relevant with asn1dn. 2015-07-16 17:16:15 -05:00
Phil Davis
693c13cb74 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 16:03:02 -03:00
Phil Davis
3eed76d729 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 16:03:02 -03:00
Chris Buechler
088af065f5 Remove old, unused NetUtils.js 2015-07-16 11:44:47 -05:00
Phil Davis
dea04167b4 Display any advanced DHCP server settings RELENG_2_2
Cherry pick of 90ad3a76ed
2015-07-15 22:25:12 +05:45
Renato Botelho
36b622c3ae Merge pull request #1754 from phil-davis/cr_2_2 2015-07-15 13:27:53 -03:00
Phil Davis
3e41547819 Cancel button after input error for RELENG_2_2 2015-07-15 21:41:33 +05:45
Phil Davis
4433cf85f6 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-15 12:04:18 -03:00
Phil Davis
043e61ee1b 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-15 12:01:13 -03:00
Phil Davis
6b30491f4a 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-15 10:38:49 -03:00
Phil Davis
e3a5f4876f 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-15 10:30:09 -03:00
Phil Davis
0d9fe84b09 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-15 10:19:43 -03:00
Phil Davis
36f90078fb 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 18:25:44 -05:00
Chris Buechler
57945fccf3 Fix adding of VoIP rules from traffic shaper wizard where IP/alias is not
specified.
2015-07-14 17:54:10 -05:00
Chris Buechler
98de735fc0 manual merge of Phil Davis pull request, commit b45537f75b 2015-07-13 20:26:04 -05:00
Chris Buechler
c9e7807a86 Fix dashboard hardware crypto display where AES-NI is enabled. Ticket 2015-07-06 17:03:45 -05:00
Chris Buechler
ee3b5c1572 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:40:20 -05:00
Phil Davis
a61daab9ba 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-03 15:47:41 -03:00
jim-p
362ddda190 Encode ca descr in system_camanager.php 2015-07-01 11:32:50 -04:00
jim-p
97fdd83dcb Encode ca/cert descr in system_certmanager.php 2015-07-01 11:28:25 -04:00
jim-p
f08e24a389 Encode ca/cert/crl descr in system_crlmanager.php 2015-07-01 11:20:24 -04:00
jim-p
009bd5fea3 Encode ca/cert descr in vpn_openvpn_server.php 2015-07-01 11:18:22 -04:00
jim-p
f7ca96741d Encode ca/cert descr in vpn_openvpn_client.php 2015-07-01 11:16:25 -04:00
jim-p
f9e80e5d65 Encode ca/cert descr in vpn_ipsec_phase1.php 2015-07-01 11:15:13 -04:00
jim-p
2ce606e15a Encode ca/cert descr in system_authservers.php 2015-07-01 11:13:40 -04:00
jim-p
76e3f194eb Encode ca/cert descr in system_usermanager.php 2015-07-01 11:11:52 -04:00
jim-p
d2d45b5fd4 Encode cert/ca descr in system_advanced_admin.php 2015-07-01 11:10:48 -04:00
jim-p
0d6b017b28 Encode cert/ca descr in services_captiveportal.php 2015-07-01 11:08:39 -04:00
jim-p
ae142a1049 Encode ca/cert info in openvpn_wizard.inc 2015-07-01 11:06:25 -04:00
Phil Davis
e24519893a Only process Traffic Graph object if it is open
Reduces useless CPU use on the pfSense box when the dashboard is
displayed with the Traffic Graphs widget.
2015-07-01 14:15:10 +05:45
N0YB
763afdaf7b Add semicolon
Fix delete Java Script to match valid HTML ID
2015-06-25 08:32:40 -03:00
N0YB
0f383d78a0 XHTML Compliance
html id's not permitted to begin with a number.
html id's not permitted to contain '/'
add prefix (entry_) and replace slash with hyphen.
table entry id format becomes: entry_<ip address>-<cidr>
replacing the format: <ip address>/<cidr>
does not change the displayed format.
2015-06-25 08:31:38 -03:00