pfSense/pfsense 9dd655atools/conf/pfPorts poudriere_bulk

Enable build of PHP 7.2 flavor

pfSense/pfsense e395730src/etc/inc captiveportal.inc

Merge pull request #3937 from Bg-Tek/cp_disconnect_not_remove_ipfw_rules

pfSense/pfsense 7be90dfsrc/etc/inc interfaces.inc, src/usr/local/www firewall_rules_edit.php firewall_rules.php

Merge pull request #3912 from mhalden/nat_ifgroups

pfSense/pfsense 9ba5842src/usr/local/www system_advanced_admin.php

Merge pull request #3935 from Firminator/patch-1

pfSense/pfsense 29a272fsrc/etc/inc captiveportal.inc

fix #8441;

ipfw rules must be deleted before cp record delete.

pfSense/pfsense 70e0b54src/usr/local/www system_advanced_admin.php

Update system_advanced_admin.php

pfSense/pfsense 9886c24src/usr/local/www system_advanced_admin.php

Update system_advanced_admin.php

* upper and lowercase fixes
* added missing space

pfSense/pfsense fad13c4src/etc/inc vpn.inc

For IPsec mobile clients, write out a more specific ipsec.secrets line to help clients 
find the right key with strongSwan's new lookup code. Fixes #8426

(cherry picked from commit af7c0311b89656198e00ded91c1a2a87f34c331b)

pfSense/pfsense af7c031src/etc/inc vpn.inc

For IPsec mobile clients, write out a more specific ipsec.secrets line to help clients 
find the right key with strongSwan's new lookup code. Fixes #8426

pfSense/pfsense 6ad146esrc/etc/inc filter.inc

Reword bogon block size error text. Ticket #8417

pfSense/pfsense aa20508src/usr/local/www system_advanced_admin.php

Correct text and help for new SSH key/pass options. Ticket #8402

pfSense/pfsense a2405c1src/etc/inc util.inc

Correct text for reserved alias name checks against protocols and services. Fixes #8409

pfSense/pfsense 885e9b2src/usr/local/www guiconfig.inc

Correct pconfig_to_address() so its logic matches the input validation used for checking 
port numbers. Fixes #8410

pfSense/pfsense 96fa3e3src/usr/local/www firewall_rules_edit.php

Cleaner fix for ##8447

pfSense/pfsense 62ea1dbsrc/etc/inc vpn.inc ipsec.inc, src/usr/local/www vpn_ipsec_keys_edit.php

Merge pull request #3904 from Hobby-Student/master

pfSense/pfsense 1d523d1src/usr/local/www firewall_rules_edit.php

Fixed #8447

pfSense/pfsense b20cfb5src/etc/inc globals.inc, src/usr/local/www firewall_aliases_import.php firewall_aliases_edit.php

Replace incomplete list of pf reserved words with a list of pf tokens pulled from the pf 
source. Fixes #8445

Also, move the list to a central location so it does not need to be duplicated.

pfSense/pfsense 1fa69c2src/etc/inc unbound.inc, src/usr/local/www services_unbound.php

Add GUI controls to the DNS Resolver for providing DNS over TLS service to local clients. 
Implements #8030

pfSense/pfsense 423ce46src/etc/inc captiveportal.inc upgrade_config.inc, src/usr/local/www services_captiveportal.php

Merge pull request #3453 from plumbeo/traffic-quota

pfSense/pfsense 9f85da7src/usr/local/www/widgets/widgets traffic_graphs.widget.php

Merge pull request #3933 from PiBa-NL/20180405-widget-invert

pfSense/pfsense 3477fc2src/usr/local/www/widgets/widgets traffic_graphs.widget.php

trafficwidget, invert option needed json parsing

pfSense/pfsense fa5df9esrc/etc/inc filter.inc

filter vip usage, ipv6 vips cause invalid rules because a empty item gets added to the 
vips list for a interface

(cherry picked from commit c6ebe69d2c0838bc76957b22f98547311c68e700)

pfSense/pfsense 74d6e94src/etc/inc filter.inc

Merge pull request #3924 from PiBa-NL/20180331-filter-ipv6-vips

pfSense/pfsense 23feda1src/usr/local/www status_unbound.php

Refinements to status_unbound.php. Ticket #8430

pfSense/pfsense 0019e3dsrc/etc sshd

Merge pull request #3932 from robjarsen/tweak/rm-whitespace
DeltaFile
+1-1src/etc/sshd
+1-11 files

pfSense/pfsense 066335asrc/usr/share/doc/radius dictionary.pfsense

Captive portal: Add custom RADIUS dictionary with the new pfSense vendor-specific 
attributes

pfSense/pfsense f87ddb3src/etc/inc upgrade_config.inc captiveportal.inc, src/usr/local/www services_captiveportal.php

Captive portal: add option to choose whether to use the bandwidth limits retrieved from 
RADIUS or not

Automatically upgrade config to preserve old RADIUS bandwidth limits behaviour on existing 
installations.

pfSense/pfsense e4c34f1src/etc/inc captiveportal.inc

Captive portal: add the explicit reason why a user was disconnected to the log

pfSense/pfsense f3e403dsrc/etc/inc captiveportal.inc radius.inc, src/usr/local/www services_captiveportal.php

Captive portal: add option to retrieve the traffic quota value from RADIUS

Add an option to enable retrieving a user's traffic quota from RADIUS. The code uses a new 
vendor-specific attribute so the RADIUS server must be configured appropriately and load 
the pfSense dictionary.

pfSense/pfsense acbd943src/etc/inc captiveportal.inc, src/usr/local/www services_captiveportal.php

Captive portal: add a traffic quota option

Add a new option to disconnect users after they exceed a traffic quota (sum of downloaded 
data and uploaded data).

pfSense/pfsense 643315bsrc/etc/inc captiveportal.inc

Captive portal: always use the RADIUS-provided session timeout value if the option is 
enabled

pfSense/pfsense 3d70689src/etc/inc unbound.inc

Do not remove unbound testing config when it fails to make it easier to debug

pfSense/pfsense b223b6esrc/usr/local/www status_unbound.php shortcuts.inc

Merge branch 'master' of https://github.com/pfsense/pfsense into tweak/rm-whitespace

pfSense/pfsense 4acef97src/usr/local/www status_unbound.php shortcuts.inc

Add a status page for unbound to show the infra cache. Ticket #8430

pfSense/pfsense aa9971asrc/etc sshd

Whitespace Removal

* src\etc\sshd
DeltaFile
+1-1src/etc/sshd
+1-11 files

pfSense/pfsense 9ec128f

Merge pull request #3922 from reb00tz/reb00tz-sshd_key_and_password-patch-1
DeltaFile
+0-00 files

pfSense/pfsense d6fdfd7src/etc sshd

Allow SSHd Key and Password Combination

Changes to allow key and password combination (in contrast to key OR password) i.e. if 
selected in the Admin>Advanced UI (SSH section), sshd will generate /etc/ssh/sshd_config 
file that requires an authorized key AND username+password.

Note: requires corresponding edits (reb00tz-sshd_key_and_password-patch-2) for proper UI 
options to show up. Otherwise, manually set $config['system']['ssh']['sshdkeyonly'] to 
"both" then restart sshd to take effect.
DeltaFile
+9-2src/etc/sshd
+9-21 files

pfSense/pfsense c2d5d1fsrc/usr/local/www system_advanced_admin.php

Enhanced sshdkeyonly Drop-Down List for Clarity...

Enhanced sshdkeyonly drop-down list for clarity, as per 
https://github.com/pfsense/pfsense/pull/3922#pullrequestreview-108426593.

pfSense/pfsense 923f05csrc/usr/local/www system_advanced_admin.php

Enhanced sshdkeyonly Drop-Down List for Clarity...

Enhanced sshdkeyonly drop-down list for clarity, as per 
https://github.com/pfsense/pfsense/pull/3922#pullrequestreview-108426593.

pfSense/pfsense 0bfd23asrc/usr/local/www system_advanced_admin.php

 Allow SSHd Key and Password Combination 

Changes to allow key and password combination (in contrast to key OR password) i.e. if 
selected in the Admin>Advanced UI (SSH section), sshd will generate /etc/ssh/sshd_config 
file that requires an authorized key AND username+password.

Note: requires corresponding edits (reb00tz-sshd_key_and_password-patch-2) for proper UI 
options to show up. Otherwise, manually set $config['system']['ssh']['sshdkeyonly'] to 
"both" then restart sshd to take effect.

pfSense/pfsense f39ba24src/etc/inc unbound.inc, src/usr/local/www services_unbound_domainoverride_edit.php

Add a TLS option for DNS Resolver Domain Overrides. Implements #8431

pfSense/pfsense 547e51bsrc/etc/inc unbound.inc, src/usr/local/www services_unbound_advanced.php

Add query name minimization options to DNS Resolver. Implements #8028

pfSense/pfsense 726a9fasrc/etc/inc dyndns.class, src/etc/inc/simplepie simplepie.inc

Merge pull request #3931 from robjarsen/tweak/rm-whitespace

pfSense/pfsense cd73821src/etc/inc unbound.inc, src/usr/local/www services_unbound.php

Add GUI option for DNS over TLS. Implements #8388

pfSense/pfsense 493e428src/etc/inc dyndns.class, src/etc/inc/simplepie simplepie.inc

Remove Whitespace

* src\etc\inc\dyndns.class
* src\etc\inc\simplepie\simplepie.inc
* src\usr\local\www\services_dyndns_edit.php

pfSense/pfsense 0dda568src/etc/inc/simplepie simplepie.inc

Update SimplePie to 1.5.1

pfSense/pfsense e3fb3f3src/etc/inc/simplepie simplepie.inc

Update SimplePie to 1.5.1

(cherry picked from commit 0e0adbc9be72c96723f002910453fc8b022ddf59)

pfSense/pfsense 83a0899src/etc/inc dyndns.class services.inc, src/usr/local/www services_dyndns_edit.php

Merge pull request #3926 from martgras/azureddns

pfSense/pfsense 96e04d7src/usr/local/share/pfSense/ssl openssl.cnf, src/usr/local/www/css Compact-RED.css

remove whitespace - pt. 2

(cherry picked from commit 523849d312daae129a287f9cf43cbdeadafd1fcb)

pfSense/pfsense 44f1b68src/usr/local/share/pfSense/ssl openssl.cnf, src/usr/local/www/css Compact-RED.css

Merge pull request #3928 from robjarsen/tweak/rm-whitespace