development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-04 16:17:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'kn/osxkeychain-skip-idempotent-store'

Browse source 
The credential helper that talks with osx keychain learned to avoid
storing back the authentication material it just got received from
the keychain.

* kn/osxkeychain-skip-idempotent-store:
  osxkeychain: state to skip unnecessary store operations
  osxkeychain: exclusive lock to serialize execution of operations
This commit is contained in:
Junio C Hamano 2024-05-28 11:17:11 -07:00
commit 2a1a882890
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/credential/osxkeychain/git-credential-osxkeychain.c
View file

@ -12,6 +12,7 @@ static CFStringRef username;
static CFDataRef password; static CFDataRef password;
static CFDataRef password_expiry_utc; static CFDataRef password_expiry_utc;
static CFDataRef oauth_refresh_token; static CFDataRef oauth_refresh_token;
static int state_seen;
static void clear_credential(void) static void clear_credential(void)
{ {
@ -171,6 +172,9 @@ static OSStatus find_internet_password(void)
CFRelease(item); CFRelease(item);
write_item("capability[]", "state", strlen("state"));
write_item("state[]", "osxkeychain:seen=1", strlen("osxkeychain:seen=1"));
out: out:
CFRelease(attrs); CFRelease(attrs);
@ -284,6 +288,9 @@ static OSStatus add_internet_password(void)
CFDictionaryRef attrs; CFDictionaryRef attrs;
OSStatus result; OSStatus result;
if (state_seen)
return errSecSuccess;
/* Only store complete credentials */ /* Only store complete credentials */
if (!protocol || !host || !username || !password) if (!protocol || !host || !username || !password)
return -1; return -1;
@ -395,6 +402,10 @@ static void read_credential(void)
oauth_refresh_token = CFDataCreate(kCFAllocatorDefault, oauth_refresh_token = CFDataCreate(kCFAllocatorDefault,
(UInt8 *)v, (UInt8 *)v,
strlen(v)); strlen(v));
else if (!strcmp(buf, "state[]")) {
if (!strcmp(v, "osxkeychain:seen=1"))
state_seen = 1;
}
/* /*
* Ignore other lines; we don't know what they mean, but * Ignore other lines; we don't know what they mean, but
* this future-proofs us when later versions of git do * this future-proofs us when later versions of git do
@ -414,6 +425,9 @@ int main(int argc, const char **argv)
if (!argv[1]) if (!argv[1])
die("%s", usage); die("%s", usage);
if (open(argv[0], O_RDONLY | O_EXLOCK) == -1)
die("failed to lock %s", argv[0]);
read_credential(); read_credential();
if (!strcmp(argv[1], "get")) if (!strcmp(argv[1], "get"))