* cmdline/apt-key:

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 860895ae23fcb7732777639eef3cc758ddbf194f..d4b61b356e5ed3336b30c7ba584ca8aff3b6f107 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -12,6 +12,7 @@ GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
 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
 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/ubuntu-archive-keyring.gpg

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


@@ -34,14 +35,33 @@ add_keys_with_verify_against_master_keyring() {
     add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
     master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
     for add_key in $add_keys; do
     add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
     master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
     for add_key in $add_keys; do

+       ADDED=0

        for master_key in $master_keys; do
        for master_key in $master_keys; do

-           if $GPG --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
+           if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then

                $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import
                $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import

+               ADDED=1

            fi
        done
            fi
        done

+       if [ $ADDED = 0 ]; then
+           echo >&2 "Key '$add_key' not added. It is not signed with a master key"
+       fi

     done
 }
 
     done
 }
 

+# update the current archive signing keyring from a network URI
+# the archive-keyring keys needs to be signed with the master key
+# (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" 
+    fi
+    if [ ! -d /var/lib/apt/keyrings ]; then
+       mkdir -p /var/lib/apt/keyrings
+    fi
+    (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
+    add_keys_with_verify_against_master_keyring /var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) $MASTER_KEYRING
+}
+

 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"


@@ -77,6 +97,7 @@ usage() {
     echo "  apt-key export <keyid>      - output the key <keyid>"
     echo "  apt-key exportall           - output all trusted keys"
     echo "  apt-key update              - update keys using the keyring package"
     echo "  apt-key export <keyid>      - output the key <keyid>"
     echo "  apt-key exportall           - output all trusted keys"
     echo "  apt-key update              - update keys using the keyring package"

+    echo "  apt-key net-update          - update keys using the network"

     echo "  apt-key list                - list keys"
     echo
 }
     echo "  apt-key list                - list keys"
     echo
 }


@@ -106,6 +127,9 @@ case "$command" in
     update)
        update
        ;;
     update)
        update
        ;;

+    net-update)
+       net_update
+       ;;

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