Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
8a29fbc8
Commit
8a29fbc8
authored
Oct 28, 2016
by
neilpang
Browse files
do not register account if already registered
parent
00bcbd36
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
8a29fbc8
...
@@ -1223,60 +1223,85 @@ _setopt() {
...
@@ -1223,60 +1223,85 @@ _setopt() {
_debug2
"
$(
grep
-n
"^
$__opt$__sep
"
$__conf
)
"
_debug2
"
$(
grep
-n
"^
$__opt$__sep
"
$__conf
)
"
}
}
#_savedomainconf key value
#save to domain.conf
#_save_conf file key value
_savedomainconf
()
{
#save to conf
_sdkey
=
"
$1
"
_save_conf
()
{
_sdvalue
=
"
$2
"
_s_c_f
=
"
$1
"
if
[
"
$DOMAIN_CONF
"
]
;
then
_sdkey
=
"
$2
"
_setopt
"
$DOMAIN_CONF
"
"
$_sdkey
"
"="
"
\"
$_sdvalue
\"
"
_sdvalue
=
"
$3
"
if
[
"
$_s_c_f
"
]
;
then
_setopt
"
$_s_c_f
"
"
$_sdkey
"
"="
"'
$_sdvalue
'"
else
else
_err
"
DOMAIN_CONF
is empty, can not save
$_sdkey
=
$_sdvalue
"
_err
"
config file
is empty, can not save
$_sdkey
=
$_sdvalue
"
fi
fi
}
}
#_cleardomainconf key
#_clear_conf file key
_cleardomainconf
()
{
_clear_conf
()
{
_sdkey
=
"
$1
"
_c_c_f
=
"
$1
"
if
[
"
$DOMAIN_CONF
"
]
;
then
_sdkey
=
"
$2
"
_sed_i
"s/^
$_sdkey
.*
$/
/"
"
$DOMAIN_CONF
"
if
[
"
$_c_c_f
"
]
;
then
_sed_i
"s/^
$_sdkey
.*
$/
/"
"
$_c_c_f
"
else
else
_err
"
DOMAIN_CONF
is empty, can not
save
$_sdkey
=
$value
"
_err
"
config file
is empty, can not
clear
"
fi
fi
}
}
#_readdomainconf key
#_read_conf file key
_readdomainconf
()
{
_read_conf
()
{
_sdkey
=
"
$1
"
_r_c_f
=
"
$1
"
if
[
"
$DOMAIN_CONF
"
]
;
then
_sdkey
=
"
$2
"
if
[
-f
"
$_r_c_f
"
]
;
then
(
(
eval
$(
grep
"^
$_sdkey
*="
"
$
DOMAIN_CONF
"
)
eval
$(
grep
"^
$_sdkey
*="
"
$
_r_c_f
"
)
eval
"printf
\"
%s
\"
\"\$
$_sdkey
\"
"
eval
"printf
\"
%s
\"
\"\$
$_sdkey
\"
"
)
)
else
else
_err
"
DOMAIN_CONF
is empty, can not read
$_sdkey
"
_err
"
config file
is empty, can not read
$_sdkey
"
fi
fi
}
}
#_savedomainconf key value
#save to domain.conf
_savedomainconf
()
{
_save_conf
"
$DOMAIN_CONF
"
"
$1
"
"
$2
"
}
#_cleardomainconf key
_cleardomainconf
()
{
_clear_conf
"
$DOMAIN_CONF
"
"
$1
"
}
#_readdomainconf key
_readdomainconf
()
{
_read_conf
"
$DOMAIN_CONF
"
"
$1
"
}
#_saveaccountconf key value
#_saveaccountconf key value
_saveaccountconf
()
{
_saveaccountconf
()
{
_sckey
=
"
$1
"
_save_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
"
$2
"
_scvalue
=
"
$2
"
if
[
"
$ACCOUNT_CONF_PATH
"
]
;
then
_setopt
"
$ACCOUNT_CONF_PATH
"
"
$_sckey
"
"="
"'
$_scvalue
'"
else
_err
"ACCOUNT_CONF_PATH is empty, can not save
$_sckey
=
$_scvalue
"
fi
}
}
#_clearaccountconf key
#_clearaccountconf key
_clearaccountconf
()
{
_clearaccountconf
()
{
_scvalue
=
"
$1
"
_clear_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
if
[
"
$ACCOUNT_CONF_PATH
"
]
;
then
}
_sed_i
"s/^
$_scvalue
.*
$/
/"
"
$ACCOUNT_CONF_PATH
"
else
#_savecaconf key value
_err
"ACCOUNT_CONF_PATH is empty, can not clear
$_scvalue
"
_savecaconf
()
{
fi
_save_conf
"
$CA_CONF
"
"
$1
"
"
$2
"
}
#_readcaconf key
_readcaconf
()
{
_read_conf
"
$CA_CONF
"
"
$1
"
}
#_clearaccountconf key
_clearcaconf
()
{
_clear_conf
"
$CA_CONF
"
"
$1
"
}
}
# content localaddress
# content localaddress
...
@@ -2047,6 +2072,10 @@ registeraccount() {
...
@@ -2047,6 +2072,10 @@ registeraccount() {
_regAccount
_regAccount
}
}
__calcAccountKeyHash
()
{
cat
"
$ACCOUNT_KEY_PATH
"
| _digest sha256
}
_regAccount
()
{
_regAccount
()
{
_initpath
_initpath
...
@@ -2131,6 +2160,10 @@ _regAccount() {
...
@@ -2131,6 +2160,10 @@ _regAccount() {
fi
fi
if
[
"
$code
"
=
'202'
]
;
then
if
[
"
$code
"
=
'202'
]
;
then
_info
"Update success."
_info
"Update success."
CA_KEY_HASH
=
"
$(
__calcAccountKeyHash
)
"
_debug
"Calc CA_KEY_HASH"
"
$CA_KEY_HASH
"
_savecaconf CA_KEY_HASH
"
$CA_KEY_HASH
"
else
else
_err
"Update account error."
_err
"Update account error."
return
1
return
1
...
@@ -2280,11 +2313,15 @@ issue() {
...
@@ -2280,11 +2313,15 @@ issue() {
return
1
return
1
fi
fi
if
!
_regAccount
;
then
_saved_account_key_hash
=
"
$(
_readcaconf
"CA_KEY_HASH"
)
"
_on_issue_err
_debug2 _saved_account_key_hash
"
$_saved_account_key_hash
"
return
1
fi
if
[
-z
"
$_saved_account_key_hash
"
]
||
[
"
$_saved_account_key_hash
"
!=
"
$(
__calcAccountKeyHash
)
"
]
;
then
if
!
_regAccount
;
then
_on_issue_err
return
1
fi
fi
if
[
-f
"
$CSR_PATH
"
]
&&
[
!
-f
"
$CERT_KEY_PATH
"
]
;
then
if
[
-f
"
$CSR_PATH
"
]
&&
[
!
-f
"
$CERT_KEY_PATH
"
]
;
then
_info
"Signing from existing CSR."
_info
"Signing from existing CSR."
...
...
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