mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-11-09 16:01:46 +00:00
Fix
This commit is contained in:
parent
43503a20e5
commit
90623142e1
@ -4,8 +4,8 @@
|
|||||||
#YC_Folder_ID="" # YC Folder ID
|
#YC_Folder_ID="" # YC Folder ID
|
||||||
#YC_SA_ID="" # Service Account ID
|
#YC_SA_ID="" # Service Account ID
|
||||||
#YC_SA_Key_ID="" # Service Account IAM Key ID
|
#YC_SA_Key_ID="" # Service Account IAM Key ID
|
||||||
#YC_SA_Key_File_Path="/path/to/private.key" # Path to private.key use instead of PEM
|
#YC_SA_Key_File_Path="/path/to/private.key" # Path to private.key use instead of YC_SA_Key_File_PEM_b64
|
||||||
#YC_SA_Key_File_PEM_b64="" # Base64 content of private.key use instead of Path
|
#YC_SA_Key_File_PEM_b64="" # Base64 content of private.key use instead of YC_SA_Key_File_Path
|
||||||
YC_Api="https://dns.api.cloud.yandex.net/dns/v1"
|
YC_Api="https://dns.api.cloud.yandex.net/dns/v1"
|
||||||
|
|
||||||
######## Public functions #####################
|
######## Public functions #####################
|
||||||
@ -15,17 +15,22 @@ dns_yc_add() {
|
|||||||
fulldomain="$(echo "$1". | _lower_case)" # Add dot at end of domain name
|
fulldomain="$(echo "$1". | _lower_case)" # Add dot at end of domain name
|
||||||
txtvalue=$2
|
txtvalue=$2
|
||||||
|
|
||||||
|
YC_SA_Key_File_PEM_b64="${YC_SA_Key_File_PEM_b64:-$(_readaccountconf_mutable YC_SA_Key_File_PEM_b64)}"
|
||||||
|
YC_SA_Key_File_Path="${YC_SA_Key_File_Path:-$(_readaccountconf_mutable YC_SA_Key_File_Path)}"
|
||||||
|
|
||||||
if [ "$YC_SA_Key_File_PEM_b64" ]; then
|
if [ "$YC_SA_Key_File_PEM_b64" ]; then
|
||||||
YC_SA_Key_File="<(echo '$YC_SA_Key_File_PEM_b64' | _dbase64 )"
|
echo "$YC_SA_Key_File_PEM_b64" | _dbase64 > private.key
|
||||||
|
YC_SA_Key_File="private.key"
|
||||||
|
_savedomainconf YC_SA_Key_File_PEM_b64 "$YC_SA_Key_File_PEM_b64"
|
||||||
else
|
else
|
||||||
YC_SA_Key_File=$YC_SA_Key_File_Path
|
YC_SA_Key_File="$YC_SA_Key_File_Path"
|
||||||
|
_savedomainconf YC_SA_Key_File_Path "$YC_SA_Key_File_Path"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
YC_Zone_ID="${YC_Zone_ID:-$(_readaccountconf_mutable YC_Zone_ID)}"
|
YC_Zone_ID="${YC_Zone_ID:-$(_readaccountconf_mutable YC_Zone_ID)}"
|
||||||
YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
|
YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
|
||||||
YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
|
YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
|
||||||
YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
|
YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
|
||||||
YC_SA_Key_File="${YC_SA_Key_File:-$(_readaccountconf_mutable YC_SA_Key_File)}"
|
|
||||||
|
|
||||||
if [ "$YC_SA_ID" ] && [ "$YC_SA_Key_ID" ] && [ "$YC_SA_Key_File" ]; then
|
if [ "$YC_SA_ID" ] && [ "$YC_SA_Key_ID" ] && [ "$YC_SA_Key_File" ]; then
|
||||||
if [ -f "$YC_SA_Key_File" ]; then
|
if [ -f "$YC_SA_Key_File" ]; then
|
||||||
@ -34,12 +39,10 @@ dns_yc_add() {
|
|||||||
_savedomainconf YC_Zone_ID "$YC_Zone_ID"
|
_savedomainconf YC_Zone_ID "$YC_Zone_ID"
|
||||||
_savedomainconf YC_SA_ID "$YC_SA_ID"
|
_savedomainconf YC_SA_ID "$YC_SA_ID"
|
||||||
_savedomainconf YC_SA_Key_ID "$YC_SA_Key_ID"
|
_savedomainconf YC_SA_Key_ID "$YC_SA_Key_ID"
|
||||||
_savedomainconf YC_SA_Key_File "$YC_SA_Key_File"
|
|
||||||
elif [ "$YC_Folder_ID" ]; then
|
elif [ "$YC_Folder_ID" ]; then
|
||||||
_savedomainconf YC_Folder_ID "$YC_Folder_ID"
|
_savedomainconf YC_Folder_ID "$YC_Folder_ID"
|
||||||
_saveaccountconf_mutable YC_SA_ID "$YC_SA_ID"
|
_saveaccountconf_mutable YC_SA_ID "$YC_SA_ID"
|
||||||
_saveaccountconf_mutable YC_SA_Key_ID "$YC_SA_Key_ID"
|
_saveaccountconf_mutable YC_SA_Key_ID "$YC_SA_Key_ID"
|
||||||
_saveaccountconf_mutable YC_SA_Key_File "$YC_SA_Key_File"
|
|
||||||
_clearaccountconf_mutable YC_Zone_ID
|
_clearaccountconf_mutable YC_Zone_ID
|
||||||
_clearaccountconf YC_Zone_ID
|
_clearaccountconf YC_Zone_ID
|
||||||
else
|
else
|
||||||
@ -59,7 +62,8 @@ dns_yc_add() {
|
|||||||
_clearaccountconf YC_Folder_ID
|
_clearaccountconf YC_Folder_ID
|
||||||
_clearaccountconf YC_SA_ID
|
_clearaccountconf YC_SA_ID
|
||||||
_clearaccountconf YC_SA_Key_ID
|
_clearaccountconf YC_SA_Key_ID
|
||||||
_clearaccountconf YC_SA_Key_File
|
_clearaccountconf YC_SA_Key_File_PEM_b64
|
||||||
|
_clearaccountconf YC_SA_Key_File_Path
|
||||||
_err "You didn't specify a YC_SA_ID or YC_SA_Key_ID or YC_SA_Key_File."
|
_err "You didn't specify a YC_SA_ID or YC_SA_Key_ID or YC_SA_Key_File."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -103,7 +107,6 @@ dns_yc_rm() {
|
|||||||
YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
|
YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
|
||||||
YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
|
YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
|
||||||
YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
|
YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
|
||||||
YC_SA_Key_File="${YC_SA_Key_File:-$(_readaccountconf_mutable YC_SA_Key_File)}"
|
|
||||||
|
|
||||||
_debug "First detect the root zone"
|
_debug "First detect the root zone"
|
||||||
if ! _get_root "$fulldomain"; then
|
if ! _get_root "$fulldomain"; then
|
||||||
@ -245,6 +248,8 @@ _yc_login() {
|
|||||||
_signature=$(printf "%s.%s" "$header" "$payload" | _sign "$YC_SA_Key_File" "sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-1" | _url_replace)
|
_signature=$(printf "%s.%s" "$header" "$payload" | _sign "$YC_SA_Key_File" "sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-1" | _url_replace)
|
||||||
_debug2 _signature "$_signature"
|
_debug2 _signature "$_signature"
|
||||||
|
|
||||||
|
rm -rf "$YC_SA_Key_File"
|
||||||
|
|
||||||
_jwt=$(printf "{\"jwt\": \"%s.%s.%s\"}" "$header" "$payload" "$_signature")
|
_jwt=$(printf "{\"jwt\": \"%s.%s.%s\"}" "$header" "$payload" "$_signature")
|
||||||
_debug2 _jwt "$_jwt"
|
_debug2 _jwt "$_jwt"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user