Temporary fix for the problem that pg_stat_activity, inet_client_addr(),

and inet_server_addr() fail if the client connected over a "scoped" IPv6
address.  In this case getnameinfo() will return a string ending with
a poorly-standardized "%something" zone specifier, which these functions
try to feed to network_in(), which won't take it.  So that we don't lose
functionality altogether, suppress the zone specifier before giving the
string to network_in().  Per report from Brian Hirt.

TODO: probably someday the inet type should support scoped IPv6 addresses,
and then this patch should be reverted.

Backpatch to 8.2 ... is it worth going further?

diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 5dd78d3fd1b974719af8a673abebee5b889e6a39..0d0a43a9d87e74c1b9ed411d872faf93490d2fd6 100644 (file)
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -1142,6 +1142,8 @@ inet_client_addr(PG_FUNCTION_ARGS)
        if (ret)
                PG_RETURN_NULL();
 
+       clean_ipv6_addr(port->raddr.addr.ss_family, remote_host);
+
        PG_RETURN_INET_P(network_in(remote_host, false));
 }
 
@@ -1216,6 +1218,8 @@ inet_server_addr(PG_FUNCTION_ARGS)
        if (ret)
                PG_RETURN_NULL();
 
+       clean_ipv6_addr(port->laddr.addr.ss_family, local_host);
+
        PG_RETURN_INET_P(network_in(local_host, false));
 }
 
@@ -1479,3 +1483,32 @@ inetmi(PG_FUNCTION_ARGS)
 
        PG_RETURN_INT64(res);
 }
+
+
+/*
+ * clean_ipv6_addr --- remove any '%zone' part from an IPv6 address string
+ *
+ * XXX This should go away someday!
+ *
+ * This is a kluge needed because we don't yet support zones in stored inet
+ * values.  Since the result of getnameinfo() might include a zone spec,
+ * call this to remove it anywhere we want to feed getnameinfo's output to
+ * network_in.  Beats failing entirely.
+ *
+ * An alternative approach would be to let network_in ignore %-parts for
+ * itself, but that would mean we'd silently drop zone specs in user input,
+ * which seems not such a good idea.
+ */
+void
+clean_ipv6_addr(int addr_family, char *addr)
+{
+#ifdef HAVE_IPV6
+       if (addr_family == AF_INET6)
+       {
+               char *pct = strchr(addr, '%');
+
+               if (pct)
+                       *pct = '\0';
+       }
+#endif
+}

diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 4a67b4e93d479db23899a3e24d59dec28b457aa0..1ba0d804c4b25c9bb9af78748d25ed8f3cfd6fe8 100644 (file)
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -550,6 +550,8 @@ pg_stat_get_backend_client_addr(PG_FUNCTION_ARGS)
        if (ret)
                PG_RETURN_NULL();
 
+       clean_ipv6_addr(beentry->st_clientaddr.addr.ss_family, remote_host);
+
        PG_RETURN_INET_P(DirectFunctionCall1(inet_in,
                                                                                 CStringGetDatum(remote_host)));
 }

diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 1e3fd6952708b87c232090edf95cf7c58cb8a1d5..6e9df275e352b56d8c88a1f6f919a29541236cbf 100644 (file)
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -797,6 +797,7 @@ extern Datum inetor(PG_FUNCTION_ARGS);
 extern Datum inetpl(PG_FUNCTION_ARGS);
 extern Datum inetmi_int8(PG_FUNCTION_ARGS);
 extern Datum inetmi(PG_FUNCTION_ARGS);
+extern void clean_ipv6_addr(int addr_family, char *addr);
 
 /* mac.c */
 extern Datum macaddr_in(PG_FUNCTION_ARGS);