From 3a5c3f0596398d64bb34498f40becbcd32ffa5de Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 17 Feb 2021 11:42:18 +0100
Subject: Consolidate error messages for consistency.

---
 lacme-accountd | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lacme-accountd')

diff --git a/lacme-accountd b/lacme-accountd
index 36e9d9f..c00530f 100755
--- a/lacme-accountd
+++ b/lacme-accountd
@@ -106,7 +106,7 @@ if ($OPTS{privkey} =~ /\A(file|gpg):(\p{Print}+)\z/) {
 
     my $str = do {local $/ = undef; <$fh>};
     close $fh or die $! ?
-        "Can't close: $!" :
+        "close: $!" :
         "Error: $command[0] exited with value ".($? >> 8)."\n";
 
     require 'Crypt/OpenSSL/RSA.pm';
@@ -140,7 +140,7 @@ my $JWK_STR = JSON::->new->encode($JWK);
 if (defined $OPTS{'conn-fd'}) {
     die "Invalid file descriptor" unless $OPTS{'conn-fd'} =~ /\A(\d+)\z/;
     # untaint and fdopen(3) our end of the socket pair
-    open ($S, '+<&=', $1+0) or die "fdopen $1: $!";
+    open ($S, '+<&=', $1+0) or die "fdopen($1): $!";
 } else {
     my $sockname = $OPTS{socket} // (defined $ENV{XDG_RUNTIME_DIR} ? "$ENV{XDG_RUNTIME_DIR}/S.lacme" : undef);
     die "Missing socket option\n" unless defined $sockname;
@@ -148,7 +148,7 @@ if (defined $OPTS{'conn-fd'}) {
 
     # ensure we're the only user with write access to the parent dir
     my $dirname = $sockname =~ s/[^\/]+$//r;
-    my @stat = stat($dirname) or die "Can't stat $dirname: $!";
+    my @stat = stat($dirname) or die "stat($dirname): $!";
     die "Error: insecure permissions on $dirname\n" if ($stat[2] & 0022) != 0;
 
     my $umask = umask(0177) // die "umask: $!";
@@ -172,14 +172,14 @@ if (defined $OPTS{'conn-fd'}) {
 sub conn($;$) {
     my $conn = shift;
     my $count = shift;
-    $conn->printflush( "$PROTOCOL_VERSION OK", "\r\n", $JWK_STR, "\r\n" );
+    $conn->printflush( "$PROTOCOL_VERSION OK", "\r\n", $JWK_STR, "\r\n" ) or warn "print: $!";
 
     # sign whatever comes in
     while (defined (my $data = $conn->getline())) {
         $data =~ s/\r\n\z// or die;
         print STDERR "[$count] >>> Issuing SHA-256 signature for: $data\n" unless $OPTS{quiet};
         my $sig = $SIGN->($data);
-        $conn->printflush( encode_base64url($sig), "\r\n" );
+        $conn->printflush( encode_base64url($sig), "\r\n" ) or warn "print: $!";
     }
 }
 
@@ -195,7 +195,7 @@ if (defined $OPTS{'conn-fd'}) {
         print STDERR "[$count] >>> Accepted new connection\n" unless $OPTS{quiet};
         conn($conn, $count);
         print STDERR "[$count] >>> Connection terminated\n" unless $OPTS{quiet};
-        close $conn or warn "Can't close: $!";
+        $conn->close() or warn "close: $!";
     }
 }
 
@@ -205,11 +205,11 @@ if (defined $OPTS{'conn-fd'}) {
 END {
     if (defined $SOCKNAME and -S $SOCKNAME) {
         print STDERR "Unlinking $SOCKNAME\n" if $OPTS{debug};
-        unlink $SOCKNAME or print STDERR "Can't unlink $SOCKNAME: $!\n";
+        unlink $SOCKNAME or print STDERR "Couldn't unlink $SOCKNAME: $!\n";
     }
     if (defined $S) {
         print STDERR "Shutting down and closing lacme Account Key Manager\n" unless $OPTS{quiet};
         shutdown($S, SHUT_RDWR) or warn "shutdown: $!";
-        close $S or print STDERR "Can't close: $!\n";
+        close $S or print STDERR "close: $!\n";
     }
 }
-- 
cgit v1.2.3