http_access.c modification for 1.1.3 (fwd)

[Rob Hartill <ro...@imdb.com>]

not acked

---------- Forwarded message ----------
Date: Wed, 15 Jan 1997 14:03:41 -0800
From: John Stewart <jn...@cisco.com>
To: apache-bugs@apache.org
Cc: domatthe@cisco.com
Subject: http_access.c modification for 1.1.3


Doug Matthews and I submitted a bug against 1.1.2 regarding cgi-bin
programs, which you fixed in 1.1.3, but we still view the fix as an
issue.

Our patch to the 1.1.3 code base follows.  We've made some
assumptions, which if are wrong, we'd appreciate knowing.  

First, the circumstances where the stat fails with an error code which
isn't understood, on a machine which doesn't have ENOENT and or
ENOTDIR, should still be processed through the CGI is_scriptaliased to
determine whether or not it is a valid script -- since CGI's are the
situation where the tests break down.

Second, given that CGI's were the scenario where 1.1.2 broke down, the
1.1.3 patches should be checking against not only ENOTDIR but also
is_scriptaliased.  Witness the issue when the URL
http://www/index.html/access is triggered.

In this circumstance, with ENOTDIR enabled in the OS, the path is
invalid, but then the path is *still* parsed to get the baseline for
presentation.  At the time it is determined the file isn't found, the
return code is NOT_FOUND and the error handler directive for 404, if
defined, takes over.

Problem is, you are *still* parsing the URL, which if nothing else is
inefficient.  Instead, we're suggesting that if ENOTDIR is determined
*and* it is a script (which to our knowledge is the only circumstance
where this happens to be valid) then continue parsing.

And if not, here is another change, return NOT_FOUND instead of
FORBIDDEN.  We noticed that the 404 error handler -- which according
to the definitions of NOT_FOUND -- should have been triggered and
wasn't.  

Maybe we're in left field, who knows -- well, you guys know.  Tell us.

thx -- John


------=------=------=------=------=------=------=------=------=------

*** http_request.c	1997/01/15 21:37:03	1.1
--- http_request.c	1997/01/15 21:42:28
***************
*** 179,191 ****
  	    *cp = '\0';
  	    return OK;
  	}
! #if defined(ENOENT) && defined(ENOTDIR)
! 	else if (errno == ENOENT || errno == ENOTDIR) {
  #else
    #error Your system apparently does not define ENOENT || ENOTDIR.
    #error Removal of these lines opens a security hole if protecting
    #error from directory indexes with DirectoryIndex.
! 	else {
  #endif
  	    last_cp = cp;
  	
--- 179,192 ----
  	    *cp = '\0';
  	    return OK;
  	}
! #if defined(ENOENT)
! 	else if (errno == ENOENT || 
! 	           (errno == ENOTDIR && is_scriptaliased(r))) { 
  #else
    #error Your system apparently does not define ENOENT || ENOTDIR.
    #error Removal of these lines opens a security hole if protecting
    #error from directory indexes with DirectoryIndex.
! 	else if (is_scriptaliased(r)) {
  #endif
  	    last_cp = cp;
  	
***************
*** 195,206 ****
  	    while (cp > path && cp[-1] == '/')
  		--cp;
  	} 
- #if defined(ENOENT) && defined(ENOTDIR)
  	else {
  	    log_printf(r->server, "access to %s failed for client; unable to determine if index file exists (stat() returned unexpected error[%d])", r->filename, errno);
! 	    return FORBIDDEN;
  	}
- #endif
      }
  
      return OK;
--- 196,205 ----
  	    while (cp > path && cp[-1] == '/')
  		--cp;
  	} 
  	else {
  	    log_printf(r->server, "access to %s failed for client; unable to determine if index file exists (stat() returned unexpected error[%d])", r->filename, errno);
! 	    return NOT_FOUND;
  	}
      }
  
      return OK;