NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit11a020e

committed

Allow escaping of option values for options passed at connection start.

This is useful to allow to set GUCs to values that include spaces;something that wasn't previously possible. The primary case motivatingthis is the desire to set default_transaction_isolation to 'repeatableread' on a per connection basis, but other usecases like seach_path doalso exist.This introduces a slight backward incompatibility: Previously a \ inan option value would have been passed on literally, now it'll betaken as an escape.The relevant mailing list discussion starts with20140204125823.GJ12016@awork2.anarazel.de.

1 parente23014f commit11a020eCopy full SHA for 11a020e

File tree

3 files changed

+43

-17

lines changed

doc/src/sgml
- protocol.sgml
src/backend
- postmaster
  - postmaster.c
- utils/init
  - postinit.c

3 files changed

+43

-17

lines changed

`‎doc/src/sgml/protocol.sgml`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4734,7 +4734,10 @@ StartupMessage (F)`
`4734`	`4734`	`set at backend start time might be listed. Such settings`
`4735`	`4735`	`will be applied during backend start (after parsing the`
`4736`	`4736`	`command-line options if any). The values will act as`
`4737`		`- session defaults.`
	`4737`	`+ session defaults. Spaces in option values need to be escaped`
	`4738`	`+ with a backslash (<literal>\</>). A literal backslash can be`
	`4739`	`+ passed by escaping it with another backslash`
	`4740`	`+ (i.e <literal>\\</>).`
`4738`	`4741`	`</para>`
`4739`	`4742`	`</listitem>`
`4740`	`4743`	`</varlistentry>`

`‎src/backend/postmaster/postmaster.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4083,8 +4083,7 @@ BackendRun(Port *port)`
`4083`	`4083`
`4084`	`4084`	`/*`
`4085`	`4085`	`* Pass any backend switches specified with -o on the postmaster's own`
`4086`		`- * command line. We assume these are secure. (It's OK to mangle`
`4087`		`- * ExtraOptions now, since we're safely inside a subprocess.)`
	`4086`	`+ * command line. We assume these are secure.`
`4088`	`4087`	`*/`
`4089`	`4088`	`pg_split_opts(av,&ac,ExtraOptions);`
`4090`	`4089`

`‎src/backend/utils/init/postinit.c`

Lines changed: 38 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -409,32 +409,57 @@ InitCommunication(void)`
`409`	`409`	`/*`
`410`	`410`	`* pg_split_opts -- split a string of options and append it to an argv array`
`411`	`411`	`*`
`412`		`- *NB: the input string is destructively modified!Also, callerisresponsible`
`413`		`- *for ensuring the argv array is large enough. The maximum possible number`
`414`		`- *of arguments added by this routine is(strlen(optstr) + 1) / 2.`
	`412`	`+ *The caller is responsible for ensuring the argv arrayislarge enough. The`
	`413`	`+ *maximum possible number of arguments added by this routine is`
	`414`	`+ * (strlen(optstr) + 1) / 2.`
`415`	`415`	`*`
`416`		`- * Since no current POSTGRES arguments require any quoting characters,`
`417`		`- * we can use the simple-minded tactic of assuming each set of space-`
`418`		`- * delimited characters is a separate argv element.`
`419`		`- *`
`420`		`- * If you don't like that, well, we used to pass the whole option string`
`421`		`- * as ONE argument to execl(), which was even less intelligent...`
	`416`	`+ * Because some option values can contain spaces we allow escaping using`
	`417`	`+ * backslashes, with \\ representing a literal backslash.`
`422`	`418`	`*/`
`423`	`419`	`void`
`424`	`420`	`pg_split_opts(char*argv,intargcp,char*optstr)`
`425`	`421`	`{`
	`422`	`+StringInfoDatas;`
	`423`	`+`
	`424`	`+initStringInfo(&s);`
	`425`	`+`
`426`	`426`	`while (*optstr)`
`427`	`427`	`{`
	`428`	`+boollast_was_escape= false;`
	`429`	`+`
	`430`	`+resetStringInfo(&s);`
	`431`	`+`
	`432`	`+/* skip over leading space */`
`428`	`433`	`while (isspace((unsignedchar)*optstr))`
`429`	`434`	`optstr++;`
	`435`	`+`
`430`	`436`	`if (*optstr=='\0')`
`431`	`437`	`break;`
`432`		`-argv[(*argcp)++]=optstr;`
`433`		`-while (optstr&& !isspace((unsignedchar)optstr))`
	`438`	`+`
	`439`	`+/*`
	`440`	`+ * Parse a single option + value, stopping at the first space, unless`
	`441`	`+ * it's escaped.`
	`442`	`+ */`
	`443`	`+while (*optstr)`
	`444`	`+{`
	`445`	`+if (isspace(*optstr)&& !last_was_escape)`
	`446`	`+break;`
	`447`	`+`
	`448`	`+if (!last_was_escape&&*optstr=='\\')`
	`449`	`+last_was_escape= true;`
	`450`	`+else`
	`451`	`+{`
	`452`	`+last_was_escape= false;`
	`453`	`+appendStringInfoChar(&s,*optstr);`
	`454`	`+}`
	`455`	`+`
`434`	`456`	`optstr++;`
`435`		`-if (*optstr)`
`436`		`-*optstr++='\0';`
	`457`	`+}`
	`458`	`+`
	`459`	`+/* now store the option */`
	`460`	`+argv[(*argcp)++]=pstrdup(s.data);`
`437`	`461`	`}`
	`462`	`+resetStringInfo(&s);`
`438`	`463`	`}`
`439`	`464`
`440`	`465`	`/*`
`@@ -981,7 +1006,6 @@ process_startup_options(Port *port, bool am_superuser)`
`981`	`1006`
`982`	`1007`	`av[ac++]="postgres";`
`983`	`1008`
`984`		`-/* Note this mangles port->cmdline_options */`
`985`	`1009`	`pg_split_opts(av,&ac,port->cmdline_options);`
`986`	`1010`
`987`	`1011`	`av[ac]=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!

Commit11a020e

File tree

3 files changed

3 files changed

`‎doc/src/sgml/protocol.sgml`

`‎src/backend/postmaster/postmaster.c`

`‎src/backend/utils/init/postinit.c`

0 commit comments