Skip to contentSkip to conversation

gssd: validate cred in gssd_acquire_user_cred

PATCH In review Weston Andros Adamson 2 participants 2 messages Oct 25, 2013 – Oct 28, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gssd: validate cred in gssd_acquire_user_cred

Call gss_inquire_cred after gssd_acquire_krb5_cred check for expired credentials.

This fixes a recent regression (since 302de786930a2c533068f9d8909a817b40f07c32) that causes the user's ticket cache to grow unbounded with expired service tickets when the user's credentials expire.

To reproduce this issue:

- mount kerberos nfs export
- kinit for a short lifetime (ie "kinit -l 1m")
- run a job that opens a file and writes for more than the lifetime
- run klist a few times after expiry and see the list grow, ie:

Ticket cache: DIR::/run/user/1749600001/krb5cc/tktYmpGlX Default principal: [email protected]

Valid starting       Expires              Service principal
10/21/2013 15:39:38  10/21/2013 15:40:35  krbtgt/[email protected]
10/21/2013 15:39:40  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:35  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:36  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:37  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:37  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:38  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:38  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:40  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:40  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:41  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:41  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:42  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:42  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:42  10/21/2013 15:40:35  nfs/[email protected]

---

Version 2 of the patch - version 1 had compiler warnings I completely missed! I wonder how it worked before... but this now compiles cleanly and I verified that it fixes the growing tkt cache problem.

Thanks,
-dros

 utils/gssd/krb5_util.c | 7 +++++++
 1 file changed, 7 insertions(+)
utils/gssd/krb5_util.c +7 -0
index c6e52fd..697d1d2 100644
@@ -1405,6 +1405,13 @@ gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred)
 
 	ret = gssd_acquire_krb5_cred(name, gss_cred);
 
+	/* force validation of cred to check for expiry */
+	if (ret == 0) {
+		if (gss_inquire_cred(&min_stat, *gss_cred, NULL, NULL,
+				     NULL, NULL) != GSS_S_COMPLETE)
+			ret = -1;
+	}
+
 	maj_stat = gss_release_name(&min_stat, &name);
 	return ret;
 }
Signature · 1 line
1.8.3.1 (Apple Git-46)
#1 lore raw
Quoted 38 lines · Weston Andros Adamson

Call gss_inquire_cred after gssd_acquire_krb5_cred check for expired credentials.

This fixes a recent regression (since 302de786930a2c533068f9d8909a817b40f07c32) that causes the user's ticket cache to grow unbounded with expired service tickets when the user's credentials expire.

To reproduce this issue:

- mount kerberos nfs export
- kinit for a short lifetime (ie "kinit -l 1m")
- run a job that opens a file and writes for more than the lifetime
- run klist a few times after expiry and see the list grow, ie:

Ticket cache: DIR::/run/user/1749600001/krb5cc/tktYmpGlX Default principal: [email protected]

Valid starting       Expires              Service principal
10/21/2013 15:39:38  10/21/2013 15:40:35  krbtgt/[email protected]
10/21/2013 15:39:40  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:35  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:36  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:37  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:37  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:38  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:38  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:39  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:40  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:40  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:41  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:41  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:42  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:42  10/21/2013 15:40:35  nfs/[email protected]
10/21/2013 15:40:42  10/21/2013 15:40:35  nfs/[email protected]
Quoted 2 lines

Committed...

steved.

Quoted 34 lines

---

Version 2 of the patch - version 1 had compiler warnings I completely missed! I wonder how it worked before... but this now compiles cleanly and I verified that it fixes the growing tkt cache problem.

Thanks,
-dros

 utils/gssd/krb5_util.c | 7 +++++++
 1 file changed, 7 insertions(+)
utils/gssd/krb5_util.c +7 -1
index c6e52fd..697d1d2 100644
@@ -1405,6 +1405,13 @@ gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred)
 
 	ret = gssd_acquire_krb5_cred(name, gss_cred);
 
+	/* force validation of cred to check for expiry */
+	if (ret == 0) {
+		if (gss_inquire_cred(&min_stat, *gss_cred, NULL, NULL,
+				     NULL, NULL) != GSS_S_COMPLETE)
+			ret = -1;
+	}
+
 	maj_stat = gss_release_name(&min_stat, &name);
 	return ret;
 }
-- 1.8.3.1 (Apple Git-46)