GlcoinCore/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2026-08-13 12:33:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

installcronjob: never wipe existing cron jobs when crontab -l fails

Browse source 
Piping a failed 'crontab -l' straight back into 'crontab -' replaced
the whole crontab with just the acme.sh entry when the listing failed
while jobs existed (seen on cPanel/CloudLinux jailshell). Capture the
listing first and refuse to write unless the failure is the normal
"no crontab for user" case.

https://github.com/acmesh-official/acme.sh/issues/3079
This commit is contained in:
neil 2026-07-12 19:21:40 +08:00
parent 15a1067f1b
commit b9ce911eb1
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
acme.sh
View file

@ -7003,15 +7003,35 @@ installcronjob() {
return 1
fi
_info "Installing cron job"
if ! $_CRONTAB -l 2>/dev/null | grep "$PROJECT_ENTRY --cron"; then
_cron_entry="$random_minute $random_hour,$(_math "$random_hour" + 6),$(_math "$random_hour" + 12),$(_math "$random_hour" + 18) * * * $lesh --cron --home \"$LE_WORKING_DIR\" $_c_entry> /dev/null"
_cron_entries="$($_CRONTAB -l 2>/dev/null)"
if [ "$?" != "0" ]; then
#when the user has no crontab yet, crontab -l also exits non-zero;
#only that case may proceed with an empty list. Any other listing
#failure must abort: piping an incomplete list back into 'crontab -'
#would wipe the user's existing cron jobs (issue 3079)
_cron_list_err="$($_CRONTAB -l 2>&1 >/dev/null)"
if echo "$_cron_list_err" | grep -i "no crontab\|no fcrontab\|can't open" >/dev/null; then
_cron_entries=""
else
_err "Can not list the current cron jobs: $_cron_list_err"
_err "Refusing to install the cron job, that could wipe your existing cron jobs."
_err "Please add this cron job manually:"
_err "$_cron_entry"
return 1
fi
fi
if ! echo "$_cron_entries" | grep "$PROJECT_ENTRY --cron"; then
if _exists uname && uname -a | grep SunOS >/dev/null; then
_CRONTAB_STDIN="$_CRONTAB --"
else
_CRONTAB_STDIN="$_CRONTAB -"
fi
$_CRONTAB -l 2>/dev/null | {
cat
echo "$random_minute $random_hour,$(_math $random_hour + 6),$(_math $random_hour + 12),$(_math $random_hour + 18) * * * $lesh --cron --home \"$LE_WORKING_DIR\" $_c_entry> /dev/null"
{
if [ "$_cron_entries" ]; then
echo "$_cron_entries"
fi
echo "$_cron_entry"
} | $_CRONTAB_STDIN
fi
if [ "$?" != "0" ]; then