Commit1b9a293

vshepard

committed

Fix set_auto_conf with single quotes

1 parent655a386 commit1b9a293Copy full SHA for 1b9a293

File tree

+37

-4

lines changed

+37

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1627,17 +1627,22 @@ def set_auto_conf(self, options, config='postgresql.auto.conf', rm_options={}):`
`1627`	`1627`	`name,var=line.partition('=')[::2]`
`1628`	`1628`	`name=name.strip()`
`1629`	`1629`	`var=var.strip()`
`1630`		`-var=var.strip('"')`
`1631`		`-var=var.strip("'")`
`1632`	`1630`
`1633`		`-# remove options specified in rm_options list`
	`1631`	`+# Handle quoted values and remove escaping`
	`1632`	`+ifvar.startswith("'")andvar.endswith("'"):`
	`1633`	`+var=var[1:-1].replace("''","'")`
	`1634`	`+`
	`1635`	`+# Remove options specified in rm_options list`
`1634`	`1636`	`ifnameinrm_options:`
`1635`	`1637`	`continue`
`1636`	`1638`
`1637`	`1639`	`current_options[name]=var`
`1638`	`1640`
`1639`	`1641`	`foroptioninoptions:`
`1640`		`-current_options[option]=options[option]`
	`1642`	`+value=options[option]`
	`1643`	`+ifisinstance(value,str):`
	`1644`	`+value=value.replace("'","\\'")`
	`1645`	`+current_options[option]=value`
`1641`	`1646`
`1642`	`1647`	`auto_conf=''`
`1643`	`1648`	`foroptionincurrent_options:`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1061,6 +1061,34 @@ def test_simple_with_bin_dir(self):`
`1061`	`1061`	`exceptFileNotFoundError:`
`1062`	`1062`	`pass# Expected error`
`1063`	`1063`
	`1064`	`+deftest_set_auto_conf(self):`
	`1065`	`+withget_new_node()asnode:`
	`1066`	`+node.init().start()`
	`1067`	`+`
	`1068`	`+options= {`
	`1069`	`+"archive_command":"cp '%p'\"/mnt/server/archivedir/%f\"",`
	`1070`	`+'restore_command':'cp "/mnt/server/archivedir/%f"\'%p\'',`
	`1071`	`+ }`
	`1072`	`+`
	`1073`	`+node.set_auto_conf(options)`
	`1074`	`+node.stop()`
	`1075`	`+node.slow_start()`
	`1076`	`+`
	`1077`	`+auto_conf_path=f"{node.data_dir}/postgresql.auto.conf"`
	`1078`	`+withopen(auto_conf_path,"r")asf:`
	`1079`	`+content=f.read()`
	`1080`	`+self.assertIn(`
	`1081`	`+"archive_command = 'cp\\'%p\\'\"/mnt/server/archivedir/%f\"",`
	`1082`	`+content,`
	`1083`	`+"archive_command stored wrong"`
	`1084`	`+ )`
	`1085`	`+self.assertIn(`
	`1086`	`+"restore_command = 'cp\"/mnt/server/archivedir/%f\"\\'%p\\''",`
	`1087`	`+content,`
	`1088`	`+"restore_command stored wrong"`
	`1089`	`+ )`
	`1090`	`+`
	`1091`	`+`
`1064`	`1092`
`1065`	`1093`	`if__name__=='__main__':`
`1066`	`1094`	`ifos.environ.get('ALT_CONFIG'):`

Comments

(0)