aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Macklem <rmacklem@FreeBSD.org>2019-11-28 02:05:31 +0000
committerRick Macklem <rmacklem@FreeBSD.org>2019-11-28 02:05:31 +0000
commit04cb0c38ebae013e6676fc402882b402cbfdba9d (patch)
treec421098f125e6175fcf1377dadbd489fdb36b84f
parent81c2e8a6f27c77bc3e385e47cdd350981fe0e8d5 (diff)
downloadsrc-04cb0c38ebae013e6676fc402882b402cbfdba9d.tar.gz
src-04cb0c38ebae013e6676fc402882b402cbfdba9d.zip
Add a cap on credential lifetime for Kerberized NFS.
The kernel RPCSEC_GSS code sets the credential (called a client) lifetime to the lifetime of the Kerberos ticket, which is typically several hours. As such, when a user's credentials change such as being added to a new group, it can take several hours for this change to be recognized by the NFS server. This patch adds a sysctl called kern.rpc.gss.lifetime_max which can be set by a sysadmin to put a cap on the time to expire for the credentials, so that a sysadmin can reduce the timeout. It also fixes a bug, where time_uptime is added twice when GSS_C_INDEFINITE is returned for a lifetime. This has no effect in practice, sine Kerberos never does this. Tested by: pen@lysator.liu.se PR: 242132 Submitted by: pen@lysator.liu.se MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=355157
-rw-r--r--sys/rpc/rpcsec_gss/svc_rpcsec_gss.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
index 8e4af69959f8..5449eb49b2cc 100644
--- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
+++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
@@ -173,6 +173,7 @@ struct svc_rpc_gss_cookedcred {
#define CLIENT_MAX 1024
u_int svc_rpc_gss_client_max = CLIENT_MAX;
u_int svc_rpc_gss_client_hash_size = CLIENT_HASH_SIZE;
+u_int svc_rpc_gss_lifetime_max = 0;
SYSCTL_NODE(_kern, OID_AUTO, rpc, CTLFLAG_RW, 0, "RPC");
SYSCTL_NODE(_kern_rpc, OID_AUTO, gss, CTLFLAG_RW, 0, "GSS");
@@ -185,6 +186,10 @@ SYSCTL_UINT(_kern_rpc_gss, OID_AUTO, client_hash, CTLFLAG_RDTUN,
&svc_rpc_gss_client_hash_size, 0,
"Size of rpc-gss client hash table");
+SYSCTL_UINT(_kern_rpc_gss, OID_AUTO, lifetime_max, CTLFLAG_RW,
+ &svc_rpc_gss_lifetime_max, 0,
+ "Maximum lifetime (seconds) of rpc-gss clients");
+
static u_int svc_rpc_gss_client_count;
SYSCTL_UINT(_kern_rpc_gss, OID_AUTO, client_count, CTLFLAG_RD,
&svc_rpc_gss_client_count, 0,
@@ -956,8 +961,15 @@ svc_rpc_gss_accept_sec_context(struct svc_rpc_gss_client *client,
* that out).
*/
if (cred_lifetime == GSS_C_INDEFINITE)
- cred_lifetime = time_uptime + 24*60*60;
+ cred_lifetime = 24*60*60;
+ /*
+ * Cap cred_lifetime if sysctl kern.rpc.gss.lifetime_max is set.
+ */
+ if (svc_rpc_gss_lifetime_max > 0 && cred_lifetime >
+ svc_rpc_gss_lifetime_max)
+ cred_lifetime = svc_rpc_gss_lifetime_max;
+
client->cl_expiration = time_uptime + cred_lifetime;
/*