mirror of
https://github.com/kenzok8/small-package.git
synced 2026-02-07 07:18:00 +08:00
update 2023-05-02 16:22:24
This commit is contained in:
github-actions[bot]
@@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-serverchan
|
||||
PKG_VERSION:=2.05.2
|
||||
PKG_VERSION:=2.06.1
|
||||
PKG_RELEASE:=10
|
||||
|
||||
PKG_MAINTAINER:=tty228 <tty228@yeah.net>
|
||||
|
||||
@@ -39,6 +39,9 @@ function read_config(){
|
||||
port_forward_list=`echo "$port_forward_list"|sed 's/ /\n/g'|sed 's/,/ /g'` 2>/dev/null
|
||||
[ -z "$serverchan_ipv4" ] && serverchan_ipv4=0
|
||||
[ -z "$serverchan_ipv6" ] && serverchan_ipv6=0
|
||||
[ -z "$sleeptime" ] && sleeptime="60"
|
||||
[ -z "$ip_black_timeout" ] && sleeptime="86400"
|
||||
[ -z "$ip_white_timeout" ] && sleeptime="600"
|
||||
[ "$iw_version" ] && wlan_interface=`iw dev 2>/dev/null|grep Interface|awk '{print $2}'` >/dev/null 2>&1
|
||||
[ -z "$up_timeout" ] || [ "$up_timeout" -eq "0" ] && up_timeout="2"
|
||||
[ -z "$down_timeout" ] || [ "$down_timeout" -eq "0" ] && down_timeout="20";down_timeout=`expr ${down_timeout} / 2 + 1`
|
||||
@@ -78,18 +81,24 @@ function serverchan_init(){
|
||||
# 推送
|
||||
function diy_send(){
|
||||
( ! echo "$lite_enable"|grep -q "content" ) && ( ! echo "$lite_enable"|grep -q "nowtime" ) && local nowtime=`date "+%Y-%m-%d %H:%M:%S"`
|
||||
! jq -r '.' ${3} >/dev/null 2>&1 && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】json 文件格式错误，这不是一个标准的 json 文件，请检查 ${3} 文件是否有特殊符号未转义或语法错误" >> ${logfile} && return 1
|
||||
local diyurl=`jq -r .url ${3}` && local diyurl=`eval echo ${diyurl}`
|
||||
local type=`jq -r '.type' ${3}` && local type=`eval echo ${type}`
|
||||
local data=`jq -r '.data' ${3}` && local data=`eval echo ${data}`
|
||||
local content_type=`jq -r '.content_type' ${3}`
|
||||
jq ".type + $type" ${jsonpath} > ${tempjsonpath}
|
||||
|
||||
jq -r '.[]' ${tempjsonpath}|grep -w "null" && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】参数值错误，请检查设置项 `jq -r '.' ${tempjsonpath}|grep "null"`" >> ${logfile} && return 1
|
||||
[ -f ${tempjsonpath} ] && local logrow=$(grep -c "" ${tempjsonpath}) || local logrow="0"
|
||||
[ $logrow -eq "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】json 文件生成失败，请检查文件格式" >> ${logfile} && return 1
|
||||
jq -r '.[]' ${tempjsonpath}|grep "null" && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】参数变量生成失败，请检查设置项 `jq -r '.' ${tempjsonpath}|grep "null"`" >> ${logfile}
|
||||
|
||||
curl -X POST -H "$content_type" -d "${data}" "${diyurl}"
|
||||
! jq "$type" ${3} > ${tempjsonpath} && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】type:{ } 字段转义变量后格式错误，请检查 type:{ } 字段内是否有特殊符号未转义或语法错误" >> ${logfile} && return 1
|
||||
|
||||
[ $4 ] && echo '{"url":"'${diyurl}'","content_type":"'${content_type}'","type":'`jq "$type" ${3}`'}' > ${dir}debug_send_json
|
||||
[ $4 ] && echo -e "${send_title}" "${send_content}" > ${dir}debug_send_content
|
||||
[ $4 ] && cat ${tempjsonpath} > ${dir}debug_send_data
|
||||
[ $4 ] && ! jq -r '.' ${dir}debug_send_json && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】转义变量后格式错误，请检查 ${dir}debug_send_json 字段内是否有特殊符号未转义或语法错误" >> ${logfile}
|
||||
[ $4 ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【debug】json 文件已保存至：${dir}debug_send_json" >> ${logfile}
|
||||
[ $4 ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【debug】推送内容预览文件保存至：${dir}debug_send_content" >> ${logfile}
|
||||
[ $4 ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【debug】如果收不到信息，请检查 ${dir}debug_send_data 文件，或使用下列命令手动测试返回值 (可能需要关闭日志自动刷新方便选中)" >> ${logfile}
|
||||
[ $4 ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【debug】"'curl -X POST -H "'$content_type'" -d "@'${dir}debug_send_data'" "'${diyurl}'" ' >> ${logfile}
|
||||
|
||||
curl -X POST -H "$content_type" -d "$data" "${diyurl}"
|
||||
[ $? -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】网络错误或 URL 错误，推送失败，curl 返回值为 ${tmp_value}" >> ${logfile} && return 1 || return 0
|
||||
}
|
||||
|
||||
# 下载设备MAC厂商信息
|
||||
@@ -1022,6 +1031,7 @@ function cpu_load(){
|
||||
fi
|
||||
}
|
||||
|
||||
# CPU 占用前三
|
||||
function cputop(){
|
||||
[ -z "$1" ] && content="${content}${str_splitline}${str_title_start} 当前 CPU 占用前三的进程${str_title_end}"
|
||||
local gettop=`top -bn 1|grep -v "top -bn 1"`
|
||||
@@ -1169,8 +1179,6 @@ function login_send(){
|
||||
function add_ip_white(){
|
||||
[ ! "$1" ] && return
|
||||
[ -z "$port_knocking" ] || [ "$port_knocking" -ne "1" ] && return
|
||||
( ipset -q test ip_whitelist ${1} ) && continue
|
||||
( ipset -q test ip_whitelistv6 ${1} ) && continue
|
||||
|
||||
# 开放端口
|
||||
if ( echo ${1}|grep -q -Eo "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" ); then
|
||||
@@ -1184,7 +1192,7 @@ function add_ip_white(){
|
||||
done
|
||||
|
||||
unset port_forward
|
||||
ipset add ip_whitelist ${1}
|
||||
ipset -exist add ip_whitelist ${1} timeout ${ip_white_timeout}
|
||||
|
||||
elif ( echo ${1}|grep -q -oE "([\da-fA-F0-9]{1,4}(:{1,2})){1,15}[\da-fA-F0-9]{1,4}" ); then
|
||||
ipset list ip_whitelistv6 >/dev/null 2>&1 || ipset create ip_whitelistv6 hash:ip timeout ${ip_white_timeout} family inet6 >/dev/null 2>&1
|
||||
@@ -1197,7 +1205,7 @@ function add_ip_white(){
|
||||
done
|
||||
|
||||
unset port_forward
|
||||
ipset add ip_whitelistv6 ${1}
|
||||
ipset -exist add ip_whitelistv6 ${1} timeout ${ip_white_timeout}
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1212,11 +1220,11 @@ function add_ip_black(){
|
||||
if ( echo ${1}|grep -q -Eo "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" ); then
|
||||
ipset list ip_blacklist >/dev/null 2>&1 || ipset create ip_blacklist hash:ip timeout ${ip_black_timeout} >/dev/null 2>&1
|
||||
iptables -C INPUT -m set --match-set ip_blacklist src -j DROP >/dev/null 2>&1 || iptables -I INPUT -m set --match-set ip_blacklist src -j DROP >/dev/null 2>&1
|
||||
ipset add ip_blacklist ${1}
|
||||
ipset add ip_blacklist ${1} timeout ${ip_black_timeout}
|
||||
elif ( echo ${1}|grep -q -oE "([\da-fA-F0-9]{1,4}(:{1,2})){1,15}[\da-fA-F0-9]{1,4}" ); then
|
||||
ipset list ip_blacklistv6 >/dev/null 2>&1 || ipset create ip_blacklistv6 hash:ip timeout ${ip_black_timeout} family inet6 >/dev/null 2>&1
|
||||
ip6tables -C INPUT -m set --match-set ip_blacklistv6 src -j DROP >/dev/null 2>&1 || ip6tables -I INPUT -m set --match-set ip_blacklistv6 src -j DROP >/dev/null 2>&1
|
||||
ipset add ip_blacklistv6 ${1}
|
||||
ipset add ip_blacklistv6 ${1} timeout ${ip_black_timeout}
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1231,6 +1239,7 @@ function del_ip_black(){
|
||||
ipset list ip_blacklistv6 >/dev/null 2>&1 && ipset -! del ip_blacklistv6 ${1}
|
||||
fi
|
||||
}
|
||||
|
||||
# 设置防火墙列表
|
||||
function set_ip_black(){
|
||||
# 检查换行，避免出错
|
||||
@@ -1260,7 +1269,6 @@ function set_ip_black(){
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
# 发送定时数据
|
||||
function send(){
|
||||
echo "`date "+%Y-%m-%d %H:%M:%S"` 【定时数据】创建定时任务" >> ${logfile}
|
||||
@@ -1330,7 +1338,7 @@ function send(){
|
||||
fi
|
||||
[ ! -z "$device_name" ] && local send_title="【$device_name】${send_title}"
|
||||
[ -z "$send_content" ] && local send_content="${str_splitline}${str_title_start} 我遇到了一个难题${str_title_end}${str_linefeed}${str_tab}定时发送选项错误，你没有选择需要发送的项目，该怎 么办呢${str_splitline}"
|
||||
[ "$send_disturb" -eq "0" ] && diy_send "${send_title}" "${send_content}" "${jsonpath}" >/dev/null 2>&1
|
||||
[ "$send_disturb" -eq "0" ] && diy_send "${send_title}" "${send_content}" "${jsonpath}" "$1" >/dev/null 2>&1
|
||||
[ $? -eq 1 ] && [ "$send_disturb" -eq "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】定时推送失败，请检查网络或设置信息" >> ${logfile} || echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}定时推送任务完成" >> ${logfile}
|
||||
deltemp
|
||||
}
|
||||
@@ -1417,7 +1425,6 @@ while [ "$serverchan_enable" -eq "1" ]; do
|
||||
[ ! -z "$device_name" ] && title="【$device_name】$title"
|
||||
( echo "$lite_enable"|grep -q "content" ) && content="$title"
|
||||
[ "$disturb" -eq "0" ] && diy_send "${title}" "${content}" "${jsonpath}" >/dev/null 2>&1
|
||||
[ $? -eq 1 ] && [ "$disturb" -eq "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【！！！】推送失败，请检查网络或设置信息 " >> ${logfile}
|
||||
fi
|
||||
|
||||
# 等待定时任务推送完成
|
||||
|
||||
Reference in New Issue
Block a user