[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.7-37-gd77923a

[Kevin Falcone]

The branch, 4.0-trunk has been updated
       via  d77923af1b16d1d118342ad539aa3231249d607a (commit)
       via  70a841a6f0e8b5e2b10f23e098db1f84a00f04cb (commit)
       via  0df6f3608f2a0a6d7c5e4ce9f3298c7df1c695a3 (commit)
       via  56eccdf973d9fd9c6938395581571c12d1e03d8d (commit)
       via  90b06a5d261b2cb7c641ee041157f844e1217392 (commit)
       via  d610b09e42590f9c42bc08701d76bded5ca0c65f (commit)
       via  6db779ee3a81953f39d83b839d4b9a20314542e0 (commit)
       via  a833c21a1ae3af496bbc208df8e81ea2cbec2e45 (commit)
       via  5198886e8092281ac3140a502008c9efb699929c (commit)
       via  c302a8f80c2a2d45de89686d7e3db5325915db78 (commit)
       via  f67496d413c779b3f017dff09a67d86cf5409c0f (commit)
       via  c8f9847875e6e6eee6a9cafb213eee02b6c4040f (commit)
       via  ddac6b4c67d2c438555ed3f011dd0db4bb2c3f42 (commit)
       via  7cfd77e831dd3323fcd25bd4fd9f062c5b779ded (commit)
       via  a8dca3bdb6e155a5108273a22ed79e3761550d4e (commit)
       via  3c1f5fecba3ce1bede7e186331c4fa0caf82a58b (commit)
       via  38093f9fd10cbbd58f09c725b88d1c35bfa9cd51 (commit)
       via  6a5ea7dab74b0b063b02e98e3cf894f8f9dee9da (commit)
       via  23eefd84b5564f84a931f37a4993456bb7389a8a (commit)
       via  b7a5a5366475d75edffb6dcf0ed0191cdfb71818 (commit)
       via  258ec2fb531c83df00afae3f428975b9871e1f68 (commit)
      from  8a3e8b8aa8860ff8c20231fd22029c76c1d49e5f (commit)

Summary of changes:
 etc/RT_Config.pm.in     |  2 +-
 lib/RT/Crypt/GnuPG.pm   | 13 +++++++++++++
 t/mail/gnupg-incoming.t | 41 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 54 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit d77923af1b16d1d118342ad539aa3231249d607a
Merge: 8a3e8b8 70a841a
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Aug 27 14:57:27 2012 -0400

    Merge branch '3.8-trunk' into 4.0-trunk
    
    Conflicts:
    	bin/webmux.pl.in
    	etc/RT_Config.pm.in
    	lib/RT/Interface/Web.pm
    	sbin/rt-email-dashboards.in
    	t/mail/gnupg-incoming.t

diff --cc etc/RT_Config.pm.in
index 4843013,1f66b8d..f339001
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@@ -1770,42 -1515,18 +1770,42 @@@ cross-site request forgery (CSRF) attac
  
  =cut
  
 -Set($DontSearchFileAttachments, undef);
 +Set($RestrictReferrer, 1);
  
 -=item C<%ChartFont>
 +=item C<$RestrictLoginReferrer>
  
 -The L<GD> module (which RT uses for graphs) ships with a builtin font 
 -that doesn't have full Unicode support. You can use a given TrueType font 
 -for a specific language by setting %ChartFont to (language =E<gt> the 
 -absolute path of a font) pairs. Your GD library must have support for
 -TrueType fonts to use this option. If there is no entry for a language 
 -in the hash then font with 'others' key is used.
 +If set to a false value, RT will allow the user to log in from any link
 +or request, merely by passing in C<user> and C<pass> parameters; setting
 +it to a true value forces all logins to come from the login box, so the
 +user is aware that they are being logged in.  The default is off, for
 +backwards compatability.
  
 -RT comes with two TrueType fonts covering most available languages.
 +=cut
 +
 +Set($RestrictLoginReferrer, 0);
 +
- =item C<$ReferrerWhitelist>
++=item C<@ReferrerWhitelist>
 +
 +This is a list of hostname:port combinations that RT will treat as being
 +part of RT's domain. This is particularly useful if you access RT as
 +multiple hostnames or have an external auth system that needs to
 +redirect back to RT once authentication is complete.
 +
 + Set(@ReferrerWhitelist, qw(www.example.com:443  www3.example.com:80));
 +
 +If the "RT has detected a possible cross-site request forgery" error is triggered
 +by a host:port sent by your browser that you believe should be valid, you can copy
 +the host:port from the error message into this list.
 +
 +Simple wildcards, similar to SSL certificates, are allowed.  For example:
 +
 +    *.example.com:80    # matches foo.example.com
 +                        # but not example.com
 +                        #      or foo.bar.example.com
 +
 +    www*.example.com:80 # matches www3.example.com
 +                        #     and www-test.example.com
 +                        #     and www.example.com
  
  =cut
  
diff --cc t/mail/gnupg-incoming.t
index e591add,c34ed99..6ff4f76
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@@ -2,25 -2,35 +2,26 @@@
  use strict;
  use warnings;
  
 -use RT::Test tests => 47;
 +my $homedir;
 +BEGIN {
 +    require RT::Test;
 +    $homedir =
 +      RT::Test::get_abs_relocatable_dir( File::Spec->updir(),
 +        qw/data gnupg keyrings/ );
 +}
  
 -plan skip_all => 'GnuPG required.'
 -    unless eval 'use GnuPG::Interface; 1';
 -plan skip_all => 'gpg executable is required.'
 -    unless RT::Test->find_executable('gpg');
 +use RT::Test::GnuPG
-   tests         => 41,
++  tests         => 49,
 +  actual_server => 1,
 +  gnupg_options => {
 +    passphrase => 'rt-test',
 +    homedir    => $homedir,
 +  };
  
 -use File::Temp;
 -use Cwd 'getcwd';
  use String::ShellQuote 'shell_quote';
  use IPC::Run3 'run3';
+ use MIME::Base64;
  
 -my $homedir = RT::Test::get_abs_relocatable_dir(File::Spec->updir(),
 -    qw(data gnupg keyrings));
 -
 -# catch any outgoing emails
 -RT::Test->set_mail_catcher;
 -
 -RT->Config->Set( 'GnuPG',
 -                 Enable => 1,
 -                 OutgoingMessagesFormat => 'RFC' );
 -
 -RT->Config->Set( 'GnuPGOptions',
 -                 homedir => $homedir,
 -                 'no-permission-warning' => undef);
 -
 -RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
 -
  my ($baseurl, $m) = RT::Test->started_ok;
  
  # configure key for General queue

-----------------------------------------------------------------------