diff --git a/pom.xml b/pom.xml index 9e890e886f..080dc5755b 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ - 4.8.0 + 5.0.0 -SNAPSHOT -Dfile.encoding=${project.build.sourceEncoding} @@ -207,16 +207,24 @@ org.jenkins-ci.plugins structs - - org.jenkins-ci.plugins - trilead-api - com.googlecode.json-simple json-simple 1.1.1 test + + io.github.sparsick.testcontainers.gitserver + testcontainers-gitserver + 0.8.0 + test + + + ch.qos.logback + * + + + io.jenkins.configuration-as-code test-harness @@ -234,8 +242,9 @@ test - org.jenkins-ci.plugins - git-server + org.awaitility + awaitility + 4.2.1 test @@ -262,6 +271,12 @@ 3.4 test + + org.testcontainers + testcontainers + 1.19.8 + test + @@ -280,6 +295,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.build.directory}/ssh/know_hosts + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/Git.java b/src/main/java/org/jenkinsci/plugins/gitclient/Git.java index 69413826b6..dd2f7a347b 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/Git.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/Git.java @@ -14,7 +14,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; -import org.jenkinsci.plugins.gitclient.jgit.PreemptiveAuthHttpClientConnectionFactory; import org.jenkinsci.plugins.gitclient.verifier.HostKeyVerifierFactory; import org.jenkinsci.plugins.gitclient.verifier.NoHostKeyVerificationStrategy; @@ -42,6 +41,7 @@ public class Git implements Serializable { private TaskListener listener; private EnvVars env; private String exe; + private HostKeyVerifierFactory hostKeyFactory; /** * Constructor for a Git object. Either Git.with(listener, env) @@ -116,6 +116,11 @@ public Git using(String exe) { return this; } + public Git withHostKeyVerifierFactory(HostKeyVerifierFactory hostKeyFactory) { + this.hostKeyFactory = hostKeyFactory; + return this; + } + /** * {@link org.jenkinsci.plugins.gitclient.GitClient} implementation. The {@link org.jenkinsci.plugins.gitclient.GitClient} interface * provides the key operations which can be performed on a git repository. @@ -125,14 +130,15 @@ public Git using(String exe) { * @throws java.lang.InterruptedException if interrupted. */ public GitClient getClient() throws IOException, InterruptedException { - HostKeyVerifierFactory hostKeyFactory; - if (Jenkins.getInstanceOrNull() == null) { - LOGGER.log(Level.FINE, "No Jenkins instance, skipping host key checking by default"); - hostKeyFactory = new NoHostKeyVerificationStrategy().getVerifier(); - } else { - hostKeyFactory = GitHostKeyVerificationConfiguration.get() - .getSshHostKeyVerificationStrategy() - .getVerifier(); + if (this.hostKeyFactory == null) { + if (Jenkins.getInstanceOrNull() == null) { + LOGGER.log(Level.FINE, "No Jenkins instance, skipping host key checking by default"); + this.hostKeyFactory = new NoHostKeyVerificationStrategy().getVerifier(); + } else { + this.hostKeyFactory = GitHostKeyVerificationConfiguration.get() + .getSshHostKeyVerificationStrategy() + .getVerifier(); + } } jenkins.MasterToSlaveFileCallable callable = new GitAPIMasterToSlaveFileCallable(hostKeyFactory); GitClient git = (repository != null ? repository.act(callable) : callable.invoke(null, null)); @@ -199,9 +205,7 @@ public GitClient invoke(File f, VirtualChannel channel) throws IOException, Inte } if (JGitApacheTool.MAGIC_EXENAME.equalsIgnoreCase(exe)) { - final PreemptiveAuthHttpClientConnectionFactory factory = - new PreemptiveAuthHttpClientConnectionFactory(); - return new JGitAPIImpl(f, listener, factory, hostKeyFactory); + return new JGitAPIImpl(f, listener, hostKeyFactory); } // Ensure we return a backward compatible GitAPI, even API only claim to provide a GitClient GitAPI gitAPI = new GitAPI(exe, f, listener, env); diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java index 11441290df..7bbccc2db9 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java @@ -14,7 +14,10 @@ import static org.jenkinsci.plugins.gitclient.CliGitAPIImpl.TIMEOUT; import static org.jenkinsci.plugins.gitclient.CliGitAPIImpl.TIMEOUT_LOG_PREFIX; +import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey; import com.cloudbees.plugins.credentials.common.StandardCredentials; +import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials; +import com.cloudbees.plugins.credentials.common.UsernameCredentials; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.FilePath; @@ -26,6 +29,7 @@ import hudson.plugins.git.GitObject; import hudson.plugins.git.IndexEntry; import hudson.plugins.git.Revision; +import hudson.util.Secret; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -35,6 +39,10 @@ import java.io.Writer; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -45,12 +53,18 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Predicate; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.stream.Collectors; +import jenkins.util.SystemProperties; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang.time.FastDateFormat; +import org.apache.sshd.common.util.security.SecurityUtils; import org.eclipse.jgit.api.AddNoteCommand; import org.eclipse.jgit.api.CommitCommand; import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode; @@ -66,6 +80,7 @@ import org.eclipse.jgit.api.ShowNoteCommand; import org.eclipse.jgit.api.SubmoduleUpdateCommand; import org.eclipse.jgit.api.TransportCommand; +import org.eclipse.jgit.api.TransportConfigCallback; import org.eclipse.jgit.api.errors.CanceledException; import org.eclipse.jgit.api.errors.CheckoutConflictException; import org.eclipse.jgit.api.errors.GitAPIException; @@ -79,6 +94,7 @@ import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.fnmatch.FileNameMatcher; import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.internal.transport.ssh.OpenSshConfigFile; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; @@ -111,15 +127,18 @@ import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.RemoteRefUpdate; -import org.eclipse.jgit.transport.SshSessionFactory; +import org.eclipse.jgit.transport.SshConstants; +import org.eclipse.jgit.transport.SshTransport; import org.eclipse.jgit.transport.TagOpt; import org.eclipse.jgit.transport.Transport; +import org.eclipse.jgit.transport.TransportHttp; import org.eclipse.jgit.transport.URIish; +import org.eclipse.jgit.transport.sshd.SshdSessionFactory; +import org.eclipse.jgit.transport.sshd.SshdSessionFactoryBuilder; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.jenkinsci.plugins.gitclient.jgit.PreemptiveAuthHttpClientConnectionFactory; -import org.jenkinsci.plugins.gitclient.trilead.SmartCredentialsProvider; -import org.jenkinsci.plugins.gitclient.trilead.TrileadSessionFactory; +import org.jenkinsci.plugins.gitclient.jgit.SmartCredentialsProvider; import org.jenkinsci.plugins.gitclient.verifier.HostKeyVerifierFactory; /** @@ -134,16 +153,20 @@ */ public class JGitAPIImpl extends LegacyCompatibleGitAPIImpl { private static final long serialVersionUID = 1L; + private static final Logger LOGGER = Logger.getLogger(JGitAPIImpl.class.getName()); private final TaskListener listener; private PersonIdent author, committer; + private final HostKeyVerifierFactory hostKeyVerifierFactory; private transient CredentialsProvider provider; + public static final String SSH_CONFIG_PATH = JGitAPIImpl.class + ".sshConfigPath"; + JGitAPIImpl(File workspace, TaskListener listener) { /* If workspace is null, then default to current directory to match * CliGitAPIImpl behavior */ - this(workspace, listener, null); + this(workspace, listener, (HostKeyVerifierFactory) null); } @Deprecated @@ -154,6 +177,7 @@ public class JGitAPIImpl extends LegacyCompatibleGitAPIImpl { this(workspace, listener, httpConnectionFactory, null); } + @Deprecated JGitAPIImpl( File workspace, TaskListener listener, @@ -163,15 +187,107 @@ public class JGitAPIImpl extends LegacyCompatibleGitAPIImpl { * CliGitAPIImpl behavior */ super(workspace == null ? new File(".") : workspace, hostKeyFactory); this.listener = listener; + hostKeyVerifierFactory = hostKeyFactory; + } + + JGitAPIImpl(File workspace, TaskListener listener, HostKeyVerifierFactory hostKeyFactory) { + /* If workspace is null, then default to current directory to match + * CliGitAPIImpl behavior */ + super(workspace == null ? new File(".") : workspace, hostKeyFactory); + this.listener = listener; + hostKeyVerifierFactory = hostKeyFactory; + } + + public SshdSessionFactory buildSshdSessionFactory(@NonNull final HostKeyVerifierFactory hostKeyVerifierFactory) { + if (Files.notExists(hostKeyVerifierFactory.getKnownHostsFile().toPath())) { + try { + Files.createDirectories(hostKeyVerifierFactory + .getKnownHostsFile() + .getParentFile() + .toPath()); + Files.createFile(hostKeyVerifierFactory.getKnownHostsFile().toPath()); + } catch (IOException e) { + LOGGER.log(Level.SEVERE, "could not create known hosts file", e); + } + } + + SmartCredentialsProvider smartCredentialsProvider = getProvider(); + // credentials have been added for the target repo only so we assume we have only the good one here + Optional sshUserPrivateKey = smartCredentialsProvider.getCredentials().values().stream() + .filter(standardCredentials -> standardCredentials instanceof SSHUserPrivateKey) + .map(SSHUserPrivateKey.class::cast) + .findFirst(); + + // if no ssh key, username can be from StandardUsernameCredentials but not ssh + String user = sshUserPrivateKey + .map(UsernameCredentials::getUsername) + .orElseGet(() -> smartCredentialsProvider.getCredentials().values().stream() + .filter(standardCredentials -> standardCredentials instanceof StandardUsernameCredentials) + .map(StandardUsernameCredentials.class::cast) + .findFirst() + .map(UsernameCredentials::getUsername) + .orElse(null)); + + SshdSessionFactoryBuilder builder = new SshdSessionFactoryBuilder() + .setHomeDirectory(SystemUtils.getUserHome()) + .setServerKeyDatabase( + (file, file2) -> hostKeyVerifierFactory.forJGit(null).getServerKeyDatabase()) + .setSshDirectory(hostKeyVerifierFactory.getKnownHostsFile().getParentFile()) + .setConfigStoreFactory((homeDir, configFile, localUserName) -> { + String configFilePath = SystemProperties.getString(SSH_CONFIG_PATH); + if (configFilePath != null) { + Path path = Paths.get(configFilePath); + homeDir = path.toFile().getParentFile(); + configFile = path.toFile(); + } + return new JenkinsOpenSshConfigFile(homeDir, configFile, user); + }) + .setDefaultKeysProvider(file -> { + if (sshUserPrivateKey.isPresent()) { + try { + String keys = String.join( + System.lineSeparator(), + sshUserPrivateKey.get().getPrivateKeys()); + return SecurityUtils.loadKeyPairIdentities( + null, + () -> "key", + IOUtils.toInputStream(keys, StandardCharsets.UTF_8), + (session, resourceKey, retryIndex) -> Optional.ofNullable( + sshUserPrivateKey.get().getPassphrase()) + .map(Secret::getPlainText) + .orElse(null)); + } catch (IOException | GeneralSecurityException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + return Collections.emptyList(); + }) + .setPreferredAuthentications("publickey,password"); + + return builder.build(null); + } + + private static class JenkinsOpenSshConfigFile extends OpenSshConfigFile { - // to avoid rogue plugins from clobbering what we use, always - // make a point of overwriting it with ours. - SshSessionFactory.setInstance(new TrileadSessionFactory(hostKeyFactory, listener)); + private String userName; - if (httpConnectionFactory != null) { - httpConnectionFactory.setCredentialsProvider(asSmartCredentialsProvider()); - // allow override of HttpConnectionFactory to avoid JENKINS-37934 - HttpTransport.setConnectionFactory(httpConnectionFactory); + public JenkinsOpenSshConfigFile(File home, File config, String userName) { + super(home, config, userName); + this.userName = userName; + } + + @Override + public HostEntry lookup(String hostName, int port, String userName) { + HostEntry hostEntry = super.lookup(hostName, port, userName); + // forcing username here otherwise we end up with SshSessionFactory#getLocalUserName which is + // current user + Optional.ofNullable(this.userName).ifPresent(s -> hostEntry.setValue(SshConstants.USER, s)); + return hostEntry; + } + + @Override + public String getLocalUserName() { + return this.userName; } } @@ -199,7 +315,7 @@ private synchronized SmartCredentialsProvider asSmartCredentialsProvider() { if (!(provider instanceof SmartCredentialsProvider)) { provider = new SmartCredentialsProvider(listener); } - return ((SmartCredentialsProvider) provider); + return (SmartCredentialsProvider) provider; } /** @@ -208,11 +324,11 @@ private synchronized SmartCredentialsProvider asSmartCredentialsProvider() { * @param prov a {@link org.eclipse.jgit.transport.CredentialsProvider} object. */ public synchronized void setCredentialsProvider(CredentialsProvider prov) { - this.provider = prov; + provider = prov; } - private synchronized CredentialsProvider getProvider() { - return provider; + public SmartCredentialsProvider getProvider() { + return asSmartCredentialsProvider(); } /** {@inheritDoc} */ @@ -692,7 +808,7 @@ public void execute() throws GitException { } fetch.setRemote(url.toString()); fetch.setCredentialsProvider(getProvider()); - + fetch.setTransportConfigCallback(getTransportConfigCallback()); fetch.setRefSpecs(allRefSpecs); fetch.setRemoveDeletedRefs(shouldPrune); setTransportTimeout(fetch, "fetch", timeout); @@ -732,7 +848,7 @@ public void fetch(String remoteName, RefSpec... refspec) throws GitException { fetch.setRemote(remoteName); } fetch.setCredentialsProvider(getProvider()); - + fetch.setTransportConfigCallback(getTransportConfigCallback()); List refSpecs = new ArrayList<>(); if (refspec != null && refspec.length > 0) { for (RefSpec rs : refspec) { @@ -837,6 +953,27 @@ public Map getHeadRev(String url) throws GitException, Interru return getRemoteReferences(url, null, true, false); } + private TransportConfigCallback getTransportConfigCallback() { + return transport -> { + if (transport instanceof SshTransport) { + ((SshTransport) transport).setSshSessionFactory(buildSshdSessionFactory(this.hostKeyVerifierFactory)); + } + if (transport instanceof HttpTransport) { + ((TransportHttp) transport) + .setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); + } + }; + } + + private void decorateTransport(Transport tn) { + if (tn instanceof SshTransport) { + ((SshTransport) tn).setSshSessionFactory(buildSshdSessionFactory(getHostKeyFactory())); + } + if (tn instanceof HttpTransport) { + ((TransportHttp) tn).setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); + } + } + /** {@inheritDoc} */ @Override public Map getRemoteReferences(String url, String pattern, boolean headsOnly, boolean tagsOnly) @@ -856,6 +993,7 @@ public Map getRemoteReferences(String url, String pattern, boo } lsRemote.setRemote(url); lsRemote.setCredentialsProvider(getProvider()); + lsRemote.setTransportConfigCallback(getTransportConfigCallback()); setTransportTimeout(lsRemote, "ls-remote", TIMEOUT); Collection refs = lsRemote.call(); for (final Ref r : refs) { @@ -890,6 +1028,7 @@ public Map getRemoteSymbolicReferences(String url, String patter LsRemoteCommand lsRemote = new LsRemoteCommand(repo); lsRemote.setRemote(url); lsRemote.setCredentialsProvider(getProvider()); + lsRemote.setTransportConfigCallback(getTransportConfigCallback()); setTransportTimeout(lsRemote, "ls-remote", TIMEOUT); Collection refs = lsRemote.call(); for (final Ref r : refs) { @@ -952,7 +1091,7 @@ public ObjectId getHeadRev(String remoteRepoUrl, String branchSpec) throws GitEx final Transport tn = Transport.open(repo, new URIish(remoteRepoUrl))) { final String branchName = extractBranchNameFromBranchSpec(branchSpec); String regexBranch = createRefRegexFromGlob(branchName); - + decorateTransport(tn); tn.setCredentialsProvider(getProvider()); try (FetchConnection c = tn.openFetch()) { for (final Ref r : c.getRefs()) { @@ -1552,6 +1691,7 @@ public void execute() throws GitException { .setProgressMonitor(new JGitProgressMonitor(listener)) .setRemote(url) .setCredentialsProvider(getProvider()) + .setTransportConfigCallback(getTransportConfigCallback()) .setTagOpt(tags ? TagOpt.FETCH_TAGS : TagOpt.NO_TAGS) .setRefSpecs(refspecs); setTransportTimeout(fetch, "fetch", timeout); @@ -1956,6 +2096,7 @@ private Set listRemoteBranches(String remote) try (final Repository repo = getRepository()) { StoredConfig config = repo.getConfig(); try (final Transport tn = Transport.open(repo, new URIish(config.getString("remote", remote, "url")))) { + decorateTransport(tn); tn.setCredentialsProvider(getProvider()); try (final FetchConnection c = tn.openFetch()) { for (final Ref r : c.getRefs()) { @@ -2040,6 +2181,7 @@ public void execute() throws GitException { .setRefSpecs(ref) .setProgressMonitor(new JGitProgressMonitor(listener)) .setCredentialsProvider(getProvider()) + .setTransportConfigCallback(getTransportConfigCallback()) .setForce(force); if (tags) { pc.setPushTags(); @@ -2432,6 +2574,7 @@ public void execute() throws GitException, InterruptedException { try (Repository repo = getRepository()) { SubmoduleUpdateCommand update = git(repo).submoduleUpdate(); update.setCredentialsProvider(getProvider()); + update.setTransportConfigCallback(getTransportConfigCallback()); setTransportTimeout(update, "update", timeout); update.call(); if (recursive) { diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/CredentialsProviderImpl.java similarity index 88% rename from src/main/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImpl.java rename to src/main/java/org/jenkinsci/plugins/gitclient/jgit/CredentialsProviderImpl.java index 9efaa18a81..2200ce6a85 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImpl.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/CredentialsProviderImpl.java @@ -1,4 +1,4 @@ -package org.jenkinsci.plugins.gitclient.trilead; +package org.jenkinsci.plugins.gitclient.jgit; import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials; import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials; @@ -14,13 +14,11 @@ *

* For HTTP transport we work through {@link org.eclipse.jgit.transport.CredentialsProvider}, * in which case this must be supplied with a {@link com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials}. - * For SSH transport, {@link org.jenkinsci.plugins.gitclient.trilead.TrileadSessionFactory} * downcasts {@link org.eclipse.jgit.transport.CredentialsProvider} to this class. * * @author Kohsuke Kawaguchi */ public class CredentialsProviderImpl extends CredentialsProvider { - public final TaskListener listener; /** * Credential that should be used. */ @@ -28,12 +26,20 @@ public class CredentialsProviderImpl extends CredentialsProvider { /** * Constructor for CredentialsProviderImpl. - * + * @deprecated use {@link #CredentialsProviderImpl(StandardUsernameCredentials)} * @param listener a {@link hudson.model.TaskListener} object. * @param cred a {@link com.cloudbees.plugins.credentials.common.StandardUsernameCredentials} object. */ + @Deprecated(forRemoval = true, since = "4.7.1") public CredentialsProviderImpl(TaskListener listener, StandardUsernameCredentials cred) { - this.listener = listener; + this(cred); + } + + /** + * Constructor for CredentialsProviderImpl. + * @param cred a {@link com.cloudbees.plugins.credentials.common.StandardUsernameCredentials} object. + */ + public CredentialsProviderImpl(StandardUsernameCredentials cred) { this.cred = cred; } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnection.java b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnection.java index c7370cfb35..3eb946e4c4 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnection.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnection.java @@ -92,7 +92,6 @@ import org.eclipse.jgit.transport.http.apache.TemporaryBufferEntity; import org.eclipse.jgit.transport.http.apache.internal.HttpApacheText; import org.eclipse.jgit.util.TemporaryBuffer; -import org.jenkinsci.plugins.gitclient.trilead.SmartCredentialsProvider; /** * A {@link HttpConnection} which uses {@link HttpClient} and attempts to @@ -186,7 +185,7 @@ private HttpClient getClient() { new HttpHost(serviceUri.getHost(), serviceUri.getPort(), serviceUri.getScheme()); CredentialsProvider clientCredentialsProvider = new SystemDefaultCredentialsProvider(); - if (credentialsProvider.supports(u, p)) { + if (credentialsProvider != null && credentialsProvider.supports(u, p)) { URIish uri = serviceUri; while (uri != null) { if (credentialsProvider.get(uri, u, p)) { diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnectionFactory.java b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnectionFactory.java index ff800db440..400d60748c 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnectionFactory.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnectionFactory.java @@ -5,7 +5,6 @@ import java.net.URL; import org.eclipse.jgit.transport.http.HttpConnection; import org.eclipse.jgit.transport.http.HttpConnectionFactory; -import org.jenkinsci.plugins.gitclient.trilead.SmartCredentialsProvider; public class PreemptiveAuthHttpClientConnectionFactory implements HttpConnectionFactory { @@ -13,7 +12,11 @@ public class PreemptiveAuthHttpClientConnectionFactory implements HttpConnection "The " + PreemptiveAuthHttpClientConnectionFactory.class.getName() + " needs to be provided a credentials provider"; - private SmartCredentialsProvider credentialsProvider; + private SmartCredentialsProvider provider; + + public PreemptiveAuthHttpClientConnectionFactory(SmartCredentialsProvider provider) { + this.provider = provider; + } @Override public HttpConnection create(final URL url) throws IOException { @@ -25,19 +28,7 @@ public HttpConnection create(final URL url, final Proxy proxy) throws IOExceptio return innerCreate(url, null); } - public SmartCredentialsProvider getCredentialsProvider() { - return credentialsProvider; - } - - public void setCredentialsProvider(final SmartCredentialsProvider credentialsProvider) { - this.credentialsProvider = credentialsProvider; - } - protected HttpConnection innerCreate(final URL url, final Proxy proxy) { - if (credentialsProvider == null) { - throw new IllegalStateException(NEED_CREDENTIALS_PROVIDER); - } - - return new PreemptiveAuthHttpClientConnection(credentialsProvider, url.toString(), proxy); + return new PreemptiveAuthHttpClientConnection(this.provider, url.toString(), proxy); } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/jgit/SmartCredentialsProvider.java b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/SmartCredentialsProvider.java new file mode 100644 index 0000000000..5ab64f80c8 --- /dev/null +++ b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/SmartCredentialsProvider.java @@ -0,0 +1,190 @@ +package org.jenkinsci.plugins.gitclient.jgit; + +import com.cloudbees.plugins.credentials.common.PasswordCredentials; +import com.cloudbees.plugins.credentials.common.StandardCredentials; +import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials; +import com.cloudbees.plugins.credentials.common.UsernameCredentials; +import hudson.model.TaskListener; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.lang.StringUtils; +import org.eclipse.jgit.errors.UnsupportedCredentialItem; +import org.eclipse.jgit.transport.CredentialItem; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.URIish; + +/** + * SmartCredentialsProvider class. + * + * @author stephenc + */ +public class SmartCredentialsProvider extends CredentialsProvider { + + public final TaskListener listener; + + private StandardCredentials defaultCredentials; + + private final ConcurrentMap specificCredentials = new ConcurrentHashMap<>(); + private static final Logger LOGGER = Logger.getLogger(SmartCredentialsProvider.class.getName()); + + /** + * Constructor for SmartCredentialsProvider. + * + * @param listener a {@link TaskListener} object. + */ + public SmartCredentialsProvider(TaskListener listener) { + this.listener = listener; + } + + /** + * Remove all credentials from the client. + * + * @since 1.2.0 + */ + public void clearCredentials() { + defaultCredentials = null; + specificCredentials.clear(); + } + + /** + * Adds credentials to be used against a specific url. + * + * @param url the url for the credentials to be used against. + * @param credentials the credentials to use. + * @since 1.2.0 + */ + public void addCredentials(String url, StandardCredentials credentials) { + specificCredentials.put(normalizeURI(url), credentials); + } + + public Map getCredentials() { + Map credentialsMap = new HashMap<>(specificCredentials); + credentialsMap.put("", defaultCredentials); + return credentialsMap; + } + + /** + * Adds credentials to be used when there are not url specific credentials defined. + * + * @param credentials the credentials to use. + * @see #addCredentials(String, StandardCredentials) + * @since 1.2.0 + */ + public synchronized void addDefaultCredentials(StandardCredentials credentials) { + defaultCredentials = credentials; + } + + /** {@inheritDoc} */ + @Override + public boolean isInteractive() { + return true; + } + + /** {@inheritDoc} */ + @Override + public boolean supports(CredentialItem... credentialItems) { + items: + for (CredentialItem item : credentialItems) { + if (supports(defaultCredentials, item)) { + continue; + } + for (StandardCredentials c : specificCredentials.values()) { + if (supports(c, item)) { + continue items; + } + } + return false; + } + return true; + } + + private boolean supports(StandardCredentials c, CredentialItem i) { + if (c == null) { + return false; + } + if (i instanceof StandardUsernameCredentialsCredentialItem) { + return c instanceof StandardUsernameCredentials; + } + if (i instanceof CredentialItem.Username) { + return c instanceof UsernameCredentials; + } + if (i instanceof CredentialItem.Password) { + return c instanceof PasswordCredentials; + } + return false; + } + + /** {@inheritDoc} */ + @Override + public boolean get(URIish uri, CredentialItem... credentialItems) throws UnsupportedCredentialItem { + StandardCredentials c = uri == null ? null : specificCredentials.get(normalizeURI(uri.toString())); + if (c == null) { + c = defaultCredentials; + } + if (c == null) { + Optional> optionalStringStandardCredentialsMapEntry = + specificCredentials.entrySet().stream() + .filter(stringStandardCredentialsEntry -> { + try { + URI repoUri = new URI(stringStandardCredentialsEntry.getKey()); + return (uri.getScheme() != null + && uri.getScheme().equals(repoUri.getScheme())) + && uri.getHost().equals(repoUri.getHost()) + && uri.getPort() == repoUri.getPort(); + } catch (URISyntaxException e) { + // ignore + return false; + } + }) + .findAny(); + c = optionalStringStandardCredentialsMapEntry + .map(Map.Entry::getValue) + .orElse(null); + } + + if (c == null) { + if (uri != null) { + LOGGER.log(Level.FINE, () -> "No credentials provided for " + uri); + } + return false; + } + for (CredentialItem i : credentialItems) { + if (i instanceof StandardUsernameCredentialsCredentialItem && c instanceof StandardUsernameCredentials) { + ((StandardUsernameCredentialsCredentialItem) i).setValue((StandardUsernameCredentials) c); + continue; + } + if (i instanceof CredentialItem.Username && c instanceof UsernameCredentials) { + ((CredentialItem.Username) i).setValue(((UsernameCredentials) c).getUsername()); + continue; + } + if (i instanceof CredentialItem.Password && c instanceof PasswordCredentials) { + ((CredentialItem.Password) i) + .setValue(((PasswordCredentials) c) + .getPassword() + .getPlainText() + .toCharArray()); + continue; + } + if (i instanceof CredentialItem.StringType) { + if (i.getPromptText().equals("Password: ") && c instanceof PasswordCredentials) { + ((CredentialItem.StringType) i) + .setValue(((PasswordCredentials) c).getPassword().getPlainText()); + continue; + } + } + throw new UnsupportedCredentialItem(uri, i.getClass().getName() + ":" + i.getPromptText()); + } + return true; + } + + private String normalizeURI(String uri) { + return StringUtils.removeEnd(StringUtils.removeEnd(uri, "/"), ".git"); + } +} diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/StandardUsernameCredentialsCredentialItem.java b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/StandardUsernameCredentialsCredentialItem.java similarity index 96% rename from src/main/java/org/jenkinsci/plugins/gitclient/trilead/StandardUsernameCredentialsCredentialItem.java rename to src/main/java/org/jenkinsci/plugins/gitclient/jgit/StandardUsernameCredentialsCredentialItem.java index 2a61fb3bab..a2c4cae740 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/StandardUsernameCredentialsCredentialItem.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/StandardUsernameCredentialsCredentialItem.java @@ -1,4 +1,4 @@ -package org.jenkinsci.plugins.gitclient.trilead; +package org.jenkinsci.plugins.gitclient.jgit; import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials; import org.eclipse.jgit.transport.CredentialItem; diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/JGitConnection.java b/src/main/java/org/jenkinsci/plugins/gitclient/trilead/JGitConnection.java deleted file mode 100644 index fa6af60ace..0000000000 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/JGitConnection.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.jenkinsci.plugins.gitclient.trilead; - -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.ConnectionInfo; -import com.trilead.ssh2.ServerHostKeyVerifier; -import java.io.IOException; -import org.jenkinsci.plugins.gitclient.verifier.AbstractJGitHostKeyVerifier; - -public class JGitConnection extends Connection { - - public JGitConnection(String hostname, int port) { - super(hostname, port); - } - - @Override - public ConnectionInfo connect(ServerHostKeyVerifier verifier) throws IOException { - if (verifier instanceof AbstractJGitHostKeyVerifier) { - String[] serverHostKeyAlgorithms = - ((AbstractJGitHostKeyVerifier) verifier).getServerHostKeyAlgorithms(this); - if (serverHostKeyAlgorithms != null && serverHostKeyAlgorithms.length > 0) { - setServerHostKeyAlgorithms(serverHostKeyAlgorithms); - } - } - return super.connect(verifier); - } -} diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProvider.java b/src/main/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProvider.java index 0243116819..75486bbb00 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProvider.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProvider.java @@ -1,158 +1,17 @@ package org.jenkinsci.plugins.gitclient.trilead; -import com.cloudbees.plugins.credentials.common.PasswordCredentials; -import com.cloudbees.plugins.credentials.common.StandardCredentials; -import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials; -import com.cloudbees.plugins.credentials.common.UsernameCredentials; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.model.TaskListener; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.apache.commons.lang.StringUtils; -import org.eclipse.jgit.errors.UnsupportedCredentialItem; -import org.eclipse.jgit.transport.CredentialItem; -import org.eclipse.jgit.transport.CredentialsProvider; -import org.eclipse.jgit.transport.URIish; /** - * SmartCredentialsProvider class. - * - * @author stephenc + * @deprecated just use the one with a better package name {@link org.jenkinsci.plugins.gitclient.jgit.SmartCredentialsProvider} */ -public class SmartCredentialsProvider extends CredentialsProvider { - - public final TaskListener listener; - - private StandardCredentials defaultCredentials; - - private Map specificCredentials = new HashMap<>(); - private static final Logger LOGGER = Logger.getLogger(SmartCredentialsProvider.class.getName()); - - /** - * Constructor for SmartCredentialsProvider. - * - * @param listener a {@link hudson.model.TaskListener} object. - */ +@Deprecated(since = "4.8.0", forRemoval = true) +@SuppressFBWarnings( + value = "NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", + justification = "only here because to keep backward compat") +public class SmartCredentialsProvider extends org.jenkinsci.plugins.gitclient.jgit.SmartCredentialsProvider { public SmartCredentialsProvider(TaskListener listener) { - this.listener = listener; - } - - /** - * Remove all credentials from the client. - * - * @since 1.2.0 - */ - public synchronized void clearCredentials() { - defaultCredentials = null; - specificCredentials.clear(); - } - - /** - * Adds credentials to be used against a specific url. - * - * @param url the url for the credentials to be used against. - * @param credentials the credentials to use. - * @since 1.2.0 - */ - public synchronized void addCredentials(String url, StandardCredentials credentials) { - specificCredentials.put(normalizeURI(url), credentials); - } - - /** - * Adds credentials to be used when there are not url specific credentials defined. - * - * @param credentials the credentials to use. - * @see #addCredentials(String, com.cloudbees.plugins.credentials.common.StandardCredentials) - * @since 1.2.0 - */ - public synchronized void addDefaultCredentials(StandardCredentials credentials) { - defaultCredentials = credentials; - } - - /** {@inheritDoc} */ - @Override - public boolean isInteractive() { - return false; - } - - /** {@inheritDoc} */ - @Override - public synchronized boolean supports(CredentialItem... credentialItems) { - items: - for (CredentialItem item : credentialItems) { - if (supports(defaultCredentials, item)) { - continue; - } - for (StandardCredentials c : specificCredentials.values()) { - if (supports(c, item)) { - continue items; - } - } - return false; - } - return true; - } - - private boolean supports(StandardCredentials c, CredentialItem i) { - if (c == null) { - return false; - } - if (i instanceof StandardUsernameCredentialsCredentialItem) { - return c instanceof StandardUsernameCredentials; - } - if (i instanceof CredentialItem.Username) { - return c instanceof UsernameCredentials; - } - if (i instanceof CredentialItem.Password) { - return c instanceof PasswordCredentials; - } - return false; - } - - /** {@inheritDoc} */ - @Override - public synchronized boolean get(URIish uri, CredentialItem... credentialItems) throws UnsupportedCredentialItem { - StandardCredentials c = specificCredentials.get(uri == null ? null : normalizeURI(uri.toString())); - if (c == null) { - c = defaultCredentials; - } - if (c == null) { - if (uri != null) { - LOGGER.log(Level.FINE, () -> "No credentials provided for " + uri); - } - return false; - } - for (CredentialItem i : credentialItems) { - if (i instanceof StandardUsernameCredentialsCredentialItem && c instanceof StandardUsernameCredentials) { - ((StandardUsernameCredentialsCredentialItem) i).setValue((StandardUsernameCredentials) c); - continue; - } - if (i instanceof CredentialItem.Username && c instanceof UsernameCredentials) { - ((CredentialItem.Username) i).setValue(((UsernameCredentials) c).getUsername()); - continue; - } - if (i instanceof CredentialItem.Password && c instanceof PasswordCredentials) { - ((CredentialItem.Password) i) - .setValue(((PasswordCredentials) c) - .getPassword() - .getPlainText() - .toCharArray()); - continue; - } - if (i instanceof CredentialItem.StringType) { - if (i.getPromptText().equals("Password: ") && c instanceof PasswordCredentials) { - ((CredentialItem.StringType) i) - .setValue(((PasswordCredentials) c).getPassword().getPlainText()); - continue; - } - } - throw new UnsupportedCredentialItem(uri, i.getClass().getName() + ":" + i.getPromptText()); - } - return true; - } - - private String normalizeURI(String uri) { - return StringUtils.removeEnd(StringUtils.removeEnd(uri, "/"), ".git"); + super(listener); } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/TrileadSession.java b/src/main/java/org/jenkinsci/plugins/gitclient/trilead/TrileadSession.java deleted file mode 100644 index ff0abebec9..0000000000 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/TrileadSession.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.jenkinsci.plugins.gitclient.trilead; - -import static com.trilead.ssh2.ChannelCondition.*; - -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.Session; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import org.eclipse.jgit.transport.RemoteSession; - -/** - * TrileadSession class. - * - * @author Kohsuke Kawaguchi - */ -public class TrileadSession implements RemoteSession { - protected final Connection con; - - /** - * Constructor for TrileadSession. - * - * @param con a {@link com.trilead.ssh2.Connection} object for this session's connection. - */ - public TrileadSession(Connection con) { - this.con = con; - } - - /** {@inheritDoc} */ - @Override - public Process exec(String commandName, final int timeout) throws IOException { - return new ProcessImpl(con, commandName, timeout); - } - - private static class ProcessImpl extends Process { - - private final int timeout; - private final Session s; - - public ProcessImpl(Connection con, String commandName, final int timeout) throws IOException { - this.timeout = timeout; - s = con.openSession(); - s.execCommand(commandName); - } - - @Override - public OutputStream getOutputStream() { - return s.getStdin(); - } - - @Override - public InputStream getInputStream() { - return s.getStdout(); - } - - @Override - public InputStream getErrorStream() { - return s.getStderr(); - } - - @Override - public int waitFor() throws InterruptedException { - int r = s.waitForCondition(EXIT_STATUS, timeout * 1000L); - if ((r & EXIT_STATUS) != 0) { - return exitValue(); - } - - // not sure what exception jgit expects - throw new InterruptedException("Timed out: " + r); - } - - @Override - public int exitValue() { - Integer i = s.getExitStatus(); - if (i == null) { - throw new IllegalThreadStateException(); // hasn't finished - } - return i; - } - - @Override - public void destroy() { - s.close(); - } - } - - @Override - public void disconnect() { - con.close(); - } -} diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/TrileadSessionFactory.java b/src/main/java/org/jenkinsci/plugins/gitclient/trilead/TrileadSessionFactory.java deleted file mode 100644 index 4a5324d638..0000000000 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/TrileadSessionFactory.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.jenkinsci.plugins.gitclient.trilead; - -import com.cloudbees.jenkins.plugins.sshcredentials.SSHAuthenticator; -import com.trilead.ssh2.Connection; -import hudson.model.TaskListener; -import java.io.IOException; -import java.util.concurrent.locks.ReentrantLock; -import org.eclipse.jgit.errors.TransportException; -import org.eclipse.jgit.errors.UnsupportedCredentialItem; -import org.eclipse.jgit.transport.CredentialsProvider; -import org.eclipse.jgit.transport.RemoteSession; -import org.eclipse.jgit.transport.SshSessionFactory; -import org.eclipse.jgit.transport.URIish; -import org.eclipse.jgit.util.FS; -import org.jenkinsci.plugins.gitclient.verifier.AcceptFirstConnectionVerifier; -import org.jenkinsci.plugins.gitclient.verifier.HostKeyVerifierFactory; - -/** - * Makes JGit uses Trilead for connectivity. - * - * @author Kohsuke Kawaguchi - */ -public class TrileadSessionFactory extends SshSessionFactory { - - private static final ReentrantLock JGIT_ACCEPT_FIRST_LOCK = new ReentrantLock(); - - private final HostKeyVerifierFactory hostKeyVerifierFactory; - private final TaskListener listener; - - public TrileadSessionFactory(HostKeyVerifierFactory hostKeyVerifierFactory, TaskListener listener) { - this.hostKeyVerifierFactory = hostKeyVerifierFactory; - this.listener = listener; - } - - /** {@inheritDoc} */ - @Override - public RemoteSession getSession(URIish uri, CredentialsProvider credentialsProvider, FS fs, int tms) - throws TransportException { - try { - int p = uri.getPort(); - if (p < 0) { - p = 22; - } - JGitConnection con = new JGitConnection(uri.getHost(), p); - con.setTCPNoDelay(true); - if (hostKeyVerifierFactory instanceof AcceptFirstConnectionVerifier) { - // Accept First connection behavior need to be synchronized, because it's the only verifier - // which could change (populate) known hosts dynamically, in other words AcceptFirstConnectionVerifier - // should be able to see and read if any known hosts was added during parallel connection. - JGIT_ACCEPT_FIRST_LOCK.lock(); - try { - con.connect(hostKeyVerifierFactory.forJGit(listener)); - } finally { - JGIT_ACCEPT_FIRST_LOCK.unlock(); - } - } else { - con.connect(hostKeyVerifierFactory.forJGit(listener)); - } - - boolean authenticated; - if (credentialsProvider instanceof SmartCredentialsProvider) { - final SmartCredentialsProvider smart = (SmartCredentialsProvider) credentialsProvider; - StandardUsernameCredentialsCredentialItem item = - new StandardUsernameCredentialsCredentialItem("Credentials for " + uri, false); - authenticated = smart.supports(item) - && smart.get(uri, item) - && SSHAuthenticator.newInstance(con, item.getValue(), uri.getUser()) - .authenticate(smart.listener); - } else if (credentialsProvider instanceof CredentialsProviderImpl) { - CredentialsProviderImpl sshcp = (CredentialsProviderImpl) credentialsProvider; - - authenticated = SSHAuthenticator.newInstance(con, sshcp.cred).authenticate(sshcp.listener); - } else { - authenticated = false; - } - if (!authenticated && con.isAuthenticationComplete()) { - throw new TransportException("Authentication failure"); - } - - return wrap(con); - } catch (UnsupportedCredentialItem | IOException | InterruptedException e) { - throw new TransportException(uri, "Failed to connect", e); - } - } - - /** {@inheritDoc} */ - @Override - public String getType() { - return "Jenkins credentials Trilead ssh session factory"; - } - - /** - * wrap. - * - * @param con a {@link com.trilead.ssh2.Connection} object. - * @return a {@link org.jenkinsci.plugins.gitclient.trilead.TrileadSession} object. - */ - protected TrileadSession wrap(Connection con) { - return new TrileadSession(con); - } -} diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/package-info.java b/src/main/java/org/jenkinsci/plugins/gitclient/trilead/package-info.java deleted file mode 100644 index f7b448bd07..0000000000 --- a/src/main/java/org/jenkinsci/plugins/gitclient/trilead/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Authentication classes for git client API. - * @since 1.0 - */ -package org.jenkinsci.plugins.gitclient.trilead; diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AbstractJGitHostKeyVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AbstractJGitHostKeyVerifier.java index 95c5f0f4d7..226e8d0ae5 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AbstractJGitHostKeyVerifier.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AbstractJGitHostKeyVerifier.java @@ -1,64 +1,127 @@ package org.jenkinsci.plugins.gitclient.verifier; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.KnownHosts; -import com.trilead.ssh2.ServerHostKeyVerifier; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.TaskListener; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.net.InetSocketAddress; +import java.nio.file.Path; +import java.security.PublicKey; +import java.util.Collections; +import java.util.List; +import java.util.function.Supplier; +import jenkins.util.SystemProperties; +import org.eclipse.jgit.internal.transport.sshd.OpenSshServerKeyDatabase; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; import org.jenkinsci.remoting.SerializableOnlyOverRemoting; -public abstract class AbstractJGitHostKeyVerifier implements ServerHostKeyVerifier, SerializableOnlyOverRemoting { +public abstract class AbstractJGitHostKeyVerifier implements SerializableOnlyOverRemoting { - private static final Logger LOGGER = Logger.getLogger(AbstractJGitHostKeyVerifier.class.getName()); + private TaskListener taskListener; - protected final transient KnownHosts knownHosts; + private final HostKeyVerifierFactory hostKeyVerifierFactory; - protected AbstractJGitHostKeyVerifier(KnownHosts knownHosts) { - this.knownHosts = knownHosts; + protected AbstractJGitHostKeyVerifier(TaskListener taskListener, HostKeyVerifierFactory hostKeyVerifierFactory) { + this.taskListener = taskListener; + this.hostKeyVerifierFactory = hostKeyVerifierFactory; } - public abstract String[] getServerHostKeyAlgorithms(Connection connection) throws IOException; + public TaskListener getTaskListener() { + return taskListener; + } + + public HostKeyVerifierFactory getHostKeyVerifierFactory() { + return hostKeyVerifierFactory; + } + + protected abstract ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration(); + + public ServerKeyDatabase getServerKeyDatabase() { + ServerKeyDatabase.Configuration configuration = getServerKeyDatabaseConfiguration(); + return new JenkinsServerKeyDatabase( + askAboutKnowHostFile(), + Collections.singletonList( + hostKeyVerifierFactory.getKnownHostsFile().toPath()), + configuration); + } + + protected static class JenkinsServerKeyDatabase extends OpenSshServerKeyDatabase { + private final ServerKeyDatabase.Configuration configuration; + + public JenkinsServerKeyDatabase( + boolean askAboutNewFile, List defaultFiles, ServerKeyDatabase.Configuration configuration) { + super(askAboutNewFile, defaultFiles); + this.configuration = configuration; + } + + @Override + public List lookup(String connectAddress, InetSocketAddress remoteAddress, Configuration config) { + return super.lookup(connectAddress, remoteAddress, this.configuration); + } + + @Override + public boolean accept( + String connectAddress, + InetSocketAddress remoteAddress, + PublicKey serverKey, + Configuration config, + CredentialsProvider provider) { + return super.accept(connectAddress, remoteAddress, serverKey, this.configuration, provider); + } + } /** - * Defines host key algorithms which is used for a Connection while establishing an encrypted TCP/IP connection to a SSH-2 server. - * @param connection - * @return array of algorithms for a connection - * @throws IOException + *

+ * see {@link OpenSshServerKeyDatabase} if {@code true} the implementation of ${@link CredentialsProvider} will be + * search with a for {@link org.eclipse.jgit.transport.CredentialItem.YesNoType} + * and our implementation {@link org.jenkinsci.plugins.gitclient.jgit.SmartCredentialsProvider} never returns that + *

+ *

+ * used only here for the Accept first which always create a file without asking anything + *

+ * @return something in the range {@code true} or {@code false}, per default {@code true} to avoid automatic creation + * of know hosts file. */ - String[] getPreferredServerHostkeyAlgorithmOrder(Connection connection) { - String[] preferredServerHostkeyAlgorithmOrder = - knownHosts.getPreferredServerHostkeyAlgorithmOrder(connection.getHostname()); - if (preferredServerHostkeyAlgorithmOrder == null) { - return knownHosts.getPreferredServerHostkeyAlgorithmOrder( - connection.getHostname() + ":" + connection.getPort()); - } - return preferredServerHostkeyAlgorithmOrder; + protected boolean askAboutKnowHostFile() { + return true; } - boolean verifyServerHostKey( - TaskListener taskListener, - KnownHosts knownHosts, - String hostname, - int port, - String serverHostKeyAlgorithm, - byte[] serverHostKey) - throws IOException { - String hostPort = hostname + ":" + port; - int resultHost = knownHosts.verifyHostkey(hostname, serverHostKeyAlgorithm, serverHostKey); - int resultHostPort = knownHosts.verifyHostkey(hostPort, serverHostKeyAlgorithm, serverHostKey); - boolean isValid = KnownHosts.HOSTKEY_IS_OK == resultHost || KnownHosts.HOSTKEY_IS_OK == resultHostPort; - - if (!isValid) { - LOGGER.log(Level.WARNING, "Host key {0} was not accepted.", hostPort); - taskListener.getLogger().printf("Host key for host %s was not accepted.%n", hostPort); + protected static class DefaultConfiguration implements ServerKeyDatabase.Configuration { + + private final HostKeyVerifierFactory hostKeyVerifierFactory; + + private final Supplier supplier; + + protected DefaultConfiguration( + @NonNull HostKeyVerifierFactory hostKeyVerifierFactory, + @NonNull Supplier supplier) { + this.hostKeyVerifierFactory = hostKeyVerifierFactory; + this.supplier = supplier; } - return isValid; - } + @Override + public List getUserKnownHostsFiles() { + return List.of(hostKeyVerifierFactory.getKnownHostsFile().getAbsolutePath()); + } - KnownHosts getKnownHosts() { - return knownHosts; + @Override + public List getGlobalKnownHostsFiles() { + return Collections.emptyList(); + } + + @Override + public boolean getHashKnownHosts() { + // configurable? + return true; + } + + @Override + public String getUsername() { + return SystemProperties.getString("user.name"); + } + + @Override + public StrictHostKeyChecking getStrictHostKeyChecking() { + return supplier.get(); + } } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java index 1dd582d514..c71834a54f 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifier.java @@ -1,16 +1,8 @@ package org.jenkinsci.plugins.gitclient.verifier; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.KnownHosts; import hudson.model.TaskListener; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Base64; -import java.util.logging.Level; import java.util.logging.Logger; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; public class AcceptFirstConnectionVerifier extends HostKeyVerifierFactory { @@ -27,95 +19,26 @@ public AbstractCliGitHostKeyVerifier forCliGit(TaskListener listener) { @Override public AbstractJGitHostKeyVerifier forJGit(TaskListener listener) { - KnownHosts knownHosts; - try { - knownHosts = - Files.exists(getKnownHostsFile().toPath()) ? new KnownHosts(getKnownHostsFile()) : new KnownHosts(); - } catch (IOException e) { - LOGGER.log(Level.WARNING, e, () -> "Could not load known hosts."); - knownHosts = new KnownHosts(); - } - return new AcceptFirstConnectionJGitHostKeyVerifier(listener, knownHosts); + return new AcceptFirstConnectionJGitHostKeyVerifier(listener, this); } - public class AcceptFirstConnectionJGitHostKeyVerifier extends AbstractJGitHostKeyVerifier { - - private final TaskListener listener; + public static class AcceptFirstConnectionJGitHostKeyVerifier extends AbstractJGitHostKeyVerifier { - public AcceptFirstConnectionJGitHostKeyVerifier(TaskListener listener, KnownHosts knownHosts) { - super(knownHosts); - this.listener = listener; + public AcceptFirstConnectionJGitHostKeyVerifier( + TaskListener listener, HostKeyVerifierFactory hostKeyVerifierFactory) { + super(listener, hostKeyVerifierFactory); } @Override - public String[] getServerHostKeyAlgorithms(Connection connection) throws IOException { - return getPreferredServerHostkeyAlgorithmOrder(connection); + protected boolean askAboutKnowHostFile() { + return false; } @Override - public boolean verifyServerHostKey( - String hostname, int port, String serverHostKeyAlgorithm, byte[] serverHostKey) throws Exception { - listener.getLogger() - .printf( - "Verifying host key for %s using %s %n", - hostname, getKnownHostsFile().toPath()); - File knownHostsFile = getKnownHostsFile(); - Path path = Paths.get(knownHostsFile.getAbsolutePath()); - String hostnamePort = hostname + ":" + port; - boolean isValid = false; - if (Files.notExists(path)) { - Files.createDirectories(knownHostsFile.getParentFile().toPath()); - Files.createFile(path); - listener.getLogger().println("Creating new known hosts file " + path); - writeToFile(knownHostsFile, hostnamePort, serverHostKeyAlgorithm, serverHostKey); - isValid = true; - } else { - KnownHosts knownHosts = getKnownHosts(); - int hostPortResult = knownHosts.verifyHostkey(hostnamePort, serverHostKeyAlgorithm, serverHostKey); - if (KnownHosts.HOSTKEY_IS_OK == hostPortResult - || KnownHosts.HOSTKEY_IS_OK - == knownHosts.verifyHostkey(hostname, serverHostKeyAlgorithm, serverHostKey)) { - isValid = true; - } else if (KnownHosts.HOSTKEY_IS_NEW == hostPortResult) { - writeToFile(knownHostsFile, hostnamePort, serverHostKeyAlgorithm, serverHostKey); - isValid = true; - } - } - - if (!isValid) { - LOGGER.log( - Level.FINER, - "Host key for {0} was not accepted on accept first verifier known hosts file {1}", - new Object[] {hostnamePort, path.toString()}); - listener.getLogger().printf("Host key for host %s was not accepted.%n", hostnamePort); - } - - return isValid; - } - - private void writeToFile( - File knownHostsFile, String hostnamePort, String serverHostKeyAlgorithm, byte[] serverHostKey) - throws IOException { - listener.getLogger().println("Adding " + hostnamePort + " to " + knownHostsFile.toPath()); - LOGGER.log( - Level.FINEST, - "Adding {0} to known hosts {1} in accept first verifier with host key {2} {3}", - new Object[] { - hostnamePort, - knownHostsFile.toPath().toString(), - serverHostKeyAlgorithm, - Base64.getEncoder().encodeToString(serverHostKey) - }); - KnownHosts.addHostkeyToFile( - knownHostsFile, - new String[] {KnownHosts.createHashedHostname(hostnamePort)}, - serverHostKeyAlgorithm, - serverHostKey); - getKnownHosts() - .addHostkey( - new String[] {KnownHosts.createHashedHostname(hostnamePort)}, - serverHostKeyAlgorithm, - serverHostKey); + public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() { + return new AbstractJGitHostKeyVerifier.DefaultConfiguration( + this.getHostKeyVerifierFactory(), + () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.ACCEPT_NEW); } } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/HostKeyVerifierFactory.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/HostKeyVerifierFactory.java index 2d4f589eec..a4d3dac986 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/HostKeyVerifierFactory.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/HostKeyVerifierFactory.java @@ -1,5 +1,6 @@ package org.jenkinsci.plugins.gitclient.verifier; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.TaskListener; import java.io.File; import org.jenkinsci.remoting.SerializableOnlyOverRemoting; @@ -16,7 +17,8 @@ public abstract class HostKeyVerifierFactory implements SerializableOnlyOverRemo */ public abstract AbstractJGitHostKeyVerifier forJGit(TaskListener listener); - File getKnownHostsFile() { + @NonNull + public File getKnownHostsFile() { return SshHostKeyVerificationStrategy.JGIT_KNOWN_HOSTS_FILE; } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java index 443715b0c5..1eec293e99 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java @@ -1,15 +1,14 @@ package org.jenkinsci.plugins.gitclient.verifier; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.KnownHosts; import hudson.console.HyperlinkNote; import hudson.model.TaskListener; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.Base64; +import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; public class KnownHostsFileVerifier extends HostKeyVerifierFactory { @@ -32,51 +31,35 @@ public AbstractCliGitHostKeyVerifier forCliGit(TaskListener listener) { @Override public AbstractJGitHostKeyVerifier forJGit(TaskListener listener) { - KnownHosts knownHosts; - try { - if (Files.exists(getKnownHostsFile().toPath())) { - knownHosts = new KnownHosts(getKnownHostsFile()); - } else { + Path knowHostPath = getKnownHostsFile().toPath(); + if (Files.notExists(knowHostPath)) { + try { logHint(listener); - knownHosts = new KnownHosts(); + Path parent = knowHostPath.getParent(); + if (parent != null) { + Files.createDirectories(parent); + Files.createFile(knowHostPath); + } else { + throw new IllegalArgumentException("knowHostPath parent cannot be null"); + } + } catch (IOException e) { + LOGGER.log(Level.WARNING, e, () -> "Could not load known hosts."); } - } catch (IOException e) { - LOGGER.log(Level.WARNING, e, () -> "Could not load known hosts."); - knownHosts = new KnownHosts(); } - return new KnownHostsFileJGitHostKeyVerifier(listener, knownHosts); + return new KnownHostsFileJGitHostKeyVerifier(listener, this); } - public class KnownHostsFileJGitHostKeyVerifier extends AbstractJGitHostKeyVerifier { - - private final TaskListener listener; + public static class KnownHostsFileJGitHostKeyVerifier extends AbstractJGitHostKeyVerifier { - public KnownHostsFileJGitHostKeyVerifier(TaskListener listener, KnownHosts knownHosts) { - super(knownHosts); - this.listener = listener; - } - - @Override - public String[] getServerHostKeyAlgorithms(Connection connection) throws IOException { - return getPreferredServerHostkeyAlgorithmOrder(connection); + public KnownHostsFileJGitHostKeyVerifier(TaskListener listener, HostKeyVerifierFactory hostKeyVerifierFactory) { + super(listener, hostKeyVerifierFactory); } @Override - public boolean verifyServerHostKey( - String hostname, int port, String serverHostKeyAlgorithm, byte[] serverHostKey) throws Exception { - listener.getLogger() - .printf( - "Verifying host key for %s using %s %n", - hostname, getKnownHostsFile().toPath()); - LOGGER.log(Level.FINEST, "Verifying {0}:{1} in known hosts file {2} with host key {3} {4}", new Object[] { - hostname, - port, - SshHostKeyVerificationStrategy.KNOWN_HOSTS_DEFAULT, - serverHostKeyAlgorithm, - Base64.getEncoder().encodeToString(serverHostKey) - }); - return verifyServerHostKey( - listener, getKnownHosts(), hostname, port, serverHostKeyAlgorithm, serverHostKey); + public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() { + return new AbstractJGitHostKeyVerifier.DefaultConfiguration( + this.getHostKeyVerifierFactory(), + () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.REQUIRE_MATCH); } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java index 65e908ada5..57d3c3667b 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifier.java @@ -1,15 +1,15 @@ package org.jenkinsci.plugins.gitclient.verifier; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.KnownHosts; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.TaskListener; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.util.Base64; +import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; public class ManuallyProvidedKeyVerifier extends HostKeyVerifierFactory { @@ -34,53 +34,55 @@ public AbstractCliGitHostKeyVerifier forCliGit(TaskListener listener) { if (File.pathSeparatorChar == ';') { // check whether on Windows or not without sending Functions over remoting // no escaping for windows because created temp file can't contain spaces - userKnownHostsFileFlag = String.format(" -o UserKnownHostsFile=%s", tempKnownHosts.toAbsolutePath()); + userKnownHostsFileFlag = String.format(" -o UserKnownHostsFile=%s", escapePath(tempKnownHosts)); } else { // escaping needed in case job name contains spaces - userKnownHostsFileFlag = String.format( - " -o UserKnownHostsFile=\\\"\"\"%s\\\"\"\"", - tempKnownHosts.toAbsolutePath().toString().replace(" ", "\\ ")); + userKnownHostsFileFlag = + String.format(" -o UserKnownHostsFile=\\\"\"\"%s\\\"\"\"", escapePath(tempKnownHosts)); } return "-o StrictHostKeyChecking=yes " + userKnownHostsFileFlag; }; } + private static String escapePath(Path path) { + if (File.pathSeparatorChar == ';') // check whether on Windows or not without sending Functions over remoting + { + return path.toAbsolutePath().toString(); + } + return path.toAbsolutePath().toString().replace(" ", "\\ "); + } + + @NonNull @Override - public AbstractJGitHostKeyVerifier forJGit(TaskListener listener) { - KnownHosts knownHosts; + public File getKnownHostsFile() { try { - knownHosts = approvedHostKeys != null ? new KnownHosts(approvedHostKeys.toCharArray()) : new KnownHosts(); + Path tempKnownHosts = Files.createTempFile("known_hosts", ""); + Files.write(tempKnownHosts, (approvedHostKeys + System.lineSeparator()).getBytes(StandardCharsets.UTF_8)); + return tempKnownHosts.toFile(); } catch (IOException e) { - LOGGER.log(Level.WARNING, e, () -> "Could not load known hosts."); - knownHosts = new KnownHosts(); + throw new RuntimeException(e); } - return new ManuallyProvidedKeyJGitHostKeyVerifier(listener, knownHosts); } - public static class ManuallyProvidedKeyJGitHostKeyVerifier extends AbstractJGitHostKeyVerifier { + @Override + public AbstractJGitHostKeyVerifier forJGit(TaskListener listener) { + return new ManuallyProvidedKeyJGitHostKeyVerifier(listener, this); + } - private final TaskListener listener; + public static class ManuallyProvidedKeyJGitHostKeyVerifier extends AbstractJGitHostKeyVerifier { - public ManuallyProvidedKeyJGitHostKeyVerifier(TaskListener listener, KnownHosts knownHosts) { - super(knownHosts); - this.listener = listener; - } + private File knownHostsFile; - @Override - public String[] getServerHostKeyAlgorithms(Connection connection) throws IOException { - return getPreferredServerHostkeyAlgorithmOrder(connection); + public ManuallyProvidedKeyJGitHostKeyVerifier( + TaskListener listener, HostKeyVerifierFactory hostKeyVerifierFactory) { + super(listener, hostKeyVerifierFactory); } @Override - public boolean verifyServerHostKey( - String hostname, int port, String serverHostKeyAlgorithm, byte[] serverHostKey) throws Exception { - listener.getLogger() - .printf("Verifying host key for %s using manually-configured host key entries %n", hostname); - LOGGER.log(Level.FINEST, "Verifying host {0}:{1} with manually-configured host key {2} {3}", new Object[] { - hostname, port, serverHostKeyAlgorithm, Base64.getEncoder().encodeToString(serverHostKey) - }); - return verifyServerHostKey( - listener, getKnownHosts(), hostname, port, serverHostKeyAlgorithm, serverHostKey); + public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() { + return new AbstractJGitHostKeyVerifier.DefaultConfiguration( + this.getHostKeyVerifierFactory(), + () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.REQUIRE_MATCH); } } } diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java index d93c48a55c..2c7f573673 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifier.java @@ -1,11 +1,8 @@ package org.jenkinsci.plugins.gitclient.verifier; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.KnownHosts; import hudson.model.TaskListener; -import java.util.Base64; -import java.util.logging.Level; import java.util.logging.Logger; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; public class NoHostKeyVerifier extends HostKeyVerifierFactory { @@ -18,27 +15,25 @@ public AbstractCliGitHostKeyVerifier forCliGit(TaskListener listener) { @Override public AbstractJGitHostKeyVerifier forJGit(TaskListener listener) { - return new AbstractJGitHostKeyVerifier(new KnownHosts()) { - - @Override - public String[] getServerHostKeyAlgorithms(Connection connection) { - return new String[0]; - } - - @Override - public boolean verifyServerHostKey( - String hostname, int port, String serverHostKeyAlgorithm, byte[] serverHostKey) { - LOGGER.log( - Level.FINEST, - "No host key verifier, host {0}:{1} not verified with host key {2} {3}", - new Object[] { - hostname, - port, - serverHostKeyAlgorithm, - Base64.getEncoder().encodeToString(serverHostKey) - }); - return true; - } - }; + return new NoHostJGitKeyVerifier(listener, this); + } + + public static class NoHostJGitKeyVerifier extends AbstractJGitHostKeyVerifier { + + /*** + * let's make spotbugs happy.... + */ + private static final long serialVersionUID = 1L; + + public NoHostJGitKeyVerifier(TaskListener listener, HostKeyVerifierFactory hostKeyVerifierFactory) { + super(listener, hostKeyVerifierFactory); + } + + @Override + public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() { + return new AbstractJGitHostKeyVerifier.DefaultConfiguration( + this.getHostKeyVerifierFactory(), + () -> ServerKeyDatabase.Configuration.StrictHostKeyChecking.ACCEPT_ANY); + } } } diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/credentials/CredentialsProviderImplTest.java similarity index 96% rename from src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java rename to src/test/java/org/jenkinsci/plugins/gitclient/credentials/CredentialsProviderImplTest.java index 0fcdac2f33..d9b9bd6a17 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/credentials/CredentialsProviderImplTest.java @@ -1,4 +1,4 @@ -package org.jenkinsci.plugins.gitclient.trilead; +package org.jenkinsci.plugins.gitclient.credentials; import static org.junit.Assert.*; @@ -13,6 +13,7 @@ import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.transport.CredentialItem; import org.eclipse.jgit.transport.URIish; +import org.jenkinsci.plugins.gitclient.jgit.CredentialsProviderImpl; import org.junit.Before; import org.junit.Test; @@ -33,7 +34,7 @@ public void setUp() { Secret secret = Secret.fromString(SECRET_VALUE); listener = StreamTaskListener.fromStdout(); StandardUsernameCredentials cred = new StandardUsernamePasswordCredentialsImpl(USER_NAME, secret); - provider = new CredentialsProviderImpl(listener, cred); + provider = new CredentialsProviderImpl(cred); } @Test @@ -98,7 +99,7 @@ public void testThrowsUnsupportedOperationException() { public void testSupportsDisallowed() { listener = StreamTaskListener.fromStdout(); StandardUsernameCredentials badCred = new MyUsernameCredentialsImpl(USER_NAME); - CredentialsProviderImpl badProvider = new CredentialsProviderImpl(listener, badCred); + CredentialsProviderImpl badProvider = new CredentialsProviderImpl(badCred); CredentialItem.Username username = new CredentialItem.Username(); assertNull(username.getValue()); assertFalse(badProvider.supports(username)); diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProviderTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/credentials/SmartCredentialsProviderTest.java similarity index 97% rename from src/test/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProviderTest.java rename to src/test/java/org/jenkinsci/plugins/gitclient/credentials/SmartCredentialsProviderTest.java index 0afe22d857..b1b7b45c31 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/SmartCredentialsProviderTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/credentials/SmartCredentialsProviderTest.java @@ -1,4 +1,4 @@ -package org.jenkinsci.plugins.gitclient.trilead; +package org.jenkinsci.plugins.gitclient.credentials; import static org.junit.Assert.*; @@ -10,6 +10,8 @@ import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.transport.CredentialItem; import org.eclipse.jgit.transport.URIish; +import org.jenkinsci.plugins.gitclient.jgit.SmartCredentialsProvider; +import org.jenkinsci.plugins.gitclient.jgit.StandardUsernameCredentialsCredentialItem; import org.junit.Before; import org.junit.Test; @@ -216,7 +218,7 @@ public void testAddDefaultCredentials() { @Test public void testIsInteractive() { - assertFalse(provider.isInteractive()); + assertTrue(provider.isInteractive()); } @Test diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/StandardUsernamePasswordCredentialsImpl.java b/src/test/java/org/jenkinsci/plugins/gitclient/credentials/StandardUsernamePasswordCredentialsImpl.java similarity index 96% rename from src/test/java/org/jenkinsci/plugins/gitclient/trilead/StandardUsernamePasswordCredentialsImpl.java rename to src/test/java/org/jenkinsci/plugins/gitclient/credentials/StandardUsernamePasswordCredentialsImpl.java index b528cd8352..36d399ecd3 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/StandardUsernamePasswordCredentialsImpl.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/credentials/StandardUsernamePasswordCredentialsImpl.java @@ -1,4 +1,4 @@ -package org.jenkinsci.plugins.gitclient.trilead; +package org.jenkinsci.plugins.gitclient.credentials; import com.cloudbees.plugins.credentials.CredentialsDescriptor; import com.cloudbees.plugins.credentials.CredentialsScope; diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/jgit/AuthzTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/jgit/AuthzTest.java new file mode 100644 index 0000000000..019a18d96a --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/gitclient/jgit/AuthzTest.java @@ -0,0 +1,180 @@ +package org.jenkinsci.plugins.gitclient.jgit; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.collection.IsMapWithSize.aMapWithSize; +import static org.hamcrest.collection.IsMapWithSize.anEmptyMap; + +import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey; +import com.cloudbees.plugins.credentials.CredentialsScope; +import com.cloudbees.plugins.credentials.common.StandardCredentials; +import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl; +import com.github.sparsick.testcontainers.gitserver.GitServerVersions; +import com.github.sparsick.testcontainers.gitserver.http.BasicAuthenticationCredentials; +import com.github.sparsick.testcontainers.gitserver.http.GitHttpServerContainer; +import com.github.sparsick.testcontainers.gitserver.plain.GitServerContainer; +import com.github.sparsick.testcontainers.gitserver.plain.SshIdentity; +import hudson.EnvVars; +import hudson.model.TaskListener; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang3.StringUtils; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.transport.URIish; +import org.jenkinsci.plugins.gitclient.Git; +import org.jenkinsci.plugins.gitclient.GitClient; +import org.jenkinsci.plugins.gitclient.verifier.NoHostKeyVerifier; +import org.jetbrains.annotations.NotNull; +import org.junit.Assume; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.testcontainers.DockerClientFactory; +import org.testcontainers.containers.GenericContainer; + +/** + *

This class is testing authz using jgit implementation against

+ *
    + *
  • git ssh server using private key
    • + *
  • git ssh server using password
    • + *
  • git http server using password
    • + *
+ * + */ +public class AuthzTest { + + @Rule + public TemporaryFolder testFolder = + TemporaryFolder.builder().assureDeletion().build(); + + @Test + public void sshKeyAuth() throws Exception { + Assume.assumeTrue(DockerClientFactory.instance().isDockerAvailable()); + try (GitServerContainer containerUnderTest = new GitServerContainer( + GitServerVersions.V2_45.getDockerImageName()) + .withGitRepo("someRepo") + .withSshKeyAuth()) { + containerUnderTest.start(); + SshIdentity sshIdentity = containerUnderTest.getSshClientIdentity(); + BasicSSHUserPrivateKey sshUserPrivateKey = getBasicSSHUserPrivateKey(sshIdentity); + testRepo(sshUserPrivateKey, containerUnderTest); + } + } + + @Test + public void sshWithPassword() throws Exception { + Assume.assumeTrue(DockerClientFactory.instance().isDockerAvailable()); + try (GitServerContainer containerUnderTest = new GitServerContainer( + GitServerVersions.V2_45.getDockerImageName()) + .withGitRepo("someRepo") + .withGitPassword("FrenchCheeseRocks!1234567") // very complicated password + .withSshKeyAuth()) { + containerUnderTest.start(); + StandardCredentials standardCredentials = new UsernamePasswordCredentialsImpl( + CredentialsScope.GLOBAL, + "username-password", + "description", + "git", + containerUnderTest.getGitPassword()); + testRepo(standardCredentials, containerUnderTest); + } + } + + @Test + public void httpWithPassword() throws Exception { + Assume.assumeTrue(DockerClientFactory.instance().isDockerAvailable()); + BasicAuthenticationCredentials credentials = new BasicAuthenticationCredentials("testuser", "testPassword"); + try (GitHttpServerContainer containerUnderTest = + new GitHttpServerContainer(GitServerVersions.V2_45.getDockerImageName(), credentials)) { + containerUnderTest.start(); + StandardCredentials standardCredentials = new UsernamePasswordCredentialsImpl( + CredentialsScope.GLOBAL, + "username-password", + "description", + containerUnderTest.getBasicAuthCredentials().getUsername(), + containerUnderTest.getBasicAuthCredentials().getPassword()); + testRepo(standardCredentials, containerUnderTest); + } + } + + protected void testRepo(StandardCredentials standardCredentials, GenericContainer containerUnderTest) + throws Exception { + String repoUrl = null; + if (containerUnderTest instanceof GitServerContainer) { + repoUrl = ((GitServerContainer) containerUnderTest) + .getGitRepoURIAsSSH() + .toString(); + // ssh://git@localhost:33011/srv/git/someRepo.git + // we don't want the user part of the uri or jgit will use this user + // and we want to be sure to test our implementation with dynamic user + repoUrl = StringUtils.remove(repoUrl, "git@"); + } + if (containerUnderTest instanceof GitHttpServerContainer) { + repoUrl = ((GitHttpServerContainer) containerUnderTest) + .getGitRepoURIAsHttp() + .toString(); + } + + Path testRepo = testFolder.newFolder().toPath(); + + GitClient client = buildClient(testRepo, standardCredentials, repoUrl); + Map rev = client.getHeadRev(repoUrl); + assertThat(rev, is(anEmptyMap())); + client.clone(repoUrl, "master", false, null); + client.config(GitClient.ConfigLevel.LOCAL, "user.name", "Someone"); + client.config(GitClient.ConfigLevel.LOCAL, "user.email", "someone@beer.com"); + client.config(GitClient.ConfigLevel.LOCAL, "commit.gpgsign", "false"); + client.config(GitClient.ConfigLevel.LOCAL, "tag.gpgSign", "false"); + client.config(GitClient.ConfigLevel.LOCAL, "gpg.format", "openpgp"); + Path testFile = testRepo.resolve("test.txt"); + Files.deleteIfExists(testFile); + Files.createFile(testFile); + Files.writeString( + testFile, + "Hello", + StandardCharsets.UTF_8, + StandardOpenOption.WRITE, + StandardOpenOption.TRUNCATE_EXISTING); + client.add("test*"); + client.commit("Very useful change"); + client.push().to(new URIish(repoUrl)).execute(); + + testRepo = testFolder.newFolder().toPath(); + client = buildClient(testRepo, standardCredentials, repoUrl); + rev = client.getHeadRev(repoUrl); + // check there is now one ref remotely after the push + assertThat(rev, aMapWithSize(1)); + } + + protected GitClient buildClient(Path repo, StandardCredentials standardCredentials, String url) throws Exception { + GitClient client = Git.with(TaskListener.NULL, new EnvVars()) + .using("jgit") + .withHostKeyVerifierFactory(new NoHostKeyVerifier()) + .in(repo.toFile()) + .getClient(); + client.addCredentials(url, standardCredentials); + client.addDefaultCredentials(standardCredentials); + return client; + } + + private static @NotNull BasicSSHUserPrivateKey getBasicSSHUserPrivateKey(SshIdentity sshIdentity) { + BasicSSHUserPrivateKey.PrivateKeySource privateKeySource = new BasicSSHUserPrivateKey.PrivateKeySource() { + @NotNull + @Override + public List getPrivateKeys() { + return List.of(new String(sshIdentity.getPrivateKey())); + } + }; + return new BasicSSHUserPrivateKey( + CredentialsScope.GLOBAL, + "some-id", + "git", + privateKeySource, + new String(sshIdentity.getPassphrase()), + "description"); + } +} diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java index 7a194701fc..7a4a0d7fcd 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java @@ -5,17 +5,20 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.hamcrest.io.FileMatchers.anExistingFile; -import static org.junit.Assert.assertThrows; +import static org.jenkinsci.plugins.gitclient.verifier.KnownHostsTestUtil.isKubernetesCI; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import hudson.model.StreamBuildListener; import hudson.model.TaskListener; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.time.Duration; import java.util.Collections; import java.util.List; -import org.jenkinsci.plugins.gitclient.trilead.JGitConnection; +import org.awaitility.Awaitility; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -26,6 +29,11 @@ public class AcceptFirstConnectionVerifierTest { + " ssh-ed25519" + " AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; + private static final String KEY_ecdsa_sha2_nistp256 = + "|1|owDOW+8aankl2aFSPKPIXsIf31E=|lGZ9BEWUfa9HoQteyYE5wIqHJdo=,|1|eGv/ezgtZ9YMw7OHcykKKOvAINk=|3lpkF7XiveRl/D7XvTOMc3ra2kU=" + + " ecdsa-sha2-nistp256" + + " AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; + @Rule public TemporaryFolder testFolder = TemporaryFolder.builder().assureDeletion().build(); @@ -47,15 +55,23 @@ public void testVerifyServerHostKeyWhenFirstConnection() throws Exception { File file = new File(testFolder.getRoot() + "path/to/file"); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(file); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should not fail because first connection and create a file - jGitConnection.connect(verifier); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + file, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); assertThat(file, is(anExistingFile())); assertThat( Files.readAllLines(file.toPath()), - hasItem(containsString(FILE_CONTENT.substring(FILE_CONTENT.indexOf(" "))))); + hasItem(containsString(KEY_ecdsa_sha2_nistp256.substring(KEY_ecdsa_sha2_nistp256.indexOf(" "))))); } @Test @@ -63,19 +79,30 @@ public void testVerifyServerHostKeyWhenSecondConnectionWithEqualKeys() throws Ex if (isKubernetesCI()) { return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents } - // |1|I9eFW1PcZ6UvKPt6iHmYwTXTo54=|PyasyFX5Az4w9co6JTn7rHkeFII= is github.com:22 String hostKeyEntry = - "|1|I9eFW1PcZ6UvKPt6iHmYwTXTo54=|PyasyFX5Az4w9co6JTn7rHkeFII= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; + "|1|FJGXVAi7jMQIsl1J6uE6KnCiteM=|xlH92KQ91GuBgRxvRbU/sBo60Bo= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; + File mockedKnownHosts = knownHostsTestUtil.createFakeKnownHosts(hostKeyEntry); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(mockedKnownHosts); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + mockedKnownHosts, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); // Should connect and do not add new line because keys are equal - jGitConnection.connect(verifier); assertThat(mockedKnownHosts, is(anExistingFile())); - assertThat(Files.readAllLines(mockedKnownHosts.toPath()), is(Collections.singletonList(hostKeyEntry))); + List keys = Files.readAllLines(mockedKnownHosts.toPath()); + assertThat(keys.size(), is(1)); + assertThat(keys, is(Collections.singletonList(hostKeyEntry))); } @Test @@ -84,16 +111,23 @@ public void testVerifyServerHostKeyWhenHostnameWithoutPort() throws Exception { return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents } String hostKeyEntry = - "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; + "github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; File mockedKnownHosts = knownHostsTestUtil.createFakeKnownHosts(hostKeyEntry); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(mockedKnownHosts); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should connect and do not add new line because keys are equal - jGitConnection.connect(verifier); - assertThat(mockedKnownHosts, is(anExistingFile())); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + mockedKnownHosts, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); assertThat(Files.readAllLines(mockedKnownHosts.toPath()), is(Collections.singletonList(hostKeyEntry))); } @@ -108,16 +142,26 @@ public void testVerifyServerHostKeyWhenSecondConnectionWhenNotDefaultAlgorithm() File mockedKnownHosts = knownHostsTestUtil.createFakeKnownHosts(fileContent); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(mockedKnownHosts); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should connect and do not add new line because keys are equal - jGitConnection.connect(verifier); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + mockedKnownHosts, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); + assertThat(mockedKnownHosts, is(anExistingFile())); assertThat(Files.readAllLines(mockedKnownHosts.toPath()), is(Collections.singletonList(fileContent))); } @Test + @Ignore("FIXME not sure what is the test here") public void testVerifyServerHostKeyWhenSecondConnectionWithNonEqualKeys() throws Exception { String fileContent = "|1|f7esvmtaiBk+EMHjPzWbRYRpBPY=|T7Qe4QAksYPZPwYEx5QxQykSjfc=" // github.com:22 + " ssh-ed25519" @@ -126,13 +170,22 @@ public void testVerifyServerHostKeyWhenSecondConnectionWithNonEqualKeys() throws knownHostsTestUtil.createFakeKnownHosts(fileContent); // file was created during first connection AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(mockedKnownHosts); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - Exception exception = assertThrows(IOException.class, () -> { - jGitConnection.connect(verifier); - }); - assertThat(exception.getMessage(), containsString("There was a problem while connecting to github.com:22")); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + mockedKnownHosts, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + assertThat(mockedKnownHosts, is(anExistingFile())); + return true; + }) + .close(); + assertThat(mockedKnownHosts, is(anExistingFile())); + assertThat(Files.readAllLines(mockedKnownHosts.toPath()), is(Collections.singletonList(fileContent))); } @Test @@ -147,14 +200,24 @@ public void testVerifyServerHostKeyWhenConnectionWithAnotherHost() throws Except File fakeKnownHosts = knownHostsTestUtil.createFakeKnownHosts(bitbucketFileContent); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(fakeKnownHosts); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should connect and add new line because a new key - jGitConnection.connect(verifier); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + fakeKnownHosts, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); List actual = Files.readAllLines(fakeKnownHosts.toPath()); assertThat(actual, hasItem(bitbucketFileContent)); - assertThat(actual, hasItem(containsString(FILE_CONTENT.substring(FILE_CONTENT.indexOf(" "))))); + assertThat( + actual, + hasItem(containsString(KEY_ecdsa_sha2_nistp256.substring(KEY_ecdsa_sha2_nistp256.indexOf(" "))))); } @Test @@ -168,23 +231,24 @@ public void testVerifyServerHostKeyWhenHostnamePortProvided() throws Exception { File mockedKnownHosts = knownHostsTestUtil.createFakeKnownHosts(fileContent); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(mockedKnownHosts); - AbstractJGitHostKeyVerifier verifier = acceptFirstConnectionVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should connect and add new line because a new key - jGitConnection.connect(verifier); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + mockedKnownHosts, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + session -> { + assertThat(session.isOpen(), is(true)); + Awaitility.await() + .atMost(Duration.ofSeconds(45)) + .until(() -> session.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(session), is(true)); + return true; + }) + .close(); + assertThat(mockedKnownHosts, is(anExistingFile())); List actual = Files.readAllLines(mockedKnownHosts.toPath()); assertThat(actual, hasItem(fileContent)); assertThat(actual, hasItem(containsString(FILE_CONTENT.substring(FILE_CONTENT.indexOf(" "))))); } - - /* Return true if running on a Kubernetes pod on ci.jenkins.io */ - private boolean isKubernetesCI() { - String kubernetesPort = System.getenv("KUBERNETES_PORT"); - String buildURL = System.getenv("BUILD_URL"); - return kubernetesPort != null - && !kubernetesPort.isEmpty() - && buildURL != null - && buildURL.startsWith("https://ci.jenkins.io/"); - } } diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java index bdbaaf21d4..714ec46c5b 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java @@ -2,14 +2,16 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThrows; +import static org.jenkinsci.plugins.gitclient.verifier.KnownHostsTestUtil.isKubernetesCI; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import hudson.model.StreamBuildListener; import hudson.model.TaskListener; import java.io.File; import java.io.IOException; -import org.jenkinsci.plugins.gitclient.trilead.JGitConnection; +import java.time.Duration; +import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -20,9 +22,9 @@ @RunWith(MockitoJUnitRunner.class) public class KnownHostsFileVerifierTest { - private static final String FILE_CONTENT = "|1|MMHhyJWbis6eLbmW7/vVMgWL01M=|OT564q9RmLIALJ94imtE4PaCewU=" - + " ssh-ed25519" - + " AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; + private static final String FILE_CONTENT = "github.com" + + " ecdsa-sha2-nistp256" + + " AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; // Create a temporary folder and assert folder deletion at end of tests @Rule @@ -39,18 +41,23 @@ public void assignVerifiers() throws IOException { } @Test - public void connectWhenHostKeyNotInKnownHostsFileForOtherHostNameThenShouldFail() throws IOException { + public void connectWhenHostKeyNotInKnownHostsFileForOtherHostNameThenShouldFail() throws Exception { fakeKnownHosts = knownHostsTestUtil.createFakeKnownHosts("fake2.ssh", "known_hosts_fake2", FILE_CONTENT); KnownHostsFileVerifier knownHostsFileVerifier = spy(new KnownHostsFileVerifier()); when(knownHostsFileVerifier.getKnownHostsFile()).thenReturn(fakeKnownHosts); - AbstractJGitHostKeyVerifier verifier = knownHostsFileVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("bitbucket.org", 22); - // Should throw exception because hostkey for 'bitbucket.org:22' is not in known_hosts file - Exception exception = assertThrows(IOException.class, () -> { - jGitConnection.connect(verifier); - }); - assertThat(exception.getMessage(), is("There was a problem while connecting to bitbucket.org:22")); + KnownHostsTestUtil.connectToHost( + "bitbucket.org", + 22, + fakeKnownHosts, + knownHostsFileVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(false)); + return true; + }) + .close(); } @Test @@ -60,10 +67,20 @@ public void connectWhenHostKeyProvidedThenShouldNotFail() throws IOException { } KnownHostsFileVerifier knownHostsFileVerifier = spy(new KnownHostsFileVerifier()); when(knownHostsFileVerifier.getKnownHostsFile()).thenReturn(fakeKnownHosts); - AbstractJGitHostKeyVerifier verifier = knownHostsFileVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); + // Should not fail because hostkey for 'github.com:22' is in known_hosts - jGitConnection.connect(verifier); + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + fakeKnownHosts, + knownHostsFileVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); } @Test @@ -77,10 +94,19 @@ public void connectWhenHostKeyInKnownHostsFileWithNotDefaultAlgorithmThenShouldN "github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="); KnownHostsFileVerifier knownHostsFileVerifier = spy(new KnownHostsFileVerifier()); when(knownHostsFileVerifier.getKnownHostsFile()).thenReturn(fakeKnownHosts); - AbstractJGitHostKeyVerifier verifier = knownHostsFileVerifier.forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should not fail because hostkey for 'github.com:22' is in known_hosts with algorithm 'ecdsa-sha2-nistp256 - jGitConnection.connect(verifier); + + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + fakeKnownHosts, + knownHostsFileVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); } @Test @@ -89,14 +115,4 @@ public void testVerifyHostKeyOptionWithDefaultFile() throws Exception { assertThat( verifier.forCliGit(TaskListener.NULL).getVerifyHostKeyOption(null), is("-o StrictHostKeyChecking=yes")); } - - /* Return true if running on a Kubernetes pod on ci.jenkins.io */ - private boolean isKubernetesCI() { - String kubernetesPort = System.getenv("KUBERNETES_PORT"); - String buildURL = System.getenv("BUILD_URL"); - return kubernetesPort != null - && !kubernetesPort.isEmpty() - && buildURL != null - && buildURL.startsWith("https://ci.jenkins.io/"); - } } diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsTestUtil.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsTestUtil.java index 72dcfee5c9..7ce011349d 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsTestUtil.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsTestUtil.java @@ -1,10 +1,37 @@ package org.jenkinsci.plugins.gitclient.verifier; +import static org.eclipse.jgit.transport.SshSessionFactory.getLocalUserName; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import hudson.util.ReflectionUtils; import java.io.File; import java.io.IOException; +import java.lang.reflect.Method; +import java.net.SocketAddress; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.PublicKey; +import java.time.Duration; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import org.apache.sshd.client.ClientBuilder; +import org.apache.sshd.client.SshClient; +import org.apache.sshd.client.config.hosts.ConfigFileHostEntryResolver; +import org.apache.sshd.client.future.ConnectFuture; +import org.apache.sshd.client.keyverifier.ServerKeyVerifier; +import org.apache.sshd.client.session.ClientSessionCreator; +import org.apache.sshd.common.compression.BuiltinCompressions; +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.io.IoSession; +import org.apache.sshd.common.util.net.SshdSocketAddress; +import org.eclipse.jgit.internal.transport.sshd.JGitClientSession; +import org.eclipse.jgit.internal.transport.sshd.JGitServerKeyVerifier; +import org.eclipse.jgit.internal.transport.sshd.JGitSshClient; +import org.eclipse.jgit.transport.sshd.IdentityPasswordProvider; import org.junit.rules.TemporaryFolder; public class KnownHostsTestUtil { @@ -43,4 +70,80 @@ public File createFakeKnownHosts(String fileContent) throws IOException { public List getKnownHostsContent(File file) throws IOException { return Files.readAllLines(file.toPath()); } + + protected static JGitClientSession connectToHost( + String host, + int port, + File knownHostsFile, + AbstractJGitHostKeyVerifier verifier, + Predicate asserts) + throws IOException { + + try (SshClient client = ClientBuilder.builder() + .factory(JGitSshClient::new) + .hostConfigEntryResolver(new ConfigFileHostEntryResolver(Paths.get("src/test/resources/ssh_config"))) + .serverKeyVerifier(new JGitServerKeyVerifier(verifier.getServerKeyDatabase())) + .compressionFactories(new ArrayList<>(BuiltinCompressions.VALUES)) + .build()) { + client.start(); + // just to avoid NPE + JGitSshClient jgitClient = (JGitSshClient) client; + jgitClient.setKeyPasswordProviderFactory(() -> new IdentityPasswordProvider(null)); + + ConnectFuture connectFuture = client.connect(getLocalUserName(), host, port); + JGitClientSession s = (JGitClientSession) + connectFuture.verify(Duration.ofMillis(3330000)).getClientSession(); + // make a simple call to force keys exchange + Method method = + ReflectionUtils.findMethod(s.getClass(), "getServices"); // sendKexInit //"doKexNegotiation"); + assert method != null; + method.setAccessible(true); + Object response = ReflectionUtils.invokeMethod(method, s); + assertThat(asserts.test(s), is(true)); + return s; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + protected static boolean checkKeys(JGitClientSession s) { + ServerKeyVerifier serverKeyVerifier = + Objects.requireNonNull(s.getServerKeyVerifier(), "No server key verifier"); + IoSession networkSession = s.getIoSession(); + SocketAddress remoteAddress = networkSession.getRemoteAddress(); + PublicKey serverKey = Objects.requireNonNull(s.getServerKey(), "No server key to verify"); + SshdSocketAddress targetServerAddress = s.getAttribute(ClientSessionCreator.TARGET_SERVER); + if (targetServerAddress != null) { + remoteAddress = targetServerAddress.toInetSocketAddress(); + } + + boolean verified = false; + if (serverKey instanceof OpenSshCertificate) { + // check if we trust the CA + verified = + serverKeyVerifier.verifyServerKey(s, remoteAddress, ((OpenSshCertificate) serverKey).getCaPubKey()); + + if (!verified) { + // fallback to actual public host key + serverKey = ((OpenSshCertificate) serverKey).getCertPubKey(); + } + } + + if (!verified) { + verified = serverKeyVerifier.verifyServerKey(s, remoteAddress, serverKey); + } + + return verified; + } + + /* Return true if running on a Kubernetes pod on ci.jenkins.io */ + public static boolean isKubernetesCI() { + return false; + // String kubernetesPort = System.getenv("KUBERNETES_PORT"); + // String buildURL = System.getenv("BUILD_URL"); + // return kubernetesPort != null + // && !kubernetesPort.isEmpty() + // && buildURL != null + // && buildURL.startsWith("https://ci.jenkins.io/"); + } } diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java index b8b4086c7b..36674a99bc 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java @@ -1,17 +1,19 @@ package org.jenkinsci.plugins.gitclient.verifier; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThrows; +import static org.jenkinsci.plugins.gitclient.verifier.KnownHostsTestUtil.isKubernetesCI; +import hudson.model.StreamBuildListener; import hudson.model.TaskListener; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Duration; import java.util.Collections; -import org.jenkinsci.plugins.gitclient.trilead.JGitConnection; +import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -27,24 +29,30 @@ public class ManuallyProvidedKeyVerifierTest { public TemporaryFolder testFolder = TemporaryFolder.builder().assureDeletion().build(); - private AbstractJGitHostKeyVerifier verifier; private String hostKey; @Before public void assignVerifier() { - hostKey = "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; + hostKey = + "|1|7qEjynZk0IodegnbgoPEhWtdgA8=|bGs7a1ktbGWwPuZqqTbAazUAULM= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; } @Test - public void connectWhenHostKeyProvidedForOtherHostNameThenShouldFail() { - verifier = new ManuallyProvidedKeyVerifier(hostKey).forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("bitbucket.org", 22); - - // Should fail because hostkey for 'bitbucket.org:22' is not manually provided - Exception exception = assertThrows(IOException.class, () -> { - jGitConnection.connect(verifier); - }); - assertThat(exception.getMessage(), containsString("There was a problem while connecting to bitbucket.org:22")); + public void connectWhenHostKeyProvidedForOtherHostNameThenShouldFail() throws Exception { + HostKeyVerifierFactory verifier = new ManuallyProvidedKeyVerifier(hostKey); + + KnownHostsTestUtil.connectToHost( + "bitbucket.org", + 22, + new File(testFolder.getRoot() + "/path/to/file/random"), + verifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(false)); + return true; + }) + .close(); } @Test @@ -52,24 +60,39 @@ public void connectWhenHostKeyProvidedThenShouldNotFail() throws Exception { if (isKubernetesCI()) { return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents } - verifier = new ManuallyProvidedKeyVerifier(hostKey).forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - - // Should not fail because hostkey for 'github.com:22' was provided - jGitConnection.connect(verifier); + ManuallyProvidedKeyVerifier verifier = new ManuallyProvidedKeyVerifier(hostKey); + ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier jGitHostKeyVerifier = + (ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier) + verifier.forJGit(StreamBuildListener.fromStdout()); + Path tempKnownHosts = Files.createTempFile("known_hosts", ""); + Files.write(tempKnownHosts, (hostKey + System.lineSeparator()).getBytes(StandardCharsets.UTF_8)); + KnownHostsTestUtil.connectToHost("github.com", 22, tempKnownHosts.toFile(), jGitHostKeyVerifier, s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + // Should not fail because hostkey for 'github.com:22' was provided + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); } @Test - public void connectWhenWrongHostKeyProvidedThenShouldFail() { - verifier = new ManuallyProvidedKeyVerifier( - "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9OOOO") - .forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - - Exception exception = assertThrows(IOException.class, () -> { - jGitConnection.connect(verifier); - }); - assertThat(exception.getMessage(), containsString("There was a problem while connecting to github.com:22")); + public void connectWhenWrongHostKeyProvidedThenShouldFail() throws Exception { + String key = "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9OOOO"; + HostKeyVerifierFactory verifier = new ManuallyProvidedKeyVerifier(key); + + ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier jGitHostKeyVerifier = + (ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier) + verifier.forJGit(StreamBuildListener.fromStdout()); + Path tempKnownHosts = Files.createTempFile("known_hosts", ""); + Files.write(tempKnownHosts, (key + System.lineSeparator()).getBytes(StandardCharsets.UTF_8)); + KnownHostsTestUtil.connectToHost("github.com", 22, tempKnownHosts.toFile(), jGitHostKeyVerifier, s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(false)); + return true; + }) + .close(); } @Test @@ -77,56 +100,22 @@ public void connectWhenHostKeyProvidedWithPortThenShouldNotFail() throws Excepti if (isKubernetesCI()) { return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents } - verifier = new ManuallyProvidedKeyVerifier( - "github.com:22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl") - .forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - - // Should not fail because hostkey for 'github.com:22' was provided - jGitConnection.connect(verifier); - } - - @Test - public void connectWhenProvidedHostnameWithPortHashedShouldNotFail() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } - // |1|L95XQhkJWMDrDLdtkT1oH7hj2ec=|A2ocjuIDw2x+SOhTnRU3IGjqai0= is github.com:22 - verifier = new ManuallyProvidedKeyVerifier( - "|1|L95XQhkJWMDrDLdtkT1oH7hj2ec=|A2ocjuIDw2x+SOhTnRU3IGjqai0= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=") - .forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - - // Should not fail because hostkey for 'github.com:22' was provided - jGitConnection.connect(verifier); - } - - @Test - public void connectWhenProvidedHostnameWithoutPortHashedShouldNotFail() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } - // |1|Sps9q6AJcYKtFor8T+uOUSdidVc=|liZf9T3FN9jJG2NPwUXK9b/YB+g= is github.com - verifier = new ManuallyProvidedKeyVerifier( - "|1|Sps9q6AJcYKtFor8T+uOUSdidVc=|liZf9T3FN9jJG2NPwUXK9b/YB+g= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=") - .forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - - // Should not fail because hostkey for 'github.com' was provided - jGitConnection.connect(verifier); - } - - @Test - public void connectWhenHostKeyProvidedThenShouldFail() { - verifier = new ManuallyProvidedKeyVerifier( - "github.com:33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl") - .forJGit(TaskListener.NULL); - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - - Exception exception = assertThrows(IOException.class, () -> { - jGitConnection.connect(verifier); - }); - assertThat(exception.getMessage(), containsString("There was a problem while connecting to github.com:22")); + String key = + "github.com:22 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; + HostKeyVerifierFactory verifier = new ManuallyProvidedKeyVerifier(key); + + ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier jGitHostKeyVerifier = + (ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier) + verifier.forJGit(StreamBuildListener.fromStdout()); + Path tempKnownHosts = Files.createTempFile("known_hosts", ""); + Files.write(tempKnownHosts, (key + System.lineSeparator()).getBytes(StandardCharsets.UTF_8)); + KnownHostsTestUtil.connectToHost("github.com", 22, tempKnownHosts.toFile(), jGitHostKeyVerifier, s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + return true; + }) + .close(); } @Test @@ -161,14 +150,4 @@ public void testGetVerifyHostKeyOptionOnWindows() throws IOException { private boolean isWindows() { return File.pathSeparatorChar == ';'; } - - /* Return true if running on a Kubernetes pod on ci.jenkins.io */ - private boolean isKubernetesCI() { - String kubernetesPort = System.getenv("KUBERNETES_PORT"); - String buildURL = System.getenv("BUILD_URL"); - return kubernetesPort != null - && !kubernetesPort.isEmpty() - && buildURL != null - && buildURL.startsWith("https://ci.jenkins.io/"); - } } diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java index 1609e7ba0d..d2a7bdf327 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java @@ -2,11 +2,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.jenkinsci.plugins.gitclient.verifier.KnownHostsTestUtil.isKubernetesCI; +import hudson.model.StreamBuildListener; import hudson.model.TaskListener; import java.io.IOException; import java.nio.file.Paths; -import org.jenkinsci.plugins.gitclient.trilead.JGitConnection; +import java.time.Duration; +import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Test; @@ -20,13 +23,26 @@ public void assignVerifier() { } @Test - public void testVerifyServerHostKey() throws IOException { + public void verifyServerHostKey() throws IOException { if (isKubernetesCI()) { return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents } - JGitConnection jGitConnection = new JGitConnection("github.com", 22); - // Should not fail because verifyServerHostKey always true - jGitConnection.connect(verifier.forJGit(TaskListener.NULL)); + + NoHostKeyVerifier acceptFirstConnectionVerifier = new NoHostKeyVerifier(); + + KnownHostsTestUtil.connectToHost( + "github.com", + 22, + null, + acceptFirstConnectionVerifier.forJGit(StreamBuildListener.fromStdout()), + s -> { + assertThat(s.isOpen(), is(true)); + Awaitility.await().atMost(Duration.ofSeconds(45)).until(() -> s.getServerKey() != null); + assertThat(KnownHostsTestUtil.checkKeys(s), is(true)); + // Should not fail because verifyServerHostKey always true + return true; + }) + .close(); } @Test @@ -35,14 +51,4 @@ public void testVerifyHostKeyOption() throws IOException { verifier.forCliGit(TaskListener.NULL).getVerifyHostKeyOption(Paths.get("")), is("-o StrictHostKeyChecking=no")); } - - /* Return true if running on a Kubernetes pod on ci.jenkins.io */ - private boolean isKubernetesCI() { - String kubernetesPort = System.getenv("KUBERNETES_PORT"); - String buildURL = System.getenv("BUILD_URL"); - return kubernetesPort != null - && !kubernetesPort.isEmpty() - && buildURL != null - && buildURL.startsWith("https://ci.jenkins.io/"); - } } diff --git a/src/test/resources/ssh_config b/src/test/resources/ssh_config new file mode 100644 index 0000000000..e1a5675e19 --- /dev/null +++ b/src/test/resources/ssh_config @@ -0,0 +1,3 @@ +Host github.com + Hostname github.com + HostKeyAlgorithms ecdsa-sha2-nistp256 \ No newline at end of file