]> andersk Git - gssapi-openssh.git/blobdiff - openssh/gss-serv.c
o Merge to OPENSSH_3_6_1P1_GSSAPI_20030425.
[gssapi-openssh.git] / openssh / gss-serv.c
index 0edb918e4fa63ff763df43cd82936d055a920c11..39cdb3f6933404040e6caae06e6736931ce06d81 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001,2002 Simon Wilkinson. All rights reserved.
+ * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,6 @@
 #ifdef GSSAPI
 
 #include "ssh.h"
-#include "ssh1.h"
 #include "ssh2.h"
 #include "xmalloc.h"
 #include "buffer.h"
@@ -44,7 +43,6 @@
 #include "dispatch.h"
 #include "servconf.h"
 #include "compat.h"
-#include "misc.h"
 #include "monitor_wrap.h"
 
 #include "ssh-gss.h"
@@ -53,652 +51,100 @@ extern ServerOptions options;
 extern u_char *session_id2;
 extern int session_id2_len;
 
-typedef struct ssh_gssapi_cred_cache {
-       char *filename;
-       char *envvar;
-       char *envval;
-       void *data;
-} ssh_gssapi_cred_cache;
+static ssh_gssapi_client gssapi_client =
+       { {0,NULL}, GSS_C_NO_CREDENTIAL, NULL, {NULL,NULL,NULL}};
 
-static struct ssh_gssapi_cred_cache gssapi_cred_store = {NULL,NULL,NULL};
-
-/*
- * Environment variables pointing to delegated credentials
- */
-static char *delegation_env[] = {
-  "X509_USER_PROXY",           /* GSSAPI/SSLeay */
-  "KRB5CCNAME",                        /* Krb5 and possibly SSLeay */
-  NULL
-};
-
-static void gssapi_unsetenv(const char *var);
+ssh_gssapi_mech gssapi_null_mech 
+  = {NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
 
 #ifdef KRB5
-
-#ifdef HEIMDAL
-#include <krb5.h>
-#else
-#include <gssapi_krb5.h>
-#define krb5_get_err_text(context,code) error_message(code)
-#endif
-
-static krb5_context krb_context = NULL;
-
-/* Initialise the krb5 library, so we can use it for those bits that
- * GSSAPI won't do */
-
-int ssh_gssapi_krb5_init() {
-       krb5_error_code problem;
-       
-       if (krb_context !=NULL)
-               return 1;
-               
-       problem = krb5_init_context(&krb_context);
-       if (problem) {
-               log("Cannot initialize krb5 context");
-               return 0;
-       }
-       krb5_init_ets(krb_context);
-
-       return 1;       
-}                      
-
-/* Check if this user is OK to login. This only works with krb5 - other 
- * GSSAPI mechanisms will need their own.
- * Returns true if the user is OK to log in, otherwise returns 0
- */
-
-int
-ssh_gssapi_krb5_userok(char *name) {
-       krb5_principal princ;
-       int retval;
-
-       if (ssh_gssapi_krb5_init() == 0)
-               return 0;
-               
-       if ((retval=krb5_parse_name(krb_context, gssapi_client_name.value, 
-                                   &princ))) {
-               log("krb5_parse_name(): %.100s", 
-                       krb5_get_err_text(krb_context,retval));
-               return 0;
-       }
-       if (krb5_kuserok(krb_context, princ, name)) {
-               retval = 1;
-               log("Authorized to %s, krb5 principal %s (krb5_kuserok)",name,
-                   (char *)gssapi_client_name.value);
-       }
-       else
-               retval = 0;
-       
-       krb5_free_principal(krb_context, princ);
-       return retval;
-}
-
-int
-ssh_gssapi_krb5_localname(char **user)
-{
-    krb5_principal princ;
-
-    if (ssh_gssapi_krb5_init() == 0)
-       return 0;
-
-    if (krb5_parse_name(krb_context, gssapi_client_name.value, &princ)) {
-       return(0);
-    }
-    *user = (char *)xmalloc(256);
-    if (krb5_aname_to_localname(krb_context, princ, 256, *user)) {
-       xfree(*user);
-       *user = NULL;
-       return(0);
-    }
-    return(1);
-}
-       
-/* Make sure that this is called _after_ we've setuid to the user */
-
-/* This writes out any forwarded credentials. Its specific to the Kerberos
- * GSSAPI mechanism
- *
- * We assume that our caller has made sure that the user has selected
- * delegated credentials, and that the client_creds structure is correctly
- * populated.
- */
-
-OM_uint32
-ssh_gssapi_krb5_storecreds(gss_buffer_t export_buffer) {
-       krb5_ccache ccache;
-       krb5_error_code problem;
-       krb5_principal princ;
-       char ccname[35];
-       static char name[40];
-       int tmpfd;
-       OM_uint32 maj_status,min_status;
-       gss_cred_id_t krb5_cred_handle;
-
-
-       if (gssapi_client_creds==NULL) {
-               debug("No credentials stored"); 
-               return GSS_S_NO_CRED;
-       }
-               
-       if (ssh_gssapi_krb5_init() == 0)
-               return GSS_S_FAILURE;
-
-       if (options.gss_use_session_ccache) {
-               snprintf(ccname,sizeof(ccname),"/tmp/krb5cc_%d_XXXXXX",geteuid());
-       
-               if ((tmpfd = mkstemp(ccname))==-1) {
-                       log("mkstemp(): %.100s", strerror(errno));
-                       return GSS_S_FAILURE;
-               }
-               if (fchmod(tmpfd, S_IRUSR | S_IWUSR) == -1) {
-                       log("fchmod(): %.100s", strerror(errno));
-                       close(tmpfd);
-                       return GSS_S_FAILURE;
-               }
-        } else {
-               snprintf(ccname,sizeof(ccname),"/tmp/krb5cc_%d",geteuid());
-               tmpfd = open(ccname, O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR);
-               if (tmpfd == -1) {
-                       log("open(): %.100s", strerror(errno));
-                       return GSS_S_FAILURE;
-               }
-        }
-
-               close(tmpfd);
-        snprintf(name, sizeof(name), "FILE:%s",ccname);
-        if ((problem = krb5_cc_resolve(krb_context, name, &ccache))) {
-                log("krb5_cc_default(): %.100s", 
-                       krb5_get_err_text(krb_context,problem));
-                return GSS_S_FAILURE;
-        }
-
-       if ((problem = krb5_parse_name(krb_context, gssapi_client_name.value, 
-                                      &princ))) {
-               log("krb5_parse_name(): %.100s", 
-                       krb5_get_err_text(krb_context,problem));
-               krb5_cc_destroy(krb_context,ccache);
-               return GSS_S_FAILURE;
-       }
-       
-       if ((problem = krb5_cc_initialize(krb_context, ccache, princ))) {
-               log("krb5_cc_initialize(): %.100s", 
-                       krb5_get_err_text(krb_context,problem));
-               krb5_free_principal(krb_context,princ);
-               krb5_cc_destroy(krb_context,ccache);
-               return GSS_S_FAILURE;
-       }
-       
-       krb5_free_principal(krb_context,princ);
-
-#ifdef MECHGLUE
-       krb5_cred_handle =
-           __gss_get_mechanism_cred(gssapi_client_creds,
-                                    &(supported_mechs[GSS_KERBEROS].oid));
-#else
-       krb5_cred_handle = gssapi_client_creds;
+extern ssh_gssapi_mech gssapi_kerberos_mech;
+extern ssh_gssapi_mech gssapi_kerberos_mech_old;
 #endif
-
-       if ((maj_status = gss_krb5_copy_ccache(&min_status, 
-                                              krb5_cred_handle, 
-                                              ccache))) {
-               log("gss_krb5_copy_ccache() failed");
-               ssh_gssapi_error(&supported_mechs[GSS_KERBEROS].oid,
-                                maj_status,min_status);
-               krb5_cc_destroy(krb_context,ccache);
-               return GSS_S_FAILURE;
-       }
-       
-       krb5_cc_close(krb_context,ccache);
-
-       export_buffer->length = strlen("KRB5CCNAME")+strlen(name)+1;
-       export_buffer->value = xmalloc(export_buffer->length+1);
-       sprintf(export_buffer->value, "%s=%s", "KRB5CCNAME", name);
-
-       return GSS_S_COMPLETE;
-}
-
-#endif /* KRB5 */
-
 #ifdef GSI
-#include <globus_gss_assist.h>
-
-/*
- * Check if this user is OK to login under GSI. User has been authenticated
- * as identity in global 'client_name.value' and is trying to log in as passed
- * username in 'name'.
- *
- * Returns non-zero if user is authorized, 0 otherwise.
- */
-int
-ssh_gssapi_gsi_userok(char *name)
-{
-    int authorized = 0;
-    
-#ifdef GLOBUS_GSI_GSS_ASSIST_MODULE
-    if (globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE) != 0) {
-       return 0;
-    }
+extern ssh_gssapi_mech gssapi_gsi_mech;
+extern ssh_gssapi_mech gssapi_gsi_mech_old;
 #endif
 
-    /* globus_gss_assist_userok() returns 0 on success */
-    authorized = (globus_gss_assist_userok(gssapi_client_name.value,
-                                          name) == 0);
-    
-    log("GSI user %s is%s authorized as target user %s",
-       (char *) gssapi_client_name.value, (authorized ? "" : " not"), name);
-    
-    return authorized;
-}
-
-/*
- * Return the local username associated with the GSI credentials.
- */
-int
-ssh_gssapi_gsi_localname(char **user)
-{
-#ifdef GLOBUS_GSI_GSS_ASSIST_MODULE
-    if (globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE) != 0) {
-       return 0;
-    }
-#endif
-    return(globus_gss_assist_gridmap(gssapi_client_name.value, user) == 0);
-}
-
-/*
- * Handle setting up child environment for GSI.
- *
- * Make sure that this is called _after_ we've setuid to the user.
- */
-OM_uint32
-ssh_gssapi_gsi_storecreds(gss_buffer_t export_buffer)
-{
-       OM_uint32       major_status;
-       OM_uint32       minor_status;
-
-       if (gssapi_client_creds != NULL)
-       {
-               char *creds_env = NULL;
-
-               /*
-                * This is the current hack with the GSI gssapi library to
-                * export credentials to disk.
-                */
-
-               debug("Exporting delegated credentials");
-               
-               minor_status = 0xdee0;  /* Magic value */
-               major_status =
-                       gss_inquire_cred(&minor_status,
-                                        gssapi_client_creds,
-                                        (gss_name_t *) &creds_env,
-                                        NULL,
-                                        NULL,
-                                        NULL);
-
-               if ((major_status == GSS_S_COMPLETE) &&
-                   (minor_status == 0xdee1) &&
-                   (creds_env != NULL))
-               {
-                       char            *value;
-                               
-                       /*
-                        * String is of the form:
-                        * X509_USER_DELEG_PROXY=filename
-                        * so we parse out the filename
-                        * and then set X509_USER_PROXY
-                        * to point at it.
-                        */
-                       value = strchr(creds_env, '=');
-                       
-                       if (value != NULL)
-                       {
-                               *value = '\0';
-                               value++;
-                               export_buffer->length=
-                                   strlen("X509_USER_PROXY")+strlen(value)+1;
-                               export_buffer->value =
-                                   xmalloc(export_buffer->length+1);
-                               sprintf(export_buffer->value, "%s=%s",
-                                       "X509_USER_PROXY", value);
-                               
-                               return GSS_S_COMPLETE;
-                       }
-                       else
-                       {
-                           log("Failed to parse delegated credentials string '%s'",
-                               creds_env);
-                       }
-               }
-               else
-               {
-                   log("Failed to export delegated credentials (error %u)",
-                       (unsigned int)major_status);
-               }
-       }
-       return 0;
-}
-
-#endif /* GSI */
-
-void
-ssh_gssapi_cleanup_creds(void *ignored)
-{
-       /* OM_uint32 min_stat; */
-
-       if (gssapi_cred_store.filename!=NULL) {
-               /* Unlink probably isn't sufficient */
-               debug("removing gssapi cred file \"%s\"",gssapi_cred_store.filename);
-               unlink(gssapi_cred_store.filename);
-       }
-       /* DK ?? 
-       if (gssapi_client_creds != GSS_C_NO_CREDENTIAL)
-               gss_release_cred(&min_stat, &gssapi_client_creds);
-       */
-}
-
-OM_uint32
-ssh_gssapi_export_cred(OM_uint32 *            minor_status,
-                      const gss_cred_id_t    cred_handle,
-                      const gss_OID          desired_mech,
-                      OM_uint32              option_req,
-                      gss_buffer_t           export_buffer)
-{
-       OM_uint32 maj_stat = GSS_S_FAILURE;
-
-       if (option_req != 1) return GSS_S_UNAVAILABLE;
-       if (desired_mech != NULL) return GSS_S_BAD_MECH;
-
-       switch (gssapi_client_type) {
+ssh_gssapi_mech* supported_mechs[]= {
 #ifdef KRB5
-       case GSS_KERBEROS:
-               maj_stat = ssh_gssapi_krb5_storecreds(export_buffer);
-               break;
+  &gssapi_kerberos_mech,
+  &gssapi_kerberos_mech_old, /* Support for legacy clients */
 #endif
 #ifdef GSI
-       case GSS_GSI:
-               maj_stat = ssh_gssapi_gsi_storecreds(export_buffer);
-               break;
-#endif /* GSI */
-       case GSS_LAST_ENTRY:
-               /* GSSAPI not used in this authentication */
-               debug("No GSSAPI credentials stored");
-               break;
-       default:
-               log("ssh_gssapi_do_child: Unknown mechanism");
-       
-       }
-
-       if (GSS_ERROR(maj_stat)) {
-               *minor_status = GSS_S_FAILURE;
-       }
-       return maj_stat;
-}
-
-void 
-ssh_gssapi_storecreds()
-{
-       OM_uint32 maj_stat, min_stat;
-       gss_buffer_desc export_cred = GSS_C_EMPTY_BUFFER;
-       char *p;
-
-       if (gssapi_client_creds == GSS_C_NO_CREDENTIAL)
-               return;
-
-#ifdef HAVE_GSSAPI_EXT
-       maj_stat = gss_export_cred(&min_stat, gssapi_client_creds,
-                                  GSS_C_NO_OID, 1, &export_cred);
-       if (GSS_ERROR(maj_stat) && maj_stat != GSS_S_UNAVAILABLE) {
-               ssh_gssapi_error(GSS_C_NO_OID, maj_stat, min_stat);
-               return;
-       }
-#endif
-
-       /* If gss_export_cred() is not available, use old methods */
-       if (export_cred.length == 0) {
-           ssh_gssapi_export_cred(&min_stat, gssapi_client_creds,
-                                  GSS_C_NO_OID, 1, &export_cred);
-           if (GSS_ERROR(maj_stat)) {
-               ssh_gssapi_error(GSS_C_NO_OID, maj_stat, min_stat);
-           }
-       }
-
-       p = strchr((char *) export_cred.value, '=');
-       if (p == NULL) {
-               log("Failed to parse exported credentials string '%.100s'",
-                   (char *)export_cred.value);
-               gss_release_buffer(&min_stat, &export_cred);
-               return;
-       }
-       *p++ = '\0';
-#ifdef GSI
-       if (strcmp((char *)export_cred.value,"X509_USER_DELEG_PROXY") == 0)
-           gssapi_cred_store.envvar = strdup("X509_USER_PROXY");
-       else
+  &gssapi_gsi_mech,
+  &gssapi_gsi_mech_old,        /* Support for legacy clients */
 #endif
-       gssapi_cred_store.envvar = strdup((char *)export_cred.value);
-       gssapi_cred_store.envval = strdup(p);
-#ifdef USE_PAM
-       do_pam_putenv(gssapi_cred_store.envvar, gssapi_cred_store.envval);
-#endif
-       if (strncmp(p, "FILE:", 5) == 0) {
-           p += 5;
-       }
-       if (access(p, R_OK) == 0) {
-           gssapi_cred_store.filename = strdup(p);
-       }
-       gss_release_buffer(&min_stat, &export_cred);
-
-       if (options.gss_cleanup_creds) {
-               fatal_add_cleanup(ssh_gssapi_cleanup_creds, NULL);
-       }
-}
+  &gssapi_null_mech,
+};
 
-/* This allows GSSAPI methods to do things to the childs environment based
- * on the passed authentication process and credentials.
+/* Return a list of the gss-group1-sha1-x mechanisms supported by this
+ * program.
  *
- * Question: If we didn't use userauth_external for some reason, should we
- * still delegate credentials?
- */
-void 
-ssh_gssapi_do_child(char ***envp, u_int *envsizep) 
-{
-
-       if (gssapi_cred_store.envvar!=NULL && 
-           gssapi_cred_store.envval!=NULL) {
-           
-               debug("Setting %s to %s", gssapi_cred_store.envvar,
-                                         gssapi_cred_store.envval);                              
-               child_set_env(envp, envsizep, gssapi_cred_store.envvar, 
-                                             gssapi_cred_store.envval);
-       }
-
-       switch(gssapi_client_type) {
-#ifdef KRB5
-       case GSS_KERBEROS: break;
-#endif
-#ifdef GSI
-       case GSS_GSI: break;
-#endif
-       case GSS_LAST_ENTRY:
-               debug("No GSSAPI credentials stored");
-               break;
-       default:
-               log("ssh_gssapi_do_child: Unknown mechanism");
-       }
-}
-
-int
-ssh_gssapi_userok(char *user)
-{
-       if (gssapi_client_name.length==0 || 
-           gssapi_client_name.value==NULL) {
-               debug("No suitable client data");
-               return 0;
-       }
-       switch (gssapi_client_type) {
-#ifdef KRB5
-       case GSS_KERBEROS:
-               return(ssh_gssapi_krb5_userok(user));
-               break; /* Not reached */
-#endif
-#ifdef GSI
-       case GSS_GSI:
-               return(ssh_gssapi_gsi_userok(user));
-               break; /* Not reached */
-#endif /* GSI */
-       case GSS_LAST_ENTRY:
-               debug("Client not GSSAPI");
-               break;
-       default:
-               debug("Unknown client authentication type");
-       }
-       return(0);
-}
-
-int
-ssh_gssapi_localname(char **user)
-{
-       *user = NULL;
-       if (gssapi_client_name.length==0 || 
-           gssapi_client_name.value==NULL) {
-               debug("No suitable client data");
-               return(0);;
-       }
-       switch (gssapi_client_type) {
-#ifdef KRB5
-       case GSS_KERBEROS:
-               return(ssh_gssapi_krb5_localname(user));
-               break; /* Not reached */
-#endif
-#ifdef GSI
-       case GSS_GSI:
-               return(ssh_gssapi_gsi_localname(user));
-               break; /* Not reached */
-#endif /* GSI */
-       case GSS_LAST_ENTRY:
-               debug("Client not GSSAPI");
-               break;
-       default:
-               debug("Unknown client authentication type");
-       }
-       return(0);
-}
-
-/*
- * Clean our environment on startup. This means removing any environment
- * strings that might inadvertantly been in root's environment and 
- * could cause serious security problems if we think we set them.
+ * We only support the mechanisms that we've indicated in the list above,
+ * but we check that they're supported by the GSSAPI mechanism on the 
+ * machine. We also check, before including them in the list, that
+ * we have the necesary information in order to carry out the key exchange
+ * (that is, that the user has credentials, the server's creds are accessible,
+ * etc)
+ *
+ * The way that this is done is fairly nasty, as we do a lot of work that
+ * is then thrown away. This should possibly be implemented with a cache
+ * that stores the results (in an expanded Gssctxt structure), which are
+ * then used by the first calls if that key exchange mechanism is chosen.
  */
-void
-ssh_gssapi_clean_env(void)
-{
-  char *envstr;
-  int envstr_index;
-
-  
-   for (envstr_index = 0;
-       (envstr = delegation_env[envstr_index]) != NULL;
-       envstr_index++) {
-
-     if (getenv(envstr)) {
-       debug("Clearing environment variable %s", envstr);
-       gssapi_unsetenv(envstr);
-     }
-   }
-}
-
-/*
- * Wrapper around unsetenv.
- */
-static void
-gssapi_unsetenv(const char *var)
-{
-#ifdef HAVE_UNSETENV
-    unsetenv(var);
-
-#else /* !HAVE_UNSETENV */
-    extern char **environ;
-    char **p1 = environ;       /* New array list */
-    char **p2 = environ;       /* Current array list */
-    int len = strlen(var);
-
-    /*
-     * Walk through current environ array (p2) copying each pointer
-     * to new environ array (p1) unless the pointer is to the item
-     * we want to delete. Copy happens in place.
-     */
-    while (*p2) {
-       if ((strncmp(*p2, var, len) == 0) &&
-           ((*p2)[len] == '=')) {
-           /*
-            * *p2 points at item to be deleted, just skip over it
-            */
-           p2++;
-       } else {
-           /*
-            * *p2 points at item we want to save, so copy it
-            */
-           *p1 = *p2;
-           p1++;
-           p2++;
-       }
-    }
-
-    /* And make sure new array is NULL terminated */
-    *p1 = NULL;
-#endif /* HAVE_UNSETENV */
-}
 
+/* Unpriviledged */ 
 char * 
-ssh_server_gssapi_mechanisms() {
+ssh_gssapi_server_mechanisms() {
        gss_OID_set     supported;
+       Gssctxt         *ctx = NULL;
        OM_uint32       maj_status, min_status;
        Buffer          buf;
        int             i = 0;
+       int             first = 0;
        int             present;
-       int             mech_count=0;
        char *          mechs;
-       Gssctxt *       ctx = NULL;     
 
        if (datafellows & SSH_OLD_GSSAPI) return NULL;
        
-       PRIVSEP(gss_indicate_mechs(&min_status, &supported));
+       ssh_gssapi_supported_oids(&supported);
        
-       buffer_init(&buf);      
+       buffer_init(&buf);
 
-       do {
+       while(supported_mechs[i]->name != NULL) {
                if ((maj_status=gss_test_oid_set_member(&min_status,
-                                                       &supported_mechs[i].oid,
+                                                       &supported_mechs[i]->oid,
                                                        supported,
                                                        &present))) {
                        present=0;
                }
+
                if (present) {
-                       if (!GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx,
-                                              &supported_mechs[i].oid)))) {
-                               /* Append gss_group1_sha1_x to our list */
-                               if (++mech_count > 1) {
-                                   buffer_append(&buf, ",", 1);
-                               }
-                               buffer_append(&buf, gssprefix,
-                                             strlen(gssprefix));
-                               buffer_append(&buf, 
-                                             supported_mechs[i].enc_name,
-                                             strlen(supported_mechs[i].enc_name));
-                               debug("GSSAPI mechanism %s (%s%s) supported",
-                                     supported_mechs[i].name, gssprefix,
-                                     supported_mechs[i].enc_name);
-                       } else {
-                           debug("no credentials for GSSAPI mechanism %s",
-                                 supported_mechs[i].name);
-                       }
-               } else {
+                   if (!GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx,
+                                          &supported_mechs[i]->oid)))) {
+                       /* Append gss_group1_sha1_x to our list */
+                       if (first++!=0)
+                               buffer_put_char(&buf,',');
+                       buffer_append(&buf, KEX_GSS_SHA1,
+                                     sizeof(KEX_GSS_SHA1)-1);
+                       buffer_append(&buf, 
+                                     supported_mechs[i]->enc_name,
+                                     strlen(supported_mechs[i]->enc_name));
+                       debug("GSSAPI mechanism %s (%s%s) supported",
+                             supported_mechs[i]->name, KEX_GSS_SHA1,
+                             supported_mechs[i]->enc_name);
+                   } else {
+                       debug("no credentials for GSSAPI mechanism %s",
+                             supported_mechs[i]->name);
+                   }
+               } else {
                    debug("GSSAPI mechanism %s not supported",
-                         supported_mechs[i].name);
+                         supported_mechs[i]->name);
                }
-       } while (supported_mechs[++i].name != NULL);
+               ssh_gssapi_delete_ctx(&ctx);
+               i++;
+       }
        
        buffer_put_char(&buf,'\0');
        
@@ -711,16 +157,9 @@ ssh_server_gssapi_mechanisms() {
           return(mechs);
 }
 
-OM_uint32
-ssh_gssapi_server_ctx(Gssctxt **ctx,gss_OID oid) {
-       if (*ctx) ssh_gssapi_delete_ctx(ctx);
-       ssh_gssapi_build_ctx(ctx);
-       ssh_gssapi_set_oid(*ctx,oid);
-       return(ssh_gssapi_acquire_cred(*ctx));
-}
-
+/* Unpriviledged */
 void ssh_gssapi_supported_oids(gss_OID_set *oidset) {
-       enum ssh_gss_id i =0;
+       int i =0;
        OM_uint32 maj_status,min_status;
        int present;
        gss_OID_set supported;
@@ -728,34 +167,82 @@ void ssh_gssapi_supported_oids(gss_OID_set *oidset) {
        gss_create_empty_oid_set(&min_status,oidset);
        PRIVSEP(gss_indicate_mechs(&min_status, &supported));
 
-       while (supported_mechs[i].name!=NULL) {
+       while (supported_mechs[i]->name!=NULL) {
                if ((maj_status=gss_test_oid_set_member(&min_status,
-                                                      &supported_mechs[i].oid,
+                                                      &supported_mechs[i]->oid,
                                                       supported,
                                                       &present))) {
                        present=0;
                }
                if (present) {
                        gss_add_oid_set_member(&min_status,
-                                              &supported_mechs[i].oid,
+                                              &supported_mechs[i]->oid,
                                               oidset); 
                }
                i++;
        }
 }      
 
-/* Wrapper arround accept_sec_context
+/* Find out which GSS type (out of the list we define in ssh-gss.h) a
+ * particular connection is using 
+ */
+
+/* Priviledged (called ssh_gssapi_accept_ctx -> ssh_gssapi_getclient ->) */
+ssh_gssapi_mech *
+ssh_gssapi_get_ctype(Gssctxt *ctxt) {
+       int i=0;
+       
+       while(supported_mechs[i]->name!=NULL) {
+           if (supported_mechs[i]->oid.length == ctxt->oid->length &&
+               (memcmp(supported_mechs[i]->oid.elements,
+                       ctxt->oid->elements,ctxt->oid->length)==0)) {
+               return supported_mechs[i];
+           }
+           i++;
+       }
+       return NULL;
+}
+
+/* Return the OID that corresponds to the given context name */
+/* Unpriviledged */
+gss_OID 
+ssh_gssapi_server_id_kex(char *name) {
+  int i=0;
+  
+  if (strncmp(name, KEX_GSS_SHA1, sizeof(KEX_GSS_SHA1)-1) !=0) {
+     return(NULL);
+  }
+  
+  name+=sizeof(KEX_GSS_SHA1)-1; /* Move to the start of the MIME string */
+  
+  while (supported_mechs[i]->name!=NULL &&
+        strcmp(name,supported_mechs[i]->enc_name)!=0) {
+       i++;
+  }
+
+  if (supported_mechs[i]->name==NULL)
+     return (NULL);
+
+  debug("using GSSAPI mechanism %s (%s%s)", supported_mechs[i]->name,
+       KEX_GSS_SHA1, supported_mechs[i]->enc_name);
+
+  return &supported_mechs[i]->oid;
+}
+
+/* Wrapper around accept_sec_context
  * Requires that the context contains:
  *    oid              
  *    credentials      (from ssh_gssapi_acquire_cred)
  */
+/* Priviledged */
 OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok,
                                gss_buffer_desc *send_tok, OM_uint32 *flags) 
 {
-       OM_uint32 maj_status, min_status;
+       OM_uint32 status;
        gss_OID mech;
        
-       maj_status=gss_accept_sec_context(&min_status,
+       ctx->major=gss_accept_sec_context(&ctx->minor,
                                          &ctx->context,
                                          ctx->creds,
                                          recv_tok,
@@ -766,8 +253,8 @@ OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok,
                                          flags,
                                          NULL,
                                          &ctx->client_creds);
-       if (GSS_ERROR(maj_status)) {
-               ssh_gssapi_send_error(ctx->oid,maj_status,min_status);
+       if (GSS_ERROR(ctx->major)) {
+               ssh_gssapi_error(ctx);
        }
        
        if (ctx->client_creds) {
@@ -779,7 +266,7 @@ OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok,
        /* FIXME: We should check that the me
         * the one that we asked for (in ctx->oid) */
 
-       ctx->status=maj_status;
+       status=ctx->major;
        
        /* Now, if we're complete and we have the right flags, then
         * we flag the user as also having been authenticated
@@ -787,49 +274,115 @@ OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok,
        
        if (((flags==NULL) || ((*flags & GSS_C_MUTUAL_FLAG) && 
                               (*flags & GSS_C_INTEG_FLAG))) &&
-           (maj_status == GSS_S_COMPLETE)) {
-               if (ssh_gssapi_getclient(ctx,&gssapi_client_type,
-                                        &gssapi_client_name,
-                                        &gssapi_client_creds))
+           (ctx->major == GSS_S_COMPLETE)) {
+               if (ssh_gssapi_getclient(ctx,&gssapi_client.mech,
+                                        &gssapi_client.name,
+                                        &gssapi_client.creds))
                        fatal("Couldn't convert client name");
        }
 
-       return(maj_status);
+       /* Make sure that the getclient call hasn't stamped on this */
+       return(status);
+}
+
+/* Extract the client details from a given context. This can only reliably
+ * be called once for a context */
+
+/* Priviledged (called from accept_secure_ctx) */
+OM_uint32 
+ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_mech **type,
+                    gss_buffer_desc *name, gss_cred_id_t *creds) {
+
+       *type=ssh_gssapi_get_ctype(ctx);
+       if ((ctx->major=gss_display_name(&ctx->minor,ctx->client,name,NULL))) {
+               ssh_gssapi_error(ctx);
+               return(ctx->major);
+       }
+       
+       /* This is icky. There appears to be no way to copy this structure,
+        * rather than the pointer to it, so we simply copy the pointer and
+        * mark the originator as empty so we don't destroy it. 
+        */
+       *creds=ctx->client_creds;
+       ctx->client_creds=GSS_C_NO_CREDENTIAL;
+       return(ctx->major);
 }
 
+/* As user - called through fatal cleanup hook */
 void
-ssh_gssapi_send_error(gss_OID mech, OM_uint32 major_status,
-                     OM_uint32 minor_status) {
-       OM_uint32 lmaj, lmin;
-        gss_buffer_desc msg = {0,NULL};
-        OM_uint32 ctx;
-        
-        ctx = 0;
-       /* The GSSAPI error */
-        do {
-               lmaj = PRIVSEP(gss_display_status(&lmin, major_status,
-                                                 GSS_C_GSS_CODE,
-                                                 mech,
-                                                 &ctx, &msg));
-               if (lmaj == GSS_S_COMPLETE) {
-                       debug((char *)msg.value);
-                       packet_send_debug((char *)msg.value);
-                       (void) gss_release_buffer(&lmin, &msg);
-               }
-        } while (ctx!=0);         
-
-        /* The mechanism specific error */
-        do {
-               lmaj = PRIVSEP(gss_display_status(&lmin, minor_status,
-                                                 GSS_C_MECH_CODE,
-                                                 mech,
-                                                 &ctx, &msg));
-               if (lmaj == GSS_S_COMPLETE) {
-                       debug((char *)msg.value);
-                       packet_send_debug((char *)msg.value);
-                       (void) gss_release_buffer(&lmin, &msg);
-               }
-        } while (ctx!=0);
+ssh_gssapi_cleanup_creds(void *ignored)
+{
+       if (gssapi_client.store.filename!=NULL) {
+               /* Unlink probably isn't sufficient */
+               debug("removing gssapi cred file\"%s\"",gssapi_client.store.filename);
+               unlink(gssapi_client.store.filename);
+       }
+}
+
+/* As user */
+void 
+ssh_gssapi_storecreds()
+{
+       if (gssapi_client.mech && gssapi_client.mech->storecreds) {
+               (*gssapi_client.mech->storecreds)(&gssapi_client);
+               if (options.gss_cleanup_creds) {
+                       fatal_add_cleanup(ssh_gssapi_cleanup_creds, NULL);
+               }
+       } else {
+               debug("ssh_gssapi_storecreds: Not a GSSAPI mechanism");
+       }
 }
 
-#endif /* GSSAPI */
+/* This allows GSSAPI methods to do things to the childs environment based
+ * on the passed authentication process and credentials.
+ */
+/* As user */
+void 
+ssh_gssapi_do_child(char ***envp, u_int *envsizep) 
+{
+
+       if (gssapi_client.store.envvar!=NULL && 
+           gssapi_client.store.envval!=NULL) {
+           
+               debug("Setting %s to %s", gssapi_client.store.envvar,
+                                         gssapi_client.store.envval);                            
+               child_set_env(envp, envsizep, gssapi_client.store.envvar, 
+                                             gssapi_client.store.envval);
+       }
+}
+
+/* Priviledged */
+int
+ssh_gssapi_userok(char *user)
+{
+       if (gssapi_client.name.length==0 || 
+           gssapi_client.name.value==NULL) {
+               debug("No suitable client data");
+               return 0;
+       }
+       if (gssapi_client.mech && gssapi_client.mech->userok) {
+               return((*gssapi_client.mech->userok)(&gssapi_client,user));
+       } else {
+               debug("ssh_gssapi_userok: Unknown GSSAPI mechanism");
+       }
+       return(0);
+}
+
+/* Priviledged */
+int
+ssh_gssapi_localname(char **user)
+{
+       *user = NULL;
+       if (gssapi_client.name.length==0 || 
+           gssapi_client.name.value==NULL) {
+               debug("No suitable client data");
+               return(0);;
+       }
+       if (gssapi_client.mech && gssapi_client.mech->localname) {
+               return((*gssapi_client.mech->localname)(&gssapi_client,user));
+       } else {
+               debug("Unknown client authentication type");
+       }
+       return(0);
+}
+#endif
This page took 0.068556 seconds and 4 git commands to generate.