Skip to content

Commit e27b518

Browse files
committed
fix(ns-don): improve variable assignment and quoting for shellcheck
1 parent 247f8d2 commit e27b518

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

  • packages/ns-don/files

packages/ns-don/files/don

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function cleanup
5454
# destroy ubus sessions
5555
session=$(ubus call session list | jq -r '.ubus_rpc_session as $parent | .data.username | select(. == "nethsupport") | $parent')
5656
if [ "$session" != "" ]; then
57-
ubus call session destroy '{"ubus_rpc_session": "'$session'"}'
57+
ubus call session destroy '{"ubus_rpc_session": "'"$session"'"}'
5858
fi
5959
log_message "Remote support session stopped"
6060
}
@@ -74,7 +74,8 @@ function get_session_info
7474
local server_id="${creds[0]}"
7575
local session_id="${creds[1]}"
7676

77-
local session_start_time=$(cat "$session_start")
77+
local session_start_time
78+
session_start_time=$(cat "$session_start")
7879
local session_expiry
7980

8081
# Use extended expiry if available, otherwise use start + 24 hours
@@ -84,7 +85,8 @@ function get_session_info
8485
session_expiry=$((session_start_time + 86400))
8586
fi
8687

87-
local current_time=$(date +%s)
88+
local current_time
89+
current_time=$(date +%s)
8890
local time_remaining=$((session_expiry - current_time))
8991
local hours_remaining=$((time_remaining / 3600))
9092
local minutes_remaining=$(( (time_remaining % 3600) / 60 ))
@@ -121,7 +123,7 @@ start)
121123
exit 2
122124
fi
123125

124-
cn=$(openssl x509 -noout -subject -in $ca | cut -d= -f 2- | sed 's/ = /=/g')
126+
cn=$(openssl x509 -noout -subject -in "$ca" | cut -d= -f 2- | sed 's/ = /=/g')
125127
if [ -z "$cn" ]; then
126128
log_error "Remote support session failed: invalid CA certificate"
127129
exit 3
@@ -214,14 +216,15 @@ AuthorizedKeysFile $auth_keys
214216
StrictModes no
215217
EOF
216218

217-
mkdir -m 0700 -p /var/empty
218-
/usr/sbin/sshd -f $sshd_conf
219-
cat $(uci -q get don.config.ssh_key) > $auth_keys
219+
mkdir -p /var/empty
220+
chmod 700 /var/empty
221+
/usr/sbin/sshd -f "$sshd_conf"
222+
cat "$(uci -q get don.config.ssh_key)" > "$auth_keys"
220223

221224
# Enable UI access
222225
uci set rpcd.ns_don=login
223226
uci set rpcd.ns_don.username=$user
224-
uci set rpcd.ns_don.password=$(echo $password | mkpasswd)
227+
uci set rpcd.ns_don.password="$(echo "$password" | mkpasswd)"
225228
uci add_list rpcd.ns_don.read='*'
226229
uci add_list rpcd.ns_don.write='*'
227230
# commit rpcd changes

0 commit comments

Comments
 (0)