6cf9b8
diff -up openssh-7.4p1/auth-krb5.c.kuserok openssh-7.4p1/auth-krb5.c
6cf9b8
--- openssh-7.4p1/auth-krb5.c.kuserok	2016-12-23 14:36:07.640465939 +0100
6cf9b8
+++ openssh-7.4p1/auth-krb5.c	2016-12-23 14:36:07.644465936 +0100
6cf9b8
@@ -56,6 +56,21 @@
Jan F. Chadima 69dd72
 
Jan F. Chadima 69dd72
 extern ServerOptions	 options;
Jan F. Chadima 69dd72
 
Jan F. Chadima 69dd72
+int
30c06a
+ssh_krb5_kuserok(krb5_context krb5_ctx, krb5_principal krb5_user, const char *client,
30c06a
+                 int k5login_exists)
Jan F. Chadima 69dd72
+{
30c06a
+	if (options.use_kuserok || !k5login_exists)
Jan F. Chadima 69dd72
+		return krb5_kuserok(krb5_ctx, krb5_user, client);
Jan F. Chadima 69dd72
+	else {
Jan F. Chadima 69dd72
+		char kuser[65];
Jan F. Chadima 69dd72
+
Jan F. Chadima 69dd72
+		if (krb5_aname_to_localname(krb5_ctx, krb5_user, sizeof(kuser), kuser))
Jan F. Chadima 69dd72
+			return 0;
Jan F. Chadima 69dd72
+		return strcmp(kuser, client) == 0;
Jan F. Chadima 69dd72
+	}
Jan F. Chadima 69dd72
+}
Jan F. Chadima 69dd72
+
Jan F. Chadima 69dd72
 static int
Jan F. Chadima 69dd72
 krb5_init(void *context)
Jan F. Chadima 69dd72
 {
6cf9b8
@@ -160,8 +175,9 @@ auth_krb5_password(Authctxt *authctxt, c
Jan F. Chadima 69dd72
 	if (problem)
Jan F. Chadima 69dd72
 		goto out;
Jan F. Chadima 69dd72
 
7463b6
-	if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user,
7463b6
-	    authctxt->pw->pw_name)) {
30c06a
+	/* Use !options.use_kuserok here to make ssh_krb5_kuserok() not
30c06a
+	 * depend on the existance of .k5login */
30c06a
+	if (!ssh_krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user, authctxt->pw->pw_name, !options.use_kuserok)) {
Jan F. Chadima 69dd72
 		problem = -1;
Jan F. Chadima 69dd72
 		goto out;
Jan F. Chadima 69dd72
 	}
6cf9b8
diff -up openssh-7.4p1/gss-serv-krb5.c.kuserok openssh-7.4p1/gss-serv-krb5.c
6cf9b8
--- openssh-7.4p1/gss-serv-krb5.c.kuserok	2016-12-23 14:36:07.640465939 +0100
6cf9b8
+++ openssh-7.4p1/gss-serv-krb5.c	2016-12-23 14:36:07.644465936 +0100
132f8f
@@ -67,6 +67,7 @@ static int ssh_gssapi_krb5_cmdok(krb5_pr
Jan F. Chadima 69dd72
     int);
Jan F. Chadima 69dd72
 
Jan F. Chadima 69dd72
 static krb5_context krb_context = NULL;
30c06a
+extern int ssh_krb5_kuserok(krb5_context, krb5_principal, const char *, int);
Jan F. Chadima 69dd72
 
Jan F. Chadima 69dd72
 /* Initialise the krb5 library, for the stuff that GSSAPI won't do */
Jan F. Chadima 69dd72
 
30c06a
@@ -92,6 +93,103 @@ ssh_gssapi_krb5_init(void)
30c06a
  * Returns true if the user is OK to log in, otherwise returns 0
30c06a
  */
30c06a
 
30c06a
+/* The purpose of the function is to find out if a Kerberos principal is
30c06a
+ * allowed to log in as the given local user. This is a general problem with
30c06a
+ * Kerberized services because by design the Kerberos principals are
30c06a
+ * completely independent from the local user names. This is one of the
30c06a
+ * reasons why Kerberos is working well on different operating systems like
30c06a
+ * Windows and UNIX/Linux. Nevertheless a relationship between a Kerberos
30c06a
+ * principal and a local user name must be established because otherwise every
30c06a
+ * access would be granted for every principal with a valid ticket.
30c06a
+ *
30c06a
+ * Since it is a general issue libkrb5 provides some functions for
30c06a
+ * applications to find out about the relationship between the Kerberos
30c06a
+ * principal and a local user name. They are krb5_kuserok() and
30c06a
+ * krb5_aname_to_localname().
30c06a
+ *
30c06a
+ * krb5_kuserok() can be used to "Determine if a principal is authorized to
30c06a
+ * log in as a local user" (from the MIT Kerberos documentation of this
30c06a
+ * function). Which is exactly what we are looking for and should be the
30c06a
+ * preferred choice. It accepts the Kerberos principal and a local user name
30c06a
+ * and let libkrb5 or its plugins determine if they relate to each other or
30c06a
+ * not.
30c06a
+ *
30c06a
+ * krb5_aname_to_localname() can use used to "Convert a principal name to a
30c06a
+ * local name" (from the MIT Kerberos documentation of this function). It
30c06a
+ * accepts a Kerberos principle and returns a local name and it is up to the
30c06a
+ * application to do any additional checks. There are two issues using
30c06a
+ * krb5_aname_to_localname(). First, since POSIX user names are case
30c06a
+ * sensitive, the calling application in general has no other choice than
30c06a
+ * doing a case-sensitive string comparison between the name returned by
30c06a
+ * krb5_aname_to_localname() and the name used at the login prompt. When the
30c06a
+ * users are provided by a case in-sensitive server, e.g. Active Directory,
30c06a
+ * this might lead to login failures because the user typing the name at the
30c06a
+ * login prompt might not be aware of the right case. Another issue might be
30c06a
+ * caused if there are multiple alias names available for a single user. E.g.
30c06a
+ * the canonical name of a user is user@group.department.example.com but there
30c06a
+ * exists a shorter login name, e.g. user@example.com, to safe typing at the
30c06a
+ * login prompt. Here krb5_aname_to_localname() can only return the canonical
30c06a
+ * name, but if the short alias is used at the login prompt authentication
30c06a
+ * will fail as well. All this can be avoided by using krb5_kuserok() and
30c06a
+ * configuring krb5.conf or using a suitable plugin to meet the needs of the
30c06a
+ * given environment.
30c06a
+ *
30c06a
+ * The Fedora and RHEL version of openssh contain two patches which modify the
30c06a
+ * access control behavior:
30c06a
+ *  - openssh-6.6p1-kuserok.patch
30c06a
+ *  - openssh-6.6p1-force_krb.patch
30c06a
+ *
30c06a
+ * openssh-6.6p1-kuserok.patch adds a new option KerberosUseKuserok for
30c06a
+ * sshd_config which controls if krb5_kuserok() is used to check if the
30c06a
+ * principle is authorized or if krb5_aname_to_localname() should be used.
30c06a
+ * The reason to add this patch was that krb5_kuserok() by default checks if
30c06a
+ * a .k5login file exits in the users home-directory. With this the user can
30c06a
+ * give access to his account for any given principal which might be
30c06a
+ * in violation with company policies and it would be useful if this can be
30c06a
+ * rejected. Nevertheless the patch ignores the fact that krb5_kuserok() does
30c06a
+ * no only check .k5login but other sources as well and checking .k5login can
30c06a
+ * be disabled for all applications in krb5.conf as well. With this new
30c06a
+ * option KerberosUseKuserok set to 'no' (and this is the default for RHEL7
30c06a
+ * and Fedora 21) openssh can only use krb5_aname_to_localname() with the
30c06a
+ * restrictions mentioned above.
30c06a
+ *
30c06a
+ * openssh-6.6p1-force_krb.patch adds a ksu like behaviour to ssh, i.e. when
30c06a
+ * using GSSAPI authentication only commands configured in the .k5user can be
30c06a
+ * executed. Here the wrong assumption that krb5_kuserok() only checks
30c06a
+ * .k5login is made as well. In contrast ksu checks .k5login directly and
30c06a
+ * does not use krb5_kuserok() which might be more useful for the given
30c06a
+ * purpose. Additionally this patch is not synced with
30c06a
+ * openssh-6.6p1-kuserok.patch.
30c06a
+ *
30c06a
+ * The current patch tries to restore the usage of krb5_kuserok() so that e.g.
30c06a
+ * localauth plugins can be used. It does so by adding a forth parameter to
30c06a
+ * ssh_krb5_kuserok() which indicates whether .k5login exists or not. If it
30c06a
+ * does not exists krb5_kuserok() is called even if KerberosUseKuserok is set
30c06a
+ * to 'no' because the intent of the option is to not check .k5login and if it
30c06a
+ * does not exists krb5_kuserok() returns a result without checking .k5login.
30c06a
+ * If .k5login does exists and KerberosUseKuserok is 'no' we fall back to
30c06a
+ * krb5_aname_to_localname(). This is in my point of view an acceptable
30c06a
+ * limitation and does not break the current behaviour.
30c06a
+ *
30c06a
+ * Additionally with this patch ssh_krb5_kuserok() is called in
30c06a
+ * ssh_gssapi_krb5_cmdok() instead of only krb5_aname_to_localname() is
30c06a
+ * neither .k5login nor .k5users exists to allow plugin evaluation via
30c06a
+ * krb5_kuserok() as well.
30c06a
+ *
30c06a
+ * I tried to keep the patch as minimal as possible, nevertheless I see some
30c06a
+ * areas for improvement which, if they make sense, have to be evaluated
30c06a
+ * carefully because they might change existing behaviour and cause breaks
30c06a
+ * during upgrade:
30c06a
+ * - I wonder if disabling .k5login usage make sense in sshd or if it should
30c06a
+ *   be better disabled globally in krb5.conf
30c06a
+ * - if really needed openssh-6.6p1-kuserok.patch should be fixed to really
30c06a
+ *   only disable checking .k5login and maybe .k5users
30c06a
+ * - the ksu behaviour should be configurable and maybe check the .k5login and
30c06a
+ *   .k5users files directly like ksu itself does
30c06a
+ * - to make krb5_aname_to_localname() more useful an option for sshd to use
30c06a
+ *   the canonical name (the one returned by getpwnam()) instead of the name
30c06a
+ *   given at the login prompt might be useful */
30c06a
+
30c06a
 static int
30c06a
 ssh_gssapi_krb5_userok(ssh_gssapi_client *client, char *name)
30c06a
 {
132f8f
@@ -116,7 +214,8 @@ ssh_gssapi_krb5_userok(ssh_gssapi_client
Jan F. Chadima 69dd72
 	/* NOTE: .k5login and .k5users must opened as root, not the user,
Jan F. Chadima 69dd72
 	 * because if they are on a krb5-protected filesystem, user credentials
Jan F. Chadima 69dd72
 	 * to access these files aren't available yet. */
84822b
-	if (krb5_kuserok(krb_context, princ, name) && k5login_exists) {
30c06a
+	if (ssh_krb5_kuserok(krb_context, princ, name, k5login_exists)
30c06a
+			&& k5login_exists) {
Jan F. Chadima 69dd72
 		retval = 1;
Jan F. Chadima 69dd72
 		logit("Authorized to %s, krb5 principal %s (krb5_kuserok)",
84822b
 		    name, (char *)client->displayname.value);
6cf9b8
@@ -190,9 +289,8 @@ ssh_gssapi_krb5_cmdok(krb5_principal pri
30c06a
 	snprintf(file, sizeof(file), "%s/.k5users", pw->pw_dir);
30c06a
 	/* If both .k5login and .k5users DNE, self-login is ok. */
30c06a
 	if (!k5login_exists && (access(file, F_OK) == -1)) {
30c06a
-		return (krb5_aname_to_localname(krb_context, principal,
30c06a
-		    sizeof(kuser), kuser) == 0) &&
30c06a
-		    (strcmp(kuser, luser) == 0);
30c06a
+                return ssh_krb5_kuserok(krb_context, principal, luser,
30c06a
+                                        k5login_exists);
30c06a
 	}
30c06a
 	if ((fp = fopen(file, "r")) == NULL) {
30c06a
 		int saved_errno = errno;
6cf9b8
diff -up openssh-7.4p1/servconf.c.kuserok openssh-7.4p1/servconf.c
6cf9b8
--- openssh-7.4p1/servconf.c.kuserok	2016-12-23 14:36:07.630465944 +0100
6cf9b8
+++ openssh-7.4p1/servconf.c	2016-12-23 15:11:52.278133344 +0100
5b55d0
@@ -116,6 +116,7 @@ initialize_server_options(ServerOptions
5b55d0
 	options->gss_strict_acceptor = -1;
5b55d0
 	options->gss_store_rekey = -1;
def1de
 	options->gss_kex_algorithms = NULL;
Jan F. Chadima 69dd72
+	options->use_kuserok = -1;
5b55d0
 	options->password_authentication = -1;
5b55d0
 	options->kbd_interactive_authentication = -1;
5b55d0
 	options->challenge_response_authentication = -1;
5b55d0
@@ -278,6 +279,8 @@ fill_default_server_options(ServerOption
def1de
 	if (options->gss_kex_algorithms == NULL)
def1de
 		options->gss_kex_algorithms = strdup(GSS_KEX_DEFAULT_KEX);
def1de
 #endif
Jan F. Chadima 69dd72
+	if (options->use_kuserok == -1)
1ba984
+		options->use_kuserok = 1;
5b55d0
 	if (options->password_authentication == -1)
5b55d0
 		options->password_authentication = 1;
5b55d0
 	if (options->kbd_interactive_authentication == -1)
117678
@@ -399,7 +402,7 @@ typedef enum {
6cf9b8
 	sPermitRootLogin, sLogFacility, sLogLevel,
Jan F. Chadima 69dd72
 	sRhostsRSAAuthentication, sRSAAuthentication,
Jan F. Chadima 69dd72
 	sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
808908
-	sKerberosGetAFSToken, sKerberosUniqueCCache,
808908
+	sKerberosGetAFSToken, sKerberosUniqueCCache, sKerberosUseKuserok,
117678
 	sChallengeResponseAuthentication,
Jan F. Chadima 69dd72
 	sPasswordAuthentication, sKbdInteractiveAuthentication,
Jan F. Chadima 69dd72
 	sListenAddress, sAddressFamily,
117678
@@ -478,12 +481,14 @@ static struct {
Jan F. Chadima 69dd72
 	{ "kerberosgetafstoken", sUnsupported, SSHCFG_GLOBAL },
Jan F. Chadima 69dd72
 #endif
808908
 	{ "kerberosuniqueccache", sKerberosUniqueCCache, SSHCFG_GLOBAL },
Jan F. Chadima 69dd72
+	{ "kerberosusekuserok", sKerberosUseKuserok, SSHCFG_ALL },
Jan F. Chadima 69dd72
 #else
Jan F. Chadima 69dd72
 	{ "kerberosauthentication", sUnsupported, SSHCFG_ALL },
Jan F. Chadima 69dd72
 	{ "kerberosorlocalpasswd", sUnsupported, SSHCFG_GLOBAL },
Jan F. Chadima 69dd72
 	{ "kerberosticketcleanup", sUnsupported, SSHCFG_GLOBAL },
Jan F. Chadima 69dd72
 	{ "kerberosgetafstoken", sUnsupported, SSHCFG_GLOBAL },
808908
 	{ "kerberosuniqueccache", sUnsupported, SSHCFG_GLOBAL },
Jan F. Chadima 69dd72
+	{ "kerberosusekuserok", sUnsupported, SSHCFG_ALL },
Jan F. Chadima 69dd72
 #endif
Jan F. Chadima 69dd72
 	{ "kerberostgtpassing", sUnsupported, SSHCFG_GLOBAL },
Jan F. Chadima 69dd72
 	{ "afstokenpassing", sUnsupported, SSHCFG_GLOBAL },
6cf9b8
@@ -1644,6 +1649,10 @@ process_server_config_line(ServerOptions
Jan F. Chadima 69dd72
 		*activep = value;
Jan F. Chadima 69dd72
 		break;
Jan F. Chadima 69dd72
 
Jan F. Chadima 69dd72
+	case sKerberosUseKuserok:
Jan F. Chadima 69dd72
+		intptr = &options->use_kuserok;
Jan F. Chadima 69dd72
+		goto parse_flag;
Jan F. Chadima 69dd72
+
bbf61d
 	case sPermitListen:
Jan F. Chadima 69dd72
 	case sPermitOpen:
bbf61d
 		if (opcode == sPermitListen) {
6cf9b8
@@ -2016,6 +2025,7 @@ copy_set_server_options(ServerOptions *d
6cf9b8
 	M_CP_INTOPT(client_alive_interval);
Jan F. Chadima 69dd72
 	M_CP_INTOPT(ip_qos_interactive);
Jan F. Chadima 69dd72
 	M_CP_INTOPT(ip_qos_bulk);
Jan F. Chadima 69dd72
+	M_CP_INTOPT(use_kuserok);
84822b
 	M_CP_INTOPT(rekey_limit);
84822b
 	M_CP_INTOPT(rekey_interval);
5b55d0
 	M_CP_INTOPT(log_level);
6cf9b8
@@ -2309,6 +2319,7 @@ dump_config(ServerOptions *o)
5b55d0
 	dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token);
5b55d0
 # endif
808908
 	dump_cfg_fmtint(sKerberosUniqueCCache, o->kerberos_unique_ccache);
Jan F. Chadima 69dd72
+	dump_cfg_fmtint(sKerberosUseKuserok, o->use_kuserok);
5b55d0
 #endif
5b55d0
 #ifdef GSSAPI
5b55d0
	dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
6cf9b8
diff -up openssh-7.4p1/servconf.h.kuserok openssh-7.4p1/servconf.h
6cf9b8
--- openssh-7.4p1/servconf.h.kuserok	2016-12-23 14:36:07.630465944 +0100
6cf9b8
+++ openssh-7.4p1/servconf.h	2016-12-23 14:36:07.645465936 +0100
5b55d0
@@ -118,6 +118,7 @@ typedef struct {
5b55d0
 						 * authenticated with Kerberos. */
808908
 	int     kerberos_unique_ccache;		/* If true, the acquired ticket will
117678
 						 * be stored in per-session ccache */
Jan F. Chadima 69dd72
+	int	use_kuserok;
5b55d0
 	int     gss_authentication;	/* If true, permit GSSAPI authentication */
5b55d0
 	int     gss_keyex;		/* If true, permit GSSAPI key exchange */
5b55d0
 	int     gss_cleanup_creds;	/* If true, destroy cred cache on logout */
6cf9b8
diff -up openssh-7.4p1/sshd_config.5.kuserok openssh-7.4p1/sshd_config.5
6cf9b8
--- openssh-7.4p1/sshd_config.5.kuserok	2016-12-23 14:36:07.637465940 +0100
6cf9b8
+++ openssh-7.4p1/sshd_config.5	2016-12-23 15:14:03.117162222 +0100
6cf9b8
@@ -850,6 +850,10 @@ Specifies whether to automatically destr
808908
 .Cm no
808908
 can lead to overwriting previous tickets by subseqent connections to the same
808908
 user account.
Jan F. Chadima 69dd72
+.It Cm KerberosUseKuserok
Jan F. Chadima 69dd72
+Specifies whether to look at .k5login file for user's aliases.
Jan F. Chadima 69dd72
+The default is
6cf9b8
+.Cm yes .
Jan F. Chadima 69dd72
 .It Cm KexAlgorithms
Jan F. Chadima 69dd72
 Specifies the available KEX (Key Exchange) algorithms.
Jan F. Chadima 69dd72
 Multiple algorithms must be comma-separated.
6cf9b8
@@ -1078,6 +1082,7 @@ Available keywords are
132f8f
 .Cm IPQoS ,
Jan F. Chadima 69dd72
 .Cm KbdInteractiveAuthentication ,
Jan F. Chadima 69dd72
 .Cm KerberosAuthentication ,
Jan F. Chadima 69dd72
+.Cm KerberosUseKuserok ,
5b55d0
 .Cm LogLevel ,
Jan F. Chadima 69dd72
 .Cm MaxAuthTries ,
Jan F. Chadima 69dd72
 .Cm MaxSessions ,
6cf9b8
diff -up openssh-7.4p1/sshd_config.kuserok openssh-7.4p1/sshd_config
6cf9b8
--- openssh-7.4p1/sshd_config.kuserok	2016-12-23 14:36:07.631465943 +0100
6cf9b8
+++ openssh-7.4p1/sshd_config	2016-12-23 14:36:07.646465935 +0100
6cf9b8
@@ -73,6 +73,7 @@ ChallengeResponseAuthentication no
3f5513
 #KerberosOrLocalPasswd yes
3f5513
 #KerberosTicketCleanup yes
3f5513
 #KerberosGetAFSToken no
3f5513
+#KerberosUseKuserok yes
3f5513
 
3f5513
 # GSSAPI options
3f5513
 GSSAPIAuthentication yes