proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-15 20:18:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tab indent.

Browse Source
This commit is contained in:
Etienne Samson 2013-07-10 10:29:32 +02:00
parent 367c1903e9
commit 08bf80fa2b
1 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
src/transports/ssh.c
View File

@ -46,27 +46,27 @@ typedef struct {
static int gen_proto(git_buf *request, const char *cmd, const char *url) static int gen_proto(git_buf *request, const char *cmd, const char *url)
{ {
char *repo; char *repo;
if (!git__prefixcmp(url, prefix_ssh)) { if (!git__prefixcmp(url, prefix_ssh)) {
url = url + strlen(prefix_ssh); url = url + strlen(prefix_ssh);
repo = strchr(url, '/'); repo = strchr(url, '/');
} else { } else {
repo = strchr(url, ':'); repo = strchr(url, ':');
} }
if (!repo) { if (!repo) {
return -1; return -1;
} }
int len = strlen(cmd) + 1 /* Space */ + 1 /* Quote */ + strlen(repo) + 1 /* Quote */ + 1; int len = strlen(cmd) + 1 /* Space */ + 1 /* Quote */ + strlen(repo) + 1 /* Quote */ + 1;
git_buf_grow(request, len); git_buf_grow(request, len);
git_buf_printf(request, "%s '%s'", cmd, repo); git_buf_printf(request, "%s '%s'", cmd, repo);
git_buf_putc(request, '\0'); git_buf_putc(request, '\0');
if (git_buf_oom(request)) if (git_buf_oom(request))
return -1; return -1;
return 0; return 0;
} }
@ -74,11 +74,11 @@ static int send_command(ssh_stream *s)
{ {
int error; int error;
git_buf request = GIT_BUF_INIT; git_buf request = GIT_BUF_INIT;
error = gen_proto(&request, s->cmd, s->url); error = gen_proto(&request, s->cmd, s->url);
if (error < 0) if (error < 0)
goto cleanup; goto cleanup;
error = libssh2_channel_exec( error = libssh2_channel_exec(
s->channel, s->channel,
request.ptr request.ptr
@ -86,9 +86,9 @@ static int send_command(ssh_stream *s)
if (0 != error) if (0 != error)
goto cleanup; goto cleanup;
s->sent_command = 1; s->sent_command = 1;
cleanup: cleanup:
git_buf_free(&request); git_buf_free(&request);
return error; return error;
@ -101,18 +101,18 @@ static int ssh_stream_read(
size_t *bytes_read) size_t *bytes_read)
{ {
ssh_stream *s = (ssh_stream *)stream; ssh_stream *s = (ssh_stream *)stream;
*bytes_read = 0; *bytes_read = 0;
if (!s->sent_command && send_command(s) < 0) if (!s->sent_command && send_command(s) < 0)
return -1; return -1;
int rc = libssh2_channel_read(s->channel, buffer, buf_size); int rc = libssh2_channel_read(s->channel, buffer, buf_size);
if (rc < 0) if (rc < 0)
return -1; return -1;
*bytes_read = rc; *bytes_read = rc;
return 0; return 0;
} }
@ -122,15 +122,15 @@ static int ssh_stream_write(
size_t len) size_t len)
{ {
ssh_stream *s = (ssh_stream *)stream; ssh_stream *s = (ssh_stream *)stream;
if (!s->sent_command && send_command(s) < 0) if (!s->sent_command && send_command(s) < 0)
return -1; return -1;
int rc = libssh2_channel_write(s->channel, buffer, len); int rc = libssh2_channel_write(s->channel, buffer, len);
if (rc < 0) { if (rc < 0) {
return -1; return -1;
} }
return rc; return rc;
} }
@ -139,26 +139,26 @@ static void ssh_stream_free(git_smart_subtransport_stream *stream)
ssh_stream *s = (ssh_stream *)stream; ssh_stream *s = (ssh_stream *)stream;
ssh_subtransport *t = OWNING_SUBTRANSPORT(s); ssh_subtransport *t = OWNING_SUBTRANSPORT(s);
int ret; int ret;
GIT_UNUSED(ret); GIT_UNUSED(ret);
t->current_stream = NULL; t->current_stream = NULL;
if (s->channel) { if (s->channel) {
libssh2_channel_close(s->channel); libssh2_channel_close(s->channel);
libssh2_channel_free(s->channel); libssh2_channel_free(s->channel);
s->channel = NULL; s->channel = NULL;
} }
if (s->session) { if (s->session) {
libssh2_session_free(s->session), s->session = NULL; libssh2_session_free(s->session), s->session = NULL;
} }
if (s->socket.socket) { if (s->socket.socket) {
ret = gitno_close(&s->socket); ret = gitno_close(&s->socket);
assert(!ret); assert(!ret);
} }
git__free(s->url); git__free(s->url);
git__free(s); git__free(s);
} }
@ -170,26 +170,26 @@ static int ssh_stream_alloc(
git_smart_subtransport_stream **stream) git_smart_subtransport_stream **stream)
{ {
ssh_stream *s; ssh_stream *s;
if (!stream) if (!stream)
return -1; return -1;
s = git__calloc(sizeof(ssh_stream), 1); s = git__calloc(sizeof(ssh_stream), 1);
GITERR_CHECK_ALLOC(s); GITERR_CHECK_ALLOC(s);
s->parent.subtransport = &t->parent; s->parent.subtransport = &t->parent;
s->parent.read = ssh_stream_read; s->parent.read = ssh_stream_read;
s->parent.write = ssh_stream_write; s->parent.write = ssh_stream_write;
s->parent.free = ssh_stream_free; s->parent.free = ssh_stream_free;
s->cmd = cmd; s->cmd = cmd;
s->url = git__strdup(url); s->url = git__strdup(url);
if (!s->url) { if (!s->url) {
git__free(s); git__free(s);
return -1; return -1;
} }
*stream = &s->parent; *stream = &s->parent;
return 0; return 0;
} }
@ -201,14 +201,14 @@ static int git_ssh_extract_url_parts(
{ {
char *colon, *at; char *colon, *at;
const char *start; const char *start;
colon = strchr(url, ':'); colon = strchr(url, ':');
if (colon == NULL) { if (colon == NULL) {
giterr_set(GITERR_NET, "Malformed URL: missing :"); giterr_set(GITERR_NET, "Malformed URL: missing :");
return -1; return -1;
} }
at = strchr(url, '@'); at = strchr(url, '@');
if (at) { if (at) {
start = at+1; start = at+1;
@ -217,9 +217,9 @@ static int git_ssh_extract_url_parts(
start = url; start = url;
*username = git__strdup(default_user); *username = git__strdup(default_user);
} }
*host = git__substrdup(start, colon - start); *host = git__substrdup(start, colon - start);
return 0; return 0;
} }
@ -235,7 +235,7 @@ static int _git_ssh_authenticate_session(
case GIT_CREDTYPE_USERPASS_PLAINTEXT: { case GIT_CREDTYPE_USERPASS_PLAINTEXT: {
git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred; git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred;
rc = libssh2_userauth_password( rc = libssh2_userauth_password(
session, session,
c->username, c->username,
c->password c->password
); );
@ -244,7 +244,7 @@ static int _git_ssh_authenticate_session(
case GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE: { case GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE: {
git_cred_ssh_keyfile_passphrase *c = (git_cred_ssh_keyfile_passphrase *)cred; git_cred_ssh_keyfile_passphrase *c = (git_cred_ssh_keyfile_passphrase *)cred;
rc = libssh2_userauth_publickey_fromfile( rc = libssh2_userauth_publickey_fromfile(
session, session,
user, user,
c->publickey, c->publickey,
c->privatekey, c->privatekey,
@ -267,13 +267,12 @@ static int _git_ssh_authenticate_session(
default: default:
rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED; rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED;
} }
} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc); } while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
return rc; return rc;
} }
static int _git_ssh_session_create static int _git_ssh_session_create(
(
LIBSSH2_SESSION** session, LIBSSH2_SESSION** session,
gitno_socket socket gitno_socket socket
) )
@ -281,31 +280,30 @@ static int _git_ssh_session_create
if (!session) { if (!session) {
return -1; return -1;
} }
LIBSSH2_SESSION* s = libssh2_session_init(); LIBSSH2_SESSION* s = libssh2_session_init();
if (!s) if (!s)
return -1; return -1;
int rc = 0; int rc = 0;
do { do {
rc = libssh2_session_startup(s, socket.socket); rc = libssh2_session_startup(s, socket.socket);
} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc); } while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
if (0 != rc) { if (0 != rc)
goto on_error; goto on_error;
}
libssh2_session_set_blocking(s, 1); libssh2_session_set_blocking(s, 1);
*session = s; *session = s;
return 0; return 0;
on_error: on_error:
if (s) { if (s) {
libssh2_session_free(s), s = NULL; libssh2_session_free(s), s = NULL;
} }
return -1; return -1;
} }
@ -321,13 +319,13 @@ static int _git_ssh_setup_conn(
ssh_stream *s; ssh_stream *s;
LIBSSH2_SESSION* session=NULL; LIBSSH2_SESSION* session=NULL;
LIBSSH2_CHANNEL* channel=NULL; LIBSSH2_CHANNEL* channel=NULL;
*stream = NULL; *stream = NULL;
if (ssh_stream_alloc(t, url, cmd, stream) < 0) if (ssh_stream_alloc(t, url, cmd, stream) < 0)
return -1; return -1;
s = (ssh_stream *)*stream; s = (ssh_stream *)*stream;
if (!git__prefixcmp(url, prefix_ssh)) { if (!git__prefixcmp(url, prefix_ssh)) {
url = url + strlen(prefix_ssh); url = url + strlen(prefix_ssh);
if (gitno_extract_url_parts(&host, &port, &user, &pass, url, default_port) < 0) if (gitno_extract_url_parts(&host, &port, &user, &pass, url, default_port) < 0)
@ -338,10 +336,10 @@ static int _git_ssh_setup_conn(
port = git__strdup(default_port); port = git__strdup(default_port);
GITERR_CHECK_ALLOC(port); GITERR_CHECK_ALLOC(port);
} }
if (gitno_connect(&s->socket, host, port, 0) < 0) if (gitno_connect(&s->socket, host, port, 0) < 0)
goto on_error; goto on_error;
if (user && pass) { if (user && pass) {
if (git_cred_userpass_plaintext_new(&t->cred, user, pass) < 0) if (git_cred_userpass_plaintext_new(&t->cred, user, pass) < 0)
goto on_error; goto on_error;
@ -357,11 +355,11 @@ static int _git_ssh_setup_conn(
goto on_error; goto on_error;
} }
assert(t->cred); assert(t->cred);
if (!user) { if (!user) {
user = git__strdup(default_user); user = git__strdup(default_user);
} }
if (_git_ssh_session_create(&session, s->socket) < 0) { if (_git_ssh_session_create(&session, s->socket) < 0) {
giterr_set(GITERR_NET, "Failed to initialize SSH session"); giterr_set(GITERR_NET, "Failed to initialize SSH session");
goto on_error; goto on_error;
@ -379,10 +377,10 @@ static int _git_ssh_setup_conn(
} }
libssh2_channel_set_blocking(channel, 1); libssh2_channel_set_blocking(channel, 1);
s->session = session; s->session = session;
s->channel = channel; s->channel = channel;
t->current_stream = s; t->current_stream = s;
git__free(host); git__free(host);
git__free(port); git__free(port);
@ -390,11 +388,15 @@ static int _git_ssh_setup_conn(
git__free(pass); git__free(pass);
return 0; return 0;
on_error: on_error:
s->session = NULL;
s->channel = NULL;
t->current_stream = NULL;
if (*stream) if (*stream)
ssh_stream_free(*stream); ssh_stream_free(*stream);
git__free(host); git__free(host);
git__free(port); git__free(port);
git__free(user); git__free(user);
@ -413,7 +415,7 @@ static int ssh_uploadpack_ls(
{ {
if (_git_ssh_setup_conn(t, url, cmd_uploadpack, stream) < 0) if (_git_ssh_setup_conn(t, url, cmd_uploadpack, stream) < 0)
return -1; return -1;
return 0; return 0;
} }
@ -423,12 +425,12 @@ static int ssh_uploadpack(
git_smart_subtransport_stream **stream) git_smart_subtransport_stream **stream)
{ {
GIT_UNUSED(url); GIT_UNUSED(url);
if (t->current_stream) { if (t->current_stream) {
*stream = &t->current_stream->parent; *stream = &t->current_stream->parent;
return 0; return 0;
} }
giterr_set(GITERR_NET, "Must call UPLOADPACK_LS before UPLOADPACK"); giterr_set(GITERR_NET, "Must call UPLOADPACK_LS before UPLOADPACK");
return -1; return -1;
} }
@ -440,7 +442,7 @@ static int ssh_receivepack_ls(
{ {
if (_git_ssh_setup_conn(t, url, cmd_receivepack, stream) < 0) if (_git_ssh_setup_conn(t, url, cmd_receivepack, stream) < 0)
return -1; return -1;
return 0; return 0;
} }
@ -450,12 +452,12 @@ static int ssh_receivepack(
git_smart_subtransport_stream **stream) git_smart_subtransport_stream **stream)
{ {
GIT_UNUSED(url); GIT_UNUSED(url);
if (t->current_stream) { if (t->current_stream) {
*stream = &t->current_stream->parent; *stream = &t->current_stream->parent;
return 0; return 0;
} }
giterr_set(GITERR_NET, "Must call RECEIVEPACK_LS before RECEIVEPACK"); giterr_set(GITERR_NET, "Must call RECEIVEPACK_LS before RECEIVEPACK");
return -1; return -1;
} }
@ -467,21 +469,21 @@ static int _ssh_action(
git_smart_service_t action) git_smart_service_t action)
{ {
ssh_subtransport *t = (ssh_subtransport *) subtransport; ssh_subtransport *t = (ssh_subtransport *) subtransport;
switch (action) { switch (action) {
case GIT_SERVICE_UPLOADPACK_LS: case GIT_SERVICE_UPLOADPACK_LS:
return ssh_uploadpack_ls(t, url, stream); return ssh_uploadpack_ls(t, url, stream);
case GIT_SERVICE_UPLOADPACK: case GIT_SERVICE_UPLOADPACK:
return ssh_uploadpack(t, url, stream); return ssh_uploadpack(t, url, stream);
case GIT_SERVICE_RECEIVEPACK_LS: case GIT_SERVICE_RECEIVEPACK_LS:
return ssh_receivepack_ls(t, url, stream); return ssh_receivepack_ls(t, url, stream);
case GIT_SERVICE_RECEIVEPACK: case GIT_SERVICE_RECEIVEPACK:
return ssh_receivepack(t, url, stream); return ssh_receivepack(t, url, stream);
} }
*stream = NULL; *stream = NULL;
return -1; return -1;
} }
@ -489,38 +491,38 @@ static int _ssh_action(
static int _ssh_close(git_smart_subtransport *subtransport) static int _ssh_close(git_smart_subtransport *subtransport)
{ {
ssh_subtransport *t = (ssh_subtransport *) subtransport; ssh_subtransport *t = (ssh_subtransport *) subtransport;
assert(!t->current_stream); assert(!t->current_stream);
GIT_UNUSED(t); GIT_UNUSED(t);
return 0; return 0;
} }
static void _ssh_free(git_smart_subtransport *subtransport) static void _ssh_free(git_smart_subtransport *subtransport)
{ {
ssh_subtransport *t = (ssh_subtransport *) subtransport; ssh_subtransport *t = (ssh_subtransport *) subtransport;
assert(!t->current_stream); assert(!t->current_stream);
git__free(t); git__free(t);
} }
int git_smart_subtransport_ssh(git_smart_subtransport **out, git_transport *owner) int git_smart_subtransport_ssh(git_smart_subtransport **out, git_transport *owner)
{ {
ssh_subtransport *t; ssh_subtransport *t;
if (!out) if (!out)
return -1; return -1;
t = git__calloc(sizeof(ssh_subtransport), 1); t = git__calloc(sizeof(ssh_subtransport), 1);
GITERR_CHECK_ALLOC(t); GITERR_CHECK_ALLOC(t);
t->owner = (transport_smart *)owner; t->owner = (transport_smart *)owner;
t->parent.action = _ssh_action; t->parent.action = _ssh_action;
t->parent.close = _ssh_close; t->parent.close = _ssh_close;
t->parent.free = _ssh_free; t->parent.free = _ssh_free;
*out = (git_smart_subtransport *) t; *out = (git_smart_subtransport *) t;
return 0; return 0;
} }