openstack/devstack
Code Issues Proposed changes

Merge "iniset: fix handling of values containg ampersand"

Browse Source
This commit is contained in:
Zuul 2022-08-10 14:21:00 +00:00 committed by Gerrit Code Review
commit 28ee346393
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/ini-config
View File

@ -189,6 +189,9 @@ function iniset {
local option=$3 local option=$3
local value=$4 local value=$4
# Escape the ampersand character (&)
value=$(echo $value | sed -e 's/&/\\&/g')
if [[ -z $section || -z $option ]]; then if [[ -z $section || -z $option ]]; then
$xtrace $xtrace
return return

12
tests/test_ini_config.sh
View File

@ -44,6 +44,9 @@ empty =
multi = foo1 multi = foo1
multi = foo2 multi = foo2
[fff]
ampersand =
[key_with_spaces] [key_with_spaces]
rgw special key = something rgw special key = something
@ -85,7 +88,7 @@ fi
# test iniget_sections # test iniget_sections
VAL=$(iniget_sections "${TEST_INI}") VAL=$(iniget_sections "${TEST_INI}")
assert_equal "$VAL" "default aaa bbb ccc ddd eee key_with_spaces \ assert_equal "$VAL" "default aaa bbb ccc ddd eee fff key_with_spaces \
del_separate_options del_same_option del_missing_option \ del_separate_options del_same_option del_missing_option \
del_missing_option_multi del_no_options" del_missing_option_multi del_no_options"
@ -124,6 +127,13 @@ iniset ${SUDO_ARG} ${TEST_INI} bbb handlers "33,44"
VAL=$(iniget ${TEST_INI} bbb handlers) VAL=$(iniget ${TEST_INI} bbb handlers)
assert_equal "$VAL" "33,44" "inset at EOF" assert_equal "$VAL" "33,44" "inset at EOF"
# Test with ampersand in values
for i in `seq 3`; do
iniset ${TEST_INI} fff ampersand '&y'
done
VAL=$(iniget ${TEST_INI} fff ampersand)
assert_equal "$VAL" "&y" "iniset ampersands in option"
# test empty option # test empty option
if ini_has_option ${SUDO_ARG} ${TEST_INI} ddd empty; then if ini_has_option ${SUDO_ARG} ${TEST_INI} ddd empty; then
passed "ini_has_option: ddd.empty present" passed "ini_has_option: ddd.empty present"