cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index b579e5a53c94aeae1928bfeecba103f9729445ef..309c51b13aa6bbed3b5eb8d6c3c603e95aec84e7 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,15 +5,42 @@ unset GREP_OPTIONS
 
 # We don't use a secret keyring, of course, but gpg panics and
 # implodes if there isn't one available
 
 # We don't use a secret keyring, of course, but gpg panics and
 # implodes if there isn't one available

+SECRETKEYRING="$(mktemp)"
+trap "rm -f '${SECRETKEYRING}'" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring ${SECRETKEYRING}"

 
 

-GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
-GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
+if [ "$(id -u)" -eq 0 ]; then
+       # we could use a tmpfile here too, but creation of this tends to be time-consuming
+       eval $(apt-config shell TRUSTDBDIR Dir::Etc/d)
+       GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
+fi
+
+GPG="$GPG_CMD"
+
+MASTER_KEYRING=""
+ARCHIVE_KEYRING_URI=""
+#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
+#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
+
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg

 
 

+requires_root() {
+       if [ "$(id -u)" -ne 0 ]; then
+               echo >&1 "ERROR: This command can only be used by root."
+               exit 1
+       fi
+}

 
 

-MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
-ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
-ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg
+# gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead.
+init_keyring() {
+    for path; do
+        if ! [ -e "$path" ]; then
+            touch -- "$path"
+            chmod 0644 -- "$path"
+        fi
+    done
+}

 
 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1
 
 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1


@@ -53,7 +80,15 @@ add_keys_with_verify_against_master_keyring() {
 # (otherwise it does not make sense from a security POV)
 net_update() {
     if [ -z "$ARCHIVE_KEYRING_URI" ]; then
 # (otherwise it does not make sense from a security POV)
 net_update() {
     if [ -z "$ARCHIVE_KEYRING_URI" ]; then

-       echo "ERROR: no location for the archive-keyring given" 
+       echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set"
+       exit 1
+    fi
+    requires_root
+    # in theory we would need to depend on wget for this, but this feature
+    # isn't useable in debian anyway as we have no keyring uri nor a master key
+    if ! which wget >/dev/null 2>&1; then
+       echo >&2 "ERROR: an installed wget is required for a network-based update"
+       exit 1

     fi
     if [ ! -d /var/lib/apt/keyrings ]; then
        mkdir -p /var/lib/apt/keyrings
     fi
     if [ ! -d /var/lib/apt/keyrings ]; then
        mkdir -p /var/lib/apt/keyrings


@@ -77,14 +112,15 @@ net_update() {
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
        echo >&2 "ERROR: Can't find the archive-keyring"
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
        echo >&2 "ERROR: Can't find the archive-keyring"

-       echo >&2 "Is the ubuntu-keyring package installed?"
+       echo >&2 "Is the debian-archive-keyring package installed?"

        exit 1
     fi
        exit 1
     fi

+    requires_root

 
     # add new keys from the package;
 
     # we do not use add_keys_with_verify_against_master_keyring here,
 
     # add new keys from the package;
 
     # we do not use add_keys_with_verify_against_master_keyring here,

-    # because we "update" is run on regular package updates.  A
+    # because "update" is run on regular package updates.  A

     # attacker might as well replace the master-archive-keyring file
     # in the package and add his own keys. so this check wouldn't
     # add any security. we *need* this check on net-update though
     # attacker might as well replace the master-archive-keyring file
     # in the package and add his own keys. so this check wouldn't
     # add any security. we *need* this check on net-update though


@@ -105,7 +141,7 @@ update() {
 
 
 usage() {
 
 
 usage() {

-    echo "Usage: apt-key [command] [arguments]"
+    echo "Usage: apt-key [--keyring file] [command] [arguments]"

     echo
     echo "Manage apt's list of trusted keys"
     echo
     echo
     echo "Manage apt's list of trusted keys"
     echo


@@ -119,8 +155,43 @@ usage() {
     echo "  apt-key finger              - list fingerprints"
     echo "  apt-key adv                 - pass advanced options to gpg (download key)"
     echo
     echo "  apt-key finger              - list fingerprints"
     echo "  apt-key adv                 - pass advanced options to gpg (download key)"
     echo

+    echo "If no specific keyring file is given the command applies to all keyring files."

 }
 
 }
 

+# Determine on which keyring we want to work
+if [ "$1" = "--keyring" ]; then
+        #echo "keyfile given"
+       shift
+       TRUSTEDFILE="$1"
+       if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then
+               GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
+       else
+               echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable"
+               exit 1
+       fi
+       shift
+# otherwise use the default
+else
+       #echo "generate list"
+       TRUSTEDFILE="/etc/apt/trusted.gpg"
+       eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
+       eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
+       if [ -r "$TRUSTEDFILE" ]; then
+               GPG="$GPG --keyring $TRUSTEDFILE"
+       fi
+       GPG="$GPG --primary-keyring $TRUSTEDFILE"
+       TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
+       eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
+       if [ -d "$TRUSTEDPARTS" ]; then
+               #echo "parts active"
+               for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do
+                       #echo "part -> $trusted"
+                       GPG="$GPG --keyring $trusted"
+               done
+       fi
+fi
+#echo "COMMAND: $GPG"
+

 command="$1"
 if [ -z "$command" ]; then
     usage
 command="$1"
 if [ -z "$command" ]; then
     usage


@@ -136,32 +207,43 @@ fi
 
 case "$command" in
     add)
 
 case "$command" in
     add)

+        requires_root
+        init_keyring "$TRUSTEDFILE"

         $GPG --quiet --batch --import "$1"
         echo "OK"
         ;;
     del|rm|remove)
         $GPG --quiet --batch --import "$1"
         echo "OK"
         ;;
     del|rm|remove)

+        requires_root
+        init_keyring "$TRUSTEDFILE"

         $GPG --quiet --batch --delete-key --yes "$1"
         echo "OK"
         ;;
     update)
         $GPG --quiet --batch --delete-key --yes "$1"
         echo "OK"
         ;;
     update)

+        init_keyring "$TRUSTEDFILE"

        update
        ;;
     net-update)
        update
        ;;
     net-update)

+        init_keyring "$TRUSTEDFILE"

        net_update
        ;;
     list)
        net_update
        ;;
     list)

+        init_keyring "$TRUSTEDFILE"

         $GPG --batch --list-keys
         ;;
     finger*)
         $GPG --batch --list-keys
         ;;
     finger*)

+        init_keyring "$TRUSTEDFILE"

         $GPG --batch --fingerprint
         ;;
     export)
         $GPG --batch --fingerprint
         ;;
     export)

+        init_keyring "$TRUSTEDFILE"

         $GPG --armor --export "$1"
         ;;
     exportall)
         $GPG --armor --export "$1"
         ;;
     exportall)

+        init_keyring "$TRUSTEDFILE"

         $GPG --armor --export
         ;;
     adv*)
         $GPG --armor --export
         ;;
     adv*)

+        init_keyring "$TRUSTEDFILE"

         echo "Executing: $GPG $*"
         $GPG $*
         ;;
         echo "Executing: $GPG $*"
         $GPG $*
         ;;