From f374ab97c7d0f6878bd75d5718b60ad05ad740e3 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Tue, 22 Jun 2010 19:19:44 -0500 Subject: Cleaned up expression LH_BOOTAPPEND and included = for live-config calls. --- cgi/cgi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cgi/cgi b/cgi/cgi index dbccf72..6d0d9de 100755 --- a/cgi/cgi +++ b/cgi/cgi @@ -46,9 +46,10 @@ else # Converting ';': sed 's/%3B/\;/g' # Converting '/': sed 's/%2F/\//g' # Converting '~': sed 's/%7E/\~/g' + # Converting '=': sed 's/%3D/=/g' # Translate parameters - QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g') + QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g') # Debug the filtering string # echo ${QUERY_STRING} @@ -78,7 +79,7 @@ else # Advanced binary options LH_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1) - LH_BOOTAPPEND=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend=[0-9,a-z,A-Z,., ,_,+,-]+' | cut -f 2 -d '=' | head -n1) + LH_BOOTAPPEND=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend=[-0-9a-zA-Z. _+=]+' | cut -f2- -d '=' | head -n1) LH_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1) LH_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1) LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9,a-z,A-Z]+' | cut -f 2 -d '=' | head -n1) -- cgit v1.0