Updated for further security fixes

Author: lupraxus

CHANGELOG.md

@@ -5,11 +5,17 @@ All notable changes to this project will be documented in this file.
 
 This changelog was automatically generated using [Caretaker](https://github.com/DevelopersToolbox/caretaker) by [Wolf Software](https://github.com/WolfSoftware)
 
+### [v0.1.3](https://github.com/DevelopersToolbox/ini-file-parser/compare/v0.1.2...v0.1.3)
+
+> Released on January, 6th 2022
+
+- Updated for further security fixes [`[head]`](https://github.com/DevelopersToolbox/ini-file-parser/commit/)
+
 ### [v0.1.2](https://github.com/DevelopersToolbox/ini-file-parser/compare/v0.1.1...v0.1.2)
 
 > Released on January, 4th 2022
 
-- Additional security fix [`[head]`](https://github.com/DevelopersToolbox/ini-file-parser/commit/)
+- Additional security fix [`[c5b29ac]`](https://github.com/DevelopersToolbox/ini-file-parser/commit/c5b29acc99feda7e1e66b8ae405fb1778510da3e)
 
 ### [v0.1.1](https://github.com/DevelopersToolbox/ini-file-parser/compare/v0.1.0...v0.1.1)
 

VERSION.txt

@@ -1 +1 @@
-0.1.2
+0.1.3

demos/complete-example.conf

@@ -20,7 +20,10 @@ value2=5678
 value1=abcd
 value2=efgh
 value3=This has spaces
-value4=$(ls / > ~/out.txt)
+value4='$(ls / >> ~/out.txt)'
+value5=$(ls / >> ~/bob.txt)
+value6="$(ls / >> ~/bob2.txt)"
+value7='$(ls / >> ~/out.txt)
 
 # Test clean up of section headers / key names / ignore comments
 [ section3  ]

demos/parse-example.sh

@@ -31,10 +31,10 @@ declare section1_value1
 # value of true.                                                                   #
 # -------------------------------------------------------------------------------- #
 
-#case_sensitive_sections=false
-#case_sensitive_keys=false
-#show_config_warnings=false
-#show_config_errors=false
+export case_sensitive_sections=false
+#export case_sensitive_keys=false
+#export show_config_warnings=false
+#export show_config_errors=false
 
 # -------------------------------------------------------------------------------- #
 # Use the source                                                                   #

src/ini-file-parser.sh

@@ -193,14 +193,40 @@ function process_value()
     value="${value%%\#*}"                                                          # Remove in line right comments
     value="${value##*( )}"                                                         # Remove leading spaces
     value="${value%%*( )}"                                                         # Remove trailing spaces
-    value="${value#\"*}"                                                           # Remove leading string quotes
-    value="${value%\"*}"                                                           # Remove trailing string quotes
-    value="${value##*( )}"                                                         # Remove leading spaces
-    value="${value%%*( )}"                                                         # Remove trailing spaces
+
+    value=$(escape_string "$value")
 
     echo "${value}"
 }
 
+# -------------------------------------------------------------------------------- #
+# Escape string                                                                    #
+# -------------------------------------------------------------------------------- #
+# Replace ' with SINGLE_QUOTE to avoid issues with eval.                           #
+# -------------------------------------------------------------------------------- #
+
+function escape_string()
+{
+    local clean
+
+    clean=${1//\'/SINGLE_QUOTE}
+    echo "${clean}"
+}
+
+# -------------------------------------------------------------------------------- #
+# Un-Escape string                                                                 #
+# -------------------------------------------------------------------------------- #
+# Convert SINGLE_QUOTE back to ' when returning the value to the caller.           #
+# -------------------------------------------------------------------------------- #
+
+function unescape_string()
+{
+    local orig
+
+    orig=${1//SINGLE_QUOTE/\'}
+    echo "${orig}"
+}
+
 # -------------------------------------------------------------------------------- #
 # Parse ini file                                                                   #
 # -------------------------------------------------------------------------------- #
@@ -220,19 +246,19 @@ function process_ini_file()
     while read -r line; do
         line_number=$((line_number+1))
 
-        if [[ $line =~ ^# || -z $line ]]; then                             # Ignore comments / empty lines
+        if [[ $line =~ ^# || -z $line ]]; then                                 # Ignore comments / empty lines
             continue;
         fi
 
-        if [[ $line =~ ^"["(.+)"]"$ ]]; then                                  # Match pattern for a 'section'
+        if [[ $line =~ ^"["(.+)"]"$ ]]; then                                   # Match pattern for a 'section'
             section=$(process_section_name "${BASH_REMATCH[1]}")
 
             if ! in_array sections "${section}"; then
                 eval "${section}_keys=()"                                      # Use eval to declare the keys array
                 eval "${section}_values=()"                                    # Use eval to declare the values array
-                sections+=("$section")                                         # Add the section name to the list
+                sections+=("${section}")                                       # Add the section name to the list
             fi
-        elif [[ $line =~ ^(.*)"="(.*) ]]; then                                # Match patter for a key=value pair
+        elif [[ $line =~ ^(.*)"="(.*) ]]; then                                 # Match patter for a key=value pair
             key=$(process_key_name "${BASH_REMATCH[1]}")
             value=$(process_value "${BASH_REMATCH[2]}")
 
@@ -280,7 +306,8 @@ function get_value()
 
     for i in "${!keys[@]}"; do
         if [[ "${keys[$i]}" = "${key}" ]]; then
-            printf '%s' "${values[$i]}"
+            orig=$(unescape_string "${values[$i]}")
+            printf '%s' "${orig}"
         fi
     done
 }
@@ -308,7 +335,8 @@ function display_config()
         eval "values=( \"\${${section}_values[@]}\" )"
 
         for i in "${!keys[@]}"; do
-            printf '%s=%s\n' "${keys[$i]}" "${values[$i]}"
+            orig=$(unescape_string "${values[$i]}")
+            printf '%s=%s\n' "${keys[$i]}" "${orig}"
         done
     printf '\n'
     done
@@ -336,7 +364,8 @@ function display_config_by_section()
     eval "values=( \"\${${section}_values[@]}\" )"
 
     for i in "${!keys[@]}"; do
-        printf '%s=%s\n' "${keys[$i]}" "${values[$i]}"
+        orig=$(unescape_string "${values[$i]}")
+        printf '%s=%s\n' "${keys[$i]}" "${orig}"
     done
     printf '\n'
 }