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

Add label filter on the list of secrets

Browse Source 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
This commit is contained in:
Nassim 'Nass' Eddequiouaq
2017-03-09 18:10:48 +01:00
parent 2a8670e0da
commit 021d7d6a19
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
secretservice/secretservice_linux.c
+21 -15
View File
@@ -42,7 +42,7 @@ GError *delete(char *server) {
return NULL; return NULL;
} }
char *get_username(SecretItem *item) { char *get_attribute(const char *attribute, SecretItem *item) {
GHashTable *attributes; GHashTable *attributes;
GHashTableIter iter; GHashTableIter iter;
gchar *value, *key; gchar *value, *key;
@@ -50,7 +50,7 @@ char *get_username(SecretItem *item) {
attributes = secret_item_get_attributes(item); attributes = secret_item_get_attributes(item);
g_hash_table_iter_init(&iter, attributes); g_hash_table_iter_init(&iter, attributes);
while (g_hash_table_iter_next(&iter, (void **)&key, (void **)&value)) { while (g_hash_table_iter_next(&iter, (void **)&key, (void **)&value)) {
if (strncmp(key, "username", strlen(key)) == 0) if (strncmp(key, attribute, strlen(key)) == 0)
return (char *)value; return (char *)value;
} }
g_hash_table_unref(attributes); g_hash_table_unref(attributes);
@@ -87,7 +87,7 @@ GError *get(char *server, char **username, char **secret) {
*secret = strdup(secret_value_get(secretValue, &length)); *secret = strdup(secret_value_get(secretValue, &length));
secret_value_unref(secretValue); secret_value_unref(secretValue);
} }
*username = get_username(l->data); *username = get_attribute("username", l->data);
} }
g_list_free_full(items, g_object_unref); g_list_free_full(items, g_object_unref);
} }
@@ -100,14 +100,12 @@ GError *get(char *server, char **username, char **secret) {
return NULL; return NULL;
} }
GError *list(char *label, char *** paths, char *** accts, unsigned int *list_l) { GError *list(char *ref_label, char *** paths, char *** accts, unsigned int *list_l) {
GList *items; GList *items;
GError *err = NULL; GError *err = NULL;
SecretService *service; SecretService *service;
SecretSearchFlags flags = SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_ALL | SECRET_SEARCH_UNLOCK; SecretSearchFlags flags = SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_ALL | SECRET_SEARCH_UNLOCK;
GHashTable *attributes = secret_attributes_build(NULL, GHashTable *attributes = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
"label", label,
NULL);
service = secret_service_get_sync(SECRET_SERVICE_NONE, NULL, &err); service = secret_service_get_sync(SECRET_SERVICE_NONE, NULL, &err);
items = secret_service_search_sync(service, NULL, attributes, flags, NULL, &err); items = secret_service_search_sync(service, NULL, attributes, flags, NULL, &err);
@@ -115,8 +113,8 @@ GError *list(char *label, char *** paths, char *** accts, unsigned int *list_l)
if (err != NULL) { if (err != NULL) {
return err; return err;
} }
*paths = (char **) malloc((int)sizeof(char *)*numKeys); char **tmp_paths = (char **) malloc((int)sizeof(char *)*numKeys);
*accts = (char **) malloc((int)sizeof(char *)*numKeys); char **tmp_accts = (char **) malloc((int)sizeof(char *)*numKeys);
// items now contains our keys from the gnome keyring // items now contains our keys from the gnome keyring
// we will now put it in our two lists to return it to go // we will now put it in our two lists to return it to go
GList *current; GList *current;
@@ -124,21 +122,29 @@ GError *list(char *label, char *** paths, char *** accts, unsigned int *list_l)
for(current = items; current!=NULL; current = current->next) { for(current = items; current!=NULL; current = current->next) {
char *pathTmp = secret_item_get_label(current->data); char *pathTmp = secret_item_get_label(current->data);
// you cannot have a key without a label in the gnome keyring // you cannot have a key without a label in the gnome keyring
char *acctTmp = get_username(current->data); char *acctTmp = get_attribute("username",current->data);
if (acctTmp==NULL) { if (acctTmp==NULL) {
acctTmp = "account not defined"; acctTmp = "account not defined";
} }
char *labelTmp = get_attribute("label", current->data);
if (strcmp(labelTmp, ref_label)) {
continue;
}
char *path = (char *) malloc(strlen(pathTmp)); char *path = (char *) malloc(strlen(pathTmp));
char *acct = (char *) malloc(strlen(acctTmp)); char *acct = (char *) malloc(strlen(acctTmp));
path = pathTmp; path = pathTmp;
acct = acctTmp; acct = acctTmp;
(*paths)[listNumber] = (char *) malloc(sizeof(char)*(strlen(path))); tmp_paths[listNumber] = (char *) malloc(sizeof(char)*(strlen(path)));
memcpy((*paths)[listNumber], path, sizeof(char)*(strlen(path))); memcpy(tmp_paths[listNumber], path, sizeof(char)*(strlen(path)));
(*accts)[listNumber] = (char *) malloc(sizeof(char)*(strlen(acct))); tmp_accts[listNumber] = (char *) malloc(sizeof(char)*(strlen(acct)));
memcpy((*accts)[listNumber], acct, sizeof(char)*(strlen(acct))); memcpy(tmp_accts[listNumber], acct, sizeof(char)*(strlen(acct)));
listNumber = listNumber + 1; listNumber = listNumber + 1;
} }
*list_l = numKeys;
*paths = (char **) realloc(tmp_paths, listNumber);
*accts = (char **) realloc(tmp_accts, listNumber);
*list_l = listNumber;
return NULL; return NULL;
} }