kwin commented on code in PR #155: URL: https://github.com/apache/maven-scm/pull/155#discussion_r926905502
########## maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java: ########## @@ -0,0 +1,149 @@ +package org.apache.maven.scm.provider.git.jgit.command.checkout; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.security.GeneralSecurityException; +import java.security.PublicKey; +import java.util.function.Consumer; + +import org.apache.commons.io.IOUtils; +import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost; +import org.apache.maven.scm.provider.git.command.checkout.GitSshCheckOutCommandTckTest; +import org.apache.maven.scm.provider.git.jgit.JGitTestScmProvider; +import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory; +import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; +import org.apache.maven.scm.repository.ScmRepository; +import org.apache.sshd.common.config.keys.PublicKeyEntry; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.internal.transport.sshd.OpenSshServerKeyDatabase; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; +import org.slf4j.Logger; + +/** @author <a href="mailto:[email protected]";>Mark Struberg</a> */ +public class JGitSshCheckOutCommandTckTest + extends GitSshCheckOutCommandTckTest +{ + + public JGitSshCheckOutCommandTckTest() throws GeneralSecurityException, IOException + { + super(); + } + + @Override + protected String getScmProvider() + { + return "jgit"; + } + + @Override + public void initRepo() throws Exception + { + super.initRepo(); + JGitTestScmProvider provider = (JGitTestScmProvider) getScmManager().getProviderByRepository( getScmRepository() ); + // accept all hosts + provider.registerCheckOutCommandCallback( new Consumer<JGitCheckOutCommand>() + { + @Override + public void accept( JGitCheckOutCommand command ) + { + command.setSshSessionFactorySupplier( AcceptAllHostsSshdSessionFactory::new ); + } + + } ); + } + + private static final class AcceptAllHostsSshdSessionFactory extends ScmProviderAwareSshdSessionFactory + { + public AcceptAllHostsSshdSessionFactory( GitScmProviderRepository repo, Logger logger ) + { + super( repo, logger ); + } + + @Override + protected ServerKeyDatabase createServerKeyDatabase( File homeDir, File sshDir ) + { + return new OpenSshServerKeyDatabase( false, null ) + { + @Override + public boolean accept( @NonNull String connectAddress, + @NonNull InetSocketAddress remoteAddress, + @NonNull PublicKey serverKey, + @NonNull Configuration config, CredentialsProvider provider ) + { + return true; + } + }; + } + } + + @Override + protected void deleteDirectory( File directory ) + throws IOException + { + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } + } + + @Test + public void testCheckOutCommandTestWithOpenSSHPrivateKey() + throws Exception + { + configureKeypairFromResource( getScmRepository(), "sample_rsa", "mySecret"); + super.testCheckOutCommandTest(); + } + + private void configureKeypairFromResource( ScmRepository repository, String resourceName, String passphrase ) + throws IOException, GeneralSecurityException + { + // accept public key + try ( InputStream publicKeyInputStream = this.getClass().getResourceAsStream( "/ssh-keypairs/" + resourceName + ".pub")) Review Comment: Done in https://github.com/apache/maven-scm/pull/155/commits/9f86604ea544ad802dffcd48e5c381facebb9269. ########## maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java: ########## @@ -0,0 +1,149 @@ +package org.apache.maven.scm.provider.git.jgit.command.checkout; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.security.GeneralSecurityException; +import java.security.PublicKey; +import java.util.function.Consumer; + +import org.apache.commons.io.IOUtils; +import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost; +import org.apache.maven.scm.provider.git.command.checkout.GitSshCheckOutCommandTckTest; +import org.apache.maven.scm.provider.git.jgit.JGitTestScmProvider; +import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory; +import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; +import org.apache.maven.scm.repository.ScmRepository; +import org.apache.sshd.common.config.keys.PublicKeyEntry; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.internal.transport.sshd.OpenSshServerKeyDatabase; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; +import org.slf4j.Logger; + +/** @author <a href="mailto:[email protected]";>Mark Struberg</a> */ +public class JGitSshCheckOutCommandTckTest + extends GitSshCheckOutCommandTckTest +{ + + public JGitSshCheckOutCommandTckTest() throws GeneralSecurityException, IOException + { + super(); + } + + @Override + protected String getScmProvider() + { + return "jgit"; + } + + @Override + public void initRepo() throws Exception + { + super.initRepo(); + JGitTestScmProvider provider = (JGitTestScmProvider) getScmManager().getProviderByRepository( getScmRepository() ); + // accept all hosts + provider.registerCheckOutCommandCallback( new Consumer<JGitCheckOutCommand>() + { + @Override + public void accept( JGitCheckOutCommand command ) + { + command.setSshSessionFactorySupplier( AcceptAllHostsSshdSessionFactory::new ); + } + + } ); + } + + private static final class AcceptAllHostsSshdSessionFactory extends ScmProviderAwareSshdSessionFactory + { + public AcceptAllHostsSshdSessionFactory( GitScmProviderRepository repo, Logger logger ) + { + super( repo, logger ); + } + + @Override + protected ServerKeyDatabase createServerKeyDatabase( File homeDir, File sshDir ) + { + return new OpenSshServerKeyDatabase( false, null ) + { + @Override + public boolean accept( @NonNull String connectAddress, + @NonNull InetSocketAddress remoteAddress, + @NonNull PublicKey serverKey, + @NonNull Configuration config, CredentialsProvider provider ) + { + return true; + } + }; + } + } + + @Override + protected void deleteDirectory( File directory ) + throws IOException + { + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } + } + + @Test + public void testCheckOutCommandTestWithOpenSSHPrivateKey() + throws Exception + { + configureKeypairFromResource( getScmRepository(), "sample_rsa", "mySecret"); + super.testCheckOutCommandTest(); + } + + private void configureKeypairFromResource( ScmRepository repository, String resourceName, String passphrase ) + throws IOException, GeneralSecurityException + { + // accept public key + try ( InputStream publicKeyInputStream = this.getClass().getResourceAsStream( "/ssh-keypairs/" + resourceName + ".pub")) + { + PublicKey publicKey = PublicKeyEntry.parsePublicKeyEntry( IOUtils.toString( publicKeyInputStream, StandardCharsets.US_ASCII ) ).resolvePublicKey( null, null, null ); + acceptedPublicKeys.add( publicKey ); + } + Path privateKeyFile = Files.createTempFile( "privateKey", null ); + // private key into tmp file + try ( InputStream privateKeyInputStream = this.getClass().getResourceAsStream( "/ssh-keypairs/" + resourceName )) + { + Files.copy( privateKeyInputStream, privateKeyFile, StandardCopyOption.REPLACE_EXISTING ); + } + // configure provider repository with private key details + ScmProviderRepositoryWithHost providerRepository = + ScmProviderRepositoryWithHost.class.cast( repository.getProviderRepository() ); + if ( passphrase != null ) Review Comment: Right, simplified in https://github.com/apache/maven-scm/pull/155/commits/9f86604ea544ad802dffcd48e5c381facebb9269. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
