Commit Graph

31778 Commits

Author SHA1 Message Date
Chris Buechler
412a9cd026 Include interface scope on IPv6 static routes to link local gateway IPs. Ticket #6506 2016-06-24 01:36:02 -05:00
Stephen Beaver
72a6e5d071 Comment typo
(cherry picked from commit b069f77e0a)
2016-06-23 22:22:56 -04:00
Chris Buechler
bc54d32da7 Revert "adding privileges and separating DNS Resolver overrides from general settings"
This reverts commit fc76a1e390.
2016-06-23 17:21:46 -05:00
NOYB
7b45ec858d Shouldn't the priv match here be set to "services_rfc2136_edit.php*"?
(cherry picked from commit 5c403f8432)
2016-06-23 13:35:38 -04:00
Phil Davis
c0b34e4ce0 Load actual value of webguihostnamemenu
This is a string from a list of valid values (empty, "hostonly", "fqdn"). So it is not correct to just gather a true/false value here.
(cherry picked from commit e93242eb2a)
2016-06-23 13:33:31 -04:00
Stephen Beaver
9c025aa561 Restored countdown functionality and menu refresh on successful update/remove/install
Added comments to clarify operation of the page

(cherry picked from commit 18295ff2f9)
2016-06-23 13:31:29 -04:00
Chris Buechler
0ce30f4a67 Clarify ports alias hint. Ticket #6523 2016-06-22 20:07:52 -05:00
jim-p
de1d4101df % and / are also allowed in values 2016-06-22 12:32:48 -04:00
NewEraCracker
bb44b41af0 Fix Bug #6394 - Incorrect Output of Translation
Apparently gettext() does not behave correctly when passed an empty string, this commit ensures gettext() is called only with non-empty strings

(cherry picked from commit 6ae99aba5c)
2016-06-22 11:57:52 -04:00
NOYB
a8ed54b4bf Remove duplicate listtags() entry 'member'.
(cherry picked from commit 40d7e4bee9)
2016-06-22 11:55:14 -04:00
stilez
76a56fcee5 Remove subnet_expand()
Function isn't used in main or packages repo, and in any case would need a complete rewrite to handle IPv6.
(cherry picked from commit 6215902c40)
2016-06-22 11:48:16 -04:00
Phil Davis
8c51280105 Fix #6482 OpenVPN Redirect Gateway Option Causes GUI Issue
This fixes the GUI inconsistency reported in the referenced bug. On edit of an OpenVPN server that has tun mode, not shared key, and the gwredir checkbox checked, the local_network fields are shown, but actually they should be hidden (because that is what happens on first data entry when gwredir is checked).
At least this makes the GUI consistent. Then the other issues mentioned in Redmine feature 6483 can be addressed separately.
(cherry picked from commit fa20dac1b5)
2016-06-22 11:45:32 -04:00
hailthemelody
4a89ba6158 added missing div.content wrapper when reloading filters
(cherry picked from commit e8406abe62)
2016-06-22 11:43:54 -04:00
NewEraCracker
2031be9ce3 Fix PHP Warning about invalid argument supplied for foreach
If _POST['members'] or _POST['groups'] is not set / none selected at GUI, it would give a warning on crash reporter (dev versions)

(cherry picked from commit 9f4722022f)
2016-06-22 11:41:27 -04:00
NewEraCracker
50264b5847 Fix bad escapeshellarg logic on mpd execution
With this change single-quotes are applied in correct places

(cherry picked from commit 08cd022545)
2016-06-22 11:39:20 -04:00
Phil Davis
4125445f98 Do not allow deleting your own user name
Currently if you delete your own user name, then the config ends up with a blank user tag in it. Rather than fix that up, it seems dangerous to be able to delete yourself anyway, because if you are the last user with admin privs for which you know the password (i.e. if you have not recorded the password for "admin" somewhere), then you can lock yourself out. That would require console access to fix, which for some people is a pain.
It seems reasonable to me to make the person login as some other user with admin privs to delete "themselves".
Bit of boots and braces done here:
1) Don't show the trash bin icon for "yourself", and also disable the delete_check checkbox. So you can't opt to delete yourself from the ordinary front-end GUI.
2) Enhance the back-end validation to prevent deleting yourself, just in case someone mucks about in the front-end code.
3) Put error messages to tell people when something is not deleted, and why.
4) In the success message for multi-deletion, tell which user names have actually been deleted.
(cherry picked from commit d6b79c398d)
2016-06-22 11:32:06 -04:00
stilez
07b8134dd0 missing "("
(cherry picked from commit 70381d4803)
2016-06-22 11:23:26 -04:00
stilez
3bea132198 optional arg for old behaviour
(cherry picked from commit cf63f1638a)
2016-06-22 11:23:24 -04:00
stilez
d65d58a794 function name hms -> dhms
to match edit to util.inc
(cherry picked from commit c57e936a65)
2016-06-22 11:23:22 -04:00
stilez
f2f86310b5 Simplify convert_seconds_to_hms() and show days for large numbers of hours
1) Function can be simplified and all "if" statements removed, using intdiv (or casting result as int for PHP < 7) and % for calcs and sprintf for padding.
2) Input validity check before trying to convert format
3) If time represented is large (eg uptime might be several months) then hours becomes unhelpful, it's clearer to show "4921:02:06" as "205d 01:02:06". (Leading "days" value not shown unless >=1 for simplicity)
(cherry picked from commit 0bde6d1057)
2016-06-22 11:23:20 -04:00
stilez
53c20c1753 Add "delete entry" for ARP table
Useful function in some circumstances - seems no reason not to have it.

Uses IP rather than hostname since not all ARP entries have hostnames.

Probably should also have "delete all" but not done that.
(cherry picked from commit 6ea0d41e3c)
2016-06-22 11:17:34 -04:00
NewEraCracker
d162670633 Fix NTP PPS. It had 'None' option available on 2.2.x.
(cherry picked from commit ceabd66d57)
2016-06-22 11:15:00 -04:00
NewEraCracker
2a68fcd333 Fix "Unable to remove NTP GPS from configuration"
https://forum.pfsense.org/index.php?topic=112771.msg627573
(cherry picked from commit 55de528cbb)
2016-06-22 11:14:59 -04:00
stilez
cfa9a5be7d redundant check - is_numericint() tests for >= 0
(cherry picked from commit f208e9690e)
2016-06-22 11:13:10 -04:00
stilez
caed078357 Use global backup count instead of hardcoded value and remove redundant function
(cherry picked from commit 01b5410ae8)
2016-06-22 11:13:08 -04:00
stilez
4e59bedbbb fix logic and replace hard coded value by global
backups should be a numeric int.
text hint for number of backups can now refer to the global value for this platform (and explains how to get that default, by leaving blank)
(cherry picked from commit 16b17c15f9)
2016-06-22 11:13:05 -04:00
stilez
3fd595756d set default_config_backup_count based on platform
At the same time the platform is being detected for PHP/GUI purposes, set the default number of backups. Also handle the case where (for any reason) detection fails, which it shouldn't, so the variables are still created
(cherry picked from commit 09a283948e)
2016-06-22 11:13:03 -04:00
stilez
cf2e697d46 Give settings section a more helpful/standard title to match other GUI settings tabs
(cherry picked from commit ca55edc393)
2016-06-22 11:13:00 -04:00
stilez
81b387118c Self correcting - poor english
(cherry picked from commit b56769c30a)
2016-06-22 11:07:10 -04:00
stilez
1d42394717 Accuracy
Large keys are not "slower to use" in many cases, since they are only used to validate or set up a session. An ongoing session usually transfers to a symmetric algorithm once established, and the user won't notice the short extra delay in session startup.
(cherry picked from commit d4fdce4e2e)
2016-06-22 11:07:08 -04:00
stilez
90faa0a4ed missed a comment I added and shouldn't have - removed
(cherry picked from commit 7c684f3b95)
2016-06-22 11:07:06 -04:00
stilez
2fe2d1945a Update OpenVPN Wizard to include missing key sizes
...and add some useful info to guide the user.
(cherry picked from commit 4981025268)
2016-06-22 11:07:04 -04:00
stilez
2762619874 Add missing recommended key lengths to OpenVPN options
Add key lengths to the OpenVPN options, for asymmetric keys of size 3072 (for current use), 7680, 15360 (for long term resistance), 8192 and 16384 (common binary exponents).

These are both supported by OpenVPN anyhow, and for certain uses are currently recommended (eg  long term resistance to replay/decryption). See keylength.com for citations.

This PR would only affect OpenVPN, and OpenVPN supports these key sizes, so should not cause any issue.
(cherry picked from commit 0693c96797)
2016-06-22 11:07:02 -04:00
Christopher Fazendin
ef609a57c5 Added option to System > General Setup > webConfigurator to change the title of the Help menu in the navbar to either the system hostname or fqdn.
(cherry picked from commit 1d12996755)
2016-06-22 11:03:18 -04:00
Chris Rowe
b8eb4e7f75 Make QinQ interfaces work again
(cherry picked from commit 1322ee2235)
2016-06-22 10:55:59 -04:00
Stephen Beaver
ab8c41067d Allow IGMP Proxy logging verbosity to be selected via system log settings (PR 2901)
(cherry picked from commit 2bd0585e30)
2016-06-22 10:50:28 -04:00
Joe
1ac8faedf7 adding privileges and separating DNS Resolver overrides from general settings
(cherry picked from commit fc76a1e390)
2016-06-22 10:18:50 -04:00
Jose Luis Duran
fe2b8de7ad Force 4096 RSA keys
Add option `-b 4096` to force the keys to 4096-bit.

This parameter is ignored for Ed25519 keys.

(cherry picked from commit 971257cbdf)
2016-06-22 10:07:07 -04:00
Jose Luis Duran
1ffd4c515b Harden sshd_config
The changes are better explained in the following article:

https://stribika.github.io/2015/01/04/secure-secure-shell.html
(cherry picked from commit dca77360ff)
2016-06-22 10:07:02 -04:00
Stephen Beaver
4a4a4c4101 Fixed #6504 by making table sortable
(cherry picked from commit 55f67b5abd)
2016-06-22 08:47:11 -04:00
Stephen Beaver
76f6498fd9 jQuery datepicker added to interfaces.php and interfaces_ppps_edit.php for setting custom expirey date
(cherry picked from commit d85d82b768)
2016-06-22 07:45:11 -04:00
Stephen Beaver
246be5d3af Fixed #6516 by replacing HTML5 datepicker with jQuery widget
(cherry picked from commit 53c38ff16c)
2016-06-22 07:27:28 -04:00
Chris Buechler
bc8b18a9ff Merge pull request #3015 from marcelloc/patch-4 2016-06-21 21:37:21 -05:00
Chris Buechler
cb74937f8d add htop to poudriere_bulk 2016-06-21 20:25:51 -05:00
Chris Buechler
ac3e3baa6e Only call interfaces_vips_configure once if it's needed, rather than doing the same thing over and over for every VIP on an interface. Ticket #6515 2016-06-21 19:40:40 -05:00
Chris Buechler
fb0ecb7a1d Fix style 2016-06-21 17:23:58 -05:00
Chris Buechler
e08b45e44f require_once auth.inc in vpn.inc since it uses functions from there, though normal use of the system won't require that, those who run certain things manually/custom may require it 2016-06-21 17:11:28 -05:00
Stephen Beaver
c513ef24af Fixed #6514 by requiring string starts with letter ot underscore
(cherry picked from commit f0a053846d)
2016-06-21 17:56:04 -04:00
Marcello Coutinho
b6a49ec3c0 fix rowhelper select_source empty combo
while using $config['installedpackage']{['...'] as source
2016-06-21 18:20:53 -03:00
Chris Buechler
7253e40724 Only omit aggressive line from ipsec.conf where IKEv2. Ticket #6513 2016-06-21 15:25:26 -05:00