From 59882b443ad6cd39f9483fa0665210794df89179 Mon Sep 17 00:00:00 2001
From: hunter-nl <junobox@gmail.com>
Date: Sat, 4 May 2019 11:45:51 +0200
Subject: [PATCH] Update imapsync_cron.pl

Fix executing imapsync command containing quoted strings in parameters.
---
 data/Dockerfiles/dovecot/imapsync_cron.pl | 63 ++++++++++-------------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/data/Dockerfiles/dovecot/imapsync_cron.pl b/data/Dockerfiles/dovecot/imapsync_cron.pl
index 4fad97ab..f9e53bf3 100755
--- a/data/Dockerfiles/dovecot/imapsync_cron.pl
+++ b/data/Dockerfiles/dovecot/imapsync_cron.pl
@@ -18,14 +18,6 @@ if ($imapsync_running eq 1)
   exit;
 }
 
-sub qqw($) {
-  my @values = split('(?=--)', $_[0]);
-  foreach my $val (@values) {
-    $val=trim($val);
-  }
-  return @values
-}
-
 $run_dir="/tmp";
 $dsn = 'DBI:mysql:database=__DBNAME__;mysql_socket=/var/run/mysqld/mysqld.sock';
 $lock_file = $run_dir . "/imapsync_busy";
@@ -114,36 +106,35 @@ while ($row = $sth->fetchrow_arrayref()) {
   print $passfile1 "$password1\n";
   print $passfile2 trim($master_pass) . "\n";
 
-  my @custom_params_a = qqw($custom_params);
-  my $custom_params_ref = \@custom_params_a;
-
-  my $generated_cmds = [ "/usr/local/bin/imapsync",
-	"--tmpdir", "/tmp",
-	"--nofoldersizes",
-	($timeout1 gt "0" ? () : ('--timeout1', $timeout1)),
-	($timeout2 gt "0" ? () : ('--timeout2', $timeout2)),
-	($exclude eq ""	? () : ("--exclude", $exclude)),
-	($subfolder2 eq "" ? () : ('--subfolder2', $subfolder2)),
-	($maxage eq "0" ? () : ('--maxage', $maxage)),
-	($maxbytespersecond eq "0" ? () : ('--maxbytespersecond', $maxbytespersecond)),
-	($delete2duplicates	ne "1" ? () : ('--delete2duplicates')),
-	($subscribeall	ne "1" ? () : ('--subscribeall')),
-	($delete1	ne "1" ? () : ('--delete')),
-  ($delete2 ne "1" ? () : ('--delete2')),
-  ($automap ne "1" ? () : ('--automap')),
-  ($skipcrossduplicates ne "1" ? () : ('--skipcrossduplicates')),
-	(!defined($enc1) ? () : ($enc1)),
-	"--host1", $host1,
-	"--user1", $user1,
-	"--passfile1", $passfile1->filename,
-	"--port1", $port1,
-	"--host2", "localhost",
-	"--user2", $user2 . '*' . trim($master_user),
-	"--passfile2", $passfile2->filename,
-	'--no-modulesversion'];
+  my $command = "/usr/local/bin/imapsync";
+  $command .= " --tmpdir /tmp";
+  $command .= " --pidfile /tmp/imapsync.pid";
+  $command .= " --nofoldersizes";
+  ($timeout1 gt "0" ? () : ($command .= " --timeout1 ${timeout1}"));
+  ($timeout2 gt "0" ? () : ($command .= " --timeout2 ${timeout2}"));
+  ($exclude eq ""   ? () : ($command .= qq` --exclude ${exclude}`));
+  ($subfolder2 eq "" ? () : ($command .= qq` --subfolder2 ${subfolder2}`));
+  ($maxage eq "0" ? () : ($command .= " --maxage ${maxage}"));
+  ($maxbytespersecond eq "0" ? () : ($command .= " --maxbytespersecond ${maxbytespersecond}"));
+  ($delete2duplicates   ne "1" ? () : ($command .= " --delete2duplicates"));
+  ($subscribeall    ne "1" ? () : ($command .= " --subscribeall"));
+  ($delete1 ne "1" ? () : ($command .= " --delete"));
+  ($delete2 ne "1" ? () : ($command .= " --delete2"));
+  ($automap ne "1" ? () : ($command .= " --automap"));
+  ($skipcrossduplicates ne "1" ? () : ($command .= " --skipcrossduplicates"));
+  (!defined($enc1) ? () : ($command .= " ${enc1}"));
+  $command .= " --host1 ${host1}";
+  $command .= qq` --user1 ${user1}`;
+  $command .= " --passfile1 $passfile1->filename";
+  $command .= " --port1 ${port1}";
+  $command .= " --host2 localhost";
+  $command .= " --user2 ${user2}" . '*' . trim($master_user);
+  $command .= " --passfile2 $passfile2->filename";
+  $command .= " --no-modulesversion";
+  ($custom_params eq "" ? () : ($command .= qq` ${custom_params}`));
 
   try {
-    run [@$generated_cmds, @$custom_params_ref], '&>', \my $stdout;
+    my $stdout = `${command}`
     $update = $dbh->prepare("UPDATE imapsync SET returned_text = ?, last_run = NOW(), is_running = 0 WHERE id = ?");
     $update->bind_param( 1, ${stdout} );
     $update->bind_param( 2, ${id} );