Commit Graph

22895 Commits

Author SHA1 Message Date
Chris Buechler 4721677dd7 fix ping_hosts.sh to not ping IPsec if CARP is in backup 2014-10-27 15:36:13 -05:00
Thomas NOËL c8a28de757 Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1 2014-10-27 18:46:28 +01:00
Serghei Mihai 0782931ac5 tiles url can be specified in SP params
Closes #5579
2014-10-27 17:08:14 +01:00
Thomas NOËL de95c825e6 consolidate local metadata system (#5568) 2014-10-27 16:57:56 +01:00
Serghei Mihai 9136aa1fec federation's metadata raw content can be added
Closes #5568
2014-10-27 16:02:42 +01:00
Renato Botelho e112f9ee60 Merge pull request #1312 from phil-davis/patch-8 2014-10-23 12:25:22 -02:00
Jérôme Schneider 0ffacdb644 Add support for mac addresses blacklist
Closes #5572
2014-10-22 16:40:37 +02:00
Jérôme Schneider f2bfdcbbad Add support for nameIDs blacklist
Closes #5571
2014-10-22 16:31:36 +02:00
Jérôme Schneider c2c61717da Interface: add a page to configure blacklists 2014-10-22 16:31:36 +02:00
Jérôme Schneider fa12833c30 www: factorise saml tabs in a function 2014-10-22 16:31:25 +02:00
Thomas NOËL a596b114f3 Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1 2014-10-21 23:36:38 +02:00
Chris Buechler 63b2c30cb3 Merge pull request #1312 from phil-davis/patch-8
Prevent Internal Server Error if range is backwards
2014-10-21 13:45:09 -05:00
jim-p a376c57de5 Teach the certificate generation code how to make a self-signed certificate, and
change the GUI cert generation code to use it. Also, move the GUI cert
generation code to its own function so we can add a GUI option to regenerate it
later. Also use some more sane defaults for the contents of the default self-
signed certificate's fields so it will be more unique and
less likely to trigger problems in browser certificate storage handling.
Also add a CLI script to regenerate a new GUI certificate.
Several master commits rolled into one patch for 2.1.x.
2014-10-21 14:43:22 -04:00
jim-p 5b473705fa Encode values before displaying them back to the user in notification settings. 2014-10-21 14:25:35 -04:00
Phil Davis 29b3bb05e0 Prevent Internal Server Error if range is backwards
Fixes redmine #3950 - ip_range_to_subnet_array can easily swap the input parameters if the caller has passed/entered them the wrong way around. That is both friendly to the caller and ensures that a hostile caller can't blow up the routine.
This patches 2.1 branch - will submit pull request for master also.
2014-10-21 15:03:18 +05:45
Chris Buechler 2c296872a7 h-node should be 8 2014-10-19 19:31:42 -05:00
jim-p 2f17d32ef2 Fix the log widget to lookup hosts by DNS using a link rather than AJAX. Quick fix for now. Ticket #3829 2014-10-16 15:22:27 -04:00
Thomas NOËL 7c89cb5c5e Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1 2014-10-16 10:29:27 +02:00
jim-p 29be59ad8e Tame the poodle. Disable SSLv3. 2014-10-15 08:41:11 -04:00
Jérôme Schneider 8d7459012c snmp: update SNMP ucd to work with univnautes 2.1
Closes #5566
2014-10-14 17:43:25 +02:00
Jérôme Schneider 9f813a6197 univnautes.js: move idp link outside the button for Fx
Closes #5678
2014-10-14 17:42:41 +02:00
Thomas NOËL c772b37ca6 Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1 2014-10-13 14:23:04 +02:00
Renato Botelho 07c24bf190 Merge pull request #1308 from phil-davis/patch-4 2014-10-13 06:54:13 -05:00
Phil Davis cce09d9431 Ticket #3860 Correctly display SMTP SSL TLS boxes
After using the "Test" button, $_POST['smtpssl'] and $_POST['smtptls'] was 'on' or null - this got blindly copied back into $pconfig[] and resulted in the state of the SSL/TLS/STARTTLS checkboxes not being redisplayed.
Fixed by setting $pconfig['smtpssl'] and $pconfig['smtptls'] using the code that was previously done only to set these in $config
2014-10-09 22:27:50 +05:45
Renato Botelho adab585de2 Merge pull request #1294 from phil-davis/patch-19 2014-09-26 13:56:59 -03:00
Phil Davis c5cfa06b27 Minor fixes to firewall_aliases_edit
for 2.1  branch
2014-09-26 21:46:30 +05:45
Renato Botelho 9ec8e1f280 Allow hostname to start with '@.' for namecheap. It fixes #3568 2014-09-19 14:16:05 -03:00
Thomas NOËL eda1b56f1c Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1 2014-09-19 11:59:40 +02:00
Thomas NOËL 9f8bbe95d0 logout view: disconnect from cp 2014-09-19 11:58:02 +02:00
dariomas beae652c15 Correct evaluation for "Acct-Interim-Interval" from RADIUS
Setting "Acct-Interim-Interval :=600" in FreeRadius2 evaluates to 'random' values with PfSense 2.1.
Possibly a bug related to:
https://forum.pfsense.org/index.php?topic=60079.0
https://forum.pfsense.org/index.php?topic=60262.0
2014-09-19 09:57:12 +00:00
Thomas NOËL 53b801b734 add cp_disconnect command (php) 2014-09-19 11:56:14 +02:00
Thomas NOËL 7f7705db4a auth.py: fix import django settings 2014-09-19 11:55:48 +02:00
Thomas NOËL 7015ccc521 homepage.html: dont use <button> 2014-09-19 10:34:11 +02:00
Thomas NOËL 2a9ee7e91d update-whitelists: dont use ipfw_context 2014-09-19 10:08:51 +02:00
Thomas NOËL d02f08dc04 add manage configxml 2014-09-19 10:05:34 +02:00
Renato Botelho e5b3335ad9 Do not call write_config() when click on Apply Changes because it was already done and it causes dhcpd to restart one more time on secondary nodes. It fixes #3797 2014-09-18 15:57:52 -03:00
Thomas NOËL 2e70388a75 www/services_captiveportal_saml_*: use rc.sh actions 2014-09-18 14:28:22 +02:00
Thomas NOËL feeef1acf4 rc.sh: add syncwl action 2014-09-18 14:26:51 +02:00
Thomas NOËL 844bed1714 update-whitelists: use table 42 2014-09-18 14:00:11 +02:00
Thomas NOËL e7fae17e43 ipfw_context_list.py (just for the record) 2014-09-18 13:45:08 +02:00
Thomas NOËL e5c257d1d2 config.xml: no whitelist in firewall 2014-09-18 12:23:29 +02:00
Thomas NOËL 888c4dddec captiveportal.inc: (re)add table 42 for whitelist
whitelist in firewall does not work...
2014-09-18 12:21:43 +02:00
Thomas NOËL 9499ce395b Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1 2014-09-18 11:50:50 +02:00
Thomas NOËL 7c1d794915 services_captiveportal_zones.php: direct links to saml tabs 2014-09-18 11:50:20 +02:00
Thomas NOËL 11fbb86d3b Revert "captiveportal.inc: add table 42 for whitelist"
This reverts commit 82baf4a83e
useless on UnivNautes2014
2014-09-17 22:54:14 +02:00
Thomas NOËL 1d88bb1bb8 update-whitelists.sh: to php, with love 2014-09-17 22:38:10 +02:00
Thomas NOËL f74657db04 rc.sh: paralleliez syncdata 2014-09-17 22:35:42 +02:00
Thomas NOËL 347f0edc06 config.xml: whitelists aliases 2014-09-17 22:34:05 +02:00
Thomas NOËL f5af3d985b minicron for update whitelists 2014-09-17 22:14:55 +02:00
Thomas NOËL 1d30fbf191 update-whitelists.sh (funny, isn't it ?) 2014-09-17 22:10:34 +02:00