MT#21209 create spool file with correct owner/permissions for user asterisk

* slightly reworked code to comply to the tap tests

Change-Id: I62875a5df2c16807996d892ddbe4f669b0283992
(cherry picked from commit d8147fa736)
(cherry picked from commit f402f93f74)

debian/control

@@ -9,7 +9,9 @@ Homepage: http://sipwise.com/
 Package: ngcp-reminder
 Architecture: all
 Depends: asterisk,
+         libconfig-tiny-perl,
          libdbi-perl,
+         libreadonly-perl,
          perl-modules,
          ${misc:Depends},
          ${shlibs:Depends}

reminder.pl

@@ -1,94 +1,83 @@
 #!/usr/bin/perl -w
 use strict;
+use warnings;
 
+use Config::Tiny;
 use File::Temp qw(tempfile);
 use File::Basename;
 use File::Copy;
 use DBI;
+use Readonly;
 
-our $weekdays;
-our $retries;
-our $retry_time;
-our $wait_time;
-our $context;
-our $sip_peer;
-our $spool;
-our $tmpdir;
-
-our $database;
-our $dbhost;
-our $dbuser;
-our $dbpassword;
-
-
-my $config_file = "/etc/ngcp-reminder/reminder.conf";
-open CONFIG, "$config_file" or die "Program stopping, couldn't open the configuration file '$config_file'.\n";
-
-while (<CONFIG>) {
-    chomp;                  # no newline
-    s/#.*//;                # no comments
-    s/^\s+//;               # no leading white
-    s/\s+$//;               # no trailing white
-    next unless length;     # anything left?
-    my ($var, $value) = split(/\s*=\s*/, $_, 2);
-        no strict 'refs';
-        $$var = $value;
-}
-close CONFIG;
+Readonly my $config_file => "/etc/ngcp-reminder/reminder.conf";
+Readonly my $owner => 'asterisk';
 
-if(!defined $weekdays || $weekdays =~ /^\s*$/) {
-	$weekdays = '2,3,4,5,6,7';
-}
-my @wdays = split /\s*,\s*/, $weekdays;
+my $config = Config::Tiny->read($config_file)
+    or die "Program stopping, couldn't open the configuration file '$config_file'.\n";
+my %cfg = ( %{$config->{_}} );
 
-my $dsn = "DBI:mysql:database=$database;host=$dbhost;port=0";
+if (!defined $cfg{weekdays} || $cfg{weekdays} =~ /^\s*$/) {
+    $cfg{weekdays} = '2,3,4,5,6,7';
+}
+my @wdays = split /\s*,\s*/, $cfg{weekdays};
 
+my $dsn = "DBI:mysql:database=$cfg{database};host=$cfg{dbhost};port=0";
 
-my $dbh = DBI->connect($dsn, $dbuser, $dbpassword);
+my $dbh = DBI->connect($dsn, ${cfg}{qw(dbuser dbpassword)})
+    or die "Cannot connect to db: ".$DBI::errstr;
 
 my $sth = $dbh->prepare("SELECT a.username, b.domain, c.recur, c.id " .
-	"FROM voip_subscribers a, voip_domains b, voip_reminder c " .
-	"WHERE c.subscriber_id = a.id and a.domain_id = b.id " . 
-	"and c.time = time_format(now(), '%H:%i:00')");
+    "FROM voip_subscribers a, voip_domains b, voip_reminder c " .
+    "WHERE c.subscriber_id = a.id and a.domain_id = b.id " .
+    "and c.time = time_format(now(), '%H:%i:00')");
 
 my $sth_d = $dbh->prepare("delete from voip_reminder where id=?");
 
-$sth->execute;
-while (my $ref = $sth->fetchrow_hashref()) 
-{
-	print "$ref->{'username'}\@$ref->{'domain'}, recur=$ref->{'recur'}\n";
-
-	if($ref->{'recur'} eq "weekdays")
-	{
-		my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time);
-		$wday++; # make sun=1, sat=7
-		next unless(grep(/^$wday$/, @wdays));
-	}
-
-	my ($tmp, $tmp_filename) = tempfile("$ref->{'username'}.XXXXXX", DIR => $tmpdir, UNLINK => 0);
-	unless(defined $tmp)
-	{
-		die "Failed to create temporary call file: $!\n";
-	}
-
-	print "Using tmpfile '$tmp_filename'\n";
-
-	print $tmp "Channel: SIP/$sip_peer/$ref->{'username'}__AT__$ref->{'domain'}\n";
-	print $tmp "MaxRetries: $retries\n";
-	print $tmp "RetryTime: $retry_time\n";
-	print $tmp "WaitTime: $wait_time\n";
-	print $tmp "Extension: s\n";
-	print $tmp "Context: $context\n";
-	print $tmp "Priority: 1\n";
-	close $tmp;
-	move "$tmp_filename", "$spool/".basename($tmp_filename)
-		or die "Failed to move call '$tmp_filename' file to spool: $!\n";
-	
-	if($ref->{'recur'} eq "never")
-	{
-		$sth_d->execute($ref->{'id'});
-	}
+$sth->execute() or die "Cannot execute: ".$DBI::errstr;
+
+while (my $ref = $sth->fetchrow_hashref()) {
+    print "$ref->{'username'}\@$ref->{'domain'}, recur=$ref->{'recur'}\n";
+
+    if ($ref->{'recur'} eq "weekdays") {
+        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time);
+        $wday++; # make sun=1, sat=7
+        next unless grep { /^$wday$/ } @wdays;
+    }
+
+    my ($tmp, $tmp_filename) = tempfile("$ref->{'username'}.XXXXXX", DIR => $cfg{tmpdir}, UNLINK => 0);
+    unless (defined $tmp) {
+        die "Failed to create temporary call file: $!\n";
+    }
+
+    print "Using tmpfile '$tmp_filename'\n";
+
+    print $tmp "Channel: SIP/$cfg{sip_peer}/$ref->{'username'}__AT__$ref->{'domain'}\n";
+    print $tmp "MaxRetries: $cfg{retries}\n";
+    print $tmp "RetryTime: $cfg{retry_time}\n";
+    print $tmp "WaitTime: $cfg{wait_time}\n";
+    print $tmp "Extension: s\n";
+    print $tmp "Context: $cfg{context}\n";
+    print $tmp "Priority: 1\n";
+    close $tmp;
+
+    my ($login,$pass,$uid,$gid) = getpwnam($owner)
+                                    or die "user '$owner' not in passwd file";
+    chown $uid, $gid, $tmp_filename;
+    chmod 0600, $tmp_filename;
+
+    my $out_filename = "$cfg{spool}/".basename($tmp_filename);
+    move "$tmp_filename", $out_filename
+        or die "Failed to move call '$tmp_filename' file to spool: $!\n";
+
+    if($ref->{'recur'} eq "never") {
+        $sth_d->execute($ref->{'id'})
+            or die "Cannot execute: ".$DBI::errstr;
+    }
 }
 
 $sth->finish;
+$sth_d->finish;
+
+$dbh->disconnect;
 
+exit 0;