1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert backpatch of inheritable-ACE patch for Win32, since it broke

Browse Source 
compatibility with pre-Windows 2000 versions.
This commit is contained in:
Magnus Hagander 2009-11-20 01:28:18 +00:00
parent 1ac1e463e6
commit 22452fa96f
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.125.2.4 2009/11/15 09:08:45 mha Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.125.2.5 2009/11/20 01:28:18 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2336,10 +2336,6 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
return 0; return 0;
} }
#ifndef __CYGWIN__
AddUserToTokenDacl(restrictedToken);
#endif
if (!CreateProcessAsUser(restrictedToken, if (!CreateProcessAsUser(restrictedToken,
NULL, NULL,
cmd, cmd,
@ -2357,6 +2353,10 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
return 0; return 0;
} }
#ifndef __CYGWIN__
AddUserToDacl(processInfo->hProcess);
#endif
return ResumeThread(processInfo->hThread); return ResumeThread(processInfo->hThread);
} }
#endif #endif

10
src/bin/pg_ctl/pg_ctl.c
View File

@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.74.2.8 2009/11/15 09:08:46 mha Exp $ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.74.2.9 2009/11/20 01:28:18 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1349,10 +1349,6 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
return 0; return 0;
} }
#ifndef __CYGWIN__
AddUserToTokenDacl(restrictedToken);
#endif
r = CreateProcessAsUser(restrictedToken, NULL, cmd, NULL, NULL, TRUE, CREATE_SUSPENDED, NULL, NULL, &si, processInfo); r = CreateProcessAsUser(restrictedToken, NULL, cmd, NULL, NULL, TRUE, CREATE_SUSPENDED, NULL, NULL, &si, processInfo);
Kernel32Handle = LoadLibrary("KERNEL32.DLL"); Kernel32Handle = LoadLibrary("KERNEL32.DLL");
@ -1433,6 +1429,10 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
} }
} }
#ifndef __CYGWIN__
AddUserToDacl(processInfo->hProcess);
#endif
CloseHandle(restrictedToken); CloseHandle(restrictedToken);
ResumeThread(processInfo->hThread); ResumeThread(processInfo->hThread);

4
src/include/port.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/port.h,v 1.106.2.7 2009/11/15 09:08:46 mha Exp $ * $PostgreSQL: pgsql/src/include/port.h,v 1.106.2.8 2009/11/20 01:28:17 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -76,7 +76,7 @@ extern int find_other_exec(const char *argv0, const char *target,
/* Windows security token manipulation (in exec.c) */ /* Windows security token manipulation (in exec.c) */
#ifdef WIN32 #ifdef WIN32
extern BOOL AddUserToTokenDacl(HANDLE hToken); extern BOOL AddUserToDacl(HANDLE hProcess);
#endif #endif

32
src/port/exec.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/exec.c,v 1.43.2.3 2009/11/15 09:08:46 mha Exp $ * $PostgreSQL: pgsql/src/port/exec.c,v 1.43.2.4 2009/11/20 01:28:18 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -649,10 +649,11 @@ set_pglocale_pgservice(const char *argv0, const char *app)
#ifdef WIN32 #ifdef WIN32
/* /*
* AddUserToTokenDacl(HANDLE hToken) * AddUserToDacl(HANDLE hProcess)
* *
* This function adds the current user account to the restricted * This function adds the current user account to the default DACL
* token used when we create a restricted process. * which gets attached to the restricted token used when we create
* a restricted process.
* *
* This is required because of some security changes in Windows * This is required because of some security changes in Windows
* that appeared in patches to XP/2K3 and in Vista/2008. * that appeared in patches to XP/2K3 and in Vista/2008.
@ -665,13 +666,13 @@ set_pglocale_pgservice(const char *argv0, const char *app)
* and CreateProcess() calls when running as Administrator. * and CreateProcess() calls when running as Administrator.
* *
* This function fixes this problem by modifying the DACL of the * This function fixes this problem by modifying the DACL of the
* token the process will use, and explicitly re-adding the current * specified process and explicitly re-adding the current user account.
* user account. This is still secure because the Administrator account * This is still secure because the Administrator account inherits it's
* inherits its privileges from the Administrators group - it doesn't * privileges from the Administrators group - it doesn't have any of
* have any of its own. * it's own.
*/ */
BOOL BOOL
AddUserToTokenDacl(HANDLE hToken) AddUserToDacl(HANDLE hProcess)
{ {
int i; int i;
ACL_SIZE_INFORMATION asi; ACL_SIZE_INFORMATION asi;
@ -680,6 +681,7 @@ AddUserToTokenDacl(HANDLE hToken)
DWORD dwSize = 0; DWORD dwSize = 0;
DWORD dwTokenInfoLength = 0; DWORD dwTokenInfoLength = 0;
DWORD dwResult = 0; DWORD dwResult = 0;
HANDLE hToken = NULL;
PACL pacl = NULL; PACL pacl = NULL;
PSID psidUser = NULL; PSID psidUser = NULL;
TOKEN_DEFAULT_DACL tddNew; TOKEN_DEFAULT_DACL tddNew;
@ -687,6 +689,13 @@ AddUserToTokenDacl(HANDLE hToken)
TOKEN_INFORMATION_CLASS tic = TokenDefaultDacl; TOKEN_INFORMATION_CLASS tic = TokenDefaultDacl;
BOOL ret = FALSE; BOOL ret = FALSE;
/* Get the token for the process */
if (!OpenProcessToken(hProcess, TOKEN_QUERY | TOKEN_ADJUST_DEFAULT, &hToken))
{
log_error("could not open process token: %ui", GetLastError());
goto cleanup;
}
/* Figure out the buffer size for the DACL info */ /* Figure out the buffer size for the DACL info */
if (!GetTokenInformation(hToken, tic, (LPVOID) NULL, dwTokenInfoLength, &dwSize)) if (!GetTokenInformation(hToken, tic, (LPVOID) NULL, dwTokenInfoLength, &dwSize))
{ {
@ -762,7 +771,7 @@ AddUserToTokenDacl(HANDLE hToken)
} }
/* Add the new ACE for the current user */ /* Add the new ACE for the current user */
if (!AddAccessAllowedAceEx(pacl, ACL_REVISION, OBJECT_INHERIT_ACE, GENERIC_ALL, psidUser)) if (!AddAccessAllowedAce(pacl, ACL_REVISION, GENERIC_ALL, psidUser))
{ {
log_error("could not add access allowed ACE: %ui", GetLastError()); log_error("could not add access allowed ACE: %ui", GetLastError());
goto cleanup; goto cleanup;
@ -789,6 +798,9 @@ cleanup:
if (ptdd) if (ptdd)
LocalFree((HLOCAL) ptdd); LocalFree((HLOCAL) ptdd);
if (hToken)
CloseHandle(hToken);
return ret; return ret;
} }