Developers of Sympa

[IKEDA Soji <address@concealed>]

Here S/MIME key seems to be assumed to be placed at $list->dir, not
Site->ssl_cert_dir.

Although I'll write on this issue later, the Message object would have
an attribute to determine the context where it was instantiated: List,
Robot or Site (current code base including trunk sometimes don't take
care of it).

Then

  my $self = Sympa::List->new(...)
  ...
  ($usercert, $dummy) = Sympa::Tools::SMIME::find_keys($self->{dir}, 
'encrypt');
  # n.b. $self is List object

would be

  ($usercert, $dummy) = Sympa::Tools::SMIME::find_keys($self->list->{dir}, 
'encrypt');
  # n.b. $self is Message object

Regards,

--- Soji

On Thu, 20 Mar 2014 09:32:28 +0100 (CET)
address@concealed wrote:

> sympa[10457] trunk/src/lib/Sympa: [dev] kill direct circular dependency 
> between Sympa::List and Sympa::Message: second argument of this method is 
> never used
> Revision 10457 Author rousse Date 2014-03-20 09:32:28 +0100 (jeu. 20 mars 
> 2014)
> Log Message[dev] kill direct circular dependency between Sympa::List and 
> Sympa::Message: second argument of this method is never used
> Modified Paths
> trunk/src/lib/Sympa/List.pm
> trunk/src/lib/Sympa/Message.pm
> Diff
> Modified: trunk/src/lib/Sympa/List.pm (10456 => 10457)
> --- trunk/src/lib/Sympa/List.pm       2014-03-20 08:30:49 UTC (rev 10456)
> +++ trunk/src/lib/Sympa/List.pm       2014-03-20 08:32:28 UTC (rev 10457)
> @@ -54,7 +54,7 @@
>  use Sympa::LDAPSource;
>  use Sympa::LockedFile;
>  use Sympa::Mail;
> -use Sympa::Message; # FIXME: circular dependency
> +use Sympa::Message;
>  use Sympa::Robot; # FIXME: circular dependency
>  use Sympa::Scenario; # FIXME: circular dependency
>  use Sympa::SQLSource;
>  Modified: trunk/src/lib/Sympa/Message.pm (10456 => 10457)
> --- trunk/src/lib/Sympa/Message.pm    2014-03-20 08:30:49 UTC (rev 10456)
> +++ trunk/src/lib/Sympa/Message.pm    2014-03-20 08:32:28 UTC (rev 10457)
> @@ -60,7 +60,6 @@
>  use URI::Escape;
>  
>  use Sympa::Language;
> -use Sympa::List; # FIXME: circular dependency
>  use Sympa::Log::Syslog;
>  use Sympa::Site;
>  use Sympa::Template;
> @@ -1081,22 +1080,17 @@
>      Sympa::Log::Syslog::do_log('debug2', '(%s, %s, %s)', @_);
>      my $self  = shift;
>      my $email = shift;
> -    my $list  = shift;
>  
>      my $usercert;
>      my $dummy;
>  
> -    if ($list eq 'list') {
> -        my $self = Sympa::List->new($email);
> -        ($usercert, $dummy) = Sympa::Tools::SMIME::find_keys($self->{dir}, 
> 'encrypt');
> +    my $base = Sympa::Site->ssl_cert_dir . '/' . 
> Sympa::Tools::escape_chars($email);
> +    if (-f "$base\@enc") {
> +        $usercert = "$base\@enc";
>      } else {
> -        my $base = Sympa::Site->ssl_cert_dir . '/' . 
> Sympa::Tools::escape_chars($email);
> -        if (-f "$base\@enc") {
> -            $usercert = "$base\@enc";
> -        } else {
> -            $usercert = "$base";
> -        }
> +        $usercert = "$base";
>      }
> +
>      if (-r $usercert) {
>          my $temporary_file = Sympa::Site->tmpdir . "/" . $email . "." . 
> $PID;
>  


-- 
株式会社 コンバージョン  セキュリティ&OSSソリューション部   池田荘児
〒231-0004　神奈川県横浜市中区元浜町3-21-2 ヘリオス関内ビル7F
e-mail address@concealed  TEL 045-640-3550
http://www.conversion.co.jp/