NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6d25eb3

committed

Allow "-C variable" and "--describe-config" even to root users.

There's no really compelling reason to refuse to do these read-only,non-server-starting options as root, and there's at least one goodreason to allow -C: pg_ctl uses -C to find out the true data directorylocation when pointed at a config-only directory. On Windows, this isdone before dropping administrator privileges, which means that pg_ctlfails for administrators if and only if a config-only layout is used.Since the root-privilege check is done so early in startup, it's a bitawkward to check for these switches. Make the somewhat arbitrarydecision that we'll only skip the root check if -C is the first switch.This is not just to make the code a bit simpler: it also guarantees thatwe can't misinterpret a --boot mode switch. (While AuxiliaryProcessMaindoesn't currently recognize any such switch, it might have one in thefuture.) This is no particular problem for pg_ctl, and since the wholebehavior is undocumented anyhow, it's not a documentation issue either.(--describe-config only works as the first switch anyway, so this isno restriction for that case either.)Back-patch to 9.2 where pg_ctl first began to use -C.MauMau, heavily edited by me

1 parented1cb42 commit6d25eb3Copy full SHA for 6d25eb3

File tree

2 files changed

+28

-6

lines changed

src
- backend/main
  - main.c
- bin/pg_ctl
  - pg_ctl.c

2 files changed

+28

-6

lines changed

`‎src/backend/main/main.c`

Lines changed: 23 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ static char get_current_username(const char progname);`
`62`	`62`	`int`
`63`	`63`	`main(intargc,char*argv[])`
`64`	`64`	`{`
	`65`	`+booldo_check_root= true;`
	`66`	`+`
`65`	`67`	`progname=get_progname(argv[0]);`
`66`	`68`
`67`	`69`	`/*`
`@@ -156,7 +158,8 @@ main(int argc, char *argv[])`
`156`	`158`	`unsetenv("LC_ALL");`
`157`	`159`
`158`	`160`	`/*`
`159`		`- * Catch standard options before doing much else`
	`161`	`+ * Catch standard options before doing much else, in particular before we`
	`162`	`+ * insist on not being root.`
`160`	`163`	`*/`
`161`	`164`	`if (argc>1)`
`162`	`165`	`{`
`@@ -170,12 +173,29 @@ main(int argc, char *argv[])`
`170`	`173`	`puts("postgres (PostgreSQL) "PG_VERSION);`
`171`	`174`	`exit(0);`
`172`	`175`	`}`
	`176`	`+`
	`177`	`+/*`
	`178`	`+ * In addition to the above, we allow "--describe-config" and "-C var"`
	`179`	`+ * to be called by root. This is reasonably safe since these are`
	`180`	`+ * read-only activities. The -C case is important because pg_ctl may`
	`181`	`+ * try to invoke it while still holding administrator privileges on`
	`182`	`+ * Windows. Note that while -C can normally be in any argv position,`
	`183`	`+ * if you wanna bypass the root check you gotta put it first. This`
	`184`	`+ * reduces the risk that we might misinterpret some other mode's -C`
	`185`	`+ * switch as being the postmaster/postgres one.`
	`186`	`+ */`
	`187`	`+if (strcmp(argv[1],"--describe-config")==0)`
	`188`	`+do_check_root= false;`
	`189`	`+elseif (argc>2&&strcmp(argv[1],"-C")==0)`
	`190`	`+do_check_root= false;`
`173`	`191`	`}`
`174`	`192`
`175`	`193`	`/*`
`176`		`- * Make sure we are not running as root.`
	`194`	`+ * Make sure we are not running as root, unless it's safe for the selected`
	`195`	`+ * option.`
`177`	`196`	`*/`
`178`		`-check_root(progname);`
	`197`	`+if (do_check_root)`
	`198`	`+check_root(progname);`
`179`	`199`
`180`	`200`	`/*`
`181`	`201`	`* Dispatch to one of various subprograms depending on first argument.`

`‎src/bin/pg_ctl/pg_ctl.c`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1968,9 +1968,11 @@ adjust_data_dir(void)`
`1968`	`1968`	`else`
`1969`	`1969`	`my_exec_path=xstrdup(exec_path);`
`1970`	`1970`
`1971`		`-snprintf(cmd,MAXPGPATH,SYSTEMQUOTE"\"%s\" %s%s -C data_directory"SYSTEMQUOTE,`
`1972`		`-my_exec_path,pgdata_opt ?pgdata_opt :"",post_opts ?`
`1973`		`-post_opts :"");`
	`1971`	`+/* it's important for -C to be the first option, see main.c */`
	`1972`	`+snprintf(cmd,MAXPGPATH,SYSTEMQUOTE"\"%s\" -C data_directory %s%s"SYSTEMQUOTE,`
	`1973`	`+my_exec_path,`
	`1974`	`+pgdata_opt ?pgdata_opt :"",`
	`1975`	`+post_opts ?post_opts :"");`
`1974`	`1976`
`1975`	`1977`	`fd=popen(cmd,"r");`
`1976`	`1978`	`if (fd==NULL\|\|fgets(filename,sizeof(filename),fd)==NULL)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6d25eb3

File tree

2 files changed

2 files changed

`‎src/backend/main/main.c`

`‎src/bin/pg_ctl/pg_ctl.c`

0 commit comments