8x48/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2026-01-15 12:52:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'acmesh-official:dev' into dev

Browse Source
This commit is contained in:
Bob Perper
2025-12-08 08:44:42 -05:00
committed by GitHub
parent 875cf056b7 3b2c2b16b2
commit b0088c82dc
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/wiki-monitor.yml vendored
View File

@@ -22,6 +22,7 @@ jobs:
page_sha=$(jq -r '.pages[0].sha' "$GITHUB_EVENT_PATH") page_sha=$(jq -r '.pages[0].sha' "$GITHUB_EVENT_PATH")
page_url=$(jq -r '.pages[0].html_url' "$GITHUB_EVENT_PATH") page_url=$(jq -r '.pages[0].html_url' "$GITHUB_EVENT_PATH")
page_action=$(jq -r '.pages[0].action' "$GITHUB_EVENT_PATH") page_action=$(jq -r '.pages[0].action' "$GITHUB_EVENT_PATH")
page_summary=$(jq -r '.pages[0].summary' "$GITHUB_EVENT_PATH")
now="$(date '+%Y-%m-%d %H:%M:%S')" now="$(date '+%Y-%m-%d %H:%M:%S')"
cd wiki cd wiki
@@ -35,9 +36,11 @@ jobs:
{ {
echo "Wiki edited" echo "Wiki edited"
echo -n "User: " echo -n "User: "
echo "[$actor]($sender_url)" echo "@$actor [$actor]($sender_url)"
echo "Time: $now" echo "Time: $now"
echo "Page: [$page_name]($page_url) (Action: $page_action)" echo "Page: [$page_name]($page_url) (Action: $page_action)"
echo "Comment: $page_summary"
echo "[Click here to Revert](${page_url}/_history)"
echo "" echo ""
echo "----" echo "----"
echo "### diff：" echo "### diff："

17
dnsapi/dns_ali.sh
View File

@@ -97,12 +97,13 @@ _ali_rest() {
} }
_ali_nonce() { _ali_nonce() {
#_head_n 1 </dev/urandom | _digest "sha256" hex | cut -c 1-31 if [ "$ACME_OPENSSL_BIN" ]; then
#Not so good... "$ACME_OPENSSL_BIN" rand -hex 16 2>/dev/null && return 0
date +"%s%N" | sed 's/%N//g' fi
printf "%s" "$(date +%s)$$$(date +%N)" | _digest sha256 hex | cut -c 1-32
} }
_timestamp() { _ali_timestamp() {
date -u +"%Y-%m-%dT%H%%3A%M%%3A%SZ" date -u +"%Y-%m-%dT%H%%3A%M%%3A%SZ"
} }
@@ -150,7 +151,7 @@ _check_exist_query() {
query=$query'&SignatureMethod=HMAC-SHA1' query=$query'&SignatureMethod=HMAC-SHA1'
query=$query"&SignatureNonce=$(_ali_nonce)" query=$query"&SignatureNonce=$(_ali_nonce)"
query=$query'&SignatureVersion=1.0' query=$query'&SignatureVersion=1.0'
query=$query'&Timestamp='$(_timestamp) query=$query'&Timestamp='$(_ali_timestamp)
query=$query'&TypeKeyWord=TXT' query=$query'&TypeKeyWord=TXT'
query=$query'&Version=2015-01-09' query=$query'&Version=2015-01-09'
} }
@@ -166,7 +167,7 @@ _add_record_query() {
query=$query'&SignatureMethod=HMAC-SHA1' query=$query'&SignatureMethod=HMAC-SHA1'
query=$query"&SignatureNonce=$(_ali_nonce)" query=$query"&SignatureNonce=$(_ali_nonce)"
query=$query'&SignatureVersion=1.0' query=$query'&SignatureVersion=1.0'
query=$query'&Timestamp='$(_timestamp) query=$query'&Timestamp='$(_ali_timestamp)
query=$query'&Type=TXT' query=$query'&Type=TXT'
query=$query'&Value='$3 query=$query'&Value='$3
query=$query'&Version=2015-01-09' query=$query'&Version=2015-01-09'
@@ -182,7 +183,7 @@ _delete_record_query() {
query=$query'&SignatureMethod=HMAC-SHA1' query=$query'&SignatureMethod=HMAC-SHA1'
query=$query"&SignatureNonce=$(_ali_nonce)" query=$query"&SignatureNonce=$(_ali_nonce)"
query=$query'&SignatureVersion=1.0' query=$query'&SignatureVersion=1.0'
query=$query'&Timestamp='$(_timestamp) query=$query'&Timestamp='$(_ali_timestamp)
query=$query'&Version=2015-01-09' query=$query'&Version=2015-01-09'
} }
@@ -196,7 +197,7 @@ _describe_records_query() {
query=$query'&SignatureMethod=HMAC-SHA1' query=$query'&SignatureMethod=HMAC-SHA1'
query=$query"&SignatureNonce=$(_ali_nonce)" query=$query"&SignatureNonce=$(_ali_nonce)"
query=$query'&SignatureVersion=1.0' query=$query'&SignatureVersion=1.0'
query=$query'&Timestamp='$(_timestamp) query=$query'&Timestamp='$(_ali_timestamp)
query=$query'&Version=2015-01-09' query=$query'&Version=2015-01-09'
} }