database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-22 12:22:45 +03:00
Code Activity

Fix issues around .pgpass file.

Browse Source 
This commit fixes the following two issues around .pgpass file.

(1) If the length of a line in .pgpass file was larger than 319B,
        libpq silently treated each 319B in the line as a separate
        setting line.

(2) The document explains that a line beginning with # is treated
        as a comment in .pgpass. But there was no code doing such
        special handling. Whether a line begins with # or not, libpq
        just checked that the first token in the line match with the host.

For (1), this commit makes libpq warn if the length of a line
is larger than 319B, and throw away the remaining part beginning
from 320B position.

For (2), this commit changes libpq so that it treats any lines
beginning with # as comments.

Author: Fujii Masao
Reviewed-by: Hamid Akhtar
Discussion: https://postgr.es/m/c0f0c01c-fa74-9749-2084-b73882fd5465@oss.nttdata.com
This commit is contained in:
Fujii Masao
2020-03-05 13:00:38 +09:00
parent fbcf087112
commit 2eb3bc5881
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/interfaces/libpq/fe-connect.c
View File

@@ -6949,6 +6949,7 @@ passwordFromFile(const char *hostname, const char *port, const char *dbname,
{ {
FILE *fp; FILE *fp;
struct stat stat_buf; struct stat stat_buf;
int line_number = 0;
#define LINELEN NAMEDATALEN*5 #define LINELEN NAMEDATALEN*5
char buf[LINELEN]; char buf[LINELEN];
@@ -7014,10 +7015,42 @@ passwordFromFile(const char *hostname, const char *port, const char *dbname,
*p1, *p1,
*p2; *p2;
int len; int len;
int buflen;
if (fgets(buf, sizeof(buf), fp) == NULL) if (fgets(buf, sizeof(buf), fp) == NULL)
break; break;
line_number++;
buflen = strlen(buf);
if (buflen >= sizeof(buf) - 1 && buf[buflen - 1] != '\n')
{
char rest[LINELEN];
int restlen;
/*
* Warn if this password setting line is too long, because it's
* unexpectedly truncated.
*/
if (buf[0] != '#')
fprintf(stderr,
libpq_gettext("WARNING: line %d too long in password file \"%s\"\n"),
line_number, pgpassfile);
/* eat rest of the line */
while (!feof(fp) && !ferror(fp))
{
if (fgets(rest, sizeof(rest), fp) == NULL)
break;
restlen = strlen(rest);
if (restlen < sizeof(rest) - 1 || rest[restlen - 1] == '\n')
break;
}
}
/* ignore comments */
if (buf[0] == '#')
continue;
/* strip trailing newline and carriage return */ /* strip trailing newline and carriage return */
len = pg_strip_crlf(buf); len = pg_strip_crlf(buf);