Add support of BasicAuthentication Authentication to Git #1940
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2012-2016 Codenvy, S.A. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Codenvy, S.A. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.api.git; | ||
|
|
||
| import com.google.inject.Singleton; | ||
| import org.eclipse.che.api.git.shared.ProviderInfo; | ||
|
|
||
| /** | ||
| * Credentials provider for Git basic authentication | ||
| * | ||
| * @author Yossi Balan | ||
| */ | ||
| @Singleton | ||
| public class GitBasicAuthenticationCredentialsProvider implements CredentialsProvider { | ||
|
|
||
| private static ThreadLocal<UserCredential> currRequestCredentials = new ThreadLocal<>(); | ||
| private static final String BASIC_PROVIDER_NAME = "basic"; | ||
|
|
||
| @Override | ||
| public UserCredential getUserCredential() { | ||
| return currRequestCredentials.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getId() { | ||
| return BASIC_PROVIDER_NAME; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean canProvideCredentials(String url) { | ||
| return getUserCredential() != null; | ||
|
There was a problem hiding this comment. Can we provide credentials for all urls? Even ssh? There was a problem hiding this comment. @sleshchenko - only http or https |
||
| } | ||
|
|
||
| @Override | ||
| public ProviderInfo getProviderInfo() { | ||
| return new ProviderInfo(BASIC_PROVIDER_NAME); | ||
| } | ||
|
|
||
| public static void setCurrentCredentials(String user, String password) { | ||
| UserCredential creds = new UserCredential(user, password, BASIC_PROVIDER_NAME); | ||
| currRequestCredentials.set(creds); | ||
| } | ||
|
|
||
| public static void clearCredentials() { | ||
| currRequestCredentials.set(null); | ||
| } | ||
|
|
||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,6 +81,7 @@ | |
| import org.eclipse.che.api.git.shared.TagCreateRequest; | ||
| import org.eclipse.che.api.git.shared.TagDeleteRequest; | ||
| import org.eclipse.che.api.git.shared.TagListRequest; | ||
| import org.eclipse.che.api.git.shared.GitRequest; | ||
| import org.eclipse.che.plugin.ssh.key.script.SshKeyProvider; | ||
| import org.eclipse.che.commons.proxy.ProxyAuthenticator; | ||
| import org.eclipse.jgit.api.AddCommand; | ||
|
|
@@ -515,7 +516,7 @@ protected void onEndTask(String taskName, int workCurr, int workTotal, int perce | |
| } | ||
| }); | ||
|
|
||
| executeRemoteCommand(remoteUri, cloneCommand , request); | ||
|
|
||
| StoredConfig repositoryConfig = getRepository().getConfig(); | ||
| GitUser gitUser = getUser(); | ||
|
|
@@ -696,7 +697,7 @@ public void fetch(FetchRequest request) throws GitException, UnauthorizedExcepti | |
| } | ||
| fetchCommand.setRemoveDeletedRefs(request.isRemoveDeletedRefs()); | ||
|
|
||
| executeRemoteCommand(remoteUri, fetchCommand, request); | ||
| } catch (GitException | GitAPIException exception) { | ||
| String errorMessage; | ||
| if (exception.getMessage().contains("Invalid remote: ")) { | ||
|
|
@@ -1013,7 +1014,7 @@ public PullResponse pull(PullRequest request) throws GitException, UnauthorizedE | |
| fetchCommand.setTimeout(timeout); | ||
| } | ||
|
|
||
| FetchResult fetchResult = (FetchResult)executeRemoteCommand(remoteUri, fetchCommand, request); | ||
|
|
||
| Ref remoteBranchRef = fetchResult.getAdvertisedRef(remoteBranch); | ||
| if (remoteBranchRef == null) { | ||
|
|
@@ -1081,7 +1082,7 @@ public PushResponse push(PushRequest request) throws GitException, UnauthorizedE | |
| } | ||
| try { | ||
| @SuppressWarnings("unchecked") | ||
| Iterable<PushResult> pushResults = (Iterable<PushResult>)executeRemoteCommand(remoteUri, pushCommand, request); | ||
| PushResult pushResult = pushResults.iterator().next(); | ||
| String commandOutput = pushResult.getMessages().isEmpty() ? "Successfully pushed to " + remoteUri : pushResult.getMessages(); | ||
| Collection<RemoteRefUpdate> refUpdates = pushResult.getRemoteUpdates(); | ||
|
|
@@ -1589,10 +1590,11 @@ public boolean accept(File dir) { | |
| * @throws UnauthorizedException | ||
| */ | ||
| @VisibleForTesting | ||
| Object executeRemoteCommand(String remoteUrl, TransportCommand command, GitRequest request) | ||
| throws GitException, GitAPIException, UnauthorizedException { | ||
| File keyDirectory = null; | ||
| UserCredential credentials = null; | ||
|
|
||
| try { | ||
| if (GitUrlUtils.isSSH(remoteUrl)) { | ||
| keyDirectory = Files.createTempDir(); | ||
|
|
@@ -1622,14 +1624,19 @@ protected JSch getJSch(final OpenSshConfig.Host hc, FS fs) throws JSchException | |
| String password = remoteUrl.substring(remoteUrl.lastIndexOf(":") + 1, remoteUrl.indexOf("@")); | ||
| command.setCredentialsProvider(new UsernamePasswordCredentialsProvider(username, password)); | ||
| } else { | ||
| String gitUser = request.getAttributes().get("username"); | ||
| String gitPassword = request.getAttributes().get("password"); | ||
|
There was a problem hiding this comment. Please format this according to https://github.com/codenvy/codenvy-dev-resources/wiki/Formatting#for-assignment-operator-the-break-comes-after-the-symbol. |
||
| if (gitUser != null && gitPassword != null) { | ||
| command.setCredentialsProvider(new UsernamePasswordCredentialsProvider(gitUser, gitPassword)); | ||
| } else { | ||
| credentials = credentialsLoader.getUserCredential(remoteUrl); | ||
| if (credentials != null) { | ||
| command.setCredentialsProvider( | ||
| new UsernamePasswordCredentialsProvider(credentials.getUserName(), credentials.getPassword())); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ProxyAuthenticator.initAuthenticator(remoteUrl); | ||
| return command.call(); | ||
| } catch (GitException | TransportException exception) { | ||
|
|
@@ -1656,7 +1663,6 @@ protected JSch getJSch(final OpenSshConfig.Host hc, FS fs) throws JSchException | |
| throw new GitException("Can't remove SSH key directory", exception); | ||
| } | ||
| } | ||
| ProxyAuthenticator.resetAuthenticator(); | ||
| } | ||
| } | ||
|
|
||
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
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.
also please fix java doc of getAuthenticateUrl method and describe that it can return null value and add org.eclipse.che.commons.annotation.Nullable for it