Move NEON_AUTH_TOKEN to a builtin GUC

This environment variable is used as the password to connect to another
postgres instance as the walreceiver. The purpose of moving to a GUC is
so that we can reload the storage auth token periodically.

Signed-off-by: Tristan Partin <[email protected]>

Author: tristan957

src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

@@ -148,7 +148,6 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 /* BEGIN_NEON */
 	const char *keys[7];
 	const char *vals[7];
-	char * neon_auth_token = NULL;
 /* END_NEON */
 	int			i = 0;
 
@@ -210,16 +209,14 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 /* BEGIN_NEON */
 	if (pg_strcasecmp(appname, "walreceiver") == 0)
 	{
-		neon_auth_token = getenv("NEON_AUTH_TOKEN");
-		if (neon_auth_token != NULL)
+		if (neon_storage_auth_token[0] != '\0')
 		{
-			elog(LOG, "Use NEON_AUTH_TOKEN to connect");
 			keys[++i] = "password";
-			vals[i] = neon_auth_token;
+			vals[i] = neon_storage_auth_token;
 		}
 		else
 		{
-			elog(LOG, "NEON_AUTH_TOKEN is undefined in the environment");
+			elog(LOG, "no storage authentication token set");
 		}
 	}
 /* END_NEON */

src/backend/replication/walreceiver.c

@@ -87,6 +87,7 @@
 int			wal_receiver_status_interval;
 int			wal_receiver_timeout;
 bool		hot_standby_feedback;
+char	   *neon_storage_auth_token;
 
 /* libpqwalreceiver connection */
 static WalReceiverConn *wrconn = NULL;

src/backend/utils/misc/guc_tables.c

@@ -71,6 +71,7 @@
 #include "replication/slot.h"
 #include "replication/slotsync.h"
 #include "replication/syncrep.h"
+#include "replication/walreceiver.h"
 #include "storage/bufmgr.h"
 #include "storage/large_object.h"
 #include "storage/pg_shmem.h"
@@ -4799,6 +4800,17 @@ struct config_string ConfigureNamesString[] =
 		check_restrict_nonsystem_relation_kind, assign_restrict_nonsystem_relation_kind, NULL
 	},
 
+	{
+		{"neon_storage_auth_token", PGC_SU_BACKEND, 0,
+			"Authentication token for Neon storage",
+			NULL,
+			GUC_SUPERUSER_ONLY
+		},
+		&neon_storage_auth_token,
+		"",
+		NULL, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, NULL, NULL, NULL, NULL

src/include/replication/walreceiver.h

@@ -29,6 +29,7 @@
 extern PGDLLIMPORT int wal_receiver_status_interval;
 extern PGDLLIMPORT int wal_receiver_timeout;
 extern PGDLLIMPORT bool hot_standby_feedback;
+extern PGDLLIMPORT char *neon_storage_auth_token;
 
 /*
  * MAXCONNINFO: maximum size of a connection string.