-
Notifications
You must be signed in to change notification settings - Fork 174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SCM-995] Upgrade JGit to 5.13.1 and leverage Apache Mina SSHD instead of JSch #153
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
...va/org/apache/maven/scm/provider/git/jgit/command/ScmProviderAwareSshdSessionFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package org.apache.maven.scm.provider.git.jgit.command; | ||
|
|
||
| /* | ||
| * 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.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; | ||
| import org.eclipse.jgit.transport.CredentialsProvider; | ||
| import org.eclipse.jgit.transport.URIish; | ||
| import org.eclipse.jgit.transport.sshd.IdentityPasswordProvider; | ||
| import org.eclipse.jgit.transport.sshd.KeyPasswordProvider; | ||
| import org.eclipse.jgit.transport.sshd.SshdSessionFactory; | ||
| import org.eclipse.jgit.util.StringUtils; | ||
| import org.slf4j.Logger; | ||
|
|
||
| /** | ||
| * {@link SshdSessionFactory} considering the settings from {@link GitScmProviderRepository}. | ||
| * | ||
| */ | ||
| public class ScmProviderAwareSshdSessionFactory extends SshdSessionFactory | ||
| { | ||
| private final GitScmProviderRepository repo; | ||
| private final Logger logger; | ||
|
|
||
| public ScmProviderAwareSshdSessionFactory( GitScmProviderRepository repo, Logger logger ) | ||
| { | ||
| this.repo = repo; | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<Path> getDefaultIdentities( File sshDir ) | ||
| { | ||
| if ( !StringUtils.isEmptyOrNull( repo.getPrivateKey() ) ) | ||
| { | ||
| logger.debug( "Using private key at {}", repo.getPrivateKey() ); | ||
michael-o marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return Collections.singletonList( Paths.get( repo.getPrivateKey() ) ); | ||
| } | ||
| else | ||
| { | ||
| return super.getDefaultIdentities( sshDir ); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected KeyPasswordProvider createKeyPasswordProvider( CredentialsProvider provider ) | ||
| { | ||
| if ( repo.getPassphrase() != null ) | ||
| { | ||
| return new IdentityPasswordProvider( provider ) | ||
| { | ||
| @Override | ||
| public char[] getPassphrase( URIish uri, int attempt ) throws IOException | ||
| { | ||
| if ( attempt > 0 ) | ||
| { | ||
| throw new IOException( "Passphrase was not correct in first attempt, " | ||
| + "canceling further attempts!" ); | ||
| } | ||
| logger.debug( "Using stored passphrase" ); | ||
| return repo.getPassphrase().toCharArray(); | ||
| } | ||
| }; | ||
| } | ||
| else | ||
| { | ||
| return super.createKeyPasswordProvider( provider ); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this strictly required to test gitexe ssh alternative private key? I don't think so. If not, I'd recomment to remove the JGit bits from here, complete gitexe with whatever is required then do two JGit PRs. WDYT?