vendor/libgit2/src/transports/ssh.c in rugged-0.27.10 vs vendor/libgit2/src/transports/ssh.c in rugged-0.27.10.1
- old
+ new
@@ -12,18 +12,15 @@
#endif
#include "global.h"
#include "git2.h"
#include "buffer.h"
-#include "net.h"
#include "netops.h"
#include "smart.h"
+#include "cred.h"
#include "streams/socket.h"
-#include "git2/cred.h"
-#include "git2/sys/cred.h"
-
#ifdef GIT_SSH
#define OWNING_SUBTRANSPORT(s) ((ssh_subtransport *)(s)->parent.subtransport)
static const char *ssh_prefixes[] = { "ssh://", "ssh+git://", "git+ssh://" };
@@ -55,11 +52,11 @@
static void ssh_error(LIBSSH2_SESSION *session, const char *errmsg)
{
char *ssherr;
libssh2_session_last_error(session, &ssherr, NULL, 0);
- git_error_set(GIT_ERROR_SSH, "%s: %s", errmsg, ssherr);
+ giterr_set(GITERR_SSH, "%s: %s", errmsg, ssherr);
}
/*
* Create a git protocol request.
*
@@ -86,11 +83,11 @@
repo = strchr(url, ':');
if (repo) repo++;
done:
if (!repo) {
- git_error_set(GIT_ERROR_NET, "malformed git protocol URL");
+ giterr_set(GITERR_NET, "malformed git protocol URL");
return -1;
}
len = strlen(cmd) + 1 /* Space */ + 1 /* Quote */ + strlen(repo) + 1 /* Quote */ + 1;
@@ -122,22 +119,22 @@
}
s->sent_command = 1;
cleanup:
- git_buf_dispose(&request);
+ git_buf_free(&request);
return error;
}
static int ssh_stream_read(
git_smart_subtransport_stream *stream,
char *buffer,
size_t buf_size,
size_t *bytes_read)
{
int rc;
- ssh_stream *s = GIT_CONTAINER_OF(stream, ssh_stream, parent);
+ ssh_stream *s = (ssh_stream *)stream;
*bytes_read = 0;
if (!s->sent_command && send_command(s) < 0)
return -1;
@@ -152,11 +149,11 @@
* not-found error, so read from stderr and signal EOF on
* stderr.
*/
if (rc == 0) {
if ((rc = libssh2_channel_read_stderr(s->channel, buffer, buf_size)) > 0) {
- git_error_set(GIT_ERROR_SSH, "%*s", rc, buffer);
+ giterr_set(GITERR_SSH, "%*s", rc, buffer);
return GIT_EEOF;
} else if (rc < LIBSSH2_ERROR_NONE) {
ssh_error(s->session, "SSH could not read stderr");
return -1;
}
@@ -171,11 +168,11 @@
static int ssh_stream_write(
git_smart_subtransport_stream *stream,
const char *buffer,
size_t len)
{
- ssh_stream *s = GIT_CONTAINER_OF(stream, ssh_stream, parent);
+ ssh_stream *s = (ssh_stream *)stream;
size_t off = 0;
ssize_t ret = 0;
if (!s->sent_command && send_command(s) < 0)
return -1;
@@ -197,11 +194,11 @@
return 0;
}
static void ssh_stream_free(git_smart_subtransport_stream *stream)
{
- ssh_stream *s = GIT_CONTAINER_OF(stream, ssh_stream, parent);
+ ssh_stream *s = (ssh_stream *)stream;
ssh_subtransport *t;
if (!stream)
return;
@@ -239,11 +236,11 @@
ssh_stream *s;
assert(stream);
s = git__calloc(sizeof(ssh_stream), 1);
- GIT_ERROR_CHECK_ALLOC(s);
+ GITERR_CHECK_ALLOC(s);
s->parent.subtransport = &t->parent;
s->parent.read = ssh_stream_read;
s->parent.write = ssh_stream_write;
s->parent.free = ssh_stream_free;
@@ -259,11 +256,12 @@
*stream = &s->parent;
return 0;
}
static int git_ssh_extract_url_parts(
- git_net_url *urldata,
+ char **host,
+ char **username,
const char *url)
{
char *colon, *at;
const char *start;
@@ -271,24 +269,24 @@
at = strchr(url, '@');
if (at) {
start = at + 1;
- urldata->username = git__substrdup(url, at - url);
- GIT_ERROR_CHECK_ALLOC(urldata->username);
+ *username = git__substrdup(url, at - url);
+ GITERR_CHECK_ALLOC(*username);
} else {
start = url;
- urldata->username = NULL;
+ *username = NULL;
}
if (colon == NULL || (colon < start)) {
- git_error_set(GIT_ERROR_NET, "malformed URL");
+ giterr_set(GITERR_NET, "malformed URL");
return -1;
}
- urldata->host = git__substrdup(start, colon - start);
- GIT_ERROR_CHECK_ALLOC(urldata->host);
+ *host = git__substrdup(start, colon - start);
+ GITERR_CHECK_ALLOC(*host);
return 0;
}
static int ssh_agent_auth(LIBSSH2_SESSION *session, git_cred_ssh_key *c) {
@@ -350,11 +348,11 @@
git_cred* cred)
{
int rc;
do {
- git_error_clear();
+ giterr_clear();
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;
@@ -428,11 +426,11 @@
rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED ||
rc == LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED)
return GIT_EAUTH;
if (rc != LIBSSH2_ERROR_NONE) {
- if (!git_error_last())
+ if (!giterr_last())
ssh_error(session, "Failed to authenticate SSH session");
return -1;
}
return 0;
@@ -447,28 +445,28 @@
no_callback = 1;
} else {
error = t->owner->cred_acquire_cb(&cred, t->owner->url, user, auth_methods,
t->owner->cred_acquire_payload);
- if (error == GIT_PASSTHROUGH) {
+ if (error == GIT_PASSTHROUGH)
no_callback = 1;
- } else if (error < 0) {
+ else if (error < 0)
return error;
- } else if (!cred) {
- git_error_set(GIT_ERROR_SSH, "callback failed to initialize SSH credentials");
+ else if (!cred) {
+ giterr_set(GITERR_SSH, "callback failed to initialize SSH credentials");
return -1;
}
}
if (no_callback) {
- git_error_set(GIT_ERROR_SSH, "authentication required but no callback set");
+ giterr_set(GITERR_SSH, "authentication required but no callback set");
return -1;
}
if (!(cred->credtype & auth_methods)) {
cred->free(cred);
- git_error_set(GIT_ERROR_SSH, "callback returned unsupported credentials type");
+ giterr_set(GITERR_SSH, "callback returned unsupported credentials type");
return -1;
}
*out = cred;
@@ -479,17 +477,17 @@
LIBSSH2_SESSION** session,
git_stream *io)
{
int rc = 0;
LIBSSH2_SESSION* s;
- git_socket_stream *socket = GIT_CONTAINER_OF(io, git_socket_stream, parent);
+ git_socket_stream *socket = (git_socket_stream *) io;
assert(session);
s = libssh2_session_init();
if (!s) {
- git_error_set(GIT_ERROR_NET, "failed to initialize SSH session");
+ giterr_set(GITERR_NET, "failed to initialize SSH session");
return -1;
}
do {
rc = libssh2_session_handshake(s, socket->s);
@@ -506,19 +504,18 @@
*session = s;
return 0;
}
-#define SSH_DEFAULT_PORT "22"
-
static int _git_ssh_setup_conn(
ssh_subtransport *t,
const char *url,
const char *cmd,
git_smart_subtransport_stream **stream)
{
- git_net_url urldata = GIT_NET_URL_INIT;
+ char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL;
+ const char *default_port="22";
int auth_methods, error = 0;
size_t i;
ssh_stream *s;
git_cred *cred = NULL;
LIBSSH2_SESSION* session=NULL;
@@ -536,26 +533,23 @@
for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) {
const char *p = ssh_prefixes[i];
if (!git__prefixcmp(url, p)) {
- if ((error = git_net_url_parse(&urldata, url)) < 0)
+ if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, default_port)) < 0)
goto done;
goto post_extract;
}
}
- if ((error = git_ssh_extract_url_parts(&urldata, url)) < 0)
+ if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0)
goto done;
+ port = git__strdup(default_port);
+ GITERR_CHECK_ALLOC(port);
- if (urldata.port == NULL)
- urldata.port = git__strdup(SSH_DEFAULT_PORT);
-
- GIT_ERROR_CHECK_ALLOC(urldata.port);
-
post_extract:
- if ((error = git_socket_stream_new(&s->io, urldata.host, urldata.port)) < 0 ||
+ if ((error = git_socket_stream_new(&s->io, host, port)) < 0 ||
(error = git_stream_connect(s->io)) < 0)
goto done;
if ((error = _git_ssh_session_create(&session, s->io)) < 0)
goto done;
@@ -564,18 +558,10 @@
git_cert_hostkey cert = {{ 0 }}, *cert_ptr;
const char *key;
cert.parent.cert_type = GIT_CERT_HOSTKEY_LIBSSH2;
-#ifdef LIBSSH2_HOSTKEY_HASH_SHA256
- key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_SHA256);
- if (key != NULL) {
- cert.type |= GIT_CERT_SSH_SHA256;
- memcpy(&cert.hash_sha256, key, 32);
- }
-#endif
-
key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_SHA1);
if (key != NULL) {
cert.type |= GIT_CERT_SSH_SHA1;
memcpy(&cert.hash_sha1, key, 20);
}
@@ -585,46 +571,45 @@
cert.type |= GIT_CERT_SSH_MD5;
memcpy(&cert.hash_md5, key, 16);
}
if (cert.type == 0) {
- git_error_set(GIT_ERROR_SSH, "unable to get the host key");
+ giterr_set(GITERR_SSH, "unable to get the host key");
error = -1;
goto done;
}
/* We don't currently trust any hostkeys */
- git_error_clear();
+ giterr_clear();
cert_ptr = &cert;
- error = t->owner->certificate_check_cb((git_cert *) cert_ptr, 0, urldata.host, t->owner->message_cb_payload);
+ error = t->owner->certificate_check_cb((git_cert *) cert_ptr, 0, host, t->owner->message_cb_payload);
+ if (error < 0) {
+ if (!giterr_last())
+ giterr_set(GITERR_NET, "user cancelled hostkey check");
- if (error < 0 && error != GIT_PASSTHROUGH) {
- if (!git_error_last())
- git_error_set(GIT_ERROR_NET, "user cancelled hostkey check");
-
goto done;
}
}
/* we need the username to ask for auth methods */
- if (!urldata.username) {
+ if (!user) {
if ((error = request_creds(&cred, t, NULL, GIT_CREDTYPE_USERNAME)) < 0)
goto done;
- urldata.username = git__strdup(((git_cred_username *) cred)->username);
+ user = git__strdup(((git_cred_username *) cred)->username);
cred->free(cred);
cred = NULL;
- if (!urldata.username)
+ if (!user)
goto done;
- } else if (urldata.username && urldata.password) {
- if ((error = git_cred_userpass_plaintext_new(&cred, urldata.username, urldata.password)) < 0)
+ } else if (user && pass) {
+ if ((error = git_cred_userpass_plaintext_new(&cred, user, pass)) < 0)
goto done;
}
- if ((error = list_auth_methods(&auth_methods, session, urldata.username)) < 0)
+ if ((error = list_auth_methods(&auth_methods, session, user)) < 0)
goto done;
error = GIT_EAUTH;
/* if we already have something to try */
if (cred && auth_methods & cred->credtype)
@@ -634,15 +619,15 @@
if (cred) {
cred->free(cred);
cred = NULL;
}
- if ((error = request_creds(&cred, t, urldata.username, auth_methods)) < 0)
+ if ((error = request_creds(&cred, t, user, auth_methods)) < 0)
goto done;
- if (strcmp(urldata.username, git_cred_get_username(cred))) {
- git_error_set(GIT_ERROR_SSH, "username does not match previous request");
+ if (strcmp(user, git_cred__username(cred))) {
+ giterr_set(GITERR_SSH, "username does not match previous request");
error = -1;
goto done;
}
error = _git_ssh_authenticate_session(session, cred);
@@ -674,11 +659,15 @@
}
if (cred)
cred->free(cred);
- git_net_url_dispose(&urldata);
+ git__free(host);
+ git__free(port);
+ git__free(path);
+ git__free(user);
+ git__free(pass);
return error;
}
static int ssh_uploadpack_ls(
@@ -701,11 +690,11 @@
if (t->current_stream) {
*stream = &t->current_stream->parent;
return 0;
}
- git_error_set(GIT_ERROR_NET, "must call UPLOADPACK_LS before UPLOADPACK");
+ giterr_set(GITERR_NET, "must call UPLOADPACK_LS before UPLOADPACK");
return -1;
}
static int ssh_receivepack_ls(
ssh_subtransport *t,
@@ -728,21 +717,21 @@
if (t->current_stream) {
*stream = &t->current_stream->parent;
return 0;
}
- git_error_set(GIT_ERROR_NET, "must call RECEIVEPACK_LS before RECEIVEPACK");
+ giterr_set(GITERR_NET, "must call RECEIVEPACK_LS before RECEIVEPACK");
return -1;
}
static int _ssh_action(
git_smart_subtransport_stream **stream,
git_smart_subtransport *subtransport,
const char *url,
git_smart_service_t action)
{
- ssh_subtransport *t = GIT_CONTAINER_OF(subtransport, ssh_subtransport, parent);
+ ssh_subtransport *t = (ssh_subtransport *) subtransport;
switch (action) {
case GIT_SERVICE_UPLOADPACK_LS:
return ssh_uploadpack_ls(t, url, stream);
@@ -760,22 +749,22 @@
return -1;
}
static int _ssh_close(git_smart_subtransport *subtransport)
{
- ssh_subtransport *t = GIT_CONTAINER_OF(subtransport, ssh_subtransport, parent);
+ ssh_subtransport *t = (ssh_subtransport *) subtransport;
assert(!t->current_stream);
GIT_UNUSED(t);
return 0;
}
static void _ssh_free(git_smart_subtransport *subtransport)
{
- ssh_subtransport *t = GIT_CONTAINER_OF(subtransport, ssh_subtransport, parent);
+ ssh_subtransport *t = (ssh_subtransport *) subtransport;
assert(!t->current_stream);
git__free(t->cmd_uploadpack);
git__free(t->cmd_receivepack);
@@ -844,11 +833,11 @@
assert(out);
GIT_UNUSED(param);
t = git__calloc(sizeof(ssh_subtransport), 1);
- GIT_ERROR_CHECK_ALLOC(t);
+ GITERR_CHECK_ALLOC(t);
t->owner = (transport_smart *)owner;
t->parent.action = _ssh_action;
t->parent.close = _ssh_close;
t->parent.free = _ssh_free;
@@ -860,11 +849,11 @@
GIT_UNUSED(param);
assert(out);
*out = NULL;
- git_error_set(GIT_ERROR_INVALID, "cannot create SSH transport. Library was built without SSH support");
+ giterr_set(GITERR_INVALID, "cannot create SSH transport. Library was built without SSH support");
return -1;
#endif
}
int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *payload)
@@ -880,35 +869,35 @@
0, /* no RPC */
NULL,
};
if (paths->count != 2) {
- git_error_set(GIT_ERROR_SSH, "invalid ssh paths, must be two strings");
+ giterr_set(GITERR_SSH, "invalid ssh paths, must be two strings");
return GIT_EINVALIDSPEC;
}
if ((error = git_transport_smart(&transport, owner, &ssh_definition)) < 0)
return error;
smart = (transport_smart *) transport;
t = (ssh_subtransport *) smart->wrapped;
t->cmd_uploadpack = git__strdup(paths->strings[0]);
- GIT_ERROR_CHECK_ALLOC(t->cmd_uploadpack);
+ GITERR_CHECK_ALLOC(t->cmd_uploadpack);
t->cmd_receivepack = git__strdup(paths->strings[1]);
- GIT_ERROR_CHECK_ALLOC(t->cmd_receivepack);
+ GITERR_CHECK_ALLOC(t->cmd_receivepack);
*out = transport;
return 0;
#else
GIT_UNUSED(owner);
GIT_UNUSED(payload);
assert(out);
*out = NULL;
- git_error_set(GIT_ERROR_INVALID, "cannot create SSH transport. Library was built without SSH support");
+ giterr_set(GITERR_INVALID, "cannot create SSH transport. Library was built without SSH support");
return -1;
#endif
}
#ifdef GIT_SSH
@@ -920,10 +909,10 @@
int git_transport_ssh_global_init(void)
{
#ifdef GIT_SSH
if (libssh2_init(0) < 0) {
- git_error_set(GIT_ERROR_SSH, "unable to initialize libssh2");
+ giterr_set(GITERR_SSH, "unable to initialize libssh2");
return -1;
}
git__on_shutdown(shutdown_ssh);
return 0;