Merge ~krenshaw/ubuntu/+source/command-not-found:focal-lp1953610 into ubuntu/+source/command-not-found:ubuntu/focal-proposed

[Kellen Renshaw]

Cherry-picks the patches contributed to cnf by Arnaud Rebillout to Focal to address LP: #1953610.

a7e9755... by Kellen Renshaw on 2022-02-14

Cherry-pick of cnf-update-db fixes from 22.04

 Fixes: LP: #1953610

Signed-off-by: Kellen Renshaw <email address hidden>

[Julian Andres Klode (juliank)]

We sponsored these uploads, this should be merged

review: Approve

diff --git a/CommandNotFound/CommandNotFound.py b/CommandNotFound/CommandNotFound.py
index 742851b..dfdd21c 100644
--- a/CommandNotFound/CommandNotFound.py
+++ b/CommandNotFound/CommandNotFound.py
@@ -75,7 +75,7 @@ class CommandNotFound(object):
     def __init__(self, data_dir="/usr/share/command-not-found"):
         self.sources_list = self._getSourcesList()
         # a new style DB means we can skip loading the old legacy static DB
-        if os.path.exists(dbpath):
+        if os.path.exists(dbpath) and os.access(dbpath, os.R_OK):
             self.db = SqliteDatabase(dbpath)
         else:
             raise FileNotFoundError("Cannot find database")
diff --git a/cnf-update-db b/cnf-update-db
index 18cba1e..6174635 100755
--- a/cnf-update-db
+++ b/cnf-update-db
@@ -22,6 +22,8 @@ if __name__ == "__main__":
 
     command_files = glob.glob("/var/lib/apt/lists/*Commands-*")
     if len(command_files) > 0:
+        umask = os.umask(0o22)
         col = DbCreator(command_files)
         col.create(db)
+        os.umask(umask)
 
diff --git a/debian/changelog b/debian/changelog
index d435bf3..9504cc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+command-not-found (20.04.6) focal; urgency=medium
+
+  [ Arnaud Rebillout ]
+  * cnf: Bail out early if the database is not readable
+  * cnf-update-db: Creates a world-readable database (Closes: #986461)
+  * Add test to make sure that the database is world-readable
+
+  [ Kellen Renshaw ]
+  * Cherry-pick cnf-update-db umask fixes from 22.04 (LP: #1953610)
+
+ -- Kellen Renshaw <[e-mail]>  Mon, 14 Feb 2022 10:10:22 -0700
+
 command-not-found (20.04.5) focal; urgency=medium
 
   * Correctly handle compressed APT index files (LP: #1876034)
diff --git a/debian/tests/smoke b/debian/tests/smoke
index 4f0e5ae..949e637 100755
--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -18,3 +18,8 @@ adduser --gecos="no" --disabled-password testuser
 
 echo "Ensure c-n-f works as user"
 su -l testuser -c "/usr/lib/command-not-found --ignore-installed konsole" 2>&1 | grep konsole
+
+echo "Ensure c-n-f database is world-readable"    # cf. #986461
+rm -f /var/lib/command-not-found/*
+(umask 0077 && /usr/lib/cnf-update-db)
+su -l testuser -c "/usr/lib/command-not-found --ignore-installed emacs" 2>&1 | grep emacs