 4a6795409d
			
		
	
	4a6795409d
	
	
	
		
			
			When passing a section or option value to config_get() which contains
characters that happen to be valid variable interpolation expressions,
the function returns a nonsensical expression result instead of the
expected empty string.
When the passed section or option name contains other characters which
are not valid within a shell variable name, a substitution error is
occuring instead.
The issue can be easily reproduced by one of the following examples:
    root@OpenWrt:~# . /lib/functions.sh
    root@OpenWrt:~# config load system
    root@OpenWrt:~# config_get variable invalid-section option
    root@OpenWrt:~# echo "$variable"
    section_option:-
    root@OpenWrt:~# . /lib/functions.sh
    root@OpenWrt:~# config load system
    root@OpenWrt:~# config_get variable section invalid-option
    root@OpenWrt:~# echo "$variable"
    option:-
    root@OpenWrt:~# . /lib/functions.sh
    root@OpenWrt:~# config load system
    root@OpenWrt:~# config_get variable section invalid@option
    -ash: eval: syntax error: bad substitution
Fix this issue by only performing interpolations when the given section
and option arguments are free of illegal characters.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
		
	
		
			
				
	
	
		
			382 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			382 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/sh
 | |
| # Copyright (C) 2006-2014 OpenWrt.org
 | |
| # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
 | |
| # Copyright (C) 2010 Vertical Communications
 | |
| 
 | |
| 
 | |
| debug () {
 | |
| 	${DEBUG:-:} "$@"
 | |
| }
 | |
| 
 | |
| # newline
 | |
| N="
 | |
| "
 | |
| 
 | |
| _C=0
 | |
| NO_EXPORT=1
 | |
| LOAD_STATE=1
 | |
| LIST_SEP=" "
 | |
| 
 | |
| # xor multiple hex values of the same length
 | |
| xor() {
 | |
| 	local val
 | |
| 	local ret="0x$1"
 | |
| 	local retlen=${#1}
 | |
| 
 | |
| 	shift
 | |
| 	while [ -n "$1" ]; do
 | |
| 		val="0x$1"
 | |
| 		ret=$((ret ^ val))
 | |
| 		shift
 | |
| 	done
 | |
| 
 | |
| 	printf "%0${retlen}x" "$ret"
 | |
| }
 | |
| 
 | |
| append() {
 | |
| 	local var="$1"
 | |
| 	local value="$2"
 | |
| 	local sep="${3:- }"
 | |
| 
 | |
| 	eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
 | |
| }
 | |
| 
 | |
| list_contains() {
 | |
| 	local var="$1"
 | |
| 	local str="$2"
 | |
| 	local val
 | |
| 
 | |
| 	eval "val=\" \${$var} \""
 | |
| 	[ "${val%% $str *}" != "$val" ]
 | |
| }
 | |
| 
 | |
| config_load() {
 | |
| 	[ -n "$IPKG_INSTROOT" ] && return 0
 | |
| 	uci_load "$@"
 | |
| }
 | |
| 
 | |
| reset_cb() {
 | |
| 	config_cb() { return 0; }
 | |
| 	option_cb() { return 0; }
 | |
| 	list_cb() { return 0; }
 | |
| }
 | |
| reset_cb
 | |
| 
 | |
| package() {
 | |
| 	return 0
 | |
| }
 | |
| 
 | |
| config () {
 | |
| 	local cfgtype="$1"
 | |
| 	local name="$2"
 | |
| 
 | |
| 	export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$((CONFIG_NUM_SECTIONS + 1))
 | |
| 	name="${name:-cfg$CONFIG_NUM_SECTIONS}"
 | |
| 	append CONFIG_SECTIONS "$name"
 | |
| 	export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
 | |
| 	config_set "$CONFIG_SECTION" "TYPE" "${cfgtype}"
 | |
| 	[ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
 | |
| }
 | |
| 
 | |
| option () {
 | |
| 	local varname="$1"; shift
 | |
| 	local value="$*"
 | |
| 
 | |
| 	config_set "$CONFIG_SECTION" "${varname}" "${value}"
 | |
| 	[ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
 | |
| }
 | |
| 
 | |
| list() {
 | |
| 	local varname="$1"; shift
 | |
| 	local value="$*"
 | |
| 	local len
 | |
| 
 | |
| 	config_get len "$CONFIG_SECTION" "${varname}_LENGTH" 0
 | |
| 	[ $len = 0 ] && append CONFIG_LIST_STATE "${CONFIG_SECTION}_${varname}"
 | |
| 	len=$((len + 1))
 | |
| 	config_set "$CONFIG_SECTION" "${varname}_ITEM$len" "$value"
 | |
| 	config_set "$CONFIG_SECTION" "${varname}_LENGTH" "$len"
 | |
| 	append "CONFIG_${CONFIG_SECTION}_${varname}" "$value" "$LIST_SEP"
 | |
| 	[ -n "$NO_CALLBACK" ] || list_cb "$varname" "$*"
 | |
| }
 | |
| 
 | |
| config_unset() {
 | |
| 	config_set "$1" "$2" ""
 | |
| }
 | |
| 
 | |
| # config_get <variable> <section> <option> [<default>]
 | |
| # config_get <section> <option>
 | |
| config_get() {
 | |
| 	case "$2${3:-$1}" in
 | |
| 		*[^A-Za-z0-9_]*) : ;;
 | |
| 		*)
 | |
| 			case "$3" in
 | |
| 				"") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";;
 | |
| 				*)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
 | |
| 			esac
 | |
| 		;;
 | |
| 	esac
 | |
| }
 | |
| 
 | |
| # config_get_bool <variable> <section> <option> [<default>]
 | |
| config_get_bool() {
 | |
| 	local _tmp
 | |
| 	config_get _tmp "$2" "$3" "$4"
 | |
| 	case "$_tmp" in
 | |
| 		1|on|true|yes|enabled) _tmp=1;;
 | |
| 		0|off|false|no|disabled) _tmp=0;;
 | |
| 		*) _tmp="$4";;
 | |
| 	esac
 | |
| 	export ${NO_EXPORT:+-n} "$1=$_tmp"
 | |
| }
 | |
| 
 | |
| config_set() {
 | |
| 	local section="$1"
 | |
| 	local option="$2"
 | |
| 	local value="$3"
 | |
| 
 | |
| 	export ${NO_EXPORT:+-n} "CONFIG_${section}_${option}=${value}"
 | |
| }
 | |
| 
 | |
| config_foreach() {
 | |
| 	local ___function="$1"
 | |
| 	[ "$#" -ge 1 ] && shift
 | |
| 	local ___type="$1"
 | |
| 	[ "$#" -ge 1 ] && shift
 | |
| 	local section cfgtype
 | |
| 
 | |
| 	[ -z "$CONFIG_SECTIONS" ] && return 0
 | |
| 	for section in ${CONFIG_SECTIONS}; do
 | |
| 		config_get cfgtype "$section" TYPE
 | |
| 		[ -n "$___type" ] && [ "x$cfgtype" != "x$___type" ] && continue
 | |
| 		eval "$___function \"\$section\" \"\$@\""
 | |
| 	done
 | |
| }
 | |
| 
 | |
| config_list_foreach() {
 | |
| 	[ "$#" -ge 3 ] || return 0
 | |
| 	local section="$1"; shift
 | |
| 	local option="$1"; shift
 | |
| 	local function="$1"; shift
 | |
| 	local val
 | |
| 	local len
 | |
| 	local c=1
 | |
| 
 | |
| 	config_get len "${section}" "${option}_LENGTH"
 | |
| 	[ -z "$len" ] && return 0
 | |
| 	while [ $c -le "$len" ]; do
 | |
| 		config_get val "${section}" "${option}_ITEM$c"
 | |
| 		eval "$function \"\$val\" \"\$@\""
 | |
| 		c="$((c + 1))"
 | |
| 	done
 | |
| }
 | |
| 
 | |
| default_prerm() {
 | |
| 	local root="${IPKG_INSTROOT}"
 | |
| 	local pkgname="$(basename ${1%.*})"
 | |
| 	local ret=0
 | |
| 
 | |
| 	if [ -f "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ]; then
 | |
| 		( . "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" )
 | |
| 		ret=$?
 | |
| 	fi
 | |
| 
 | |
| 	local shell="$(command -v bash)"
 | |
| 	for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
 | |
| 		if [ -n "$root" ]; then
 | |
| 			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
 | |
| 		else
 | |
| 			if [ "$PKG_UPGRADE" != "1" ]; then
 | |
| 				"$i" disable
 | |
| 			fi
 | |
| 			"$i" stop
 | |
| 		fi
 | |
| 	done
 | |
| 
 | |
| 	return $ret
 | |
| }
 | |
| 
 | |
| add_group_and_user() {
 | |
| 	local pkgname="$1"
 | |
| 	local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)"
 | |
| 
 | |
| 	if [ -n "$rusers" ]; then
 | |
| 		local tuple oIFS="$IFS"
 | |
| 		for tuple in $rusers; do
 | |
| 			local uid gid uname gname
 | |
| 
 | |
| 			IFS=":"
 | |
| 			set -- $tuple; uname="$1"; gname="$2"
 | |
| 			IFS="="
 | |
| 			set -- $uname; uname="$1"; uid="$2"
 | |
| 			set -- $gname; gname="$1"; gid="$2"
 | |
| 			IFS="$oIFS"
 | |
| 
 | |
| 			if [ -n "$gname" ] && [ -n "$gid" ]; then
 | |
| 				group_exists "$gname" || group_add "$gname" "$gid"
 | |
| 			elif [ -n "$gname" ]; then
 | |
| 				gid="$(group_add_next "$gname")"
 | |
| 			fi
 | |
| 
 | |
| 			if [ -n "$uname" ]; then
 | |
| 				user_exists "$uname" || user_add "$uname" "$uid" "$gid"
 | |
| 			fi
 | |
| 
 | |
| 			if [ -n "$uname" ] && [ -n "$gname" ]; then
 | |
| 				group_add_user "$gname" "$uname"
 | |
| 			fi
 | |
| 
 | |
| 			unset uid gid uname gname
 | |
| 		done
 | |
| 	fi
 | |
| }
 | |
| 
 | |
| default_postinst() {
 | |
| 	local root="${IPKG_INSTROOT}"
 | |
| 	local pkgname="$(basename ${1%.*})"
 | |
| 	local filelist="/usr/lib/opkg/info/${pkgname}.list"
 | |
| 	local ret=0
 | |
| 
 | |
| 	add_group_and_user "${pkgname}"
 | |
| 
 | |
| 	if [ -f "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ]; then
 | |
| 		( . "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" )
 | |
| 		ret=$?
 | |
| 	fi
 | |
| 
 | |
| 	if [ -d "$root/rootfs-overlay" ]; then
 | |
| 		cp -R $root/rootfs-overlay/. $root/
 | |
| 		rm -fR $root/rootfs-overlay/
 | |
| 	fi
 | |
| 
 | |
| 	if [ -z "$root" ]; then
 | |
| 		if grep -m1 -q -s "^/etc/modules.d/" "$filelist"; then
 | |
| 			kmodloader
 | |
| 		fi
 | |
| 
 | |
| 		if grep -m1 -q -s "^/etc/sysctl.d/" "$filelist"; then
 | |
| 			/etc/init.d/sysctl restart
 | |
| 		fi
 | |
| 
 | |
| 		if grep -m1 -q -s "^/etc/uci-defaults/" "$filelist"; then
 | |
| 			[ -d /tmp/.uci ] || mkdir -p /tmp/.uci
 | |
| 			for i in $(grep -s "^/etc/uci-defaults/" "$filelist"); do
 | |
| 				( [ -f "$i" ] && cd "$(dirname $i)" && . "$i" ) && rm -f "$i"
 | |
| 			done
 | |
| 			uci commit
 | |
| 		fi
 | |
| 
 | |
| 		rm -f /tmp/luci-indexcache
 | |
| 	fi
 | |
| 
 | |
| 	local shell="$(command -v bash)"
 | |
| 	for i in $(grep -s "^/etc/init.d/" "$root$filelist"); do
 | |
| 		if [ -n "$root" ]; then
 | |
| 			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable
 | |
| 		else
 | |
| 			if [ "$PKG_UPGRADE" != "1" ]; then
 | |
| 				"$i" enable
 | |
| 			fi
 | |
| 			"$i" start
 | |
| 		fi
 | |
| 	done
 | |
| 
 | |
| 	return $ret
 | |
| }
 | |
| 
 | |
| include() {
 | |
| 	local file
 | |
| 
 | |
| 	for file in $(ls $1/*.sh 2>/dev/null); do
 | |
| 		. $file
 | |
| 	done
 | |
| }
 | |
| 
 | |
| find_mtd_index() {
 | |
| 	local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
 | |
| 	local INDEX="${PART##mtd}"
 | |
| 
 | |
| 	echo ${INDEX}
 | |
| }
 | |
| 
 | |
| find_mtd_part() {
 | |
| 	local INDEX=$(find_mtd_index "$1")
 | |
| 	local PREFIX=/dev/mtdblock
 | |
| 
 | |
| 	[ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
 | |
| 	echo "${INDEX:+$PREFIX$INDEX}"
 | |
| }
 | |
| 
 | |
| group_add() {
 | |
| 	local name="$1"
 | |
| 	local gid="$2"
 | |
| 	local rc
 | |
| 	[ -f "${IPKG_INSTROOT}/etc/group" ] || return 1
 | |
| 	[ -n "$IPKG_INSTROOT" ] || lock /var/lock/group
 | |
| 	echo "${name}:x:${gid}:" >> ${IPKG_INSTROOT}/etc/group
 | |
| 	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/group
 | |
| }
 | |
| 
 | |
| group_exists() {
 | |
| 	grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/group
 | |
| }
 | |
| 
 | |
| group_add_next() {
 | |
| 	local gid gids
 | |
| 	gid=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group | cut -d: -f3)
 | |
| 	if [ -n "$gid" ]; then
 | |
| 		echo $gid
 | |
| 		return
 | |
| 	fi
 | |
| 	gids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/group)
 | |
| 	gid=65536
 | |
| 	while echo "$gids" | grep -q "^$gid$"; do
 | |
| 		gid=$((gid + 1))
 | |
| 	done
 | |
| 	group_add $1 $gid
 | |
| 	echo $gid
 | |
| }
 | |
| 
 | |
| group_add_user() {
 | |
| 	local grp delim=","
 | |
| 	grp=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group)
 | |
| 	echo "$grp" | cut -d: -f4 | grep -q $2 && return
 | |
| 	echo "$grp" | grep -q ":$" && delim=""
 | |
| 	[ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
 | |
| 	sed -i "s/$grp/$grp$delim$2/g" ${IPKG_INSTROOT}/etc/group
 | |
| 	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
 | |
| }
 | |
| 
 | |
| user_add() {
 | |
| 	local name="${1}"
 | |
| 	local uid="${2}"
 | |
| 	local gid="${3}"
 | |
| 	local desc="${4:-$1}"
 | |
| 	local home="${5:-/var/run/$1}"
 | |
| 	local shell="${6:-/bin/false}"
 | |
| 	local rc
 | |
| 	[ -z "$uid" ] && {
 | |
| 		uids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd)
 | |
| 		uid=65536
 | |
| 		while echo "$uids" | grep -q "^$uid$"; do
 | |
| 			uid=$((uid + 1))
 | |
| 		done
 | |
| 	}
 | |
| 	[ -z "$gid" ] && gid=$uid
 | |
| 	[ -f "${IPKG_INSTROOT}/etc/passwd" ] || return 1
 | |
| 	[ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
 | |
| 	echo "${name}:x:${uid}:${gid}:${desc}:${home}:${shell}" >> ${IPKG_INSTROOT}/etc/passwd
 | |
| 	echo "${name}:x:0:0:99999:7:::" >> ${IPKG_INSTROOT}/etc/shadow
 | |
| 	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
 | |
| }
 | |
| 
 | |
| user_exists() {
 | |
| 	grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
 | |
| }
 | |
| 
 | |
| board_name() {
 | |
| 	[ -e /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name || echo "generic"
 | |
| }
 | |
| 
 | |
| [ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh
 |