yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构 addNewDSMUser 和 forceEnableDSMTelnetSSH 函数，改用脚本文件替代数据库任务插入，简化用户管理和服务启用流程

Browse Source
This commit is contained in:
Ing 2025-05-21 21:32:57 +08:00
parent c884e86575
commit d0e858e8e4
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
files/initrd/opt/rr/menu.sh
View File

@ -1960,25 +1960,20 @@ function addNewDSMUser() {
password="$(sed -n '2p' "${TMP_PATH}/resp" 2>/dev/null)"
rm -f "${TMP_PATH}/isOk"
(
ONBOOTUP=""
ONBOOTUP="${ONBOOTUP}if synouser --enum local | grep -q ^${username}\$; then synouser --setpw ${username} ${password}; else synouser --add ${username} ${password} rr 0 user@rr.com 1; fi\n"
ONBOOTUP="${ONBOOTUP}synogroup --memberadd administrators ${username}\n"
ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''RRONBOOTUPRR_ADDUSER'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
mkdir -p "${TMP_PATH}/mdX"
for I in ${DSMROOTS}; do
fixDSMRootPart "${I}"
T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
[ $? -ne 0 ] && continue
if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" <<EOF
DELETE FROM task WHERE task_name LIKE 'RRONBOOTUPRR_ADDUSER';
INSERT INTO task VALUES('RRONBOOTUPRR_ADDUSER', '', 'bootup', '', 1, 0, 0, 0, '', 0, '$(echo -e "${ONBOOTUP}")', 'script', '{}', '', '', '{}', '{}');
EOF
sync
echo "true" >"${TMP_PATH}/isOk"
fi
mkdir -p "${TMP_PATH}/mdX/usr/rr/once.d"
{
echo "#!/usr/bin/env bash"
echo "if synouser --enum local | grep -q ^${username}\$; then synouser --setpw ${username} ${password}; else synouser --add ${username} ${password} rr 0 user@rr.com 1; fi"
echo "synogroup --memberadd administrators ${username}"
} >"${TMP_PATH}/mdX/usr/rr/once.d/addNewDSMUser.sh"
sync
echo "true" >"${TMP_PATH}/isOk"
umount "${TMP_PATH}/mdX"
done
rm -rf "${TMP_PATH}/mdX"
@ -2003,24 +1998,20 @@ function forceEnableDSMTelnetSSH() {
fi
rm -f "${TMP_PATH}/isOk"
(
ONBOOTUP=""
ONBOOTUP="${ONBOOTUP}systemctl restart inetd\n"
ONBOOTUP="${ONBOOTUP}synowebapi --exec api=SYNO.Core.Terminal method=set version=3 enable_telnet=true enable_ssh=true ssh_port=22 forbid_console=false\n"
ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''RRONBOOTUPRR_SSH'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
mkdir -p "${TMP_PATH}/mdX"
for I in ${DSMROOTS}; do
fixDSMRootPart "${I}"
T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
[ $? -ne 0 ] && continue
if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" <<EOF
DELETE FROM task WHERE task_name LIKE 'RRONBOOTUPRR_SSH';
INSERT INTO task VALUES('RRONBOOTUPRR_SSH', '', 'bootup', '', 1, 0, 0, 0, '', 0, '$(echo -e "${ONBOOTUP}")', 'script', '{}', '', '', '{}', '{}');
EOF
sync
echo "true" >"${TMP_PATH}/isOk"
fi
mkdir -p "${TMP_PATH}/mdX/usr/rr/once.d"
{
echo "#!/usr/bin/env bash"
echo "systemctl restart inetd"
echo "synowebapi -s --exec api=SYNO.Core.Terminal method=set version=3 enable_telnet=true enable_ssh=true ssh_port=22 forbid_console=false"
} >"${TMP_PATH}/mdX/usr/rr/once.d/enableTelnetSSH.sh"
sync
echo "true" >"${TMP_PATH}/isOk"
umount "${TMP_PATH}/mdX"
done
rm -rf "${TMP_PATH}/mdX"