projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT 4.0.19
[freeside.git]
/
rt
/
lib
/
RT
/
Interface
/
Email
/
Auth
/
GnuPG.pm
diff --git
a/rt/lib/RT/Interface/Email/Auth/GnuPG.pm
b/rt/lib/RT/Interface/Email/Auth/GnuPG.pm
index
6d43b96
..
5137707
100755
(executable)
--- a/
rt/lib/RT/Interface/Email/Auth/GnuPG.pm
+++ b/
rt/lib/RT/Interface/Email/Auth/GnuPG.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-58,7
+58,7
@@
To use the gnupg-secured mail gateway, you need to do the following:
Set up a GnuPG key directory with a pubring containing only the keys
you care about and specify the following in your SiteConfig.pm
Set up a GnuPG key directory with a pubring containing only the keys
you care about and specify the following in your SiteConfig.pm
- Set(%GnuPGOptions, homedir => '/opt/rt
3
/var/data/GnuPG');
+ Set(%GnuPGOptions, homedir => '/opt/rt
4
/var/data/GnuPG');
Set(@MailPlugins, 'Auth::MailFrom', 'Auth::GnuPG', ...other filter...);
=cut
Set(@MailPlugins, 'Auth::MailFrom', 'Auth::GnuPG', ...other filter...);
=cut
@@
-77,8
+77,9
@@
sub GetCurrentUser {
foreach my $p ( $args{'Message'}->parts_DFS ) {
$p->head->delete($_) for qw(
foreach my $p ( $args{'Message'}->parts_DFS ) {
$p->head->delete($_) for qw(
- X-RT-GnuPG-Status X-RT-Incoming-Encrypton
+ X-RT-GnuPG-Status X-RT-Incoming-Encrypt
i
on
X-RT-Incoming-Signature X-RT-Privacy
X-RT-Incoming-Signature X-RT-Privacy
+ X-RT-Sign X-RT-Encrypt
);
}
);
}
@@
-88,7
+89,7
@@
sub GetCurrentUser {
Entity => $args{'Message'}, AddStatus => 1,
);
if ( $status && !@res ) {
Entity => $args{'Message'}, AddStatus => 1,
);
if ( $status && !@res ) {
- $args{'Message'}->head->
add
(
+ $args{'Message'}->head->
replace
(
'X-RT-Incoming-Encryption' => 'Not encrypted'
);
'X-RT-Incoming-Encryption' => 'Not encrypted'
);
@@
-112,7
+113,7
@@
sub GetCurrentUser {
Data => ${ $args{'RawMessageRef'} },
);
Data => ${ $args{'RawMessageRef'} },
);
- $args{'Message'}->head->
add
( 'X-RT-Privacy' => 'PGP' );
+ $args{'Message'}->head->
replace
( 'X-RT-Privacy' => 'PGP' );
foreach my $part ( $args{'Message'}->parts_DFS ) {
my $decrypted;
foreach my $part ( $args{'Message'}->parts_DFS ) {
my $decrypted;
@@
-124,14
+125,14
@@
sub GetCurrentUser {
$decrypted = 1;
}
if ( $_->{Operation} eq 'Verify' && $_->{Status} eq 'DONE' ) {
$decrypted = 1;
}
if ( $_->{Operation} eq 'Verify' && $_->{Status} eq 'DONE' ) {
- $part->head->
add
(
+ $part->head->
replace
(
'X-RT-Incoming-Signature' => $_->{UserString}
);
}
}
}
'X-RT-Incoming-Signature' => $_->{UserString}
);
}
}
}
- $part->head->
add
(
+ $part->head->
replace
(
'X-RT-Incoming-Encryption' =>
$decrypted ? 'Success' : 'Not encrypted'
);
'X-RT-Incoming-Encryption' =>
$decrypted ? 'Success' : 'Not encrypted'
);