4 files changed, 29 insertions, 39 deletions

diff --git a/lib/JWebmail/Model/ReadMails/MockJSON.pm b/lib/JWebmail/Model/ReadMails/MockJSON.pm
index 64d6873..9ad5f09 100644
--- a/lib/JWebmail/Model/ReadMails/MockJSON.pm
+++ b/lib/JWebmail/Model/ReadMails/MockJSON.pm
@@ -21,14 +21,12 @@ use constant {
 with 'JWebmail::Model::ReadMails::Role';
 
 
-sub new { bless {}, shift }
+sub new { bless {%$_[1]}, shift }
 
 sub _read_json_file {
-    my ($file_name) = @_;
+    my ($self, $file_name) = @_;
 
-    use constant PREFIX => 't/testdata/json/';
-
-    open my $body_file, '<', PREFIX . $file_name;
+    open my $body_file, '<', $self->{mailbox_path} . '/' . $file_name;
     local $/;
     my $body = <$body_file>;
     close $body_file;
@@ -37,13 +35,15 @@ sub _read_json_file {
 }
 
 sub list_reply {
-    state $init = _read_json_file('msgs.json');
+    my $self = shift;
+    state $init = _read_json_file($self, 'msgs.json');
 }
 
 sub read_reply {
+    my $self = shift;
     state $init = {
-        'SC-ORD-MAIL54526c63b751646618a793be3f8329cca@sc-ord-mail5' => _read_json_file('msg2.json'),
-        'example' => _read_json_file('msg.json'),
+        'SC-ORD-MAIL54526c63b751646618a793be3f8329cca@sc-ord-mail5' => _read_json_file($self, 'msg2.json'),
+        'example' => _read_json_file($self, 'msg.json'),
     };
 }
 
diff --git a/lib/JWebmail/Model/ReadMails/MockMaildir.pm b/lib/JWebmail/Model/ReadMails/MockMaildir.pm
index fc9cc4a..f9d530f 100644
--- a/lib/JWebmail/Model/ReadMails/MockMaildir.pm
+++ b/lib/JWebmail/Model/ReadMails/MockMaildir.pm
@@ -4,35 +4,26 @@ use Mojo::Base 'JWebmail::Model::ReadMails::QMailAuthuser';
 
 use Mojo::JSON 'decode_json';
 
-use Digest::HMAC_MD5 'hmac_md5_hex';
+use JWebmail::Config 'LOGIN_SCHEME';
 
+if (LOGIN_SCHEME eq fc 'cram_md5') {
+    require Digest::HMAC_MD5;
+    Digest::HMAC_MD5->import('hmac_md5_hex');
+}
 
 use constant {
     VALID_USER => 'mockmaildir@example.org',
     VALID_PW   => '12345',
 };
 
-has user      => sub { $ENV{USER} };
-has maildir   => 't/testdata/';
-has extractor => 'python';
-
-our %EXTRACTORS = (
-    perl   => 'script/qmauth.pl',
-    python => 'script/qmauth.py',
-    rust   => 'bin/jwebmail-extract',
-);
-
 
 sub new {
     my $cls = shift;
     my %args = @_ == 1 ? %$_[0] : @_;
 
     my $self = bless {%args}, ref $cls || $cls;
-    $self->user;
-    $self->maildir;
 
-    $self->next::method(prog => $EXTRACTORS{$self->extractor});
-    return $self;
+    return $self->next::method();
 }
 
 
@@ -56,7 +47,7 @@ sub start_qmauth {
     my ($auth, $mode, $args) = @_;
 
     my $mail_user = 'maildir';
-    my @exec = ($EXTRACTORS{$self->extractor}, $self->maildir, $self->user, $mail_user, $mode, @$args);
+    my @exec = ($self->{prog}, $self->{mailbox_path}, $self->{virtual_user}, $mail_user, $mode, @$args);
 
     my $pid = open(my $reader, '-|', @exec)
         or die "failed to create subprocess: $!";
diff --git a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
index 19f8b12..b2015aa 100644
--- a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
+++ b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
@@ -1,10 +1,9 @@
 package JWebmail::Model::ReadMails::QMailAuthuser;
 
-use v5.22;
+use v5.24;
 use warnings;
 use utf8;
 
-use File::Basename 'fileparse';
 use IPC::Open2;
 use JSON::PP 'decode_json';
 use Params::Check 'check';
@@ -12,6 +11,8 @@ use Role::Tiny::With;
 use Scalar::Util 'blessed';
 use namespace::clean;
 
+use JWebmail::Config 'MAILDIR_EXTRACTOR';
+
 with 'JWebmail::Model::ReadMails::Role';
 
 
@@ -73,12 +74,9 @@ package JWebmail::Model::ReadMails::QMailAuthuser::Error {
 
 
 my $QMailAuthuserCheck = {
-    user      => {required => 1},
-    maildir   => {required => 1},
-    prog      => {required => 1},
-    prefix    => {default => ''},
-    qmail_dir => {default => '/var/qmail/'},
-    logfile   => {default => '/dev/null'},
+    virtual_user => {required => 1},
+    mailbox_path => {required => 1},
+    qmail_dir    => {default => '/var/qmail/'},
 };
 
 sub new {
@@ -94,6 +92,7 @@ sub new {
     local $Params::Check::WARNINGS_FATAL = 1;
     my $s = check($QMailAuthuserCheck, $self)
         or die __PACKAGE__ . " creation failed!";
+    $s->{prog} = MAILDIR_EXTRACTOR;
     return bless $s, $cls;
 }
 
@@ -180,11 +179,9 @@ sub build_arg {
 
     my ($user_name) = $user_mail_addr =~ /(\w*)@/;
 
-    return $self->{qmail_dir}.'/bin/qmail-authuser'
-    . $self->{prefix} . ' '
-    . join(' ', map { my $x = s/(['\\])/\\$1/gr; "'$x'" } ($self->{prog}, $self->{maildir}, $self->{user}, $user_name, $mode, @$args))
-    . ' 3<&0'
-    . ' 2>>'.$self->{logfile};
+    return $self->{qmail_dir}.'/bin/qmail-authuser '
+    . join(' ', map { my $x = s/(['\\])/\\$1/gr; "'$x'" } ($self->{prog}, $self->{mailbox_path}, $self->{virtual_user}, $user_name, $mode, @$args))
+    . ' 3<&0';
 }
 
 sub start_qmauth {
diff --git a/lib/JWebmail/Model/WriteMails.pm b/lib/JWebmail/Model/WriteMails.pm
index 05c4cd1..751192a 100644
--- a/lib/JWebmail/Model/WriteMails.pm
+++ b/lib/JWebmail/Model/WriteMails.pm
@@ -1,9 +1,11 @@
 package JWebmail::Model::WriteMails;
 
-use v5.18;
+use v5.24;
 use warnings;
 use utf8;
 
+use JWebmail::Config 'SENDMAIL';
+
 use Exporter 'import';
 our @EXPORT_OK = qw(sendmail);
 
@@ -51,7 +53,7 @@ sub _build_mail {
 sub _send {
     my ($mime, @recipients) = @_;
 
-    open(my $m, '|-', 'sendmail', '-i', @recipients)
+    open(my $m, '|-', SENDMAIL, '-i', @recipients)
         or die 'Connecting to sendmail failed. Is it in your PATH?';
     $m->print($mime->as_string());
     close($m);