Skip to content
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.

Sign up for GitHub

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

CHE-1893; fix authorization flow during clone from private repo #1905

Merged
merged 2 commits into from
Jul 22, 2016
Merged

CHE-1893; fix authorization flow during clone from private repo #1905

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51f8abc
CHE-1893; fix authorization flow during clone from private repo
mshaposhnik Jul 22, 2016
d75f096
fixup! CHE-1893; fix authorization flow during clone from private repo
mshaposhnik Jul 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions ...nt/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.jgit;

import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
Expand Down Expand Up @@ -51,6 +52,7 @@
import org.eclipse.che.api.git.shared.MergeRequest;
import org.eclipse.che.api.git.shared.MergeResult;
import org.eclipse.che.api.git.shared.MoveRequest;
import org.eclipse.che.api.git.shared.ProviderInfo;
import org.eclipse.che.api.git.shared.PullRequest;
import org.eclipse.che.api.git.shared.PullResponse;
import org.eclipse.che.api.git.shared.PushRequest;
Expand Down Expand Up @@ -170,6 +172,8 @@
import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.eclipse.che.api.git.shared.ProviderInfo.AUTHENTICATE_URL;
import static org.eclipse.che.api.git.shared.ProviderInfo.PROVIDER_NAME;
import static org.eclipse.che.dto.server.DtoFactory.newDto;

/**
Expand Down Expand Up @@ -1564,12 +1568,12 @@ public boolean accept(File dir) {
*/
private Object executeRemoteCommand(String remoteUrl, TransportCommand command)
throws GitException, GitAPIException, UnauthorizedException {
String sshKeyDirectoryPath = "";
File keyDirectory = null;
UserCredential credentials = null;
try {
if (GitUrlUtils.isSSH(remoteUrl)) {
File keyDirectory = Files.createTempDir();
sshKeyDirectoryPath = keyDirectory.getPath();
File sshKey = writePrivateKeyFile(remoteUrl, keyDirectory);
keyDirectory = Files.createTempDir();
final File sshKey = writePrivateKeyFile(remoteUrl, keyDirectory);

SshSessionFactory sshSessionFactory = new JschConfigSessionFactory() {
@Override
Expand All @@ -1593,7 +1597,7 @@ public void configure(Transport transport) {
}
});
} else {
UserCredential credentials = credentialsLoader.getUserCredential(remoteUrl);
credentials = credentialsLoader.getUserCredential(remoteUrl);
if (credentials != null) {
command.setCredentialsProvider(new UsernamePasswordCredentialsProvider(credentials.getUserName(),
credentials.getPassword()));
Expand All @@ -1604,16 +1608,25 @@ public void configure(Transport transport) {

return command.call();
} catch (GitException | TransportException exception) {
if ("Unable get private ssh key".equals(exception.getMessage())
|| exception.getMessage().contains(ERROR_AUTHENTICATION_REQUIRED)) {
throw new UnauthorizedException(exception.getMessage());
if ("Unable get private ssh key".equals(exception.getMessage())) {
throw new UnauthorizedException(exception.getMessage(), ErrorCodes.UNABLE_GET_PRIVATE_SSH_KEY);
} else if (exception.getMessage().contains(ERROR_AUTHENTICATION_REQUIRED)) {
final ProviderInfo info = credentialsLoader.getProviderInfo(remoteUrl);
if (info != null) {
throw new UnauthorizedException(exception.getMessage(),
ErrorCodes.UNAUTHORIZED_GIT_OPERATION,
ImmutableMap.of(PROVIDER_NAME, info.getProviderName(),
AUTHENTICATE_URL, info.getAuthenticateUrl(),
"authenticated", Boolean.toString(credentials != null)));
}
throw new UnauthorizedException(exception.getMessage(), ErrorCodes.UNAUTHORIZED_GIT_OPERATION);
} else {
throw exception;
}
} finally {
if (!sshKeyDirectoryPath.isEmpty()) {
if (keyDirectory != null && keyDirectory.exists()) {
try {
FileUtils.delete(new File(sshKeyDirectoryPath), FileUtils.RECURSIVE);
FileUtils.delete(keyDirectory, FileUtils.RECURSIVE);
} catch (IOException exception) {
throw new GitException("Can't remove SSH key directory", exception);
}
Expand Down