kittykat/mad
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

# 2025.02.18 - [uploadhive] Add handling of the new /cgi-bin/dl.cgi/ url tickets (WIP)

Browse source 
#               (unfortunately, this is tied to the requesting ip, so downloads get "Wrong IP")
# 2025.02.18 - [up_oshi] Add Manage url as comment on uploads
# 2025.02.18 - [up_oshi / oshi] use /nossl/ url and http
# 2025.02.17 - [gofile] Add a random sleep if 429 response detected (too many requests)
# 2025.02.17 - [*ALL] Audit and update all single bracket operations
# 2025.02.17 - [filehaus] Fix downloading from fh
# 2025.02.15 - [uploadbay] Update urls regex for acceptable alternate
# 2025.02.15 - [up_sendnow] Add send.now as upload host
# 2025.02.15 - [sendnow] Fix handling of filenames with special characters in url
This commit is contained in:
kittykat 2025-02-19 13:41:07 +00:00
parent d48116dbe3
commit d62376f7a8
Signed by: kittykat
GPG key ID: E3F1556620F70C3C
103 changed files with 3541 additions and 3517 deletions
Download patch file Download diff file Expand all files Collapse all files

96
hosts/dataupload.sh
View file

@ -43,24 +43,24 @@ dup_DownloadFile() {
tor_identity="${RANDOM}"
finalAttempt="false"
for ((z=0; z<=$MaxUrlRetries; z++)); do
if [ $z -eq $MaxUrlRetries ] ; then
if [[ $z -eq $MaxUrlRetries ]] ; then
finalAttempt="true"
fi
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; echo ""; tput cnorm; exit" 0 1 2 3 6 15
if dup_FetchFileInfo $finalAttempt && dup_GetFile "${filecnt}" $((z+1)) $finalAttempt ; then
return 0
elif [ $z -lt $MaxUrlRetries ]; then
if [ "${fileAlreadyDone}" == "true" ] ; then
elif [[ $z -lt $MaxUrlRetries ]]; then
if [[ "${fileAlreadyDone}" == "true" ]] ; then
break
fi
if [[ "${warnAndRetryUnknownError}" == "true" ]] ; then
if [ "${DebugAllEnabled}" == "true" ] ; then
if [[ "${DebugAllEnabled}" == "true" ]] ; then
debugHtml "${remote_url##*/}" "error" "Retry due to an unknown issue: attempt #$((z+1)) of ${MaxUrlRetries}"
fi
fi
if [[ "${exitDownloadError}" == "true" || "${exitDownloadNotAvailable}" == "true" ]] ; then
if [ "${DebugAllEnabled}" == "true" ] ; then
if [[ "${DebugAllEnabled}" == "true" ]] ; then
debugHtml "${remote_url##*/}" "error" "Exit due to unrecoverable issue"
fi
rm -f "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}"
@ -88,16 +88,16 @@ dup_FetchFileInfo() {
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; rm -f "${dup_cookie_jar}"; echo ""; tput cnorm; exit" 0 1 2 3 6 15
response=$(tor_curl_request --insecure -L -s -b "${dup_cookie_jar}" -c "${dup_cookie_jar}" "$remote_url")
if [ "${DebugAllEnabled}" == "true" ] ; then
if [[ "${DebugAllEnabled}" == "true" ]] ; then
debugHtml "${remote_url##*/}" "dup_dwnpage$i" "${response}"
fi
if [[ -z $response ]] ; then
rm -f "${dup_cookie_jar}";
if [ $i == $maxfetchretries ] ; then
if [[ $i == $maxfetchretries ]] ; then
printf "\\n"
echo -e "${RED}| Failed to extract download link.${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "" ""
fi
return 1
@ -107,11 +107,11 @@ dup_FetchFileInfo() {
fi
if grep -Eqi "Sorry, you are banned" <<< "$response"; then
rm -f "${dup_cookie_jar}";
if [ $i == $maxfetchretries ] ; then
if [[ $i == $maxfetchretries ]] ; then
printf "\\n"
echo -e "${RED}| Failed to extract download link.${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "" ""
fi
return 1
@ -139,11 +139,11 @@ dup_FetchFileInfo() {
fi
if [[ -z "$post_action" ]] || [[ -z "$post_op" ]] || [[ -z "$post_id" ]] ; then
rm -f "${dup_cookie_jar}";
if [ $i == $maxfetchretries ] ; then
if [[ $i == $maxfetchretries ]] ; then
printf "\\n"
echo -e "${RED}| Failed to extract download link [2].${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "Failed to extract download link [2]" ""
fi
return 1
@ -166,16 +166,16 @@ dup_FetchFileInfo() {
response=$(tor_curl_request --insecure -svo. -X POST \
-b "${dup_cookie_jar}" -c "${dup_cookie_jar}" \
--data-raw "$form_data" "$post_action" 2>&1)
if [ "${DebugAllEnabled}" == "true" ] ; then
if [[ "${DebugAllEnabled}" == "true" ]] ; then
debugHtml "${remote_url##*/}" "dup_post" "post_action: ${post_action}"$'\n'"form_data: ${form_data}"$'\n'"${response}"
fi
if [[ -z $response ]] ; then
if [ $i == $maxfetchretries ] ; then
if [[ $i == $maxfetchretries ]] ; then
rm -f "${dup_cookie_jar}";
printf "\\n"
echo -e "${RED}| Failed to extract download link [3].${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "" ""
fi
return 1
@ -193,12 +193,12 @@ dup_FetchFileInfo() {
return 1
fi
if grep -Eqi 'Just a moment...' <<< "$response"; then
if [ $i == $maxfetchretries ] ; then
if [[ $i == $maxfetchretries ]] ; then
rm -f "${dup_cookie_jar}";
printf "\\n"
echo -e "${RED}| Failed to extract download link [3].${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "" ""
fi
return 1
@ -211,7 +211,7 @@ dup_FetchFileInfo() {
printf "\\n"
echo -e "${RED}| Failed to extract download link [4]${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
rm -f "${dup_cookie_jar}";
failedRetryDownload "${remote_url}" "Failed to extract download link [4]" ""
fi
@ -232,16 +232,16 @@ dup_FetchFileInfo() {
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; rm -f ${dup_cookie_jar}; echo ""; tput cnorm; exit" 0 1 2 3 6 15
GetRandomUA
file_header=$(tor_curl_request --insecure -L --head -s "$download_url")
if [ "${DebugAllEnabled}" == "true" ] ; then
if [[ "${DebugAllEnabled}" == "true" ]] ; then
debugHtml "${remote_url##*/}" "dup_head$j" "download_url: ${download_url}"$'\n'"${file_header}"
fi
if [[ -z $file_header ]] ; then
if [ $j == $maxfetchretries ] ; then
if [[ $j == $maxfetchretries ]] ; then
rm -f "${dup_cookie_jar}";
printf "\\n"
echo -e "${RED}| Failed to extract file info [1]${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "Failed to extract file info [1]" ""
fi
return 1
@ -251,12 +251,12 @@ dup_FetchFileInfo() {
fi
fi
if ! grep -Eqi 'HTTP.*200' <<< $file_header ; then
if [ $j == $maxfetchretries ] ; then
if [[ $j == $maxfetchretries ]] ; then
rm -f "${dup_cookie_jar}";
printf "\\n"
echo -e "${RED}| Failed to extract file info [2]${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "Failed to extract file info [2]" ""
fi
return 1
@ -265,15 +265,15 @@ dup_FetchFileInfo() {
continue
fi
fi
if [ "$filename_override" == "" ] ; then
if [[ "$filename_override" == "" ]] ; then
filename="${download_url##*/}"
filename=${filename//%0d/}
if [[ -z "$filename" ]]; then
if [ $j == $maxfetchretries ] ; then
if [[ $j == $maxfetchretries ]] ; then
printf "\\n"
echo -e "${RED}| Failed to extract file name${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "Failed to extract file name" ""
fi
return 1
@ -285,12 +285,12 @@ dup_FetchFileInfo() {
file_size_bytes=$(grep -oPi '(?<=content-length: ).*?(?=$)' <<< "$file_header")
file_size_bytes=${file_size_bytes//[$'\t\r\n']}
if [[ -z "$file_size_bytes" ]]; then
if [ $j == $maxfetchretries ] ; then
if [[ $j == $maxfetchretries ]] ; then
rm -f "${dup_cookie_jar}";
printf "\\n"
echo -e "${RED}| Failed to extract file size.${NC}"
warnAndRetryUnknownError=true
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "Failed to extract file size." ""
fi
return 1
@ -301,15 +301,15 @@ dup_FetchFileInfo() {
fi
break #Good to go here
done
touch ${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}
if [ ! "$filename_override" == "" ] ; then
touch "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}"
if [[ ! "$filename_override" == "" ]] ; then
filename="$filename_override"
fi
filename=$(sanitize_file_or_folder_name "${filename}")
printf "\\n"
echo -e "${YELLOW}| File name:${NC}\t\"${filename}\""
if [ -z $file_size_bytes ] ; then
if [ "${finalAttempt}" == "true" ] ; then
if [[ -z $file_size_bytes ]] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
failedRetryDownload "${remote_url}" "Filesize not found!" ""
fi
echo -e "${YELLOW}| Filesize not found… retry${NC}"
@ -340,14 +340,14 @@ dup_GetFile() {
flockDownload="${WorkDir}/.flocks/${filename//[^a-zA-Z0-9\.\_\-]/}.flock"
for ((j=1; j<=$MaxDownloadRetries; j++)); do
pd_presize=0
if [ -f "$file_path" ] ; then
if [[ -f "$file_path" ]] ; then
pd_presize=$(stat --format="%s" "$file_path" | tr -d '[:space:]')
fi
GetRandomUA
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; rm -f "${dup_cookie_jar}"; rm -f $flockDownload; echo ""; tput cnorm; exit" 0 1 2 3 6 15
if [ "${UseTorCurlImpersonate}" == "true" ]; then
if [ "${RateMonitorEnabled}" == "true" ]; then
if [[ "${UseTorCurlImpersonate}" == "true" ]]; then
if [[ "${RateMonitorEnabled}" == "true" ]]; then
tor_curl_request --insecure \
--speed-limit $DownloadSpeedMin --speed-time $DownloadTimeoutInterval \
-b "${dup_cookie_jar}" -c "${dup_cookie_jar}" \
@ -360,7 +360,7 @@ dup_GetFile() {
"$download_url" --continue-at - --output "$file_path"
fi
else
if [ "${RateMonitorEnabled}" == "true" ]; then
if [[ "${RateMonitorEnabled}" == "true" ]]; then
tor_curl_request --insecure \
--speed-limit $DownloadSpeedMin --speed-time $DownloadTimeoutInterval \
-b "${dup_cookie_jar}" -c "${dup_cookie_jar}" \
@ -396,7 +396,7 @@ dup_GetFile() {
fi
fi
received_file_size=0
if [ -f "$file_path" ] ; then
if [[ -f "$file_path" ]] ; then
received_file_size=$(stat --format="%s" "$file_path" | tr -d '[:space:]')
fi
if CheckNoHtml "$remote_url" "$filename" "$file_path" ; then
@ -405,9 +405,9 @@ dup_GetFile() {
containsHtml=true
fi
downDelta=$(( received_file_size - pd_presize ))
if [[ "${received_file_size}" -ne "${file_size_bytes}" ]] || [ "$containsHtml" == "true" ]; then
if [ "${AutoRepairBadPartials}" == "true" ] && (( downDelta > 0 && downDelta < 1024 )) ; then
if [ -f "${file_path}" ] ; then
if [[ "${received_file_size}" -ne "${file_size_bytes}" ]] || [[ "$containsHtml" == "true" ]]; then
if [[ "${AutoRepairBadPartials}" == "true" ]] && (( downDelta > 0 && downDelta < 1024 )) ; then
if [[ -f "${file_path}" ]] ; then
if ((pd_presize > 0)); then
echo -e "${YELLOW}Bad node / HTML found:${NC} reverting to previous file..."
truncateDownload "$remote_url" "$filename" "$pd_presize" "$received_file_size"
@ -419,15 +419,15 @@ dup_GetFile() {
fi
if ((j >= $MaxDownloadRetries)) ; then
rm -f "$flockDownload";
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
fi
return 1
else
continue
fi
elif [ "${AutoRepairBadPartials}" == "true" ] && [ "$containsHtml" == "true" ] ; then
if [ -f "${file_path}" ] ; then
elif [[ "${AutoRepairBadPartials}" == "true" ]] && [[ "$containsHtml" == "true" ]] ; then
if [[ -f "${file_path}" ]] ; then
if ((pd_presize > 0)); then
echo -e "${YELLOW}Bad node / HTML found:${NC} reverting to previous file..."
truncateDownload "$remote_url" "$filename" "$pd_presize" "$received_file_size"
@ -439,21 +439,21 @@ dup_GetFile() {
fi
if ((j >= $MaxDownloadRetries)) ; then
rm -f "$flockDownload";
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
fi
return 1
else
continue
fi
elif (( downDelta > 0 && downDelta < 1024 )) || [ "$containsHtml" == "true" ] ; then
if [ -f "$file_path" ] ; then
elif (( downDelta > 0 && downDelta < 1024 )) || [[ "$containsHtml" == "true" ]] ; then
if [[ -f "$file_path" ]] ; then
rm -rf "$file_path"
fi
echo -e "\n${YELLOW}Bad node / HTML found:${NC} tainted partial removed..."
if ((j >= $MaxDownloadRetries)) ; then
rm -f "$flockDownload";
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
fi
return 1
@ -465,7 +465,7 @@ dup_GetFile() {
echo -e "\n${RED}Download failed, file is incomplete.${NC}"
if ((j >= $MaxDownloadRetries)) ; then
rm -f "$flockDownload";
if [ "${finalAttempt}" == "true" ] ; then
if [[ "${finalAttempt}" == "true" ]] ; then
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
fi
return 1