SSH signing: prepare config

Include the SSH specifics in the GpgConfig so that we will have access
to these configs later on.

Change-Id: Iad3d6f2bdb5ba879e1672368c82d367b8ccd246c
Signed-off-by: Thomas Wolf <twolf@apache.org>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
index c5f27688becb794ddbc73a0455925cba54a3c902..a57f1b714a750fdf389185020129e01b9b8198fc 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@ -205,8 +205,37 @@ public final class ConfigConstants {
         */
        public static final String CONFIG_KEY_SIGNINGKEY = "signingKey";
 
+       /**
+        * The "ssh" subsection key.
+        *
+        * @since 7.1
+        */
+       public static final String CONFIG_SSH_SUBSECTION = "ssh";
+
+       /**
+        * The "defaultKeyCommand" key.
+        *
+        * @since 7.1
+        */
+       public static final String CONFIG_KEY_SSH_DEFAULT_KEY_COMMAND = "defaultKeyCommand";
+
+       /**
+        * The "allowedSignersFile" key.
+        *
+        * @since 7.1
+        */
+       public static final String CONFIG_KEY_SSH_ALLOWED_SIGNERS_FILE = "allowedSignersFile";
+
+       /**
+        * The "revocationFile" key,
+        *
+        * @since 7.1
+        */
+       public static final String CONFIG_KEY_SSH_REVOCATION_FILE = "revocationFile";
+
        /**
         * The "commit" section
+        *
         * @since 5.2
         */
        public static final String CONFIG_COMMIT_SECTION = "commit";

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java
index fb5c904215215274b14d2ae3c287b743775ecf88..76ed36a6e56562a68835b2870d7740c2f0329286 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java
@@ -61,6 +61,12 @@ public class GpgConfig {
 
        private final boolean forceAnnotated;
 
+       private final String sshDefaultKeyCommand;
+
+       private final String sshAllowedSignersFile;
+
+       private final String sshRevocationFile;
+
        /**
         * Create a new GPG config that reads the configuration from config.
         *
@@ -88,6 +94,17 @@ public class GpgConfig {
                                ConfigConstants.CONFIG_KEY_GPGSIGN, false);
                forceAnnotated = config.getBoolean(ConfigConstants.CONFIG_TAG_SECTION,
                                ConfigConstants.CONFIG_KEY_FORCE_SIGN_ANNOTATED, false);
+               sshDefaultKeyCommand = config.getString(
+                               ConfigConstants.CONFIG_GPG_SECTION,
+                               ConfigConstants.CONFIG_SSH_SUBSECTION,
+                               ConfigConstants.CONFIG_KEY_SSH_DEFAULT_KEY_COMMAND);
+               sshAllowedSignersFile = config.getString(
+                               ConfigConstants.CONFIG_GPG_SECTION,
+                               ConfigConstants.CONFIG_SSH_SUBSECTION,
+                               ConfigConstants.CONFIG_KEY_SSH_ALLOWED_SIGNERS_FILE);
+               sshRevocationFile = config.getString(ConfigConstants.CONFIG_GPG_SECTION,
+                               ConfigConstants.CONFIG_SSH_SUBSECTION,
+                               ConfigConstants.CONFIG_KEY_SSH_REVOCATION_FILE);
        }
 
        /**
@@ -151,4 +168,37 @@ public class GpgConfig {
        public boolean isSignAnnotated() {
                return forceAnnotated;
        }
+
+       /**
+        * Retrieves the value of git config {@code gpg.ssh.defaultKeyCommand}.
+        *
+        * @return the value of {@code gpg.ssh.defaultKeyCommand}
+        *
+        * @since 7.1
+        */
+       public String getSshDefaultKeyCommand() {
+               return sshDefaultKeyCommand;
+       }
+
+       /**
+        * Retrieves the value of git config {@code gpg.ssh.allowedSignersFile}.
+        *
+        * @return the value of {@code gpg.ssh.allowedSignersFile}
+        *
+        * @since 7.1
+        */
+       public String getSshAllowedSignersFile() {
+               return sshAllowedSignersFile;
+       }
+
+       /**
+        * Retrieves the value of git config {@code gpg.ssh.revocationFile}.
+        *
+        * @return the value of {@code gpg.ssh.revocationFile}
+        *
+        * @since 7.1
+        */
+       public String getSshRevocationFile() {
+               return sshRevocationFile;
+       }
 }