[dpkg] 10/23: Dpkg::OpenPGP: Automatically detect both cmd and cmdv

[Guillem Jover]

This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=31dbc0bf23ad73d607b1595a0b21915547eccf08

commit 31dbc0bf23ad73d607b1595a0b21915547eccf08
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Fri Nov 4 03:48:29 2022 +0100

    Dpkg::OpenPGP: Automatically detect both cmd and cmdv
    
    Separate the backend command from the specialized verification tool (if
    available), and use the specified command or the found when executing
    them.
---
 scripts/Dpkg/OpenPGP.pm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 22d0baf08..558072212 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -31,24 +31,26 @@ use Dpkg::OpenPGP::ErrorCodes;
 
 our $VERSION = '0.01';
 
+sub _detect_cmd {
+    my ($cmd, $default) = @_;
+
+    if (! defined $cmd || $cmd eq 'auto') {
+        return find_command($default);
+    } else {
+        return find_command($cmd);
+    }
+}
+
 sub new {
     my ($this, %opts) = @_;
     my $class = ref($this) || $this;
 
     my $self = {
-        cmd => $opts{cmd} // 'auto',
-        has_cmd => {},
+        cmdv => _detect_cmd($opts{cmdv}, 'gpgv'),
+        cmd => _detect_cmd($opts{cmd}, 'gpg'),
     };
     bless $self, $class;
 
-    if ($self->{cmd} eq 'auto') {
-        foreach my $cmd (qw(gpg gpgv)) {
-            $self->{has_cmd}{$cmd} = 1 if find_command($cmd);
-        }
-    } else {
-        $self->{has_cmd}{$self->{cmd}} = 1 if find_command($self->{cmd});
-    }
-
     return $self;
 }
 
@@ -176,15 +178,15 @@ sub _gpg_options_weak_digests {
 sub _gpg_verify {
     my ($self, $signeddata, $sig, $data, @certs) = @_;
 
-    return OPENPGP_MISSING_CMD if ! $self->{has_cmd}{gpgv} || ! 
$self->{has_cmd}{gpg};
+    return OPENPGP_MISSING_CMD if ! $self->{cmdv} || ! $self->{cmd};
 
     my $gpg_home = File::Temp->newdir('dpkg-gpg-verify.XXXXXXXX', TMPDIR => 1);
 
     my @exec;
-    if ($self->{has_cmd}{gpgv}) {
-        push @exec, qw(gpgv);
+    if ($self->{cmdv}) {
+        push @exec, $self->{cmdv};
     } else {
-        push @exec, qw(gpg);
+        push @exec, $self->{cmd};
         push @exec, qw(--no-options --no-default-keyring --batch --quiet);
     }
     push @exec, _gpg_options_weak_digests();
@@ -196,7 +198,7 @@ sub _gpg_verify {
         push @exec, '--keyring', $certring;
     }
     push @exec, '--output', $data if defined $data;
-    if (! $self->{has_cmd}{gpgv}) {
+    if (! $self->{cmdv}) {
         push @exec, '--verify';
     }
     push @exec, $sig if defined $sig;

-- 
Dpkg.Org's dpkg