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
948e8750
Commit
948e8750
authored
Dec 28, 2015
by
neil
Browse files
minor, change base64 encoding
parent
10af90d6
Changes
1
Show whitespace changes
Inline
Side-by-side
le.sh
View file @
948e8750
...
@@ -129,7 +129,6 @@ _b64() {
...
@@ -129,7 +129,6 @@ _b64() {
__n
=
$__n$__line
__n
=
$__n$__line
done
;
done
;
__n
=
$(
echo
$__n
|
sed
"s|/|_|g"
)
__n
=
$(
echo
$__n
|
sed
"s|/|_|g"
)
__n
=
$(
echo
$__n
|
sed
"s| ||g"
)
__n
=
$(
echo
$__n
|
sed
"s|+|-|g"
)
__n
=
$(
echo
$__n
|
sed
"s|+|-|g"
)
__n
=
$(
echo
$__n
|
sed
"s|=||g"
)
__n
=
$(
echo
$__n
|
sed
"s|=||g"
)
echo
$__n
echo
$__n
...
@@ -149,7 +148,7 @@ _send_signed_request() {
...
@@ -149,7 +148,7 @@ _send_signed_request() {
if
[
"
$DEBUG
"
]
;
then
if
[
"
$DEBUG
"
]
;
then
CURL
=
"
$CURL
--trace-ascii
$dp
"
CURL
=
"
$CURL
--trace-ascii
$dp
"
fi
fi
payload64
=
$(
echo
-n
$payload
|
base64
| _b64
)
payload64
=
$(
echo
-n
$payload
|
base64
-w
0
| _b64
)
_debug payload64
$payload64
_debug payload64
$payload64
nonceurl
=
"
$API
/directory"
nonceurl
=
"
$API
/directory"
...
@@ -160,17 +159,17 @@ _send_signed_request() {
...
@@ -160,17 +159,17 @@ _send_signed_request() {
protected
=
$(
echo
-n
"
$HEADERPLACE
"
|
sed
"s/NONCE/
$nonce
/"
)
protected
=
$(
echo
-n
"
$HEADERPLACE
"
|
sed
"s/NONCE/
$nonce
/"
)
_debug protected
"
$protected
"
_debug protected
"
$protected
"
protected64
=
$(
echo
-n
$protected
|
base64
| _b64
)
protected64
=
$(
echo
-n
$protected
|
base64
-w
0
| _b64
)
_debug protected64
"
$protected64
"
_debug protected64
"
$protected64
"
sig
=
$(
echo
-n
"
$protected64
.
$payload64
"
| openssl dgst
-sha256
-sign
$ACCOUNT_KEY_PATH
|
base64
| _b64
)
sig
=
$(
echo
-n
"
$protected64
.
$payload64
"
| openssl dgst
-sha256
-sign
$ACCOUNT_KEY_PATH
|
base64
-w
0
| _b64
)
_debug sig
"
$sig
"
_debug sig
"
$sig
"
body
=
"{
\"
header
\"
:
$HEADER
,
\"
protected
\"
:
\"
$protected64
\"
,
\"
payload
\"
:
\"
$payload64
\"
,
\"
signature
\"
:
\"
$sig
\"
}"
body
=
"{
\"
header
\"
:
$HEADER
,
\"
protected
\"
:
\"
$protected64
\"
,
\"
payload
\"
:
\"
$payload64
\"
,
\"
signature
\"
:
\"
$sig
\"
}"
_debug body
"
$body
"
_debug body
"
$body
"
if
[
"
$needbase64
"
]
;
then
if
[
"
$needbase64
"
]
;
then
response
=
"
$(
$CURL
-X
POST
--data
"
$body
"
$url
|
base64
)
"
response
=
"
$(
$CURL
-X
POST
--data
"
$body
"
$url
|
base64
-w
0
)
"
else
else
response
=
"
$(
$CURL
-X
POST
--data
"
$body
"
$url
)
"
response
=
"
$(
$CURL
-X
POST
--data
"
$body
"
$url
)
"
fi
fi
...
@@ -287,7 +286,7 @@ issue() {
...
@@ -287,7 +286,7 @@ issue() {
_debug e
"
$e
"
_debug e
"
$e
"
modulus
=
$(
openssl rsa
-in
$ACCOUNT_KEY_PATH
-modulus
-noout
|
cut
-d
'='
-f
2
)
modulus
=
$(
openssl rsa
-in
$ACCOUNT_KEY_PATH
-modulus
-noout
|
cut
-d
'='
-f
2
)
n
=
$(
echo
$modulus
| xxd
-r
-p
|
base64
| _b64
)
n
=
$(
echo
$modulus
| xxd
-r
-p
|
base64
-w
0
| _b64
)
jwk
=
'{"e": "'
$e
'", "kty": "RSA", "n": "'
$n
'"}'
jwk
=
'{"e": "'
$e
'", "kty": "RSA", "n": "'
$n
'"}'
...
@@ -296,7 +295,7 @@ issue() {
...
@@ -296,7 +295,7 @@ issue() {
_debug HEADER
"
$HEADER
"
_debug HEADER
"
$HEADER
"
accountkey_json
=
$(
echo
-n
"
$jwk
"
|
sed
"s/ //g"
)
accountkey_json
=
$(
echo
-n
"
$jwk
"
|
sed
"s/ //g"
)
thumbprint
=
$(
echo
-n
"
$accountkey_json
"
|
sha256sum
| xxd
-r
-p
|
base64
| _b64
)
thumbprint
=
$(
echo
-n
"
$accountkey_json
"
|
sha256sum
| xxd
-r
-p
|
base64
-w
0
| _b64
)
_info
"Registering account"
_info
"Registering account"
...
@@ -394,7 +393,7 @@ issue() {
...
@@ -394,7 +393,7 @@ issue() {
done
done
_info
"Verify finished, start to sign."
_info
"Verify finished, start to sign."
der
=
"
$(
openssl req
-in
$CSR_PATH
-outform
DER |
base64
| _b64
)
"
der
=
"
$(
openssl req
-in
$CSR_PATH
-outform
DER |
base64
-w
0
| _b64
)
"
_send_signed_request
"
$API
/acme/new-cert"
"{
\"
resource
\"
:
\"
new-cert
\"
,
\"
csr
\"
:
\"
$der
\"
}"
"needbase64"
_send_signed_request
"
$API
/acme/new-cert"
"{
\"
resource
\"
:
\"
new-cert
\"
,
\"
csr
\"
:
\"
$der
\"
}"
"needbase64"
...
@@ -417,7 +416,7 @@ issue() {
...
@@ -417,7 +416,7 @@ issue() {
_setopt
$DOMAIN_CONF
"Le_Keylength"
"="
"
$Le_Keylength
"
_setopt
$DOMAIN_CONF
"Le_Keylength"
"="
"
$Le_Keylength
"
if
[
-z
"
$Le_LinkCert
"
]
;
then
if
[
-z
"
$Le_LinkCert
"
]
;
then
response
=
"
$(
echo
$response
|
sed
's/ //g'
|
base64
-d
)
"
response
=
"
$(
echo
$response
|
base64
-d
)
"
_info
"Sign failed:
$(
echo
"
$response
"
|
grep
-o
'"detail":"[^"]*"'
)
"
_info
"Sign failed:
$(
echo
"
$response
"
|
grep
-o
'"detail":"[^"]*"'
)
"
return
1
return
1
fi
fi
...
...
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