Added code to allow SmartConfigure to be called mutiple times on the same package...

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 5f4e02fdf03975bdda0a02c80f0efdb46efa0593..843163f82c5fc3367f9a4d023817763888af8312 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,10 +5,13 @@ 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

+GPG_CMD='gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg'

 
 

-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
+       GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg"
+fi

 
 

+GPG="$GPG_CMD"

 
 MASTER_KEYRING=""
 ARCHIVE_KEYRING_URI=""
 
 MASTER_KEYRING=""
 ARCHIVE_KEYRING_URI=""


@@ -18,6 +21,13 @@ ARCHIVE_KEYRING_URI=""
 ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.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
+}
+

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


@@ -56,7 +66,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


@@ -83,6 +101,7 @@ update() {
        echo >&2 "Is the debian-archive-keyring package installed?"
        exit 1
     fi
        echo >&2 "Is the debian-archive-keyring package installed?"
        exit 1
     fi

+    requires_root

 
     # add new keys from the package;
 
 
     # add new keys from the package;
 


@@ -108,7 +127,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


@@ -122,8 +141,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" ]; 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


@@ -139,10 +193,12 @@ fi
 
 case "$command" in
     add)
 
 case "$command" in
     add)

+        requires_root

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

+        requires_root

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