Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
7690f73e
Commit
7690f73e
authored
Mar 05, 2019
by
neilpang
Browse files
base64 encode reloadcmd.
fix
https://github.com/Neilpang/acme.sh/issues/2134
parent
b3f61297
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
7690f73e
...
@@ -66,6 +66,9 @@ END_CERT="-----END CERTIFICATE-----"
...
@@ -66,6 +66,9 @@ END_CERT="-----END CERTIFICATE-----"
CONTENT_TYPE_JSON="application/jose+json"
CONTENT_TYPE_JSON="application/jose+json"
RENEW_SKIP=2
RENEW_SKIP=2
B64CONF_START="__ACME_BASE64__START_"
B64CONF_END="__ACME_BASE64__END_"
ECC_SEP="_"
ECC_SEP="_"
ECC_SUFFIX="${ECC_SEP}ecc"
ECC_SUFFIX="${ECC_SEP}ecc"
...
@@ -1964,12 +1967,16 @@ _setopt() {
...
@@ -1964,12 +1967,16 @@ _setopt() {
_debug3 "$(grep -n "^$__opt$__sep" "$__conf")"
_debug3 "$(grep -n "^$__opt$__sep" "$__conf")"
}
}
#_save_conf file key value
#_save_conf file key value
base64encode
#save to conf
#save to conf
_save_conf() {
_save_conf() {
_s_c_f="$1"
_s_c_f="$1"
_sdkey="$2"
_sdkey="$2"
_sdvalue="$3"
_sdvalue="$3"
_b64encode="$4"
if [ "$_b64encode" ]; then
_sdvalue="${B64CONF_START}$(printf "%s" "${_sdvalue}" | _base64)${B64CONF_END}"
fi
if [ "$_s_c_f" ]; then
if [ "$_s_c_f" ]; then
_setopt "$_s_c_f" "$_sdkey" "=" "'$_sdvalue'"
_setopt "$_s_c_f" "$_sdkey" "=" "'$_sdvalue'"
else
else
...
@@ -1994,19 +2001,20 @@ _read_conf() {
...
@@ -1994,19 +2001,20 @@ _read_conf() {
_r_c_f="$1"
_r_c_f="$1"
_sdkey="$2"
_sdkey="$2"
if [ -f "$_r_c_f" ]; then
if [ -f "$_r_c_f" ]; then
(
_sdv="$(grep "^$_sdkey *=" "$_r_c_f" | cut -d = -f 2-1000 | tr -d "'")"
eval
"
$(
grep
"^
$_sdkey
*="
"
$_r_c_f
"
)
"
if _startswith "$_sdv" "${B64CONF_START}" && _endswith "$_sdv" "${B64CONF_END}"; then
eval
"printf
\"
%s
\"
\"\$
$_sdkey
\"
"
_sdv="$(echo "$_sdv" | sed "s/${B64CONF_START}//" | sed "s/${B64CONF_END}//" | _dbase64)"
)
fi
printf "%s" "$_sdv"
else
else
_debug "config file is empty, can not read $_sdkey"
_debug "config file is empty, can not read $_sdkey"
fi
fi
}
}
#_savedomainconf key value
#_savedomainconf key value
base64encode
#save to domain.conf
#save to domain.conf
_savedomainconf() {
_savedomainconf() {
_save_conf
"
$DOMAIN_CONF
"
"
$
1
"
"
$2
"
_save_conf "$DOMAIN_CONF" "$
@
"
}
}
#_cleardomainconf key
#_cleardomainconf key
...
@@ -2019,14 +2027,14 @@ _readdomainconf() {
...
@@ -2019,14 +2027,14 @@ _readdomainconf() {
_read_conf "$DOMAIN_CONF" "$1"
_read_conf "$DOMAIN_CONF" "$1"
}
}
#_saveaccountconf key value
#_saveaccountconf key value
base64encode
_saveaccountconf() {
_saveaccountconf() {
_save_conf
"
$ACCOUNT_CONF_PATH
"
"
$
1
"
"
$2
"
_save_conf "$ACCOUNT_CONF_PATH" "$
@
"
}
}
#key value
#key value
base64encode
_saveaccountconf_mutable() {
_saveaccountconf_mutable() {
_save_conf
"
$ACCOUNT_CONF_PATH
"
"SAVED_
$1
"
"
$2
"
_save_conf "$ACCOUNT_CONF_PATH" "SAVED_$1" "$2"
"$3"
#remove later
#remove later
_clearaccountconf "$1"
_clearaccountconf "$1"
}
}
...
@@ -4455,7 +4463,7 @@ $_authorizations_map"
...
@@ -4455,7 +4463,7 @@ $_authorizations_map"
_savedomainconf "Le_RealCertPath" "$_real_cert"
_savedomainconf "Le_RealCertPath" "$_real_cert"
_savedomainconf "Le_RealCACertPath" "$_real_ca"
_savedomainconf "Le_RealCACertPath" "$_real_ca"
_savedomainconf "Le_RealKeyPath" "$_real_key"
_savedomainconf "Le_RealKeyPath" "$_real_key"
_savedomainconf
"Le_ReloadCmd"
"
$_reload_cmd
"
_savedomainconf "Le_ReloadCmd" "$_reload_cmd"
"base64"
_savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
_savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
if ! _installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"; then
if ! _installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"; then
return 1
return 1
...
@@ -4522,6 +4530,7 @@ renew() {
...
@@ -4522,6 +4530,7 @@ renew() {
fi
fi
IS_RENEW="1"
IS_RENEW="1"
Le_ReloadCmd="$(_readdomainconf Le_ReloadCmd)"
issue "$Le_Webroot" "$Le_Domain" "$Le_Alt" "$Le_Keylength" "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath" "$Le_PreHook" "$Le_PostHook" "$Le_RenewHook" "$Le_LocalAddress" "$Le_ChallengeAlias"
issue "$Le_Webroot" "$Le_Domain" "$Le_Alt" "$Le_Keylength" "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath" "$Le_PreHook" "$Le_PostHook" "$Le_RenewHook" "$Le_LocalAddress" "$Le_ChallengeAlias"
res="$?"
res="$?"
if [ "$res" != "0" ]; then
if [ "$res" != "0" ]; then
...
@@ -4802,7 +4811,7 @@ installcert() {
...
@@ -4802,7 +4811,7 @@ installcert() {
_savedomainconf "Le_RealCertPath" "$_real_cert"
_savedomainconf "Le_RealCertPath" "$_real_cert"
_savedomainconf "Le_RealCACertPath" "$_real_ca"
_savedomainconf "Le_RealCACertPath" "$_real_ca"
_savedomainconf "Le_RealKeyPath" "$_real_key"
_savedomainconf "Le_RealKeyPath" "$_real_key"
_savedomainconf
"Le_ReloadCmd"
"
$_reload_cmd
"
_savedomainconf "Le_ReloadCmd" "$_reload_cmd"
"base64"
_savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
_savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
_installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"
_installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment