notkshitij/docker-credential-helpers
1
0
Fork 0
mirror of https://github.com/docker/docker-credential-helpers.git synced 2026-06-13 16:01:28 +05:30
Code Releases 1 Activity

Merge pull request #42 from ebriney/fix-keychain-list

Browse Source 
Reconstruct the full url when doing `keychain_list`
This commit is contained in:
Vincent Demeester
2017-03-03 17:56:15 +01:00
committed by GitHub
parent b7c53e02cd 19ec1c3164
commit 3c3e1d3af1
1 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osxkeychain/osxkeychain_darwin.c
+52 -22
View File
@@ -1,5 +1,6 @@
#include "osxkeychain_darwin.h" #include "osxkeychain_darwin.h"
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <Foundation/NSValue.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -123,36 +124,29 @@ char *keychain_list(char *** paths, char *** accts, unsigned int *list_l) {
//Use this query dictionary //Use this query dictionary
CFTypeRef result= NULL; CFTypeRef result= NULL;
OSStatus status = SecItemCopyMatching( OSStatus status = SecItemCopyMatching(
query, query,
&result); &result);
//Ran a search and store the results in result //Ran a search and store the results in result
if (status) { if (status) {
return get_error(status); return get_error(status);
} }
int numKeys = CFArrayGetCount(result); CFIndex numKeys = CFArrayGetCount(result);
*paths = (char **) malloc((int)sizeof(char *)*numKeys); *paths = (char **) malloc((int)sizeof(char *)*numKeys);
*accts = (char **) malloc((int)sizeof(char *)*numKeys); *accts = (char **) malloc((int)sizeof(char *)*numKeys);
//result is of type CFArray //result is of type CFArray
for(int i=0; i<numKeys; i++) { for(CFIndex i=0; i<numKeys; i++) {
CFDictionaryRef currKey = CFArrayGetValueAtIndex(result,i); CFDictionaryRef currKey = CFArrayGetValueAtIndex(result,i);
if (CFDictionaryContainsKey(currKey, CFSTR("path"))) {
//Even if a key is stored without an account, Apple defaults it to null so these arrays will be of the same length CFStringRef protocolTmp = CFDictionaryGetValue(currKey, CFSTR("ptcl"));
CFStringRef pathTmp = CFDictionaryGetValue(currKey, CFSTR("path")); if (protocolTmp != NULL) {
CFStringRef acctTmp = CFDictionaryGetValue(currKey, CFSTR("acct")); CFStringRef protocolStr = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@"), protocolTmp);
if (acctTmp == NULL) { if (CFStringCompare(protocolStr, CFSTR("htps"), 0) == kCFCompareEqualTo) {
acctTmp = CFSTR("account not defined"); protocolTmp = CFSTR("https://");
} }
char * path = (char *) malloc(CFStringGetLength(pathTmp)+1); else {
path = CFStringToCharArr(pathTmp); protocolTmp = CFSTR("http://");
path[strlen(path)] = '\0'; }
char * acct = (char *) malloc(CFStringGetLength(acctTmp)+1); CFRelease(protocolStr);
acct = CFStringToCharArr(acctTmp);
acct[strlen(acct)] = '\0';
//We now have all we need, username and servername. Now export this to .go
(*paths)[i] = (char *) malloc(sizeof(char)*(strlen(path)+1));
memcpy((*paths)[i], path, sizeof(char)*(strlen(path)+1));
(*accts)[i] = (char *) malloc(sizeof(char)*(strlen(acct)+1));
memcpy((*accts)[i], acct, sizeof(char)*(strlen(acct)+1));
} }
else { else {
char * path = "0"; char * path = "0";
@@ -161,9 +155,45 @@ char *keychain_list(char *** paths, char *** accts, unsigned int *list_l) {
memcpy((*paths)[i], path, sizeof(char)*(strlen(path))); memcpy((*paths)[i], path, sizeof(char)*(strlen(path)));
(*accts)[i] = (char *) malloc(sizeof(char)*(strlen(acct))); (*accts)[i] = (char *) malloc(sizeof(char)*(strlen(acct)));
memcpy((*accts)[i], acct, sizeof(char)*(strlen(acct))); memcpy((*accts)[i], acct, sizeof(char)*(strlen(acct)));
continue;
} }
CFMutableStringRef str = CFStringCreateMutableCopy(NULL, 0, protocolTmp);
CFStringRef serverTmp = CFDictionaryGetValue(currKey, CFSTR("srvr"));
if (serverTmp != NULL) {
CFStringAppend(str, serverTmp);
}
CFStringRef pathTmp = CFDictionaryGetValue(currKey, CFSTR("path"));
if (pathTmp != NULL) {
CFStringAppend(str, pathTmp);
}
const NSNumber * portTmp = CFDictionaryGetValue(currKey, CFSTR("port"));
if (portTmp != NULL && portTmp.integerValue != 0) {
CFStringRef portStr = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@"), portTmp);
CFStringAppend(str, CFSTR(":"));
CFStringAppend(str, portStr);
CFRelease(portStr);
}
CFStringRef acctTmp = CFDictionaryGetValue(currKey, CFSTR("acct"));
if (acctTmp == NULL) {
acctTmp = CFSTR("account not defined");
}
char * path = CFStringToCharArr(str);
char * acct = CFStringToCharArr(acctTmp);
//We now have all we need, username and servername. Now export this to .go
(*paths)[i] = (char *) malloc(sizeof(char)*(strlen(path)+1));
memcpy((*paths)[i], path, sizeof(char)*(strlen(path)+1));
(*accts)[i] = (char *) malloc(sizeof(char)*(strlen(acct)+1));
memcpy((*accts)[i], acct, sizeof(char)*(strlen(acct)+1));
CFRelease(str);
} }
*list_l = numKeys; *list_l = (int)numKeys;
return NULL; return NULL;
} }