Revert "Merge branch 'mh/credential-password-expiry-libsecret' into next"

This reverts commit fd898e37564343333ed91e3846cbe78f8e0cb548, reversing
changes made to c2148408a2ae76fb39d0ecdf1f991ee8dc540936.

With the previous round, 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.  It was caught before merged to 'master' and
being replaced.

4 files changed, 4 insertions, 69 deletions

diff --git a/contrib/credential/libsecret/git-credential-libsecret.c b/contrib/credential/libsecret/git-credential-libsecret.c
index a353321be1..ef681f29d5 100644
--- a/contrib/credential/libsecret/git-credential-libsecret.c
+++ b/contrib/credential/libsecret/git-credential-libsecret.c
@@ -39,7 +39,6 @@ struct credential {
 	char *path;
 	char *username;
 	char *password;
-	char *password_expiry_utc;
 };
 
 #define CREDENTIAL_INIT { 0 }
@@ -55,21 +54,6 @@ struct credential_operation {
 
 /* ----------------- Secret Service functions ----------------- */
 
-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 },
-		{  NULL, 0 },
-	}
-};
-
 static char *make_label(struct credential *c)
 {
 	if (c->port)
@@ -94,9 +78,6 @@ static GHashTable *make_attr_list(struct credential *c)
 		g_hash_table_insert(al, "port", g_strdup_printf("%hu", c->port));
 	if (c->path)
 		g_hash_table_insert(al, "object", g_strdup(c->path));
-	if (c->password_expiry_utc)
-		g_hash_table_insert(al, "password_expiry_utc",
-			g_strdup(c->password_expiry_utc));
 
 	return al;
 }
@@ -120,7 +101,7 @@ static int keyring_get(struct credential *c)
 
 	attributes = make_attr_list(c);
 	items = secret_service_search_sync(service,
-					   &schema,
+					   SECRET_SCHEMA_COMPAT_NETWORK,
 					   attributes,
 					   SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_UNLOCK,
 					   NULL,
@@ -147,12 +128,6 @@ static int keyring_get(struct credential *c)
 			c->username = g_strdup(s);
 		}
 
-		s = g_hash_table_lookup(attributes, "password_expiry_utc");
-		if (s) {
-			g_free(c->password_expiry_utc);
-			c->password_expiry_utc = g_strdup(s);
-		}
-
 		s = secret_value_get_text(secret);
 		if (s) {
 			g_free(c->password);
@@ -187,7 +162,7 @@ static int keyring_store(struct credential *c)
 
 	label = make_label(c);
 	attributes = make_attr_list(c);
-	secret_password_storev_sync(&schema,
+	secret_password_storev_sync(SECRET_SCHEMA_COMPAT_NETWORK,
 				    attributes,
 				    NULL,
 				    label,
@@ -223,7 +198,7 @@ static int keyring_erase(struct credential *c)
 		return EXIT_FAILURE;
 
 	attributes = make_attr_list(c);
-	secret_password_clearv_sync(&schema,
+	secret_password_clearv_sync(SECRET_SCHEMA_COMPAT_NETWORK,
 				    attributes,
 				    NULL,
 				    &error);
@@ -263,7 +238,6 @@ static void credential_clear(struct credential *c)
 	g_free(c->path);
 	g_free(c->username);
 	g_free(c->password);
-	g_free(c->password_expiry_utc);
 
 	credential_init(c);
 }
@@ -310,9 +284,6 @@ static int credential_read(struct credential *c)
 		} else if (!strcmp(key, "username")) {
 			g_free(c->username);
 			c->username = g_strdup(value);
-		} else if (!strcmp(key, "password_expiry_utc")) {
-			g_free(c->password_expiry_utc);
-			c->password_expiry_utc = g_strdup(value);
 		} else if (!strcmp(key, "password")) {
 			g_free(c->password);
 			c->password = g_strdup(value);
@@ -340,11 +311,9 @@ static void credential_write_item(FILE *fp, const char *key, const char *value)
 
 static void credential_write(const struct credential *c)
 {
-	/* only write username/password/expiry, if set */
+	/* only write username/password, if set */
 	credential_write_item(stdout, "username", c->username);
 	credential_write_item(stdout, "password", c->password);
-	credential_write_item(stdout, "password_expiry_utc",
-		c->password_expiry_utc);
 }
 
 static void usage(const char *name)
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index f14057d8a4..f1ab92ba35 100644
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -43,7 +43,6 @@ helper_test_clean() {
 	reject $1 https example.com store-user
 	reject $1 https example.com user1
 	reject $1 https example.com user2
-	reject $1 https example.com user3
 	reject $1 https example.com user4
 	reject $1 http path.tld user
 	reject $1 https timeout.tld user
@@ -358,35 +357,6 @@ helper_test_oauth_refresh_token() {
 	'
 }
 
-helper_test_password_expiry_utc() {
-	HELPER=$1
-
-	test_expect_success "helper ($HELPER) stores password_expiry_utc" '
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user3
-		password=pass
-		password_expiry_utc=9999999999
-		EOF
-	'
-
-	test_expect_success "helper ($HELPER) gets password_expiry_utc" '
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user3
-		--
-		protocol=https
-		host=example.com
-		username=user3
-		password=pass
-		password_expiry_utc=9999999999
-		--
-		EOF
-	'
-}
-
 write_script askpass <<\EOF
 echo >&2 askpass: $*
 what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh
index a4c4af3e40..c02a3b5969 100755
--- a/t/t0301-credential-cache.sh
+++ b/t/t0301-credential-cache.sh
@@ -31,8 +31,6 @@ test_atexit 'git credential-cache exit'
 helper_test cache
 helper_test_oauth_refresh_token cache
 
-helper_test_password_expiry_utc cache
-
 test_expect_success 'socket defaults to ~/.cache/git/credential/socket' '
 	test_when_finished "
 		git credential-cache exit &&
diff --git a/t/t0303-credential-external.sh b/t/t0303-credential-external.sh
index f1478680bf..f028fd1418 100755
--- a/t/t0303-credential-external.sh
+++ b/t/t0303-credential-external.sh
@@ -52,8 +52,6 @@ else
 	helper_test_timeout "$GIT_TEST_CREDENTIAL_HELPER_TIMEOUT"
 fi
 
-helper_test_password_expiry_utc "$GIT_TEST_CREDENTIAL_HELPER"
-
 # clean afterwards so that we are good citizens
 # and don't leave cruft in the helper's storage, which
 # might be long-term system storage