More style-stuff. A lot of this doesn't qualify as 'readable' even so.. :-( (c6024ef0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

server/request.c

+93 −74

Original line number	Diff line number	Diff line
		@@ -172,8 +172,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
		*/
		r->per_dir_config = r->server->lookup_defaults;

		if ((access_status = ap_run_map_to_storage(r)))
		{
		if ((access_status = ap_run_map_to_storage(r))) {
		/* This request wasn't in storage (e.g. TRACE) */
		return access_status;
		}
		@@ -216,15 +215,19 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
		return decl_die(access_status, "check access", r);
		}
		if (ap_some_auth_required(r)) {
		if (((access_status = ap_run_check_user_id(r)) != 0) \|\| !ap_auth_type(r)) {
		if (((access_status = ap_run_check_user_id(r)) != 0)
		\|\| !ap_auth_type(r)) {
		return decl_die(access_status, ap_auth_type(r)
		? "check user. No user file?"
		: "perform authentication. AuthType not set!", r);
		: "perform authentication. AuthType not set!",
		r);
		}
		if (((access_status = ap_run_auth_checker(r)) != 0) \|\| !ap_auth_type(r)) {
		if (((access_status = ap_run_auth_checker(r)) != 0)
		\|\| !ap_auth_type(r)) {
		return decl_die(access_status, ap_auth_type(r)
		? "check access. No groups file?"
		: "perform authentication. AuthType not set!", r);
		: "perform authentication. AuthType not set!",
		r);
		}
		}
		break;
		@@ -233,17 +236,22 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
		if (!ap_some_auth_required(r)) {
		return decl_die(access_status, ap_auth_type(r)
		? "check access"
		: "perform authentication. AuthType not set!", r);
		: "perform authentication. AuthType not set!",
		r);
		}
		if (((access_status = ap_run_check_user_id(r)) != 0) \|\| !ap_auth_type(r)) {
		if (((access_status = ap_run_check_user_id(r)) != 0)
		\|\| !ap_auth_type(r)) {
		return decl_die(access_status, ap_auth_type(r)
		? "check user. No user file?"
		: "perform authentication. AuthType not set!", r);
		: "perform authentication. AuthType not set!",
		r);
		}
		if (((access_status = ap_run_auth_checker(r)) != 0) \|\| !ap_auth_type(r)) {
		if (((access_status = ap_run_auth_checker(r)) != 0)
		\|\| !ap_auth_type(r)) {
		return decl_die(access_status, ap_auth_type(r)
		? "check access. No groups file?"
		: "perform authentication. AuthType not set!", r);
		: "perform authentication. AuthType not set!",
		r);
		}
		}
		break;
		@@ -307,10 +315,9 @@ static walk_cache_t prep_walk_cache(const char cache_name, request_rec *r)
		* this _walk()er with a copy it is allowed to munge. If there is no
		* parent or prior cached request, then create a new walk cache.
		*/
		if ((apr_pool_userdata_get((void **)&cache,
		cache_name, r->pool)
		!= APR_SUCCESS) \|\| !cache)
		{
		if ((apr_pool_userdata_get((void **)&cache, cache_name, r->pool)
		!= APR_SUCCESS)
		\|\| !cache) {
		if ((r->main && (apr_pool_userdata_get((void **)&cache,
		cache_name,
		r->main->pool)
		@@ -459,7 +466,7 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
		*/
		if (r->filename == NULL \|\| !ap_os_is_path_absolute(r->pool, r->filename)) {
		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO\|APLOG_INFO, 0, r,
		"Module bug? Request filename path %s is missing or "
		"Module bug? Request filename path %s is missing "
		"or not absolute for uri %s",
		r->filename ? r->filename : "<NULL>", r->uri);
		return OK;
		@@ -728,12 +735,13 @@ minimerge:
		* See core.c::merge_core_dir_configs() for explanation.
		*/
		minimerge2:
		this_dir = ap_get_module_config(htaccess_conf, &core_module);
		this_dir = ap_get_module_config(htaccess_conf,
		&core_module);

		if (this_dir)
		{
		if (this_dir) {
		if (this_dir->opts & OPT_UNSET) {
		opts_add = (opts_add & ~this_dir->opts_remove) \| this_dir->opts_add;
		opts_add = (opts_add & ~this_dir->opts_remove)
		\| this_dir->opts_add;
		opts_remove = (opts_remove & ~this_dir->opts_add)
		\| this_dir->opts_remove;
		opts = (opts & ~opts_remove) \| opts_add;
		@@ -804,10 +812,12 @@ minimerge2:
		* want the name of this 'link' object, not the name of its
		* target, if we are fixing case.
		*/
		rv = apr_lstat(&r->finfo, r->filename, APR_FINFO_MIN \| APR_FINFO_NAME, r->pool);
		rv = apr_lstat(&r->finfo, r->filename,
		APR_FINFO_MIN \| APR_FINFO_NAME, r->pool);

		if (APR_STATUS_IS_ENOENT(rv)) {
		/* Nothing? That could be nice. But our directory walk is done.
		/* Nothing? That could be nice. But our directory
		* walk is done.
		*/
		r->finfo.filetype = APR_NOFILE;
		break;
		@@ -842,14 +852,15 @@ minimerge2:
		strcpy(seg_name, r->finfo.name);
		}

		if (r->finfo.filetype == APR_LNK)
		{
		if (r->finfo.filetype == APR_LNK) {
		/* Is this an possibly acceptable symlink?
		*/
		if ((res = resolve_symlink(r->filename, &r->finfo,
		opts, r->pool)) != OK) {
		opts, r->pool))
		!= OK) {
		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO\|APLOG_ERR, 0, r,
		"Symbolic link not allowed: %s", r->filename);
		"Symbolic link not allowed: %s",
		r->filename);
		return r->status = res;
		}

		@@ -926,10 +937,11 @@ minimerge2:
		}
		}

		/* It seems this shouldn't be needed anymore. We translated the symlink above
		x into a real resource, and should have died up there. Even if we keep this,
		x it needs more thought (maybe an r->file_is_symlink) perhaps it should actually
		x happen in file_walk, so we catch more obscure cases in autoindex sub requests, etc.
		/* It seems this shouldn't be needed anymore. We translated the
		x symlink above into a real resource, and should have died up there.
		x Even if we keep this, it needs more thought (maybe an r->file_is_symlink)
		x perhaps it should actually happen in file_walk, so we catch more
		x obscure cases in autoindex sub requests, etc.
		x
		x * Symlink permissions are determined by the parent. If the request is
		x * for a directory then applying the symlink test here would use the
		@@ -940,7 +952,8 @@ minimerge2:
		x * you would not get the 403.
		x
		x if (r->finfo.filetype != APR_DIR
		x && (res = resolve_symlink(r->filename, r->info, ap_allow_options(r), r->pool))) {
		x && (res = resolve_symlink(r->filename, r->info, ap_allow_options(r),
		x r->pool))) {
		x ap_log_rerror(APLOG_MARK, APLOG_NOERRNO\|APLOG_ERR, 0, r,
		x "Symbolic link not allowed: %s", r->filename);
		x return res;
		@@ -1009,7 +1022,8 @@ AP_DECLARE(int) ap_location_walk(request_rec *r)
		* and the vhost's list of locations hasn't changed, we can skip
		* rewalking the location_walk entries.
		*/
		if (cache->cached && (cache->dir_conf_tested == sec_ent)
		if (cache->cached
		&& (cache->dir_conf_tested == sec_ent)
		&& (strcmp(entry_uri, cache->cached) == 0)) {
		/* Well this looks really familiar! If our end-result (per_dir_result)
		* didn't change, we have absolutely nothing to do :)
		@@ -1161,7 +1175,8 @@ AP_DECLARE(int) ap_file_walk(request_rec *r)
		* and the directory's list of file sections hasn't changed, we
		* can skip rewalking the file_walk entries.
		*/
		if (cache->cached && (cache->dir_conf_tested == sec_ent)
		if (cache->cached
		&& (cache->dir_conf_tested == sec_ent)
		&& (strcmp(test_file, cache->cached) == 0)) {
		/* Well this looks really familiar! If our end-result (per_dir_result)
		* didn't change, we have absolutely nothing to do :)
		@@ -1456,9 +1471,10 @@ AP_DECLARE(request_rec ) ap_sub_req_lookup_dirent(const apr_finfo_t dirent,
		if (ap_allow_options(rnew) & OPT_SYM_LINKS) {
		if (((rv = apr_stat(&rnew->finfo, rnew->filename,
		APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
		&& (rv != APR_INCOMPLETE))
		&& (rv != APR_INCOMPLETE)) {
		rnew->finfo.filetype = 0;
		}
		}
		else {
		if (((rv = apr_lstat(&rnew->finfo, rnew->filename,
		APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
		@@ -1476,7 +1492,8 @@ AP_DECLARE(request_rec ) ap_sub_req_lookup_dirent(const apr_finfo_t dirent,
		* Resolve this symlink. We should tie this back to dir_walk's cache
		*/
		if ((res = resolve_symlink(rnew->filename, &rnew->finfo,
		ap_allow_options(rnew), rnew->pool)) != OK) {
		ap_allow_options(rnew), rnew->pool))
		!= OK) {
		rnew->status = res;
		return rnew;
		}
		@@ -1544,25 +1561,27 @@ AP_DECLARE(request_rec ) ap_sub_req_lookup_file(const char new_file,

		if (strncmp(rnew->filename, fdir, fdirlen) == 0
		&& rnew->filename[fdirlen]
		&& ap_strchr_c(rnew->filename + fdirlen, '/') == NULL)
		{
		&& ap_strchr_c(rnew->filename + fdirlen, '/') == NULL) {
		apr_status_t rv;
		if (ap_allow_options(rnew) & OPT_SYM_LINKS) {
		if (((rv = apr_stat(&rnew->finfo, rnew->filename,
		APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
		&& (rv != APR_INCOMPLETE))
		&& (rv != APR_INCOMPLETE)) {
		rnew->finfo.filetype = 0;
		}
		}
		else {
		if (((rv = apr_lstat(&rnew->finfo, rnew->filename,
		APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
		&& (rv != APR_INCOMPLETE))
		&& (rv != APR_INCOMPLETE)) {
		rnew->finfo.filetype = 0;
		}
		}

		if (r->uri && *r->uri) {
		char *udir = ap_make_dirstr_parent(rnew->pool, r->uri);
		rnew->uri = ap_make_full_path(rnew->pool, udir, rnew->filename + fdirlen);
		rnew->uri = ap_make_full_path(rnew->pool, udir,
		rnew->filename + fdirlen);
		ap_parse_uri(rnew, rnew->uri); /* fill in parsed_uri values */
		}
		else {