github
/
acme.sh
mirror of https://github.com/acmesh-official/acme.sh
1
0
Fork 0
Code Issues Releases Wiki Activity

formalized _eab_id and _eab_kid and added EAB parameters to _regAccount on --issue

pull/5087/head
clement-gouin 2024-04-11 12:53:46 +00:00
parent fa3d7ad14b
commit 2ae9498bcc
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
acme.sh
View File

@ -3664,10 +3664,10 @@ _on_issue_success() {
#account_key_length eab-kid eab-hmac-key #account_key_length eab-kid eab-hmac-key
registeraccount() { registeraccount() {
_account_key_length="$1" _account_key_length="$1"
_eab_id="$2" _eab_kid="$2"
_eab_hmac_key="$3" _eab_hmac_key="$3"
_initpath _initpath
_regAccount "$_account_key_length" "$_eab_id" "$_eab_hmac_key" _regAccount "$_account_key_length" "$_eab_kid" "$_eab_hmac_key"
} }
__calcAccountKeyHash() { __calcAccountKeyHash() {
@ -3697,7 +3697,7 @@ _getAccountEmail() {
_regAccount() { _regAccount() {
_initpath _initpath
_reg_length="$1" _reg_length="$1"
_eab_id="$2" _eab_kid="$2"
_eab_hmac_key="$3" _eab_hmac_key="$3"
_debug3 _regAccount "$_regAccount" _debug3 _regAccount "$_regAccount"
_initAPI _initAPI
@ -3714,13 +3714,13 @@ _regAccount() {
if ! _calcjwk "$ACCOUNT_KEY_PATH"; then if ! _calcjwk "$ACCOUNT_KEY_PATH"; then
return 1 return 1
fi fi
if [ "$_eab_id" ] && [ "$_eab_hmac_key" ]; then if [ "$_eab_kid" ] && [ "$_eab_hmac_key" ]; then
_savecaconf CA_EAB_KEY_ID "$_eab_id" _savecaconf CA_EAB_KEY_ID "$_eab_kid"
_savecaconf CA_EAB_HMAC_KEY "$_eab_hmac_key" _savecaconf CA_EAB_HMAC_KEY "$_eab_hmac_key"
fi fi
_eab_id=$(_readcaconf "CA_EAB_KEY_ID") _eab_kid=$(_readcaconf "CA_EAB_KEY_ID")
_eab_hmac_key=$(_readcaconf "CA_EAB_HMAC_KEY") _eab_hmac_key=$(_readcaconf "CA_EAB_HMAC_KEY")
_secure_debug3 _eab_id "$_eab_id" _secure_debug3 _eab_kid "$_eab_kid"
_secure_debug3 _eab_hmac_key "$_eab_hmac_key" _secure_debug3 _eab_hmac_key "$_eab_hmac_key"
_email="$(_getAccountEmail)" _email="$(_getAccountEmail)"
if [ "$_email" ]; then if [ "$_email" ]; then
@ -3728,7 +3728,7 @@ _regAccount() {
fi fi
if [ "$ACME_DIRECTORY" = "$CA_ZEROSSL" ]; then if [ "$ACME_DIRECTORY" = "$CA_ZEROSSL" ]; then
if [ -z "$_eab_id" ] || [ -z "$_eab_hmac_key" ]; then if [ -z "$_eab_kid" ] || [ -z "$_eab_hmac_key" ]; then
_info "No EAB credentials found for ZeroSSL, let's get one" _info "No EAB credentials found for ZeroSSL, let's get one"
if [ -z "$_email" ]; then if [ -z "$_email" ]; then
_info "$(__green "$PROJECT_NAME is using ZeroSSL as default CA now.")" _info "$(__green "$PROJECT_NAME is using ZeroSSL as default CA now.")"
@ -3744,10 +3744,10 @@ _regAccount() {
return 1 return 1
fi fi
_secure_debug2 _eabresp "$_eabresp" _secure_debug2 _eabresp "$_eabresp"
_eab_id="$(echo "$_eabresp" | tr ',}' '\n\n' | grep '"eab_kid"' | cut -d : -f 2 | tr -d '"')" _eab_kid="$(echo "$_eabresp" | tr ',}' '\n\n' | grep '"eab_kid"' | cut -d : -f 2 | tr -d '"')"
_secure_debug2 _eab_id "$_eab_id" _secure_debug2 _eab_kid "$_eab_kid"
if [ -z "$_eab_id" ]; then if [ -z "$_eab_kid" ]; then
_err "Can not resolve _eab_id" _err "Can not resolve _eab_kid"
return 1 return 1
fi fi
_eab_hmac_key="$(echo "$_eabresp" | tr ',}' '\n\n' | grep '"eab_hmac_key"' | cut -d : -f 2 | tr -d '"')" _eab_hmac_key="$(echo "$_eabresp" | tr ',}' '\n\n' | grep '"eab_hmac_key"' | cut -d : -f 2 | tr -d '"')"
@ -3756,12 +3756,12 @@ _regAccount() {
_err "Can not resolve _eab_hmac_key" _err "Can not resolve _eab_hmac_key"
return 1 return 1
fi fi
_savecaconf CA_EAB_KEY_ID "$_eab_id" _savecaconf CA_EAB_KEY_ID "$_eab_kid"
_savecaconf CA_EAB_HMAC_KEY "$_eab_hmac_key" _savecaconf CA_EAB_HMAC_KEY "$_eab_hmac_key"
fi fi
fi fi
if [ "$_eab_id" ] && [ "$_eab_hmac_key" ]; then if [ "$_eab_kid" ] && [ "$_eab_hmac_key" ]; then
eab_protected="{\"alg\":\"HS256\",\"kid\":\"$_eab_id\",\"url\":\"${ACME_NEW_ACCOUNT}\"}" eab_protected="{\"alg\":\"HS256\",\"kid\":\"$_eab_kid\",\"url\":\"${ACME_NEW_ACCOUNT}\"}"
_debug3 eab_protected "$eab_protected" _debug3 eab_protected "$eab_protected"
eab_protected64=$(printf "%s" "$eab_protected" | _base64 | _url_replace) eab_protected64=$(printf "%s" "$eab_protected" | _base64 | _url_replace)
@ -4476,7 +4476,7 @@ issue() {
_debug2 _saved_account_key_hash "$_saved_account_key_hash" _debug2 _saved_account_key_hash "$_saved_account_key_hash"
if [ -z "$ACCOUNT_URL" ] || [ -z "$_saved_account_key_hash" ] || [ "$_saved_account_key_hash" != "$(__calcAccountKeyHash)" ]; then if [ -z "$ACCOUNT_URL" ] || [ -z "$_saved_account_key_hash" ] || [ "$_saved_account_key_hash" != "$(__calcAccountKeyHash)" ]; then
if ! _regAccount "$_accountkeylength"; then if ! _regAccount "$_accountkeylength" "$_eab_kid" "$_eab_hmac_key"; then
_on_issue_err "$_post_hook" _on_issue_err "$_post_hook"
return 1 return 1
fi fi