mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cloud storage: add support for https based remote

Browse source 
This will make it easier to access the remote storage.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-05-31 17:15:58 -07:00
parent 96cffe88e7
commit 97ef9d0ee8
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
git-access.c
View file

@ -70,7 +70,7 @@ static int try_to_update(git_repository *rep, git_reference *local, git_referenc
} }
#if USE_LIBGIT23_API #if USE_LIBGIT23_API
int credential_cb(git_cred **out, int credential_ssh_cb(git_cred **out,
const char *url, const char *url,
const char *username_from_url, const char *username_from_url,
unsigned int allowed_types, unsigned int allowed_types,
@ -80,6 +80,17 @@ int credential_cb(git_cred **out,
const char *passphrase = copy_string(prefs.passphrase); const char *passphrase = copy_string(prefs.passphrase);
return git_cred_ssh_key_new(out, username_from_url, NULL, priv_key, passphrase); return git_cred_ssh_key_new(out, username_from_url, NULL, priv_key, passphrase);
} }
int credential_https_cb(git_cred **out,
const char *url,
const char *username_from_url,
unsigned int allowed_types,
void *payload)
{
const char *username = "ssrftest";
const char *password = copy_string(prefs.passphrase);
return git_cred_userpass_plaintext_new(out, username, password);
}
#endif #endif
static git_repository *update_local_repo(const char *localdir, const char *remote, const char *branch) static git_repository *update_local_repo(const char *localdir, const char *remote, const char *branch)
@ -111,7 +122,9 @@ static git_repository *update_local_repo(const char *localdir, const char *remot
#if USE_LIBGIT23_API #if USE_LIBGIT23_API
git_fetch_options opts = GIT_FETCH_OPTIONS_INIT; git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;
if (strncmp(remote, "ssh://", 6) == 0) if (strncmp(remote, "ssh://", 6) == 0)
opts.callbacks.credentials = credential_cb; opts.callbacks.credentials = credential_ssh_cb;
else if (strncmp(remote, "https://", 8) == 0)
opts.callbacks.credentials = credential_https_cb;
error = git_remote_fetch(origin, NULL, &opts, NULL); error = git_remote_fetch(origin, NULL, &opts, NULL);
#else #else
error = git_remote_fetch(origin, NULL, NULL, NULL); error = git_remote_fetch(origin, NULL, NULL, NULL);
@ -151,7 +164,9 @@ static git_repository *create_local_repo(const char *localdir, const char *remot
git_clone_options opts = GIT_CLONE_OPTIONS_INIT; git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
#if USE_LIBGIT23_API #if USE_LIBGIT23_API
if (strncmp(remote, "ssh://", 6) == 0) if (strncmp(remote, "ssh://", 6) == 0)
opts.fetch_opts.callbacks.credentials = credential_cb; opts.fetch_opts.callbacks.credentials = credential_ssh_cb;
else if (strncmp(remote, "https://", 8) == 0)
opts.fetch_opts.callbacks.credentials = credential_https_cb;
#endif #endif
opts.checkout_branch = branch; opts.checkout_branch = branch;
error = git_clone(&cloned_repo, remote, localdir, &opts); error = git_clone(&cloned_repo, remote, localdir, &opts);