Date: Thu, 20 Jun 2019 16:03:19 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Jorge Gustavo Rocha <jgr@geomaster.pt>, pgsql-bugs@lists.postgresql.org
Subject: Re: BUG #15827: Unable to connect on Windows using pg_services.conf
 using Python psycopg2
Message-ID: <20190620070319.GH2660@paquier.xyz>
References: <15827-e6ba53a3a7ed543c@postgresql.org>
 <82491.1559409563@sss.pgh.pa.us>
 <e12a23c6-5e00-3fa6-6179-681336130361@geomaster.pt>
 <1473.1560866085@sss.pgh.pa.us>
 <fcb5c34c-cf5f-6dc9-c68e-6b297f073b79@geomaster.pt>
 <CA+mi_8aBnLKypX2Ttksg8JEhApBo=JpF6P_STQGp-FOvDpn6Yw@mail.gmail.com>
 <81d9d421-6947-7111-a1dc-cfd99cd3ae53@geomaster.pt>
 <23215.1560977098@sss.pgh.pa.us>
 <20190620031218.GC2660@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="T4IYkFBVPN84tP7K"
Content-Disposition: inline
In-Reply-To: <20190620031218.GC2660@paquier.xyz>
Precedence: bulk


--T4IYkFBVPN84tP7K
Content-Type: multipart/mixed; boundary="YhFoJY/gx7awiIuK"
Content-Disposition: inline


--YhFoJY/gx7awiIuK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Jun 20, 2019 at 12:12:18PM +0900, Michael Paquier wrote:
> The discussion here is on 10, and the password file has does not
> enforce the flag either because it filters '\r' by itself.  So another
> solution may be to do the same thing as what's done in
> passwordFromFile()?

That still sounds like a good idea to do at the end.  So attached is
the Dr Evil's version I was thinking of, and that would be rather
back-patchable.  (Spoiler: not seriously tested.)

Thoughts?
--
Michael

--YhFoJY/gx7awiIuK
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="service-libpq-crlf-v1.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-co=
nnect.c
index c800d7921e..4e6902daef 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -5020,6 +5020,8 @@ parseServiceFile(const char *serviceFile,
=20
 	while ((line =3D fgets(buf, sizeof(buf), f)) !=3D NULL)
 	{
+		int			len;
+
 		linenr++;
=20
 		if (strlen(line) >=3D sizeof(buf) - 1)
@@ -5032,16 +5034,23 @@ parseServiceFile(const char *serviceFile,
 			return 2;
 		}
=20
+		len =3D strlen(line);
+
 		/* ignore EOL at end of line */
-		if (strlen(line) && line[strlen(line) - 1] =3D=3D '\n')
-			line[strlen(line) - 1] =3D 0;
+		if (len > 0 && line[len - 1] =3D=3D '\n')
+		{
+			line[--len] =3D '\0';
+			/* Handle DOS-style line endings, too, even when not on Windows */
+			if (len > 0 && line[len - 1] =3D=3D '\r')
+				line[--len] =3D '\0';
+		}
=20
 		/* ignore leading blanks */
 		while (*line && isspace((unsigned char) line[0]))
 			line++;
=20
 		/* ignore comments and empty lines */
-		if (strlen(line) =3D=3D 0 || line[0] =3D=3D '#')
+		if (len =3D=3D 0 || line[0] =3D=3D '#')
 			continue;
=20
 		/* Check for right groupname */

--YhFoJY/gx7awiIuK--

--T4IYkFBVPN84tP7K
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAl0LL7cACgkQnvQgOdby
QH2hmQ//Q4bEuLYA6IhTn6GkUWGkn7gLEL00bKRLu/6hyVyHpLObasum7uSlx3lO
XTRjOezx3vWZgnbp/7Qs/4ZOUCbdyJAtOcGZjz06SG6rO1Z3wMqNlx1GNvbCcDNi
RD78BsooyiwYgJGBKc17FM20g1/iZsxCMlnPqS+6jJ48nq3sQPFRLz2mSFY/Gfbf
tikC1cXvqEr9wQivQEZTI/TU0S40VpqlhvIvnra39suaqqrqyLIXbPIYgw61c1/c
afJgZigzq+VgFeTU7M1DuaznDBeiZvSykPdLreodl3nlcSWuQg9IACDBg6qUrxvF
7aJ+YjuHwbkoUjUE+a+WhvoujiuZY+/TBF5sSSAJSDIO0jd3ZER0gzhJl+ajmzhF
eHvowb5l9l7sRAude9QpAVe/0Wgy3JZ0t3Nz+95v8CnNkI5KW3zHj44bA/Q3rOSu
xBINRktEBoBEnUEn0gK+tM7EUYVfFJkRHTWL5zyM3G5h5JuSsnzTJqIMIk2apLvK
MZIcKCM1Z+/GO9OcQKQrYVicFdOjFbL6zm9R8RT8axRgcb36mnY1AzmQ+St3To9C
4yoL2v+YYV0A5cSKcHrpyXkxxGHz/KtulYxlnBQ0UMh18QzWm4M5rNs3cmPlbR0B
tMvzDnwxIDVPxhfqGUU3jdOCfMuPy7RNxeM5Qoa2IF8aIhlsLvU=
=yfQU
-----END PGP SIGNATURE-----

--T4IYkFBVPN84tP7K--