Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
letsencrypt.sh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
letsencrypt.sh
Commits
561f0626
Commit
561f0626
authored
May 18, 2016
by
Lukas Schauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compatibility with "pretty" json (fixes #202)
parent
969bebef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
CHANGELOG
CHANGELOG
+1
-0
letsencrypt.sh
letsencrypt.sh
+8
-3
No files found.
CHANGELOG
View file @
561f0626
...
...
@@ -14,6 +14,7 @@ This file contains a log of major changes in letsencrypt.sh
### Fixed
- Fixed bug with uppercase names in domains.txt (script now converts everything to lowercase)
- mktemp no longer uses the deprecated `-t` parameter.
- Compatibility with "pretty" json
## [0.1.0] - 2016-03-25
### Changed
...
...
letsencrypt.sh
View file @
561f0626
...
...
@@ -209,6 +209,11 @@ _exiterr() {
exit
1
}
# Remove newlines and whitespace from json
clean_json
()
{
tr
-d
'\r\n'
| _sed
-e
's/ +/ /g'
-e
's/\{ /{/g'
-e
's/ \}/}/g'
-e
's/\[ /[/g'
-e
's/ \]/]/g'
}
# Encode data as url-safe formatted base64
urlbase64
()
{
# urlbase64: base64 encoded string with '+' replaced with '-' and '/' replaced with '_'
...
...
@@ -376,7 +381,7 @@ sign_csr() {
for
altname
in
${
altnames
}
;
do
# Ask the acme-server for new challenge token and extract them from the resulting json block
echo
" + Requesting challenge for
${
altname
}
..."
response
=
"
$(
signed_request
"
${
CA_NEW_AUTHZ
}
"
'{"resource": "new-authz", "identifier": {"type": "dns", "value": "'
"
${
altname
}
"
'"}}'
)
"
response
=
"
$(
signed_request
"
${
CA_NEW_AUTHZ
}
"
'{"resource": "new-authz", "identifier": {"type": "dns", "value": "'
"
${
altname
}
"
'"}}'
| clean_json
)
"
challenges
=
"
$(
printf
'%s\n'
"
${
response
}
"
|
sed
-n
's/.*\("challenges":[^\[]*\[[^]]*]\).*/\1/p'
)
"
repl
=
$'
\n
''{'
# fix syntax highlighting in Vim
...
...
@@ -428,7 +433,7 @@ sign_csr() {
# Ask the acme-server to verify our challenge and wait until it is no longer pending
echo
" + Responding to challenge for
${
altname
}
..."
result
=
"
$(
signed_request
"
${
challenge_uris
[
${
idx
}
]
}
"
'{"resource": "challenge", "keyAuthorization": "'
"
${
keyauth
}
"
'"}'
)
"
result
=
"
$(
signed_request
"
${
challenge_uris
[
${
idx
}
]
}
"
'{"resource": "challenge", "keyAuthorization": "'
"
${
keyauth
}
"
'"}'
| clean_json
)
"
reqstatus
=
"
$(
printf
'%s\n'
"
${
result
}
"
| get_json_string_value status
)
"
...
...
@@ -678,7 +683,7 @@ command_revoke() {
echo
"Revoking
${
cert
}
"
cert64
=
"
$(
openssl x509
-in
"
${
cert
}
"
-inform
PEM
-outform
DER | urlbase64
)
"
response
=
"
$(
signed_request
"
${
CA_REVOKE_CERT
}
"
'{"resource": "revoke-cert", "certificate": "'
"
${
cert64
}
"
'"}'
)
"
response
=
"
$(
signed_request
"
${
CA_REVOKE_CERT
}
"
'{"resource": "revoke-cert", "certificate": "'
"
${
cert64
}
"
'"}'
| clean_json
)
"
# if there is a problem with our revoke request _request (via signed_request) will report this and "exit 1" out
# so if we are here, it is safe to assume the request was successful
echo
" + Done."
...
...
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