On Mon, 15 May 2023 at 19:15, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > M Hickford <mirth.hickford@xxxxxxxxx> writes: > > >> +static const SecretSchema schema = { > >> + "org.git.Password", > >> + /* Ignore schema name for backwards compatibility with previous versions */ > >> + SECRET_SCHEMA_DONT_MATCH_NAME, > >> + { > >> + { "user", SECRET_SCHEMA_ATTRIBUTE_STRING }, > >> + { "object", SECRET_SCHEMA_ATTRIBUTE_STRING }, > >> + { "protocol", SECRET_SCHEMA_ATTRIBUTE_STRING }, > >> + { "port", SECRET_SCHEMA_ATTRIBUTE_INTEGER }, > >> + { "server", SECRET_SCHEMA_ATTRIBUTE_STRING }, > >> + { "password_expiry_utc", SECRET_SCHEMA_ATTRIBUTE_INTEGER }, > > > > I've been testing this patch with credential-generating helper > > git-credential-helper. It works, but because libsecret overwrites > > items if and only if the attributes match exactly, you end up with > > many items in the secret store that differ only by expiry date. This > > is inelegant, and confusing to users. Please hold this patch, don't > > merge to master. A solution might be to store the expiry date as the > > secret of a separate item (even though the value is not confidential) > > Thanks for stopping me. I'll mark the topic as "on hold". Thanks Junio > > It does sound problematic, but if we think about what is used as > keys and what is used as values, it does make a lot more sense to > store the expiry as part of a value. After all, we are not even > asking "give me the password that will expire in the most distant > future" or anything like that. We consult the database with "who > wants to access what server over which protocol at what port" as the > key and expect we find the suitable authentication material to use. > It would be best if we can treat the expiry date as an additional > attribute of that authentication material. > > Do the methods to store and retrieve a password from the keyring > allow us to add such an extra attribute to the password? I have no > idea how the Gnome keyring API works, but is there a way to mark > each entry in the SecretSchemaAttributes as "this is used as a key" > vs "this is used as a value---do not match"? Would thinking along > such a line help? Unfortunately not. The libsecret docs warn "Attributes are meant to be used for lookup of items; they’re not designed to be used as a generic key/value database". https://gnome.pages.gitlab.gnome.org/libsecret/migrating-libgnome-keyring.html Interestingly, Windows' wincred API doesn't have this issue, because it searches by a unique key, defined separately to attributes. > > Another possibility would be to store encoded concatenation of the > real password and expiration timestamp and decode them into two upon > retrieval. If we were the only user of the keystore, that may work, > but if we are sharing the keystore with other applications, it would > be a non-starter. Yes, I think that would work nicely. A format such as that below would be backwards compatible (passwords already can't contain newlines) and self explanatory to any curious user browsing their secret store. I already have a draft that works much like this. I'll prepare a patch v4. 7d7b554 password_expiry_utc=1684179877 oauth_refresh_token=be8a9aa3 Is the secret store ever shared with other applications such as a web browser? If so, sharing is already broken, because popular Git hosts such as GitHub and GitLab expect different passwords for web login and Git authentication (OAuth token or personal access token). A solution could be to introduce our own libsecret schema (as in the current patch) instead of continuing to use SECRET_SCHEMA_COMPAT_NETWORK potentially shared with other apps. I'm not sure whether that's worthwhile in this patch. I defer to you. AFAIK major web browsers all implement their own password store rather than use libsecret, though apparently Chromium has a build flag to use libsecret on Linux. https://source.chromium.org/search?q=libsecret%20-f:third_party&ss=chromium > > What do other application do, when using the keyring to store > expirable passwords with services that do let you know the > expiration time of the password? If they just ask the users again > only after finding out that the password did not work, perhaps we > should do the same, without being proactive and notice the expiry > ourselves? That is, instead of failing the access to the server > immediately upon seeing an auth failure, if the authentication > material is know to have expiration time, can we let the application > layer to ask the end-user to provide an refreshed password and try > again? For such a scheme, we do not have to store ever-changing > "password_expiry_utc" and contaminate the keyring with crufts whose > expiry dates are the only difference. Instead we can just have a > Boolean "does this site expire a valid password?" and use it to > behave differently, if desired, from sites for which the passwords > do not expire, perhaps? > In the case of HTTP error 401 Unauthorized, Git calls `credential reject` then exits. An improvement could be to first call `credential fill` again (this time without password prompt) and retry if a new credential is returned. A fresh credential if generated is likely to be valid. This would improve the experience when using a credential-generating helper together with a storage helper that drops password_expiry_utc. Best remains to use a storage helper that stores password_expiry_utc. This avoids a doomed HTTP request. Storing oauth_refresh_token is also beneficial, because OAuth refresh is faster than cold OAuth.