Merge branch 'debian/jessie' into debian/experimental

[apt.git] / cmdline / apt-key.in

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 74ca4d1351d9c9d12b0284307682586a713c2a2b..2a66ad74d182a805c5a62f410ab2a3857fc67ba8 100644 (file)
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -14,7 +14,6 @@ REMOVED_KEYS='&keyring-removed-filename;'
 eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys)
 ARCHIVE_KEYRING_URI='&keyring-uri;'
 eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI)
 eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys)
 ARCHIVE_KEYRING_URI='&keyring-uri;'
 eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI)

-TMP_KEYRING=${APT_DIR}/var/lib/apt/keyrings/maybe-import-keyring.gpg

 
 aptkey_echo() { echo "$@"; }
 
 
 aptkey_echo() { echo "$@"; }
 


@@ -68,24 +67,28 @@ add_keys_with_verify_against_master_keyring() {
             fi
         done
     done
             fi
         done
     done

-    
+

     for add_key in $add_keys; do
         # export the add keyring one-by-one
     for add_key in $add_keys; do
         # export the add keyring one-by-one

-        rm -f $TMP_KEYRING
-        $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key 
-        # check if signed with the master key and only add in this case
-        ADDED=0
+       local TMP_KEYRING="${GPGHOMEDIR}/tmp-keyring.gpg"
+       $GPG_CMD --batch --yes --keyring "$ADD_KEYRING" --output "$TMP_KEYRING" --export "$add_key"
+       if ! $GPG_CMD --batch --yes --keyring "$TMP_KEYRING" --import "$MASTER" > "${GPGHOMEDIR}/gpgoutput.log" 2>&1; then
+           cat "${GPGHOMEDIR}/gpgoutput.log"
+           false
+       fi
+       # check if signed with the master key and only add in this case
+       ADDED=0

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

-           if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then
-               $GPG --import $TMP_KEYRING
+           if $GPG_CMD --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then
+               $GPG_CMD --batch --yes --keyring "$ADD_KEYRING" --export "$add_key" | $GPG --batch --yes --import

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

+       rm -f "${TMP_KEYRING}"

     done
     done

-    rm -f $TMP_KEYRING

 }
 
 # update the current archive signing keyring from a network URI
 }
 
 # update the current archive signing keyring from a network URI


@@ -163,11 +166,9 @@ remove_key_from_keyring() {
     fi
 
     local GPG="$GPG_CMD --keyring $KEYRINGFILE"
     fi
 
     local GPG="$GPG_CMD --keyring $KEYRINGFILE"

-    while [ -n "$1" ]; do
-       local KEY="$1"
-       shift
+    for KEY in "$@"; do

        # check if the key is in this keyring: the key id is in the 5 column at the end
        # check if the key is in this keyring: the key id is in the 5 column at the end

-       if ! get_fingerprints_of_keyring "$KEYRINGFILE" | grep -q "^[0-9A-F]*${KEY}$"; then
+       if ! get_fingerprints_of_keyring "$KEYRINGFILE" | grep -iq "^[0-9A-F]*${KEY}$"; then

            continue
        fi
        if [ ! -w "$KEYRINGFILE" ]; then
            continue
        fi
        if [ ! -w "$KEYRINGFILE" ]; then


@@ -223,43 +224,84 @@ foreach_keyring_do() {
    fi
 }
 
    fi
 }
 

-list_keys_from_keyring() {
-    local KEYRINGFILE="$1"
-    shift
-    # don't show the error message if this keyring doesn't include the key
-    $GPG_CMD --keyring "$KEYRINGFILE" --batch --list-keys "$@" 2>/dev/null || true
-}
-
-fingerprint_keys_from_keyring() {
+run_cmd_on_keyring() {

     local KEYRINGFILE="$1"
     shift
     local KEYRINGFILE="$1"
     shift

-    # don't show the error message if this keyring doesn't include the fingerprint
-    $GPG_CMD --keyring "$KEYRINGFILE" --batch --fingerprint "$@" 2>/dev/null || true
+    # fingerprint and co will fail if key isn't in this keyring
+    $GPG_CMD --keyring "$KEYRINGFILE" --batch "$@" 2>/dev/null || true

 }
 
 import_keys_from_keyring() {
     local IMPORT="$1"
     local KEYRINGFILE="$2"
 }
 
 import_keys_from_keyring() {
     local IMPORT="$1"
     local KEYRINGFILE="$2"

-    $GPG_CMD --keyring "$KEYRINGFILE" --batch --import "$IMPORT" >/dev/null 2>&1
+    if ! $GPG_CMD --keyring "$KEYRINGFILE" --batch --import "$IMPORT" > "${GPGHOMEDIR}/gpgoutput.log" 2>&1; then
+       cat "${GPGHOMEDIR}/gpgoutput.log"
+       false
+    fi
+}
+
+merge_keys_into_keyrings() {
+    local KEYRINGFILE="$1"
+    local IMPORT="$2"
+    if ! $GPG_CMD --keyring "$KEYRINGFILE" --batch --import --import-options 'merge-only' "$IMPORT" > "${GPGHOMEDIR}/gpgoutput.log" 2>&1; then
+       cat "${GPGHOMEDIR}/gpgoutput.log"
+       false
+    fi
+}
+
+merge_back_changes() {
+    if [ -n "$FORCED_KEYRING" ]; then
+       # if the keyring was forced merge is already done
+       return
+    fi
+    if [ -s "${GPGHOMEDIR}/pubring.gpg" ]; then
+       # merge all updated keys
+       foreach_keyring_do 'merge_keys_into_keyrings' "${GPGHOMEDIR}/pubring.gpg"
+    fi
+    # look for keys which were added or removed
+    get_fingerprints_of_keyring "${GPGHOMEDIR}/pubring.orig.gpg" > "${GPGHOMEDIR}/pubring.orig.keylst"
+    get_fingerprints_of_keyring "${GPGHOMEDIR}/pubring.gpg" > "${GPGHOMEDIR}/pubring.keylst"
+    sort "${GPGHOMEDIR}/pubring.keylst" "${GPGHOMEDIR}/pubring.orig.keylst" | uniq --unique | while read key; do
+       if grep -q "^${key}$" "${GPGHOMEDIR}/pubring.orig.keylst"; then
+           # key isn't part of new keyring, so remove
+           foreach_keyring_do 'remove_key_from_keyring' "$key"
+       elif grep -q "^${key}$" "${GPGHOMEDIR}/pubring.keylst"; then
+           # key is part of new keyring, so we need to import it
+           create_new_keyring "$TRUSTEDFILE"
+           if ! $GPG --batch --yes --export "$key" | $GPG_CMD --keyring "$TRUSTEDFILE" --batch --yes --import > "${GPGHOMEDIR}/gpgoutput.log" 2>&1; then
+              cat "${GPGHOMEDIR}/gpgoutput.log"
+              false
+           fi
+       else
+           echo >&2 "Errror: Key ${key} (dis)appeared out of nowhere"
+       fi
+    done

 }
 
 setup_merged_keyring() {
     if [ -z "$FORCED_KEYRING" ]; then
 }
 
 setup_merged_keyring() {
     if [ -z "$FORCED_KEYRING" ]; then

-       local TRUSTEDFILE_BAK="$TRUSTEDFILE"
-       TRUSTEDFILE='/dev/null'

        foreach_keyring_do 'import_keys_from_keyring' "${GPGHOMEDIR}/pubring.gpg"
        foreach_keyring_do 'import_keys_from_keyring' "${GPGHOMEDIR}/pubring.gpg"

-       TRUSTEDFILE="$TRUSTEDFILE_BAK"
-       # mark it as non-writeable so users get errors if gnupg tries to modify it
-       if [ -s "${GPGHOMEDIR}/pubring.gpg" ]; then
-           chmod -w "${GPGHOMEDIR}/pubring.gpg"
-           GPG="$GPG --keyring ${GPGHOMEDIR}/pubring.gpg"
+       if [ -r "${GPGHOMEDIR}/pubring.gpg" ]; then
+           cp -a "${GPGHOMEDIR}/pubring.gpg" "${GPGHOMEDIR}/pubring.orig.gpg"
+       else
+          touch "${GPGHOMEDIR}/pubring.gpg" "${GPGHOMEDIR}/pubring.orig.gpg"

        fi
        fi

-    fi
-    if [ -r "$TRUSTEDFILE" ]; then
-       GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
+       GPG="$GPG --keyring ${GPGHOMEDIR}/pubring.gpg"
+    else
+       GPG="$GPG --keyring $TRUSTEDFILE"
+       create_new_keyring "$TRUSTEDFILE"

     fi
 }
 
     fi
 }
 

+create_new_keyring() {
+    # gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead.
+    if ! [ -e "$TRUSTEDFILE" ]; then
+       if [ -w "$(dirname "$TRUSTEDFILE")" ]; then
+           touch -- "$TRUSTEDFILE"
+           chmod 0644 -- "$TRUSTEDFILE"
+       fi
+    fi
+}

 
 usage() {
     echo "Usage: apt-key [--keyring file] [command] [arguments]"
 
 usage() {
     echo "Usage: apt-key [--keyring file] [command] [arguments]"


@@ -285,15 +327,19 @@ while [ -n "$1" ]; do
         shift
         TRUSTEDFILE="$1"
         FORCED_KEYRING="$1"
         shift
         TRUSTEDFILE="$1"
         FORCED_KEYRING="$1"

+        ;;
+      --secret-keyring)

         shift
         shift

+        FORCED_SECRET_KEYRING="$1"
+        ;;
+      --readonly)
+        merge_back_changes() { true; }

         ;;
       --fakeroot)
         requires_root() { true; }
         ;;
       --fakeroot)
         requires_root() { true; }

-        shift

         ;;
       --quiet)
         aptkey_echo() { true; }
         ;;
       --quiet)
         aptkey_echo() { true; }

-        shift

         ;;
       --*)
         echo >&2 "Unknown option: $1"
         ;;
       --*)
         echo >&2 "Unknown option: $1"


@@ -302,6 +348,7 @@ while [ -n "$1" ]; do
       *)
         break;;
    esac
       *)
         break;;
    esac

+   shift

 done
 
 if [ -z "$TRUSTEDFILE" ]; then
 done
 
 if [ -z "$TRUSTEDFILE" ]; then


@@ -337,6 +384,13 @@ if [ "$command" != "help" ]; then
 
     # gpg needs (in different versions more or less) files to function correctly,
     # so we give it its own homedir and generate some valid content for it
 
     # gpg needs (in different versions more or less) files to function correctly,
     # so we give it its own homedir and generate some valid content for it

+    if [ -n "$TMPDIR" ]; then
+       # tmpdir is a directory and current user has rwx access to it
+       # same tests as in apt-pkg/contrib/fileutl.cc GetTempDir()
+       if [ ! -d "$TMPDIR" ] || [ ! -r "$TMPDIR" ] || [ ! -w "$TMPDIR" ] || [ ! -x "$TMPDIR" ]; then
+         unset TMPDIR
+       fi
+    fi

     GPGHOMEDIR="$(mktemp -d)"
     CURRENTTRAP="${CURRENTTRAP} rm -rf '${GPGHOMEDIR}';"
     trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
     GPGHOMEDIR="$(mktemp -d)"
     CURRENTTRAP="${CURRENTTRAP} rm -rf '${GPGHOMEDIR}';"
     trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM


@@ -355,12 +409,10 @@ if [ "$command" != "help" ]; then
     GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always"
     GPG="$GPG_CMD"
 
     GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always"
     GPG="$GPG_CMD"
 

-    # gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead.
-    if ! [ -e "$TRUSTEDFILE" ]; then
-       if [ -w "$(dirname "$TRUSTEDFILE")" ]; then
-          touch -- "$TRUSTEDFILE"
-          chmod 0644 -- "$TRUSTEDFILE"
-       fi
+    # for advanced operations, we might really need a secret keyring after all
+    if [ -n "$FORCED_SECRET_KEYRING" ] && [ -r "$FORCED_SECRET_KEYRING" ]; then
+       rm -f "$SECRETKEYRING"
+       cp -a "$FORCED_SECRET_KEYRING" "$SECRETKEYRING"

     fi
 fi
 
     fi
 fi
 


@@ -369,6 +421,7 @@ case "$command" in
        requires_root
        setup_merged_keyring
        $GPG --quiet --batch --import "$@"
        requires_root
        setup_merged_keyring
        $GPG --quiet --batch --import "$@"

+       merge_back_changes

        aptkey_echo "OK"
         ;;
     del|rm|remove)
        aptkey_echo "OK"
         ;;
     del|rm|remove)


@@ -380,17 +433,19 @@ case "$command" in
        requires_root
        setup_merged_keyring
        update
        requires_root
        setup_merged_keyring
        update

+       merge_back_changes

        ;;
     net-update)
        requires_root
        setup_merged_keyring
        net_update
        ;;
     net-update)
        requires_root
        setup_merged_keyring
        net_update

+       merge_back_changes

        ;;
     list)
        ;;
     list)

-       foreach_keyring_do 'list_keys_from_keyring' "$@"
+       foreach_keyring_do 'run_cmd_on_keyring' --list-keys "$@"

        ;;
     finger*)
        ;;
     finger*)

-       foreach_keyring_do 'fingerprint_keys_from_keyring' "$@"
+       foreach_keyring_do 'run_cmd_on_keyring' --fingerprint "$@"

        ;;
     export|exportall)
        foreach_keyring_do 'import_keys_from_keyring' "${GPGHOMEDIR}/pubring.gpg"
        ;;
     export|exportall)
        foreach_keyring_do 'import_keys_from_keyring' "${GPGHOMEDIR}/pubring.gpg"


@@ -400,6 +455,15 @@ case "$command" in
        setup_merged_keyring
        aptkey_echo "Executing: $GPG $*"
        $GPG "$@"
        setup_merged_keyring
        aptkey_echo "Executing: $GPG $*"
        $GPG "$@"

+       merge_back_changes
+       ;;
+    verify)
+       setup_merged_keyring
+       if which gpgv >/dev/null 2>&1; then
+           gpgv --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@"
+       else
+           $GPG --verify "$@"
+       fi

        ;;
     help)
         usage
        ;;
     help)
         usage