File php-5.4.x-fpm-user-ini-docroot.patch of Package scl-php54

Overview Repositories Revisions Requests Users Attributes Meta

File php-5.4.x-fpm-user-ini-docroot.patch of Package scl-php54 (Revision 2983d296cc6a8039f8f2cf3932664978)

Currently displaying revision 2983d296cc6a8039f8f2cf3932664978 , Show latest

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index d12ac01..dd05f03 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -715,6 +715,9 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
 
 	/* Check whether cache entry has expired and rescan if it is */
 	if (request_time > entry->expires) {
+		char pwnambuf[4096 + 256];
+		struct passwd pwd, *pwdp;
+		long homedirlen;
 		char * real_path;
 		int real_path_len;
 		char *s1, *s2;
@@ -743,6 +746,15 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
 			s_len = path_len;
 		}
 
+		/* Find our home directory, and ensure the document root is within it.
+		 */
+		if (getpwuid_r(geteuid(), &pwd, pwnambuf, sizeof(pwnambuf), &pwdp) || !pwdp || !pwdp->pw_dir)
+			return;
+
+		homedirlen = strlen(pwdp->pw_dir);
+		if (strncmp(doc_root, pwdp->pw_dir, homedirlen) || doc_root[homedirlen] != '/')
+			return;
+
 		/* we have to test if path is part of DOCUMENT_ROOT.
 		  if it is inside the docroot, we scan the tree up to the docroot 
 			to find more user.ini, if not we only scan the current path.

Places

File php-5.4.x-fpm-user-ini-docroot.patch of Package scl-php54 (Revision 2983d296cc6a8039f8f2cf3932664978)

Places