fix authentication for replication in pg_hba.conf

funbringer · funbringer · commit bd4eb3c250e7 · 2017-11-29T18:23:05.000+03:00
diff --git a/testgres/testgres.py b/testgres/testgres.py
@@ -552,10 +552,19 @@ def default_conf(self,
 
             # replication-related settings
             if allow_streaming:
+                # get auth method for host or local users
+                def get_auth_method(t):
+                    return next((s.split()[-1] for s in lines
+                                 if s.startswith(t)), 'trust')
+
+                # get auth methods
+                auth_local = get_auth_method('local')
+                auth_host = get_auth_method('host')
+
                 new_lines = [
-                    "local\treplication\tall\t\t\ttrust\n",
-                    "host\treplication\tall\t127.0.0.1/32\ttrust\n",
-                    "host\treplication\tall\t::1/128\t\ttrust\n"
+                    "local\treplication\tall\t\t\t{}\n".format(auth_local),
+                    "host\treplication\tall\t127.0.0.1/32\t{}\n".format(auth_host),
+                    "host\treplication\tall\t::1/128\t\t{}\n".format(auth_host)
                 ]
 
                 # write missing lines
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -35,6 +35,21 @@ def test_custom_init(self):
             node.init(initdb_params=['-k']).start()
             node.safe_psql('postgres', 'select 1')
 
+        with get_new_node('test') as node:
+            node.init(allow_streaming=True,
+                      initdb_params=['--auth-local=reject',
+                                     '--auth-host=reject'])
+
+            hba_file = os.path.join(node.data_dir, 'pg_hba.conf')
+            with open(hba_file, 'r') as conf:
+                lines = conf.readlines()
+
+                # check number of lines
+                self.assertGreaterEqual(len(lines), 6)
+
+                # there should be no trust entries at all
+                self.assertFalse(any('trust' in s for s in lines))
+
     def test_double_init(self):
         with get_new_node('test') as node:
             # can't initialize node more than once
