From: Stefan Fritsch <sf@apache.org>
Date: Wed, 18 Aug 2010 09:24:04 +0000 (+0000)
Subject: Add the same r->user == NULL check in the Satisfy Any code path as r965709 did
X-Git-Tag: 2.3.7~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8b19fb99f0fc4f9bd6630db9ddf7d256b477ea3;p=thirdparty%2Fapache%2Fhttpd.git

Add the same r->user == NULL check in the Satisfy Any code path as r965709 did
for Satisfy all


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@986606 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/request.c b/server/request.c
index 92f989b6aa8..a5fbcde9982 100644
--- a/server/request.c
+++ b/server/request.c
@@ -260,7 +260,14 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
                 if ((access_status = ap_run_check_user_id(r)) != OK) {
                     return decl_die(access_status, "check user", r);
                 }
-
+                if (r->user == NULL) {
+                    /* don't let buggy authn module crash us in authz */
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                                  "Buggy authn provider failed to set user for %s",
+                                  r->uri);
+                    access_status = HTTP_INTERNAL_SERVER_ERROR;
+                    return decl_die(access_status, "check user", r);
+                }
                 if ((access_status = ap_run_auth_checker(r)) != OK) {
                     return decl_die(access_status, "check authorization", r);
                 }