NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0f679d2

committed

Reject, in pg_dumpall, names containing CR or LF.

These characters prematurely terminate Windows shell command processing,causing the shell to execute a prefix of the intended command. Thechief alternative to rejecting these characters was to bypass theWindows shell with CreateProcess(), but the ability to use such nameshas little value. Back-patch to 9.1 (all supported versions).This change formally revokes support for these characters in databasenames and roles names. Don't document this; the error message isself-explanatory, and too few users would benefit. A future majorrelease may forbid creation of databases and roles so named. For now,check only at known weak points in pg_dumpall. Future commits will,without notice, reject affected names from other frontend programs.Also extend the restriction to pg_dumpall --dbname=CONNSTR arguments and--file arguments. Unlike the effects on role name arguments anddatabase names, this does not reflect a broad policy change. Amigration to CreateProcess() could lift these two restrictions.Reviewed by Peter Eisentraut.Security:CVE-2016-5424

1 parent05abd3b commit0f679d2Copy full SHA for 0f679d2

File tree

1 file changed

+22

-0

lines changed

src/bin/pg_dump
- pg_dumpall.c

1 file changed

+22

-0

lines changed

`‎src/bin/pg_dump/pg_dumpall.c`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2117,6 +2117,12 @@ doConnStrQuoting(PQExpBuffer buf, const char *str)`
`2117`	`2117`	`/*`
`2118`	`2118`	`* Append the given string to the shell command being built in the buffer,`
`2119`	`2119`	`* with suitable shell-style quoting.`
	`2120`	`+ *`
	`2121`	`+ * Forbid LF or CR characters, which have scant practical use beyond designing`
	`2122`	`+ * security breaches. The Windows command shell is unusable as a conduit for`
	`2123`	`+ * arguments containing LF or CR characters. A future major release should`
	`2124`	`+ * reject those characters in CREATE ROLE and CREATE DATABASE, because use`
	`2125`	`+ * there eventually leads to errors here.`
`2120`	`2126`	`*/`
`2121`	`2127`	`staticvoid`
`2122`	`2128`	`doShellQuoting(PQExpBufferbuf,constchar*str)`
`@@ -2127,6 +2133,14 @@ doShellQuoting(PQExpBuffer buf, const char *str)`
`2127`	`2133`	`appendPQExpBufferChar(buf,'\'');`
`2128`	`2134`	`for (p=str;*p;p++)`
`2129`	`2135`	`{`
	`2136`	`+if (p=='\n'\|\|p=='\r')`
	`2137`	`+{`
	`2138`	`+fprintf(stderr,`
	`2139`	`+_("shell command argument contains a newline or carriage return: \"%s\"\n"),`
	`2140`	`+str);`
	`2141`	`+exit(EXIT_FAILURE);`
	`2142`	`+}`
	`2143`	`+`
`2130`	`2144`	`if (*p=='\'')`
`2131`	`2145`	`appendPQExpBuffer(buf,"'\"'\"'");`
`2132`	`2146`	`else`
`@@ -2138,6 +2152,14 @@ doShellQuoting(PQExpBuffer buf, const char *str)`
`2138`	`2152`	`appendPQExpBufferChar(buf,'"');`
`2139`	`2153`	`for (p=str;*p;p++)`
`2140`	`2154`	`{`
	`2155`	`+if (p=='\n'\|\|p=='\r')`
	`2156`	`+{`
	`2157`	`+fprintf(stderr,`
	`2158`	`+_("shell command argument contains a newline or carriage return: \"%s\"\n"),`
	`2159`	`+str);`
	`2160`	`+exit(EXIT_FAILURE);`
	`2161`	`+}`
	`2162`	`+`
`2141`	`2163`	`if (*p=='"')`
`2142`	`2164`	`appendPQExpBuffer(buf,"\\\"");`
`2143`	`2165`	`else`

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!

Commit0f679d2

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_dumpall.c`

0 commit comments