rugged 1.3.1 → 1.6.2

data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c

@@ -7,17 +7,15 @@
 
 #include "auth.h"
 
-#include "git2.h"
-#include "buffer.h"
 #include "git2/sys/credential.h"
 
 static int basic_next_token(
-	git_buf *out,
+	git_str *out,
 	git_http_auth_context *ctx,
 	git_credential *c)
 {
 	git_credential_userpass_plaintext *cred;
-	git_buf raw = GIT_BUF_INIT;
+	git_str raw = GIT_STR_INIT;
 	int error = GIT_EAUTH;
 
 	GIT_UNUSED(ctx);
@@ -29,11 +27,11 @@ static int basic_next_token(
 
 	cred = (git_credential_userpass_plaintext *)c;
 
-	git_buf_printf(&raw, "%s:%s", cred->username, cred->password);
+	git_str_printf(&raw, "%s:%s", cred->username, cred->password);
 
-	if (git_buf_oom(&raw) ||
-		git_buf_puts(out, "Basic ") < 0 ||
-		git_buf_encode_base64(out, git_buf_cstr(&raw), raw.size) < 0)
+	if (git_str_oom(&raw) ||
+		git_str_puts(out, "Basic ") < 0 ||
+		git_str_encode_base64(out, git_str_cstr(&raw), raw.size) < 0)
 		goto on_error;
 
 	error = 0;
@@ -42,7 +40,7 @@ on_error:
 	if (raw.size)
 		git__memzero(raw.ptr, raw.size);
 
-	git_buf_dispose(&raw);
+	git_str_dispose(&raw);
 	return error;
 }
 

data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h

@@ -10,13 +10,12 @@
 
 #include "common.h"
 
-#include "git2.h"
 #include "netops.h"
 
 typedef enum {
 	GIT_HTTP_AUTH_BASIC = 1,
 	GIT_HTTP_AUTH_NEGOTIATE = 2,
-	GIT_HTTP_AUTH_NTLM = 4,
+	GIT_HTTP_AUTH_NTLM = 4
 } git_http_auth_t;
 
 typedef struct git_http_auth_context git_http_auth_context;
@@ -35,7 +34,7 @@ struct git_http_auth_context {
 	int (*set_challenge)(git_http_auth_context *ctx, const char *challenge);
 
 	/** Gets the next authentication token from the context */
-	int (*next_token)(git_buf *out, git_http_auth_context *ctx, git_credential *cred);
+	int (*next_token)(git_str *out, git_http_auth_context *ctx, git_credential *cred);
 
 	/** Examines if all tokens have been presented. */
 	int (*is_complete)(git_http_auth_context *ctx);

data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.c

@@ -10,7 +10,6 @@
 #if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK)
 
 #include "git2.h"
-#include "buffer.h"
 #include "auth.h"
 #include "git2/sys/credential.h"
 
@@ -33,7 +32,7 @@ typedef struct {
 	git_http_auth_context parent;
 	unsigned configured : 1,
 		complete : 1;
-	git_buf target;
+	git_str target;
 	char *challenge;
 	gss_ctx_id_t gss_context;
 	gss_OID oid;
@@ -87,14 +86,14 @@ static void negotiate_context_dispose(http_auth_negotiate_context *ctx)
 		ctx->gss_context = GSS_C_NO_CONTEXT;
 	}
 
-	git_buf_dispose(&ctx->target);
+	git_str_dispose(&ctx->target);
 
 	git__free(ctx->challenge);
 	ctx->challenge = NULL;
 }
 
 static int negotiate_next_token(
-	git_buf *buf,
+	git_str *buf,
 	git_http_auth_context *c,
 	git_credential *cred)
 {
@@ -104,7 +103,7 @@ static int negotiate_next_token(
 		input_token = GSS_C_EMPTY_BUFFER,
 		output_token = GSS_C_EMPTY_BUFFER;
 	gss_buffer_t input_token_ptr = GSS_C_NO_BUFFER;
-	git_buf input_buf = GIT_BUF_INIT;
+	git_str input_buf = GIT_STR_INIT;
 	gss_name_t server = NULL;
 	gss_OID mech;
 	size_t challenge_len;
@@ -142,7 +141,7 @@ static int negotiate_next_token(
 	}
 
 	if (challenge_len > 9) {
-		if (git_buf_decode_base64(&input_buf,
+		if (git_str_decode_base64(&input_buf,
 				ctx->challenge + 10, challenge_len - 10) < 0) {
 			git_error_set(GIT_ERROR_NET, "invalid negotiate challenge from server");
 			error = -1;
@@ -192,16 +191,16 @@ static int negotiate_next_token(
 		goto done;
 	}
 
-	git_buf_puts(buf, "Negotiate ");
-	git_buf_encode_base64(buf, output_token.value, output_token.length);
+	git_str_puts(buf, "Negotiate ");
+	git_str_encode_base64(buf, output_token.value, output_token.length);
 
-	if (git_buf_oom(buf))
+	if (git_str_oom(buf))
 		error = -1;
 
 done:
 	gss_release_name(&status_minor, &server);
 	gss_release_buffer(&status_minor, (gss_buffer_t) &output_token);
-	git_buf_dispose(&input_buf);
+	git_str_dispose(&input_buf);
 	return error;
 }
 
@@ -270,10 +269,10 @@ static int negotiate_init_context(
 		return GIT_EAUTH;
 	}
 
-	git_buf_puts(&ctx->target, "HTTP@");
-	git_buf_puts(&ctx->target, url->host);
+	git_str_puts(&ctx->target, "HTTP@");
+	git_str_puts(&ctx->target, url->host);
 
-	if (git_buf_oom(&ctx->target))
+	if (git_str_oom(&ctx->target))
 		return -1;
 
 	ctx->gss_context = GSS_C_NO_CONTEXT;

data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.c

@@ -5,11 +5,11 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "git2.h"
+#include "auth_ntlm.h"
+
 #include "common.h"
-#include "buffer.h"
+#include "str.h"
 #include "auth.h"
-#include "auth_ntlm.h"
 #include "git2/sys/credential.h"
 
 #ifdef GIT_NTLM
@@ -77,12 +77,12 @@ done:
 }
 
 static int ntlm_next_token(
-	git_buf *buf,
+	git_str *buf,
 	git_http_auth_context *c,
 	git_credential *cred)
 {
 	http_auth_ntlm_context *ctx = (http_auth_ntlm_context *)c;
-	git_buf input_buf = GIT_BUF_INIT;
+	git_str input_buf = GIT_STR_INIT;
 	const unsigned char *msg;
 	size_t challenge_len, msg_len;
 	int error = GIT_EAUTH;
@@ -129,7 +129,7 @@ static int ntlm_next_token(
 			goto done;
 		}
 
-		if (git_buf_decode_base64(&input_buf,
+		if (git_str_decode_base64(&input_buf,
 		    ctx->challenge + 5, challenge_len - 5) < 0) {
 			git_error_set(GIT_ERROR_NET, "invalid NTLM challenge from server");
 			goto done;
@@ -149,16 +149,16 @@ static int ntlm_next_token(
 		}
 	}
 
-	git_buf_puts(buf, "NTLM ");
-	git_buf_encode_base64(buf, (const char *)msg, msg_len);
+	git_str_puts(buf, "NTLM ");
+	git_str_encode_base64(buf, (const char *)msg, msg_len);
 
-	if (git_buf_oom(buf))
+	if (git_str_oom(buf))
 		goto done;
 
 	error = 0;
 
 done:
-	git_buf_dispose(&input_buf);
+	git_str_dispose(&input_buf);
 	return error;
 }
 

data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h

@@ -8,7 +8,6 @@
 #ifndef INCLUDE_transports_auth_ntlm_h__
 #define INCLUDE_transports_auth_ntlm_h__
 
-#include "git2.h"
 #include "auth.h"
 
 /* NTLM requires a full request/challenge/response */

data/vendor/libgit2/src/{transports → libgit2/transports}/git.c

@@ -7,12 +7,10 @@
 
 #include "common.h"
 
-#include "git2.h"
-#include "buffer.h"
 #include "netops.h"
-#include "git2/sys/transport.h"
 #include "stream.h"
 #include "streams/socket.h"
+#include "git2/sys/transport.h"
 
 #define OWNING_SUBTRANSPORT(s) ((git_subtransport *)(s)->parent.subtransport)
 
@@ -39,7 +37,7 @@ typedef struct {
  *
  * For example: 0035git-upload-pack /libgit2/libgit2\0host=github.com\0
  */
-static int gen_proto(git_buf *request, const char *cmd, const char *url)
+static int gen_proto(git_str *request, const char *cmd, const char *url)
 {
 	char *delim, *repo;
 	char host[] = "host=";
@@ -61,13 +59,13 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url)
 
 	len = 4 + strlen(cmd) + 1 + strlen(repo) + 1 + strlen(host) + (delim - url) + 1;
 
-	git_buf_grow(request, len);
-	git_buf_printf(request, "%04x%s %s%c%s",
+	git_str_grow(request, len);
+	git_str_printf(request, "%04x%s %s%c%s",
 		(unsigned int)(len & 0x0FFFF), cmd, repo, 0, host);
-	git_buf_put(request, url, delim - url);
-	git_buf_putc(request, '\0');
+	git_str_put(request, url, delim - url);
+	git_str_putc(request, '\0');
 
-	if (git_buf_oom(request))
+	if (git_str_oom(request))
 		return -1;
 
 	return 0;
@@ -75,7 +73,7 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url)
 
 static int send_command(git_proto_stream *s)
 {
-	git_buf request = GIT_BUF_INIT;
+	git_str request = GIT_STR_INIT;
 	int error;
 
 	if ((error = gen_proto(&request, s->cmd, s->url)) < 0)
@@ -87,7 +85,7 @@ static int send_command(git_proto_stream *s)
 	s->sent_command = 1;
 
 cleanup:
-	git_buf_dispose(&request);
+	git_str_dispose(&request);
 	return error;
 }
 

data/vendor/libgit2/src/{transports → libgit2/transports}/http.c

@@ -9,13 +9,10 @@
 
 #ifndef GIT_WINHTTP
 
-#include "git2.h"
 #include "http_parser.h"
-#include "buffer.h"
 #include "net.h"
 #include "netops.h"
 #include "remote.h"
-#include "git2/sys/credential.h"
 #include "smart.h"
 #include "auth.h"
 #include "http.h"
@@ -25,6 +22,7 @@
 #include "streams/tls.h"
 #include "streams/socket.h"
 #include "httpclient.h"
+#include "git2/sys/credential.h"
 
 bool git_http__expect_continue = false;
 
@@ -40,7 +38,8 @@ typedef struct {
 	const char *url;
 	const char *request_type;
 	const char *response_type;
-	unsigned chunked : 1;
+	unsigned int initial : 1,
+	             chunked : 1;
 } http_service;
 
 typedef struct {
@@ -72,24 +71,28 @@ static const http_service upload_pack_ls_service = {
 	GIT_HTTP_METHOD_GET, "/info/refs?service=git-upload-pack",
 	NULL,
 	"application/x-git-upload-pack-advertisement",
+	1,
 	0
 };
 static const http_service upload_pack_service = {
 	GIT_HTTP_METHOD_POST, "/git-upload-pack",
 	"application/x-git-upload-pack-request",
 	"application/x-git-upload-pack-result",
+	0,
 	0
 };
 static const http_service receive_pack_ls_service = {
 	GIT_HTTP_METHOD_GET, "/info/refs?service=git-receive-pack",
 	NULL,
 	"application/x-git-receive-pack-advertisement",
+	1,
 	0
 };
 static const http_service receive_pack_service = {
 	GIT_HTTP_METHOD_POST, "/git-receive-pack",
 	"application/x-git-receive-pack-request",
 	"application/x-git-receive-pack-result",
+	0,
 	1
 };
 
@@ -176,6 +179,7 @@ GIT_INLINE(int) handle_remote_auth(
 	git_http_response *response)
 {
 	http_subtransport *transport = OWNING_SUBTRANSPORT(stream);
+	git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
 
 	if (response->server_auth_credtypes == 0) {
 		git_error_set(GIT_ERROR_HTTP, "server requires authentication that we do not support");
@@ -189,8 +193,8 @@ GIT_INLINE(int) handle_remote_auth(
 		transport->owner->url,
 		response->server_auth_schemetypes,
 		response->server_auth_credtypes,
-		transport->owner->cred_acquire_cb,
-		transport->owner->cred_acquire_payload);
+		connect_opts->callbacks.credentials,
+		connect_opts->callbacks.payload);
 }
 
 GIT_INLINE(int) handle_proxy_auth(
@@ -198,6 +202,7 @@ GIT_INLINE(int) handle_proxy_auth(
 	git_http_response *response)
 {
 	http_subtransport *transport = OWNING_SUBTRANSPORT(stream);
+	git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
 
 	if (response->proxy_auth_credtypes == 0) {
 		git_error_set(GIT_ERROR_HTTP, "proxy requires authentication that we do not support");
@@ -208,13 +213,26 @@ GIT_INLINE(int) handle_proxy_auth(
 	return handle_auth(
 		&transport->proxy,
 		SERVER_TYPE_PROXY,
-		transport->owner->proxy.url,
+		connect_opts->proxy_opts.url,
 		response->server_auth_schemetypes,
 		response->proxy_auth_credtypes,
-		transport->owner->proxy.credentials,
-		transport->owner->proxy.payload);
+		connect_opts->proxy_opts.credentials,
+		connect_opts->proxy_opts.payload);
 }
 
+static bool allow_redirect(http_stream *stream)
+{
+	http_subtransport *transport = OWNING_SUBTRANSPORT(stream);
+
+	switch (transport->owner->connect_opts.follow_redirects) {
+	case GIT_REMOTE_REDIRECT_INITIAL:
+		return (stream->service->initial == 1);
+	case GIT_REMOTE_REDIRECT_ALL:
+		return true;
+	default:
+		return false;
+	}
+}
 
 static int handle_response(
 	bool *complete,
@@ -233,7 +251,7 @@ static int handle_response(
 			return -1;
 		}
 
-		if (git_net_url_apply_redirect(&transport->server.url, response->location, stream->service->url) < 0) {
+		if (git_net_url_apply_redirect(&transport->server.url, response->location, allow_redirect(stream), stream->service->url) < 0) {
 			return -1;
 		}
 
@@ -288,6 +306,7 @@ static int lookup_proxy(
 	bool *out_use,
 	http_subtransport *transport)
 {
+	git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
 	const char *proxy;
 	git_remote *remote;
 	char *config = NULL;
@@ -296,9 +315,9 @@ static int lookup_proxy(
 	*out_use = false;
 	git_net_url_dispose(&transport->proxy.url);
 
-	switch (transport->owner->proxy.type) {
+	switch (connect_opts->proxy_opts.type) {
 	case GIT_PROXY_SPECIFIED:
-		proxy = transport->owner->proxy.url;
+		proxy = connect_opts->proxy_opts.url;
 		break;
 
 	case GIT_PROXY_AUTO:
@@ -347,7 +366,7 @@ static int generate_request(
 	request->credentials = transport->server.cred;
 	request->proxy = use_proxy ? &transport->proxy.url : NULL;
 	request->proxy_credentials = transport->proxy.cred;
-	request->custom_headers = &transport->owner->custom_headers;
+	request->custom_headers = &transport->owner->connect_opts.custom_headers;
 
 	if (stream->service->method == GIT_HTTP_METHOD_POST) {
 		request->chunked = stream->service->chunked;
@@ -635,6 +654,8 @@ static int http_action(
 	git_smart_service_t action)
 {
 	http_subtransport *transport = GIT_CONTAINER_OF(t, http_subtransport, parent);
+	git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
+	git_http_client_options opts = {0};
 	http_stream *stream;
 	const http_service *service;
 	int error;
@@ -663,14 +684,14 @@ static int http_action(
 	stream = git__calloc(sizeof(http_stream), 1);
 	GIT_ERROR_CHECK_ALLOC(stream);
 
-	if (!transport->http_client) {
-		git_http_client_options opts = {0};
-
-		opts.server_certificate_check_cb = transport->owner->certificate_check_cb;
-		opts.server_certificate_check_payload = transport->owner->message_cb_payload;
-		opts.proxy_certificate_check_cb = transport->owner->proxy.certificate_check;
-		opts.proxy_certificate_check_payload = transport->owner->proxy.payload;
+	opts.server_certificate_check_cb = connect_opts->callbacks.certificate_check;
+	opts.server_certificate_check_payload = connect_opts->callbacks.payload;
+	opts.proxy_certificate_check_cb = connect_opts->proxy_opts.certificate_check;
+	opts.proxy_certificate_check_payload = connect_opts->proxy_opts.payload;
 
+	if (transport->http_client) {
+		git_http_client_set_options(transport->http_client, &opts);
+	} else {
 		if (git_http_client_new(&transport->http_client, &opts) < 0)
 			return -1;
 	}

data/vendor/libgit2/src/{transports → libgit2/transports}/http.h

@@ -8,7 +8,6 @@
 #ifndef INCLUDE_transports_http_h__
 #define INCLUDE_transports_http_h__
 
-#include "buffer.h"
 #include "settings.h"
 #include "httpclient.h"
 
@@ -16,14 +15,14 @@
 
 extern bool git_http__expect_continue;
 
-GIT_INLINE(int) git_http__user_agent(git_buf *buf)
+GIT_INLINE(int) git_http__user_agent(git_str *buf)
 {
 	const char *ua = git_libgit2__user_agent();
 
 	if (!ua)
 		ua = "libgit2 " LIBGIT2_VERSION;
 
-	return git_buf_printf(buf, "git/2.0 (%s)", ua);
+	return git_str_printf(buf, "git/2.0 (%s)", ua);
 }
 
 #endif