proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-05 18:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1717 from libgit2/arrbee/pr-1706-merged-and-cleaned

Browse Source 
PR 1706 plus error reporting cleanups
This commit is contained in:
Vicent Martí 2013-07-10 10:58:26 -07:00
commit bf730611da
3 changed files with 100 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/transports/cred.c
View File

@ -33,8 +33,7 @@ int git_cred_userpass_plaintext_new(
{
git_cred_userpass_plaintext *c;
if (!cred)
return -1;
assert(cred);
c = git__malloc(sizeof(git_cred_userpass_plaintext));
GITERR_CHECK_ALLOC(c);

2
src/transports/smart_protocol.c
View File

@ -372,7 +372,7 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
return error;
if (pkt->type == GIT_PKT_NAK ||
(pkt->type == GIT_PKT_ACK && pkt->status != GIT_ACK_CONTINUE)) {
(pkt->type == GIT_PKT_ACK && pkt->status != GIT_ACK_CONTINUE)) {
git__free(pkt);
break;
}

193
src/transports/ssh.c
View File

@ -55,6 +55,7 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url)
}
if (!repo) {
giterr_set(GITERR_NET, "Malformed git protocol URL");
return -1;
}
@ -79,13 +80,11 @@ static int send_command(ssh_stream *s)
if (error < 0)
goto cleanup;
error = libssh2_channel_exec(
s->channel,
request.ptr
);
if (0 != error)
error = libssh2_channel_exec(s->channel, request.ptr);
if (error < 0) {
giterr_set(GITERR_NET, "SSH could not execute request");
goto cleanup;
}
s->sent_command = 1;
@ -100,6 +99,7 @@ static int ssh_stream_read(
size_t buf_size,
size_t *bytes_read)
{
int rc;
ssh_stream *s = (ssh_stream *)stream;
*bytes_read = 0;
@ -107,9 +107,10 @@ static int ssh_stream_read(
if (!s->sent_command && send_command(s) < 0)
return -1;
int rc = libssh2_channel_read(s->channel, buffer, buf_size);
if (rc < 0)
if ((rc = libssh2_channel_read(s->channel, buffer, buf_size)) < 0) {
giterr_set(GITERR_NET, "SSH could not read data");
return -1;
}
*bytes_read = rc;
@ -126,12 +127,12 @@ static int ssh_stream_write(
if (!s->sent_command && send_command(s) < 0)
return -1;
int rc = libssh2_channel_write(s->channel, buffer, len);
if (rc < 0) {
if (libssh2_channel_write(s->channel, buffer, len) < 0) {
giterr_set(GITERR_NET, "SSH could not write data");
return -1;
}
return rc;
return 0;
}
static void ssh_stream_free(git_smart_subtransport_stream *stream)
@ -146,17 +147,18 @@ static void ssh_stream_free(git_smart_subtransport_stream *stream)
if (s->channel) {
libssh2_channel_close(s->channel);
libssh2_channel_free(s->channel);
s->channel = NULL;
libssh2_channel_free(s->channel);
s->channel = NULL;
}
if (s->session) {
libssh2_session_free(s->session), s->session = NULL;
libssh2_session_free(s->session);
s->session = NULL;
}
if (s->socket.socket) {
ret = gitno_close(&s->socket);
assert(!ret);
(void)gitno_close(&s->socket);
/* can't do anything here with error return value */
}
git__free(s->url);
@ -171,8 +173,7 @@ static int ssh_stream_alloc(
{
ssh_stream *s;
if (!stream)
return -1;
assert(stream);
s = git__calloc(sizeof(ssh_stream), 1);
GITERR_CHECK_ALLOC(s);
@ -183,8 +184,8 @@ static int ssh_stream_alloc(
s->parent.free = ssh_stream_free;
s->cmd = cmd;
s->url = git__strdup(url);
s->url = git__strdup(url);
if (!s->url) {
git__free(s);
return -1;
@ -202,7 +203,7 @@ static int git_ssh_extract_url_parts(
char *colon, *at;
const char *start;
colon = strchr(url, ':');
colon = strchr(url, ':');
if (colon == NULL) {
giterr_set(GITERR_NET, "Malformed URL: missing :");
@ -217,8 +218,10 @@ static int git_ssh_extract_url_parts(
start = url;
*username = git__strdup(default_user);
}
GITERR_CHECK_ALLOC(*username);
*host = git__substrdup(start, colon - start);
GITERR_CHECK_ALLOC(*host);
return 0;
}
@ -226,95 +229,80 @@ static int git_ssh_extract_url_parts(
static int _git_ssh_authenticate_session(
LIBSSH2_SESSION* session,
const char *user,
git_cred* cred
)
git_cred* cred)
{
int rc;
do {
switch (cred->credtype) {
case GIT_CREDTYPE_USERPASS_PLAINTEXT: {
git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred;
rc = libssh2_userauth_password(
session,
c->username,
c->password
);
break;
}
case GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE: {
git_cred_ssh_keyfile_passphrase *c = (git_cred_ssh_keyfile_passphrase *)cred;
rc = libssh2_userauth_publickey_fromfile(
session,
user,
c->publickey,
c->privatekey,
c->passphrase
);
break;
}
case GIT_CREDTYPE_SSH_PUBLICKEY: {
git_cred_ssh_publickey *c = (git_cred_ssh_publickey *)cred;
rc = libssh2_userauth_publickey(
session,
user,
(const unsigned char *)c->publickey,
c->publickey_len,
c->sign_callback,
&c->sign_data
);
break;
}
default:
rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED;
case GIT_CREDTYPE_USERPASS_PLAINTEXT: {
git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred;
rc = libssh2_userauth_password(session, c->username, c->password);
break;
}
} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
case GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE: {
git_cred_ssh_keyfile_passphrase *c = (git_cred_ssh_keyfile_passphrase *)cred;
rc = libssh2_userauth_publickey_fromfile(
session, user, c->publickey, c->privatekey, c->passphrase);
break;
}
case GIT_CREDTYPE_SSH_PUBLICKEY: {
git_cred_ssh_publickey *c = (git_cred_ssh_publickey *)cred;
rc = libssh2_userauth_publickey(
session, user, (const unsigned char *)c->publickey,
c->publickey_len, c->sign_callback, &c->sign_data);
break;
}
default:
rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED;
}
} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
return rc;
}
static int _git_ssh_session_create
(
LIBSSH2_SESSION** session,
gitno_socket socket
)
{
if (!session) {
if (rc != 0) {
giterr_set(GITERR_NET, "Failed to authenticate SSH session");
return -1;
}
LIBSSH2_SESSION* s = libssh2_session_init();
if (!s)
return -1;
return 0;
}
int rc = 0;
do {
rc = libssh2_session_startup(s, socket.socket);
} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
static int _git_ssh_session_create(
LIBSSH2_SESSION** session,
gitno_socket socket)
{
int rc = 0;
LIBSSH2_SESSION* s;
assert(session);
s = libssh2_session_init();
if (!s) {
giterr_set(GITERR_NET, "Failed to initialize SSH session");
return -1;
}
do {
rc = libssh2_session_startup(s, socket.socket);
} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
if (0 != rc) {
goto on_error;
}
libssh2_session_free(s);
giterr_set(GITERR_NET, "Failed to start SSH session");
return -1;
}
libssh2_session_set_blocking(s, 1);
*session = s;
return 0;
on_error:
if (s) {
libssh2_session_free(s), s = NULL;
}
return -1;
}
static int _git_ssh_setup_conn(
ssh_subtransport *t,
const char *url,
const char *cmd,
git_smart_subtransport_stream **stream
)
git_smart_subtransport_stream **stream)
{
char *host, *port=NULL, *user=NULL, *pass=NULL;
const char *default_port="22";
@ -345,29 +333,40 @@ static int _git_ssh_setup_conn(
if (user && pass) {
if (git_cred_userpass_plaintext_new(&t->cred, user, pass) < 0)
goto on_error;
} else {
if (t->owner->cred_acquire_cb(&t->cred,
t->owner->url,
user,
GIT_CREDTYPE_USERPASS_PLAINTEXT | GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE,
} else if (t->owner->cred_acquire_cb) {
if (t->owner->cred_acquire_cb(
&t->cred, t->owner->url, user,
GIT_CREDTYPE_USERPASS_PLAINTEXT |
GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE,
t->owner->cred_acquire_payload) < 0)
return -1;
goto on_error;
if (!t->cred) {
giterr_set(GITERR_NET, "Callback failed to initialize SSH credentials");
goto on_error;
}
} else {
giterr_set(GITERR_NET, "Cannot set up SSH connection without credentials");
goto on_error;
}
assert(t->cred);
if (!user) {
user = git__strdup(default_user);
GITERR_CHECK_ALLOC(user);
}
if (_git_ssh_session_create(&session, s->socket) < 0)
goto on_error;
if (_git_ssh_authenticate_session(session, user, t->cred) < 0)
if (_git_ssh_authenticate_session(session, user, t->cred) < 0)
goto on_error;
channel = libssh2_channel_open_session(session);
if (!channel)
goto on_error;
if (!channel) {
giterr_set(GITERR_NET, "Failed to open SSH channel");
goto on_error;
}
libssh2_channel_set_blocking(channel, 1);
@ -383,6 +382,10 @@ static int _git_ssh_setup_conn(
return 0;
on_error:
s->session = NULL;
s->channel = NULL;
t->current_stream = NULL;
if (*stream)
ssh_stream_free(*stream);
@ -392,7 +395,7 @@ on_error:
git__free(pass);
if (session)
libssh2_session_free(session), session = NULL;
libssh2_session_free(session);
return -1;
}