enable preferred realms for ccache searching
Subsystems (2)
PATCH 1/1 enable preferred realms for ccache searching
The rpc.gssd scans for any suitable kerberos ticket. In cross-realm environment this would not have to be the desired behaviour. Therefore a new option is presented -R preferred realm so that the rpc.gssd preferrs tickets from this realm. By default, no realm is preferred so we follow the original behavior.
utils/gssd/gssd.c +6 -2
@@ -61,6 +61,7 @@ char *ccachesearch[GSSD_MAX_CCACHE_SEARCH + 1];int use_memcache =0 ;int root_uses_machine_creds =1 ;int ccache_timeout =0 ; +char *preferred_realm =NULL ;void sig_die (int signal)
@@ -83,7 +84,7 @@ sig_hup(int signal)static void usage (char *progname) { -fprintf (stderr,"usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout]\n" , +fprintf (stderr,"usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm]\n" , progname);exit (1 ); }
@@ -100,7 +101,7 @@ main(int argc, char *argv[])char *progname;memset (ccachesearch,0 ,sizeof (ccachesearch)); -while ((opt =getopt (argc, argv,"fvrmnMp:k:d:t:" )) !=-1 ) { +while ((opt =getopt (argc, argv,"fvrmnMp:k:d:t:R:" )) !=-1 ) {switch (opt) {case 'f' : fg =1 ;
@@ -138,6 +139,9 @@ main(int argc, char *argv[])case 't' : ccache_timeout =atoi (optarg);break ; +case 'R' : + preferred_realm =strdup (optarg); +break ;default :usage (argv[0 ]);break ;
utils/gssd/gssd.h +1 -0
@@ -66,6 +66,7 @@ extern char *ccachesearch[];extern int use_memcache;extern int root_uses_machine_creds;extern int ccache_timeout; +extern char *preferred_realm; TAILQ_HEAD(clnt_list_head, clnt_info) clnt_list;
utils/gssd/gssd.man +3 -0
@@ -86,6 +86,9 @@ Increases the verbosity of the output (can be specified multiple times). .B -r If the rpcsec_gss library supports setting debug level, increases the verbosity of the output (can be specified multiple times). +.B -R realm +Tickets from this realm will be preffered when scaning ccache dir. +By default no realm is preferred. .TP .B -t timeout Timeout in seconds for kernel tickets cache. This is workaround in case you want to
utils/gssd/krb5_util.c +107 -7
167 lines not on this page · raw message
Hello Lukas,
I'm fixing some things up in this patch (see comments below) and I have a question as well: Is "score" ever anything besides zero or one? I can see how it might be used in the future for including more preferences, but today it is only zero or one?
Thanks,
K.C.
Quoted 66 lines · Lukas Hejtmanek
The rpc.gssd scans for any suitable kerberos ticket. In cross-realm environment this would not have to be the desired behaviour. Therefore a new option is presented -R preferred realm so that the rpc.gssd preferrs tickets from this realm. By default, no realm is preferred so we follow the original behavior.
Signed-off-by Lukas Hejtmanek <[email protected]>utils/gssd/gssd.c +6
-2@@ -61,6 +61,7 @@ char *ccachesearch[GSSD_MAX_CCACHE_SEARCH + 1];int use_memcache =0 ;int root_uses_machine_creds =1 ;int ccache_timeout =0 ; +char *preferred_realm =NULL ;void sig_die (int signal)@@ -83,7 +84,7 @@ sig_hup(int signal)static void usage (char *progname) { -fprintf (stderr,"usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout]\n" , +fprintf (stderr,"usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm]\n" , progname);exit (1 ); }@@ -100,7 +101,7 @@ main(int argc, char *argv[])char *progname;memset (ccachesearch,0 ,sizeof (ccachesearch)); -while ((opt =getopt (argc, argv,"fvrmnMp:k:d:t:" )) !=-1 ) { +while ((opt =getopt (argc, argv,"fvrmnMp:k:d:t:R:" )) !=-1 ) {switch (opt) {case 'f' : fg =1 ;@@ -138,6 +139,9 @@ main(int argc, char *argv[])case 't' : ccache_timeout =atoi (optarg);break ; +case 'R' : + preferred_realm =strdup (optarg); +break ;default :usage (argv[0 ]);break ;utils/gssd/gssd.h +1
-0@@ -66,6 +66,7 @@ extern char *ccachesearch[];extern int use_memcache;extern int root_uses_machine_creds;extern int ccache_timeout; +extern char *preferred_realm; TAILQ_HEAD(clnt_list_head, clnt_info) clnt_list;utils/gssd/gssd.man +0
-0
utils/gssd/gssd.man Increases the verbosity of the output (can be specified multiple times). · line 90
Quoted 5 lines
utils/gssd/gssd.man +2
-0@@ -86,6 +86,9 @@ Increases the verbosity of the output (can be specified multiple times). .B -r If the rpcsec_gss library supports setting debug level, increases the verbosity of the output (can be specified multiple times). +.B -R realm +Tickets from this realm will be preffered when scaning ccache dir.
I'm fixing typo here.
Quoted 115 lines
utils/gssd/gssd.man +1
-0+By default no realm is preferred. .TP .B -t timeout Timeout in seconds for kernel tickets cache. This is workaround in case you want toutils/gssd/krb5_util.c +43
-7@@ -135,7 +135,7 @@ static int gssd_find_existing_krb5_ccache(uid_t uid, char *dirname, struct dirent **d);static int gssd_get_single_krb5_cred (krb5_context context,krb5_keytab kt,struct gssd_k5_kt_princ *ple); - +static int query_krb5_ccache (const char * cred_cache,char **ret_princname,char **ret_realm);/* * Called from the scandir function to weed out potential krb5 @@ -179,6 +179,10 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname, struct dirent **d)int found =0 ;struct dirent *best_match_dir =NULL ;struct stat best_match_stat, tmp_stat; +char buf[1030 ]; +char *princname; +char *realm =NULL ; +int score, best_match_score =0 ;memset (&best_match_stat,0 ,sizeof (best_match_stat)); *d =NULL ;@@ -194,6 +198,8 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname, struct dirent **d) namelist[i]->d_name);snprintf (statname,sizeof (statname),"%s/%s" , dirname, namelist[i]->d_name); +snprintf (buf,sizeof (buf),"FILE:%s/%s" , dirname, + namelist[i]->d_name);if (lstat (statname, &tmp_stat)) {printerr (0 ,"Error doing stat on file '%s'\n" , statname);@@ -213,9 +219,19 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname, struct dirent **d)free (namelist[i]);continue ; } -printerr (3 ,"CC file '%s' matches owner check and has " -"mtime of %u\n" , - namelist[i]->d_name, tmp_stat.st_mtime); +if (!query_krb5_ccache (buf, &princname, &realm)) { +printerr (3 ,"CC file '%s' expired or corrupt\n" , statname); +continue ; + } + + score =0 ; +if (preferred_realm && !strcmp (realm, preferred_realm)) + score+=1 ; + +printerr (3 ,"CC file '%s'(%s@%s) passed all checks and" +" has mtime of %u\n" , + namelist[i]->d_name, princname, realm, + tmp_stat.st_mtime);/* * if more than one match is found, return the most * recent (the one with the latest mtime), and @@ -224,20 +240,26 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname, struct dirent **d)if (!found) { best_match_dir = namelist[i]; best_match_stat = tmp_stat; + best_match_score = score; found++; }else {/* -* If the current match has an mtime later +* If current score is higher than best match +* score, we use the current match. Otherwies, +* if the current match has an mtime later * than the one we are looking at, then use * the current match. Otherwise, we still * have the best match. */ -if (tmp_stat.st_mtime > - best_match_stat.st_mtime) { +if (best_match_score < score || + (best_match_score == score && + tmp_stat.st_mtime > + best_match_stat.st_mtime)) {free (best_match_dir); best_match_dir = namelist[i]; best_match_stat = tmp_stat; + best_match_score = score; }else {free (namelist[i]);@@ -248,6 +270,8 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname, struct dirent **d) best_match_dir->d_name, best_match_stat.st_mtime); } +free (princname); +free (realm); }free (namelist); }@@ -884,6 +908,82 @@ out:return retval; } + +static int +check_for_tgt (krb5_context context,krb5_ccache ccache, +krb5_principal principal) +{ +krb5_error_code ret; +krb5_creds creds; +krb5_cc_cursor cur; +int found =0 ; + + ret =krb5_cc_start_seq_get (context, ccache, &cur); +if (ret)
utils/gssd/krb5_util.c out: · line 932
Quoted 10 lines
utils/gssd/krb5_util.c +10
-0+return 0 ; + +while (!found && !(ret =krb5_cc_next_cred (context, ccache, &cur, &creds))) { + if (creds.server->length == 2 && + strcmp(creds.server->realm.data, + principal->realm.data) == 0 && + strcmp((char *)creds.server->data[0].data, + "krbtgt") == 0 && + strcmp((char *)creds.server->data[1].data, + principal->realm.data) == 0 &&
I don't believe these creds strings are guaranteed to be null-terminated.
Quoted 28 lines
utils/gssd/krb5_util.c +28
-0+ creds.times.endtime > time(NULL)) + found =1 ; +krb5_free_cred_contents (context, &creds); + } +if (ret ==KRB5_CC_END ) { +krb5_cc_end_seq_get (context, ccache, &cur); + } + +return found; +} + +static +int query_krb5_ccache (const char * cred_cache,char **ret_princname,char **ret_realm) +{ +krb5_error_code ret; +krb5_context context; +krb5_ccache ccache; +krb5_principal principal; +int found =0 ; +char *str =NULL ; + + ret =krb5_init_context (&context); +if (ret) +return 0 ; + +if (!cred_cache ||krb5_cc_resolve (context, cred_cache, &ccache)) + goto err_cache; +
utils/gssd/krb5_util.c out: · line 970
Quoted 10 lines
utils/gssd/krb5_util.c +10
-0+if (krb5_cc_set_flags (context, ccache,0 )) + goto err_princ; + + ret =krb5_cc_get_principal (context, ccache, &principal); +if (ret) + goto err_princ; + + found =check_for_tgt (context, ccache, principal); +if (found) { + ret =krb5_unparse_name (context, principal, ret_princname);
This storage should be freed with krb5_free_unparsed_name(), it is being freed with free above.
Quoted 21 lines
utils/gssd/krb5_util.c +16
-0+if (!ret && (str =strchr (*ret_princname,'@' ))) { + *str ='\0' ; + *ret_realm =strdup (str+1 ); + }else { + found =0 ; + } + } +krb5_free_principal (context, principal); +err_princ: +krb5_cc_set_flags (context, ccache,KRB5_TC_OPENCLOSE ); +krb5_cc_close (context, ccache); +err_cache: +krb5_free_context (context); +return found; +} +/*==========================*/ /*=== External routines ===*/ /*==========================*/
A message that is not in the archive (sent off-list or not yet received): 4d569c330807020853m37a834ex5ba191faf85b0f97-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 4 lines · Kevin Coffman
I'm fixing some things up in this patch (see comments below) and I have a question as well: Is "score" ever anything besides zero or one? I can see how it might be used in the future for including more preferences, but today it is only zero or one?
The score is really only zero or one. It is there because we use one mo= re
preference - PBSPro tickets - these have the highest priority at all bu= t
I don't think PBS tickets are widely used so I removed this part from t= he
public patch. Depending how close is release of 1.1.3 utils but we may = want
allow to add dynamic settings of score to be read from a config file. O= n the
other hand, this will be deprecated once the keyring stuff is ready.
Do you want me to rework the patch according to your comments?
Also, if interested, I have a patch to set the default preferred realm = from the
kerberos configuration.
Thanks anyway.=20
--=20
Luk=E1=B9 Hejtm=E1nek
2008/7/2 Lukas Hejtmanek <[email protected]>:
Quoted 10 lines · Kevin Coffman
Quoted 4 lines
I'm fixing some things up in this patch (see comments below) and I have a question as well: Is "score" ever anything besides zero or one? I can see how it might be used in the future for including more preferences, but today it is only zero or one?
The score is really only zero or one. It is there because we use one more preference - PBSPro tickets - these have the highest priority at all but I don't think PBS tickets are widely used so I removed this part from the public patch.
OK, I'll leave that part alone then.
Quoted 5 lines
Depending how close is release of 1.1.3 utils but we may want allow to add dynamic settings of score to be read from a config file. On the other hand, this will be deprecated once the keyring stuff is ready.
Do you want me to rework the patch according to your comments?
Thanks, but I'm already cleaning it up. I'll re-post for you look at before sending up to Steve.
Quoted 2 lines
Also, if interested, I have a patch to set the default preferred realm from the kerberos configuration.
I think that would be a nice thing to add to this.
Quoted 2 lines · Kevin Coffman
Thanks, but I'm already cleaning it up. I'll re-post for you look at before sending up to Steve.
OK, thanks
Quoted 4 lines
Quoted 2 lines
Also, if interested, I have a patch to set the default preferred realm from the kerberos configuration.
I think that would be a nice thing to add to this.
attached.
Signature · 1 line
Lukáš Hejtmánek
Set default kerberos realm as preferred realm by default.
utils/gssd/gssd.c +3 -0
@@ -148,6 +148,9 @@ main(int argc, char *argv[]) } } +if (!preferred_realm) + preferred_realm =gssd_k5_get_default_realm (); + i =0 ; ccachesearch[i++] =strtok (ccachedir,":" ); do {
utils/gssd/krb5_util.c +23 -0
@@ -1234,3 +1234,26 @@ gssd_k5_err_msg(krb5_context context, krb5_error_code code)return error_message (code);#endif } + +/* +* Routine that returns default kerberos realm +*/ + +const char * +gssd_k5_get_default_realm () +{ +krb5_context context; +char *realm; + +if (krb5_init_context (&context)) { +return NULL ; + } + +if (krb5_get_default_realm (context, &realm)) { +krb5_free_context (context); +return NULL ; + } + +krb5_free_context (context); +return realm; +}
utils/gssd/krb5_util.h +1 -0
@@ -17,6 +17,7 @@ struct gssd_k5_kt_princ { }; +const char *gssd_k5_get_default_realm (void );int gssd_setup_krb5_user_gss_ccache (uid_t uid,char *servername,char *dirname);int gssd_get_krb5_machine_cred_list (char ***list);
_______________________________________________
NFSv4 mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/nfsv4