www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Remove the final vestiges of stat.h from Apache 2.0. All calls are now to

Browse Source 
ap_stat.  This also adds the new function ap_lstat().  This function is
analogous to lstat.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85535 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Bloom
2000-06-12 15:29:09 +00:00
parent b6571e18f1
commit 16748b4e22
16 changed files with 63 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/http/http_request.c
View File

@@ -76,6 +76,7 @@
#include "http_log.h"
#include "http_main.h"
#include "util_charset.h"
#include "apr_file_io.h"
#include "apr_fnmatch.h"
AP_HOOK_STRUCT(
@@ -136,13 +137,13 @@ static int check_safe_file(request_rec *r)
}
static int check_symlinks(char *d, int opts)
static int check_symlinks(char *d, int opts, ap_pool_t *p)
{
#if defined(OS2) || defined(WIN32)
/* OS/2 doesn't have symlinks */
return OK;
#else
struct stat lfi, fi;
ap_finfo_t lfi, fi;
char *lastp;
int res;
@@ -168,7 +169,7 @@ static int check_symlinks(char *d, int opts)
else
lastp = NULL;
res = lstat(d, &lfi);
res = ap_lstat(&lfi, d, p);
if (lastp)
*lastp = '/';
@@ -178,7 +179,7 @@ static int check_symlinks(char *d, int opts)
* the like may cons up a way to run the transaction anyway)...
*/
if (!(res >= 0) || !S_ISLNK(lfi.st_mode))
if ((res != APR_SUCCESS) || lfi.filetype != APR_LNK)
return OK;
/* OK, it's a symlink. May still be OK with OPT_SYM_OWNER */
@@ -186,10 +187,10 @@ static int check_symlinks(char *d, int opts)
if (!(opts & OPT_SYM_OWNER))
return HTTP_FORBIDDEN;
if (stat(d, &fi) < 0)
if (ap_stat(&fi, d, p) < 0)
return HTTP_FORBIDDEN;
return (fi.st_uid == lfi.st_uid) ? OK : HTTP_FORBIDDEN;
return (fi.user == lfi.user) ? OK : HTTP_FORBIDDEN;
#endif
}
@@ -485,7 +486,7 @@ static int directory_walk(request_rec *r)
* permissions appropriate to the *parent* directory...
*/
if ((res = check_symlinks(test_dirname, core_dir->opts))) {
if ((res = check_symlinks(test_dirname, core_dir->opts, r->pool))) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"Symbolic link not allowed: %s", test_dirname);
return res;
@@ -582,7 +583,7 @@ static int directory_walk(request_rec *r)
* you would *not* get the 403.
*/
if (r->finfo.filetype != APR_DIR
&& (res = check_symlinks(r->filename, ap_allow_options(r)))) {
&& (res = check_symlinks(r->filename, ap_allow_options(r), r->pool))) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"Symbolic link not allowed: %s", r->filename);
return res;
@@ -893,7 +894,8 @@ API_EXPORT(request_rec *) ap_sub_req_lookup_file(const char *new_file,
}
}
else {
if ((res = check_symlinks(rnew->filename, ap_allow_options(rnew)))) {
if ((res = check_symlinks(rnew->filename, ap_allow_options(rnew),
rnew->pool))) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, rnew,
"Symbolic link not allowed: %s", rnew->filename);
rnew->status = res;