Fix failures to ignore \r when reading Windows-style newlines.

libpq failed to ignore Windows-style newlines in connection service files.
This normally wasn't a problem on Windows itself, because fgets() would
convert \r\n to just \n.  But if libpq were running inside a program that
changes the default fopen mode to binary, it would see the \r's and think
they were data.  In any case, it's project policy to ignore \r in text
files unconditionally, because people sometimes try to use files with
DOS-style newlines on Unix machines, where the C library won't hide that
from us.

Hence, adjust parseServiceFile() to ignore \r as well as \n at the end of
the line.  In HEAD, go a little further and make it ignore all trailing
whitespace, to match what it's always done with leading whitespace.

In HEAD, also run around and fix up everyplace where we have
newline-chomping code to make all those places look consistent and
uniformly drop \r.  It is not clear whether any of those changes are
fixing live bugs.  Most of the non-cosmetic changes are in places that
are reading popen output, and the jury is still out as to whether popen
on Windows can return \r\n.  (The Windows-specific code in pipe_read_line
seems to think so, but our lack of support for this elsewhere suggests
maybe it's not a problem in practice.)  Hence, I desisted from applying
those changes to back branches, except in run_ssl_passphrase_command()
which is new enough and little-tested enough that we'd probably not have
heard about any problems there.

Tom Lane and Michael Paquier, per bug #15827 from Jorge Gustavo Rocha.
Back-patch the parseServiceFile() change to all supported branches,
and the run_ssl_passphrase_command() change to v11 where that was added.

Discussion: https://postgr.es/m/15827-e6ba53a3a7ed543c@postgresql.org

diff --git a/src/backend/libpq/be-secure-common.c b/src/backend/libpq/be-secure-common.c
index 877226d3776fcc969a4bc9ad93779a3598ec6cbe..4abbef5bf1907fe13b0e51cd2f4c6137d1da6c75 100644 (file)
--- a/src/backend/libpq/be-secure-common.c
+++ b/src/backend/libpq/be-secure-common.c
@@ -112,9 +112,10 @@ run_ssl_passphrase_command(const char *prompt, bool is_server_start, char *buf,
                goto error;
        }
 
-       /* strip trailing newline */
+       /* strip trailing newline, including \r in case we're on Windows */
        len = strlen(buf);
-       if (len > 0 && buf[len - 1] == '\n')
+       while (len > 0 && (buf[len - 1] == '\n' ||
+                                          buf[len - 1] == '\r'))
                buf[--len] = '\0';
 
 error:

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index c800d7921e318b1fb82d4237a02f802cad052c8c..7a4c782554723521c25838d3173091ed27268a58 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -5020,6 +5020,8 @@ parseServiceFile(const char *serviceFile,
 
        while ((line = fgets(buf, sizeof(buf), f)) != NULL)
        {
+               int                     len;
+
                linenr++;
 
                if (strlen(line) >= sizeof(buf) - 1)
@@ -5032,16 +5034,18 @@ parseServiceFile(const char *serviceFile,
                        return 2;
                }
 
-               /* ignore EOL at end of line */
-               if (strlen(line) && line[strlen(line) - 1] == '\n')
-                       line[strlen(line) - 1] = 0;
+               /* ignore EOL at end of line, including \r in case it's a DOS file */
+               len = strlen(line);
+               while (len > 0 && (line[len - 1] == '\n' ||
+                                                  line[len - 1] == '\r'))
+                       line[--len] = '\0';
 
                /* ignore leading blanks */
                while (*line && isspace((unsigned char) line[0]))
                        line++;
 
                /* ignore comments and empty lines */
-               if (strlen(line) == 0 || line[0] == '#')
+               if (line[0] == '\0' || line[0] == '#')
                        continue;
 
                /* Check for right groupname */