FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Allow proxy options when connecting with a detached remote. by lrm29 · Pull Request #6058 · libgit2/libgit2 · GitHub

/ libgit2 Public

Allow proxy options when connecting with a detached remote. #6058

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

Merged
ethomson merged 4 commits into from
Sep 20, 2021
Conversation 7 Commits 4 Checks 0 Files changed
Merged

Allow proxy options when connecting with a detached remote. #6058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb41276
Allow proxy options when connecting with a detached remote.
lrm29 Sep 16, 2021
e994299
Update formatting.
lrm29 Sep 16, 2021
c8823fb
Apply suggestions from code review
lrm29 Sep 18, 2021
3bd462a
Update remote.c
lrm29 Sep 18, 2021
File filter

Filter by extension

Filter by extension .c  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 11 additions & 4 deletions src/remote.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -884,15 +884,22 @@ static void url_config_trim(git_net_url *url)

static int http_proxy_config(char **out, git_remote *remote, git_net_url *url)
{
git_config *cfg;
git_config *cfg = NULL;
git_buf buf = GIT_BUF_INIT;
git_net_url lookup_url = GIT_NET_URL_INIT;
int error;

if ((error = git_net_url_dup(&lookup_url, url)) < 0 ||
(error = git_repository_config__weakptr(&cfg, remote->repo)) < 0)
if ((error = git_net_url_dup(&lookup_url, url)) < 0)
goto done;

if (remote->repo) {
if ((error = git_repository_config(&cfg, remote->repo)) < 0)
goto done;
} else {
if ((error = git_config_open_default(&cfg)) < 0)
goto done;
}

/* remote.<name>.proxy config setting */
if (remote->name && remote->name[0]) {
git_buf_clear(&buf);
Expand Down Expand Up @@ -922,6 +929,7 @@ static int http_proxy_config(char **out, git_remote *remote, git_net_url *url)
error = lookup_config(out, cfg, "http.proxy");

done:
git_config_free(cfg);
git_buf_dispose(&buf);
git_net_url_dispose(&lookup_url);
return error;
Expand Down Expand Up @@ -971,7 +979,6 @@ int git_remote__http_proxy(char **out, git_remote *remote, git_net_url *url)

GIT_ASSERT_ARG(out);
GIT_ASSERT_ARG(remote);
GIT_ASSERT_ARG(remote->repo);

*out = NULL;

Expand Down
42 changes: 41 additions & 1 deletion tests/remote/httpproxy.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "clar_libgit2.h"
#include "remote.h"
#include "futils.h"
#include "net.h"
#include "remote.h"

static git_repository *repo;
static git_net_url url = GIT_NET_URL_INIT;
Expand Down Expand Up @@ -105,6 +106,45 @@ void test_remote_httpproxy__config_empty_overrides(void)
assert_config_match("remote.lg2.proxy", "");
}

void assert_global_config_match(const char *config, const char *expected)
{
git_remote *remote;
char *proxy;
git_config* cfg;

if (config) {
cl_git_pass(git_config_open_default(&cfg));
git_config_set_string(cfg, config, expected);
git_config_free(cfg);
}

cl_git_pass(git_remote_create_detached(&remote, "https://github.com/libgit2/libgit2"));
cl_git_pass(git_remote__http_proxy(&proxy, remote, &url));

if (expected)
cl_assert_equal_s(proxy, expected);
else
cl_assert_equal_p(proxy, expected);

git_remote_free(remote);
git__free(proxy);
}

void test_remote_httpproxy__config_overrides_detached_remote(void)
{
cl_fake_home();

assert_global_config_match(NULL, NULL);
assert_global_config_match("http.proxy", "http://localhost:1/");
assert_global_config_match("http.https://github.com.proxy", "http://localhost:2/");
assert_global_config_match("http.https://github.com/.proxy", "http://localhost:3/");
assert_global_config_match("http.https://github.com/libgit2.proxy", "http://localhost:4/");
assert_global_config_match("http.https://github.com/libgit2/.proxy", "http://localhost:5/");
assert_global_config_match("http.https://github.com/libgit2/libgit2.proxy", "http://localhost:6/");

cl_git_pass(git_futils_rmdir_r("home", NULL, GIT_RMDIR_REMOVE_FILES));
}

void test_remote_httpproxy__env(void)
{
orig_http_proxy = cl_getenv("HTTP_PROXY");
Expand Down
Back | FazBrowse Home | New Git URL