[dpkg] 09/16: Dpkg::Vendor: Use a normalized key to access the cached objects

[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=dff52dbdbfe0552d36ed11091ac33a6ed1c193f4

commit dff52dbdbfe0552d36ed11091ac33a6ed1c193f4
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Wed Sep 21 03:44:16 2022 +0200

    Dpkg::Vendor: Use a normalized key to access the cached objects
    
    Given that we accept variants for the vendor name, we should normalize
    by what we cached the result, otherwise we might end up doing more work
    than necessary.
    
    Use a very restricted set of characters, that should be extremely safe
    both for the vendor filename and the module name.
    
    Reported-by: Niels Thykier <ni...@thykier.net> (on IRC)
---
 scripts/Dpkg/Vendor.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm
index 4bcba9b51..7ad643e7d 100644
--- a/scripts/Dpkg/Vendor.pm
+++ b/scripts/Dpkg/Vendor.pm
@@ -92,16 +92,19 @@ if there's no file for the given vendor.
 
 =cut
 
+my $vendor_sep_regex = qr{[^A-Za-z0-9]+};
+
 sub get_vendor_info(;$) {
     my $vendor = shift || 'default';
+    my $vendor_key = lc $vendor =~ s{$vendor_sep_regex}{}gr;
     state %VENDOR_CACHE;
-    return $VENDOR_CACHE{$vendor} if exists $VENDOR_CACHE{$vendor};
+    return $VENDOR_CACHE{$vendor_key} if exists $VENDOR_CACHE{$vendor_key};
 
     my $file = get_vendor_file($vendor);
     return unless $file;
     my $fields = Dpkg::Control::HashCore->new();
     $fields->load($file, compression => 0) or error(g_('%s is empty'), $file);
-    $VENDOR_CACHE{$vendor} = $fields;
+    $VENDOR_CACHE{$vendor_key} = $fields;
     return $fields;
 }
 
@@ -159,8 +162,9 @@ lower-casing then capitalizing, as-is or lower-casing.
 
 sub get_vendor_object {
     my $vendor = shift || get_current_vendor() || 'Default';
+    my $vendor_key = lc $vendor =~ s{$vendor_sep_regex}{}gr;
     state %OBJECT_CACHE;
-    return $OBJECT_CACHE{$vendor} if exists $OBJECT_CACHE{$vendor};
+    return $OBJECT_CACHE{$vendor_key} if exists $OBJECT_CACHE{$vendor_key};
 
     my ($obj, @names);
     push @names, ucfirst $vendor, ucfirst lc $vendor, $vendor, lc $vendor;
@@ -172,7 +176,7 @@ sub get_vendor_object {
             \$obj = Dpkg::Vendor::$name->new();
         };
         unless ($@) {
-            $OBJECT_CACHE{$vendor} = $obj;
+            $OBJECT_CACHE{$vendor_key} = $obj;
             return $obj;
         }
     }

-- 
Dpkg.Org's dpkg