mirror of
https://github.com/docker/docker-credential-helpers.git
synced 2026-06-16 01:12:47 +05:30
Merge pull request #324 from thaJeztah/carry_207_friendlier_labels
Set a better displaylabel for secretservice
This commit is contained in:
@@ -17,11 +17,11 @@ const SecretSchema *docker_get_schema(void)
|
|||||||
return &docker_schema;
|
return &docker_schema;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *add(char *label, char *server, char *username, char *secret) {
|
GError *add(char *label, char *server, char *username, char *secret, char *displaylabel) {
|
||||||
GError *err = NULL;
|
GError *err = NULL;
|
||||||
|
|
||||||
secret_password_store_sync (DOCKER_SCHEMA, SECRET_COLLECTION_DEFAULT,
|
secret_password_store_sync (DOCKER_SCHEMA, SECRET_COLLECTION_DEFAULT,
|
||||||
server, secret, NULL, &err,
|
displaylabel, secret, NULL, &err,
|
||||||
"label", label,
|
"label", label,
|
||||||
"server", server,
|
"server", server,
|
||||||
"username", username,
|
"username", username,
|
||||||
|
|||||||
@@ -33,8 +33,10 @@ func (h Secretservice) Add(creds *credentials.Credentials) error {
|
|||||||
defer C.free(unsafe.Pointer(username))
|
defer C.free(unsafe.Pointer(username))
|
||||||
secret := C.CString(creds.Secret)
|
secret := C.CString(creds.Secret)
|
||||||
defer C.free(unsafe.Pointer(secret))
|
defer C.free(unsafe.Pointer(secret))
|
||||||
|
displayLabel := C.CString("Registry credentials for " + creds.ServerURL)
|
||||||
|
defer C.free(unsafe.Pointer(displayLabel))
|
||||||
|
|
||||||
if err := C.add(credsLabel, server, username, secret); err != nil {
|
if err := C.add(credsLabel, server, username, secret, displayLabel); err != nil {
|
||||||
defer C.g_error_free(err)
|
defer C.g_error_free(err)
|
||||||
errMsg := (*C.char)(unsafe.Pointer(err.message))
|
errMsg := (*C.char)(unsafe.Pointer(err.message))
|
||||||
return errors.New(C.GoString(errMsg))
|
return errors.New(C.GoString(errMsg))
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ const SecretSchema *docker_get_schema(void) G_GNUC_CONST;
|
|||||||
|
|
||||||
#define DOCKER_SCHEMA docker_get_schema()
|
#define DOCKER_SCHEMA docker_get_schema()
|
||||||
|
|
||||||
GError *add(char *label, char *server, char *username, char *secret);
|
GError *add(char *label, char *server, char *username, char *secret, char *displaylabel);
|
||||||
GError *delete(char *server);
|
GError *delete(char *server);
|
||||||
GError *get(char *server, char **username, char **secret);
|
GError *get(char *server, char **username, char **secret);
|
||||||
GError *list(char *label, char *** paths, char *** accts, unsigned int *list_l);
|
GError *list(char *label, char *** paths, char *** accts, unsigned int *list_l);
|
||||||
|
|||||||
Reference in New Issue
Block a user