Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9485663

Browse files
committed
Run pg_upgrade and pg_resetxlog with restricted token on Windows
As with initdb these programs need to run with a restricted token, andif they don't pg_upgrade will fail when run as a user with Adminstratorprivileges.Backpatch to all live branches. On the development branch the code isreorganized so that the restricted token code is now in a singlelocation. On the stable bramches a less invasive change is made bysimply copying the relevant code to pg_upgrade.c and pg_resetxlog.c.Patches and bug report from Muhammad Asif Naeem, reviewed by MichaelPaquier, slightly edited by me.
1 parentf155466 commit9485663

File tree

2 files changed

+346
-0
lines changed

2 files changed

+346
-0
lines changed

‎contrib/pg_upgrade/pg_upgrade.c

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ static void copy_clog_xlog_xid(void);
5050
staticvoidset_frozenxids(void);
5151
staticvoidsetup(char*argv0,boollive_check);
5252
staticvoidcleanup(void);
53+
staticvoidget_restricted_token(constchar*progname);
54+
55+
#ifdefWIN32
56+
staticintCreateRestrictedProcess(char*cmd,PROCESS_INFORMATION*processInfo,constchar*progname);
57+
#endif
5358

5459
ClusterInfoold_cluster,
5560
new_cluster;
@@ -67,6 +72,9 @@ char *output_files[] = {
6772
NULL
6873
};
6974

75+
#ifdefWIN32
76+
staticchar*restrict_env;
77+
#endif
7078

7179
int
7280
main(intargc,char**argv)
@@ -78,6 +86,8 @@ main(int argc, char **argv)
7886

7987
parseCommandLine(argc,argv);
8088

89+
get_restricted_token(os_info.progname);
90+
8191
adjust_data_dir(&old_cluster);
8292
adjust_data_dir(&new_cluster);
8393

@@ -170,6 +180,162 @@ main(int argc, char **argv)
170180
return0;
171181
}
172182

183+
#ifdefWIN32
184+
typedefBOOL(WINAPI*__CreateRestrictedToken) (HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE);
185+
186+
/* Windows API define missing from some versions of MingW headers */
187+
#ifndefDISABLE_MAX_PRIVILEGE
188+
#defineDISABLE_MAX_PRIVILEGE0x1
189+
#endif
190+
191+
/*
192+
* Create a restricted token and execute the specified process with it.
193+
*
194+
* Returns 0 on failure, non-zero on success, same as CreateProcess().
195+
*
196+
* On NT4, or any other system not containing the required functions, will
197+
* NOT execute anything.
198+
*/
199+
staticint
200+
CreateRestrictedProcess(char*cmd,PROCESS_INFORMATION*processInfo,constchar*progname)
201+
{
202+
BOOLb;
203+
STARTUPINFOsi;
204+
HANDLEorigToken;
205+
HANDLErestrictedToken;
206+
SID_IDENTIFIER_AUTHORITYNtAuthority= {SECURITY_NT_AUTHORITY };
207+
SID_AND_ATTRIBUTESdropSids[2];
208+
__CreateRestrictedToken_CreateRestrictedToken=NULL;
209+
HANDLEAdvapi32Handle;
210+
211+
ZeroMemory(&si,sizeof(si));
212+
si.cb=sizeof(si);
213+
214+
Advapi32Handle=LoadLibrary("ADVAPI32.DLL");
215+
if (Advapi32Handle!=NULL)
216+
{
217+
_CreateRestrictedToken= (__CreateRestrictedToken)GetProcAddress(Advapi32Handle,"CreateRestrictedToken");
218+
}
219+
220+
if (_CreateRestrictedToken==NULL)
221+
{
222+
fprintf(stderr,_("%s: WARNING: cannot create restricted tokens on this platform\n"),progname);
223+
if (Advapi32Handle!=NULL)
224+
FreeLibrary(Advapi32Handle);
225+
return0;
226+
}
227+
228+
/* Open the current token to use as a base for the restricted one */
229+
if (!OpenProcessToken(GetCurrentProcess(),TOKEN_ALL_ACCESS,&origToken))
230+
{
231+
fprintf(stderr,_("%s: could not open process token: error code %lu\n"),progname,GetLastError());
232+
return0;
233+
}
234+
235+
/* Allocate list of SIDs to remove */
236+
ZeroMemory(&dropSids,sizeof(dropSids));
237+
if (!AllocateAndInitializeSid(&NtAuthority,2,
238+
SECURITY_BUILTIN_DOMAIN_RID,DOMAIN_ALIAS_RID_ADMINS,0,0,0,0,0,
239+
0,&dropSids[0].Sid)||
240+
!AllocateAndInitializeSid(&NtAuthority,2,
241+
SECURITY_BUILTIN_DOMAIN_RID,DOMAIN_ALIAS_RID_POWER_USERS,0,0,0,0,0,
242+
0,&dropSids[1].Sid))
243+
{
244+
fprintf(stderr,_("%s: could not to allocate SIDs: error code %lu\n"),progname,GetLastError());
245+
return0;
246+
}
247+
248+
b=_CreateRestrictedToken(origToken,
249+
DISABLE_MAX_PRIVILEGE,
250+
sizeof(dropSids) /sizeof(dropSids[0]),
251+
dropSids,
252+
0,NULL,
253+
0,NULL,
254+
&restrictedToken);
255+
256+
FreeSid(dropSids[1].Sid);
257+
FreeSid(dropSids[0].Sid);
258+
CloseHandle(origToken);
259+
FreeLibrary(Advapi32Handle);
260+
261+
if (!b)
262+
{
263+
fprintf(stderr,_("%s: could not create restricted token: error code %lu\n"),progname,GetLastError());
264+
return0;
265+
}
266+
267+
#ifndef__CYGWIN__
268+
AddUserToTokenDacl(restrictedToken);
269+
#endif
270+
271+
if (!CreateProcessAsUser(restrictedToken,
272+
NULL,
273+
cmd,
274+
NULL,
275+
NULL,
276+
TRUE,
277+
CREATE_SUSPENDED,
278+
NULL,
279+
NULL,
280+
&si,
281+
processInfo))
282+
283+
{
284+
fprintf(stderr,_("%s: could not start process for command \"%s\": error code %lu\n"),progname,cmd,GetLastError());
285+
return0;
286+
}
287+
288+
returnResumeThread(processInfo->hThread);
289+
}
290+
#endif
291+
292+
void
293+
get_restricted_token(constchar*progname)
294+
{
295+
#ifdefWIN32
296+
297+
/*
298+
* Before we execute another program, make sure that we are running with a
299+
* restricted token. If not, re-execute ourselves with one.
300+
*/
301+
302+
if ((restrict_env=getenv("PG_RESTRICT_EXEC"))==NULL
303+
||strcmp(restrict_env,"1")!=0)
304+
{
305+
PROCESS_INFORMATIONpi;
306+
char*cmdline;
307+
308+
ZeroMemory(&pi,sizeof(pi));
309+
310+
cmdline=pg_strdup(GetCommandLine());
311+
312+
putenv("PG_RESTRICT_EXEC=1");
313+
314+
if (!CreateRestrictedProcess(cmdline,&pi,progname))
315+
{
316+
fprintf(stderr,_("%s: could not re-execute with restricted token: error code %lu\n"),progname,GetLastError());
317+
}
318+
else
319+
{
320+
/*
321+
* Successfully re-execed. Now wait for child process to capture
322+
* exitcode.
323+
*/
324+
DWORDx;
325+
326+
CloseHandle(pi.hThread);
327+
WaitForSingleObject(pi.hProcess,INFINITE);
328+
329+
if (!GetExitCodeProcess(pi.hProcess,&x))
330+
{
331+
fprintf(stderr,_("%s: could not get exit code from subprocess: error code %lu\n"),progname,GetLastError());
332+
exit(1);
333+
}
334+
exit(x);
335+
}
336+
}
337+
#endif
338+
}
173339

174340
staticvoid
175341
setup(char*argv0,boollive_check)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp