gssd: allow it to work with KEYRING: credcaches
Subsystems (2)
cover gssd: allow it to work with KEYRING: credcaches
This set is comprised of a couple of patches that fix gssd so that it works with KEYRING: style credcaches. It turns out that gssd already tries to query GSSAPI to find the best credcache to use and only falls back to trawling through likely locations for credcaches if that fails.
The problem is that the initial call into GSSAPI for this almost always fails, so it ends up falling back to trawling in the common case. This patch corrects this by making a number of changes:
1) credentials are switched sooner during the upcall and don't switch back
2) credentials are switched using setuid() instead of setfsuid(). The GSSAPI libs depend on the *real* uid being correct.
3) the daemon now forks before doing any credential switching to ensure that unprivileged users can't do anything nefarious to it while it's running under a different uid.
With this set of changes, and a bleeding-edge version of the krb5 and keyutils libs, I can now successfully use KEYRING: style credcaches.
Jeff Layton (2):
gssd: have process_krb5_upcall fork before handling upcall
gssd: switch real uid instead of just fsuid when looking for user
creds
utils/gssd/gssd_proc.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/2 gssd: have process_krb5_upcall fork before handling upcall
In order to handle KEYRING: caches, we need to be able to switch the real UID of the process to the designated one, but that opens the door to allowing gssd to be killed or reniced during the window where we've switched credentials.
Change gssd to fork before trying to handle each upcall. The child will do the work to establish the context and the parent task will just wait for it to exit. It's still possible for the child to be killed or reniced, but that would only affect a single upcall instead of the entire daemon.
--- utils/gssd/gssd_main_loop.c | 3 ++- utils/gssd/gssd_proc.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-)
utils/gssd/gssd_main_loop.c +2 -1
@@ -40,7 +40,8 @@#include <sys/socket.h> #include <sys/poll.h> #include <netinet/in.h> - +#include <sys/types.h> +#include <sys/wait.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
utils/gssd/gssd_proc.c +18 -1
@@ -982,6 +982,23 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,int err, downcall_err = -EACCES ;gss_cred_id_t gss_cred;OM_uint32 maj_stat, min_stat, lifetime_rec; +pid_t pid; + + pid =fork (); +switch (pid) { +case 0 : +/* Child: fall through to rest of function */ +break ; +case -1 : +/* fork() failed! */ +printerr (0 ,"WARNING: unable to fork() to handle upcall: %s\n" , +strerror (errno)); +return ; +default : +/* Parent: just wait on child to exit and return */ +wait (&err); +return ; + }printerr (1 ,"handling krb5 upcall (%s)\n" , clp->dirname);
@@ -1121,7 +1138,7 @@ out:AUTH_DESTROY (auth);if (rpc_clnt)clnt_destroy (rpc_clnt); -return ; +exit (0 ); out_return_error:do_error_downcall (fd, uid, downcall_err);
Signature · 1 line
1.8.3.1
Re: [PATCH 1/2] gssd: have process_krb5_upcall fork before handling upcall
Quoted 22 lines · On Thu, 3 Oct 2013 14:42:10 -0400 Jeff Layton <[email protected]> wrote:
In order to handle KEYRING: caches, we need to be able to switch the real UID of the process to the designated one, but that opens the door to allowing gssd to be killed or reniced during the window where we've switched credentials.
Change gssd to fork before trying to handle each upcall. The child will do the work to establish the context and the parent task will just wait for it to exit. It's still possible for the child to be killed or reniced, but that would only affect a single upcall instead of the entire daemon.
Signed-off-by Jeff Layton <[email protected]>--- utils/gssd/gssd_main_loop.c | 3 ++- utils/gssd/gssd_proc.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-)utils/gssd/gssd_main_loop.c +0
-0
utils/gssd/gssd_main_loop.c line 44
Quoted 6 lines
utils/gssd/gssd_main_loop.c +2
-1@@ -40,7 +40,8 @@#include <sys/socket.h> #include <sys/poll.h> #include <netinet/in.h> - +#include <sys/types.h> +#include <sys/wait.h>
My apologies -- unneeded delta here that gets fixed up in the 2nd patch. The final result is fine, but this breaks bisectability. I'll fix and send a v2 set. Sorry for the noise...
Quoted 40 lines
utils/gssd/gssd_main_loop.c +0
-0#include <stdio.h> #include <stdlib.h> #include <string.h> utils/gssd/gssd_proc.c +18
-1@@ -982,6 +982,23 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,int err, downcall_err = -EACCES ;gss_cred_id_t gss_cred;OM_uint32 maj_stat, min_stat, lifetime_rec; +pid_t pid; + + pid =fork (); +switch (pid) { +case 0 : +/* Child: fall through to rest of function */ +break ; +case -1 : +/* fork() failed! */ +printerr (0 ,"WARNING: unable to fork() to handle upcall: %s\n" , +strerror (errno)); +return ; +default : +/* Parent: just wait on child to exit and return */ +wait (&err); +return ; + }printerr (1 ,"handling krb5 upcall (%s)\n" , clp->dirname);@@ -1121,7 +1138,7 @@ out:AUTH_DESTROY (auth);if (rpc_clnt)clnt_destroy (rpc_clnt); -return ; +exit (0 ); out_return_error:do_error_downcall (fd, uid, downcall_err);
Signature · 1 line
Jeff Layton <[email protected]>
PATCH 2/2 gssd: switch real uid instead of just fsuid when looking for user creds
In reply to Jeff LaytonThe part of process_krb5_upcall that handles non-machine user creds first tries to query GSSAPI for credentials. If that fails, it then falls back to trawling through likely credcache locations to find them and then points $KRB5CCNAME at it before proceeding. There are a number of bugs in this code that this patch attempts to address.
The code that queries GSSAPI for credentials does it as root and that almost universally fails to do anything useful unless we happen to be looking for non-machine root creds. Because of this, gssd almost always falls back to having to search for credcaches "manually" and then set $KRB5CCNAME if and when they are found. The code that handles credential switching is in create_auth_rpc_client, so it's too late to be of any use here.
Worse yet, the GSSAPI code that handles finding credcaches does it based on the return from getuid(), so just switching the fsuid or even euid is insufficient. You must switch the real uid.
This code moves the credential switching into process_krb5_upcall and makes it use setuid() instead of setfsuid(). That's of course irreversible so we can't switch back to root after doing so. No matter though since it's probably safer to do all of this as an unprivileged user anyway.
--- utils/gssd/gssd_main_loop.c | 3 +-- utils/gssd/gssd_proc.c | 28 ++++++++++++---------------- 2 files changed, 13 insertions(+), 18 deletions(-)
utils/gssd/gssd_main_loop.c +1 -2
@@ -40,8 +40,7 @@#include <sys/socket.h> #include <sys/poll.h> #include <netinet/in.h> -#include <sys/types.h> -#include <sys/wait.h> +#include <stdio.h> #include <stdlib.h> #include <string.h>
utils/gssd/gssd_proc.c +12 -16
@@ -67,6 +67,8 @@#include <errno.h> #include <gssapi/gssapi.h> #include <netdb.h> +#include <sys/types.h> +#include <sys/wait.h> #include "gssd.h" #include "err_util.h"
@@ -832,7 +834,6 @@ create_auth_rpc_client(struct clnt_info *clp,CLIENT *rpc_clnt =NULL ;struct rpc_gss_sec sec;AUTH *auth =NULL ; -uid_t save_uid =-1 ;int retval =-1 ;OM_uint32 min_stat;char rpc_errmsg[1024 ];
@@ -841,16 +842,6 @@ create_auth_rpc_client(struct clnt_info *clp,struct sockaddr *addr = (struct sockaddr *) &clp->addr;socklen_t salen; -/* Create the context as the user (not as root) */ - save_uid =geteuid (); -if (setfsuid (uid) !=0 ) { -printerr (0 ,"WARNING: Failed to setfsuid for " -"user with uid %d\n" , uid); - goto out_fail; - } -printerr (2 ,"creating context using fsuid %d (save_uid %d)\n" , - uid, save_uid); - sec.qop =GSS_C_QOP_DEFAULT ; sec.svc =RPCSEC_GSS_SVC_NONE ; sec.cred = cred;
@@ -949,11 +940,6 @@ create_auth_rpc_client(struct clnt_info *clp, out:if (sec.cred !=GSS_C_NO_CREDENTIAL )gss_release_cred (&min_stat, &sec.cred); -/* Restore euid to original value */ -if (((int )save_uid !=-1 ) && (setfsuid (save_uid) != (int )uid)) { -printerr (0 ,"WARNING: Failed to restore fsuid" -" to uid %d from %d\n" , save_uid, uid); - }return retval; out_fail:
@@ -1031,6 +1017,16 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname, service ? service : "<null>");if (uid !=0 || (uid ==0 && root_uses_machine_creds ==0 && service ==NULL )) { + +/* Create the context as the user (not as root) */ +if (setuid (uid) !=0 ) { +printerr (0 ,"WARNING: Failed to setuid for " +"user with uid %d\n" , uid); + goto out_return_error; + } + +printerr (2 ,"creating context using real uid %d\n" , uid); +/* Tell krb5 gss which credentials cache to use */ /* Try first to acquire credentials directly via GSSAPI */ err =gssd_acquire_user_cred (uid, &gss_cred);
Signature · 1 line
1.8.3.1