Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cherry-pick] [7X] gpconfig does not escape '$' char #403

Merged
merged 1 commit into from
Apr 10, 2024
Merged

[cherry-pick] [7X] gpconfig does not escape '$' char #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions gpMgmt/bin/gppylib/commands/gp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"""
import json
import os, time
import base64
import pickle
import shlex
import os.path
import pipes
Expand Down Expand Up @@ -1101,7 +1103,7 @@ def __init__(self, command_name, postgresconf_dir, name, value=None, segInfo=Non

addParameter = (not getParameter) and (not removeParameter)
if addParameter:
args = "--add-parameter %s --value %s " % (name, shlex.quote(value))
args = "--add-parameter %s --value %s " % (name, base64.urlsafe_b64encode(pickle.dumps(value)).decode())
if getParameter:
args = "--get-parameter %s" % name
if removeParameter:
Expand All @@ -1115,7 +1117,8 @@ def __init__(self, command_name, postgresconf_dir, name, value=None, segInfo=Non

# FIXME: figure out how callers of this can handle exceptions here
def get_value(self):
return self.get_results().stdout
raw_value = self.get_results().stdout
return pickle.loads(base64.urlsafe_b64decode(raw_value))


#-----------------------------------------------
Expand Down
16 changes: 8 additions & 8 deletions gpMgmt/bin/gppylib/test/unit/test_unit_gpconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import errno
import imp
import os
import shlex
import base64, pickle
import shutil
import sys
import tempfile
Expand Down Expand Up @@ -289,11 +289,11 @@ def test_option_change_value_coordinator_separate_succeed(self):
self.assertEqual(self.pool.addCommand.call_count, 5)
segment_command = self.pool.addCommand.call_args_list[0][0][0]
self.assertTrue("my_property_name" in segment_command.cmdStr)
value = shlex.quote("100")
value = base64.urlsafe_b64encode(pickle.dumps("100")).decode()
self.assertTrue(value in segment_command.cmdStr)
coordinator_command = self.pool.addCommand.call_args_list[4][0][0]
self.assertTrue("my_property_name" in coordinator_command.cmdStr)
value = shlex.quote("20")
value = base64.urlsafe_b64encode(pickle.dumps("20")).decode()
self.assertTrue(value in coordinator_command.cmdStr)

def test_option_change_value_coordinatoronly_succeed(self):
Expand All @@ -312,7 +312,7 @@ def test_option_change_value_coordinatoronly_succeed(self):
self.assertEqual(self.pool.addCommand.call_count, 1)
coordinator_command = self.pool.addCommand.call_args_list[0][0][0]
self.assertTrue(("my_property_name") in coordinator_command.cmdStr)
value = shlex.quote("100")
value = base64.urlsafe_b64encode(pickle.dumps("100")).decode()
self.assertTrue(value in coordinator_command.cmdStr)

def test_new_option_change_value_coordinatoronly_succeed(self):
Expand All @@ -331,7 +331,7 @@ def test_new_option_change_value_coordinatoronly_succeed(self):
self.assertEqual(self.pool.addCommand.call_count, 1)
coordinator_command = self.pool.addCommand.call_args_list[0][0][0]
self.assertTrue(("my_property_name") in coordinator_command.cmdStr)
value = shlex.quote("100")
value = base64.urlsafe_b64encode(pickle.dumps("100")).decode()
self.assertTrue(value in coordinator_command.cmdStr)

def test_old_and_new_option_change_value_coordinatoronly_succeed(self):
Expand All @@ -350,7 +350,7 @@ def test_old_and_new_option_change_value_coordinatoronly_succeed(self):
self.assertEqual(self.pool.addCommand.call_count, 1)
coordinator_command = self.pool.addCommand.call_args_list[0][0][0]
self.assertTrue(("my_property_name") in coordinator_command.cmdStr)
value = shlex.quote("100")
value = base64.urlsafe_b64encode(pickle.dumps("100")).decode()
self.assertTrue(value in coordinator_command.cmdStr)


Expand All @@ -373,7 +373,7 @@ def test_option_change_value_hidden_guc_with_skipvalidation(self):
self.assertTrue("my_hidden_guc_name" in segment_command.cmdStr)
coordinator_command = self.pool.addCommand.call_args_list[1][0][0]
self.assertTrue("my_hidden_guc_name" in coordinator_command.cmdStr)
value = shlex.quote("100")
value = base64.urlsafe_b64encode(pickle.dumps("100")).decode()
self.assertTrue(value in coordinator_command.cmdStr)

def test_option_change_value_hidden_guc_without_skipvalidation(self):
Expand Down Expand Up @@ -579,7 +579,7 @@ def validation_for_testing_quoting_string_values(self, expected_value):
# In this case, we have an object as an argument to poo.addCommand
# call_obj[1] returns a dict for all named arguments -> {key='arg3', key2='arg4'}
gp_add_config_script_obj = call[0][0]
value = shlex.quote(expected_value)
value = base64.urlsafe_b64encode(pickle.dumps(expected_value)).decode()
try:
self.assertTrue(value in gp_add_config_script_obj.cmdStr)
except AssertionError as e:
Expand Down
6 changes: 4 additions & 2 deletions gpMgmt/sbin/gpconfig_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import shutil
import sys
import tempfile
import base64
import pickle

from optparse import Option, OptionParser
from gppylib.gpparseopts import OptParser, OptChecker
Expand Down Expand Up @@ -101,7 +103,7 @@ def add_parameter(filename, name, value):
for line in lines:
outfile.write(line)
new_lines = new_lines + 1
outfile.write(name + '=' + value + os.linesep)
outfile.write(name + '=' + pickle.loads(base64.urlsafe_b64decode(value)) + os.linesep)
new_lines = new_lines + 1

if new_lines == len(lines) + 1:
Expand All @@ -122,7 +124,7 @@ def main():
if options.get_parameter:
try:
value = get_parameter(options.file, options.get_parameter)
sys.stdout.write(value)
sys.stdout.write(base64.urlsafe_b64encode(pickle.dumps(value)).decode())
return
except Exception as err:
sys.stderr.write("Failed to get value for parameter '%s' in file %s due to: %s" % (
Expand Down
1 change: 1 addition & 0 deletions gpMgmt/test/behave/mgmt_utils/gpconfig.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Feature: gpconfig integration tests
| float | checkpoint_completion_target | float | 0.4 | 0.5 | 0.5 | 0.5 | 0.33 | 0.33 | 0.7 | 0.7 | 0.7 |
| basic string | application_name | string | xxxxxx | bodhi | 'bodhi' | bodhi | lucy | 'lucy' | bengie | 'bengie' | bengie |
| string with spaces | application_name | string | yyyyyy | 'bod hi' | 'bod hi' | bod hi | 'bod hi' | 'bod hi' | 'bod hi' | 'bod hi' | bod hi |
| string with special characters | application_name | string | yyyyyy | '$li@d#r' | '$li@d#r' | $li@d#r | '$li@d#r' | '$li@d#r' | '$li@d#r' | '$li@d#r' | $li@d#r |
| different value on coordinator and segments | application_name | string | yyyyyy | 'bod hi' | 'bod hi' | bod hi | 'lu cy' | 'lu cy' | 'ben gie' | 'ben gie' | ben gie |
| empty string | application_name | string | zzzzzz | '' | '' | | '' | '' | '' | '' | |
| quoted double quotes | application_name | string | zzzzzz | '"hi"' | '"hi"' | "hi" | '"hi"' | '"hi"' | '"hi"' | '"hi"' | "hi" |
Expand Down
Loading