Browse Source

Add info msg ZeroSSL missing JWS signature #4503

Adds some extra error output contextually for default value users
as well as a hint of how to more easily switch from the default
pull/4527/head
Shane B 2 years ago
parent
commit
6a73b5f3de
  1. 21
      acme.sh

21
acme.sh

@ -180,6 +180,8 @@ _VALIDITY_WIKI="https://github.com/acmesh-official/acme.sh/wiki/Validity"
_DNSCHECK_WIKI="https://github.com/acmesh-official/acme.sh/wiki/dnscheck" _DNSCHECK_WIKI="https://github.com/acmesh-official/acme.sh/wiki/dnscheck"
_ZEROSSL_DEFAULT_CA_WIKI="https://github.com/acmesh-official/acme.sh/wiki/Change-default-CA-to-ZeroSSL"
_DNS_MANUAL_ERR="The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead." _DNS_MANUAL_ERR="The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."
_DNS_MANUAL_WARN="It seems that you are using dns manual mode. please take care: $_DNS_MANUAL_ERR" _DNS_MANUAL_WARN="It seems that you are using dns manual mode. please take care: $_DNS_MANUAL_ERR"
@ -2241,7 +2243,15 @@ _send_signed_request() {
_sleep $_sleep_retry_sec _sleep $_sleep_retry_sec
continue continue
fi fi
if [ "$code" = '400' ] && _contains "$_body" "The JWS Signature MUST be present" && [ ! "$_ACME_USE_NONDEFAULT_SERVER" ]; then
_shortCAOptions="$(_getCAShortNameList)"
_err "To use a different CA server (default used: $DEFAULT_CA), provide a --server parameter with one of: $_shortCAOptions."
_err "For example: $PROJECT_ENTRY --issue -d example.com -w /home/wwwroot/example.com --server letsencrypt"
_err "We recommend using ZeroSSL. Read more about using ZeroSSL here: $_ZEROSSL_DEFAULT_CA_WIKI"
fi
fi fi
return 0 return 0
done done
_info "Giving up sending to CA server after $MAX_REQUEST_RETRY_TIMES retries." _info "Giving up sending to CA server after $MAX_REQUEST_RETRY_TIMES retries."
@ -7168,6 +7178,16 @@ _getCAShortName() {
echo "$caurl" echo "$caurl"
} }
_getCAShortNameList() {
_res=''
for snames in $CA_NAMES; do
_shortname=$(_getfield "$snames" 2)
_res="$_res$_shortname, "
done
_clean="${_res:0:-2}"
echo "$_clean"
}
#set default ca to $ACME_DIRECTORY #set default ca to $ACME_DIRECTORY
setdefaultca() { setdefaultca() {
if [ -z "$ACME_DIRECTORY" ]; then if [ -z "$ACME_DIRECTORY" ]; then
@ -7407,6 +7427,7 @@ _process() {
;; ;;
--server) --server)
_server="$2" _server="$2"
export _ACME_USE_NONDEFAULT_SERVER=1
shift shift
;; ;;
--debug) --debug)

Loading…
Cancel
Save