ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
WETOOP 2018-04-29 17:10:31 +08:00 committed by GitHub
parent 1be61ffc55
commit cc9c4e5c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
deploy/cdn_ali.sh
View File

@ -40,17 +40,17 @@ cdn_ali_deploy() {
# read cert and key files and urlencode both # read cert and key files and urlencode both
_certnamestr=$DEPLOY_CDN_Ali_Prefix$_cdomain'-'$(sha1sum "$_ccert" | cut -c1-20) _certnamestr=$DEPLOY_CDN_Ali_Prefix$_cdomain'-'$(sha1sum "$_ccert" | cut -c1-20)
_certtext=$(cat "$_cfullchain" | sed '/^$/d') _certtext=$(sed '/^$/d' < "$_cfullchain")
_keytext=$(cat "$_ckey" | sed '/^$/d') _keytext=$(sed '/^$/d' < "$_ckey")
_certstr=$(_urlencode "$_certtext") _certstr=$(_ali_urlencode "$_certtext")
_keystr=$(_urlencode "$_keytext") _keystr=$(_ali_urlencode "$_keytext")
_debug _certname "$_certnamestr" _debug _certname "$_certnamestr"
_debug2 _cert "$_certstr" _debug2 _cert "$_certstr"
_debug2 _key "$_keystr" _debug2 _key "$_keystr"
_debug "Set Cert" _debug "Set Cert"
_set_cert_query $(_urlencode "$DEPLOY_CDN_Ali_Prefix$_cdomain") $(_urlencode "$_certnamestr") "$_certstr" "$_keystr" && _ali_rest "Set Cert" _set_cert_query "$(_ali_urlencode "$DEPLOY_CDN_Ali_Prefix$_cdomain")" "$(_ali_urlencode "$_certnamestr")" "$_certstr" "$_keystr" && _ali_rest "Set Cert"
return 0 return 0
} }
@ -96,20 +96,25 @@ _ali_rest() {
} }
_ali_urlencode() { _ali_urlencode() {
# urlencode <string>
old_lc_collate=$LC_COLLATE
LC_COLLATE=C
_str="$1" _str="$1"
_str_len=${#_str} _str_length="${#1}"
_u_i=1 i=1
while [ "$_u_i" -le "$_str_len" ]; do while [ "$i" -le "$_str_length" ]
_str_c="$(printf "%s" "$_str" | cut -c "$_u_i")" do
case $_str_c in [a-zA-Z0-9.~_-]) _str_c="$(expr substr "$_str" "$i" 1)"
printf "%s" "$_str_c" case $_str_c in
;; [a-zA-Z0-9.~_-]) printf "%s" "$_str_c" ;;
*) "") printf "%s" "%0A" ;;
printf "%%%02X" "'$_str_c" *) printf '%%%02X' "'$_str_c" ;;
;;
esac esac
_u_i="$(_math "$_u_i" + 1)" i=$((i + 1))
done done
LC_COLLATE=$old_lc_collate
} }
_ali_nonce() { _ali_nonce() {
@ -121,18 +126,3 @@ _ali_nonce() {
_timestamp() { _timestamp() {
date -u +"%Y-%m-%dT%H%%3A%M%%3A%SZ" date -u +"%Y-%m-%dT%H%%3A%M%%3A%SZ"
} }
_urlencode() {
# urlencode <string>
old_lc_collate=$LC_COLLATE
LC_COLLATE=C
local length="${#1}"
for (( i = 0; i < length; i++ )); do
local c="${1:i:1}"
case $c in
[a-zA-Z0-9.~_-]) printf "$c" ;;
*) printf '%%%02X' "'$c" ;;
esac
done
LC_COLLATE=$old_lc_collate
}