Commit Graph

862 Commits

Author SHA1 Message Date
Christopher Engelhard 2910be82a4 revert change of --no-color option 2020-08-21 09:54:47 +02:00
Christopher Engelhard 07fdb087dc fix typo 2020-08-21 09:53:04 +02:00
Christopher Engelhard 58150f5dcd change --pkcs to --pkcs12 2020-08-21 09:53:04 +02:00
Christopher Engelhard e7a6ff39f9 fix wrong indentation 2020-08-21 09:53:04 +02:00
Christopher Engelhard b086afb272 fix some more issues in showhelp() 2020-08-21 09:53:04 +02:00
Christopher Engelhard 7decf76883 group commands logically, rearrange option forms in _process()
Commands have been reordered in showhelp() to a more consistent grouping,
help > version > install > certs > csr > account > cron > other

All option alternatives in _process() case statement have been reordered toshow the canonical variants first, legacy variants after.
2020-08-21 09:53:04 +02:00
Christopher Engelhard d81369d63a add hyphenated options, fix wrong -ccr in usage() 2020-08-21 09:53:04 +02:00
Christopher Engelhard c0fbe8237b reformat usage message for consistency & clarity 2020-08-21 09:53:04 +02:00
neil b7b01999d9
fix preferred chain for renewal
fix https://github.com/acmesh-official/acme.sh/issues/3116
2020-08-20 09:13:44 +08:00
neil bb3a986859 Merge branch 'dev' of https://github.com/acmesh-official/acme.sh into dev 2020-08-18 23:28:25 +08:00
neil 50fefc3bb0 minor 2020-08-18 23:28:06 +08:00
Oliver Burgmaier 2d5f14388e Revert "Removed content for clean pull request"
This reverts commit ab47bf6451.
2020-08-18 14:52:23 +02:00
Oliver Burgmaier ab47bf6451 Removed content for clean pull request 2020-08-18 14:01:02 +02:00
Oliver Burgmaier d8bd45c2bd Fix issue #2833 with backslash in JSON
Backslash will be removed form JSON responses for each request
and for the initial configuration request
2020-08-18 13:53:48 +02:00
neil 19c4345162 fix shfmt 2020-08-17 22:18:20 +08:00
neil d5d38b3331 support multiple intermediate CA matching for `--preferred-chain` 2020-08-17 22:06:02 +08:00
neil bd04638d27 minor 2020-08-16 17:36:24 +08:00
neil e3ebd582ec support "--preferred-chain" to select chain
https://github.com/acmesh-official/acme.sh/wiki/Preferred-Chain
2020-08-16 16:57:06 +08:00
neil 95ef046d0a fix https://github.com/acmesh-official/acme.sh/issues/3103 2020-08-15 12:32:15 +08:00
neil b3a801df11 fix test endpoint 2020-08-15 10:33:24 +08:00
neil a6d22e3b22 1. save the CA url anyway.
2. clear some code.
2020-08-13 23:12:30 +08:00
neil 1177cc3f29 fix format 2020-08-12 22:09:37 +08:00
neil 269847d19d Add CA name to the `--list` command output. 2020-08-12 21:45:20 +08:00
neil df22f68088 Add info for set-default-ca 2020-08-12 21:25:35 +08:00
neil d83d8552b8 Add "--server" wiki 2020-08-12 21:17:15 +08:00
neil 365aa69afd fix format 2020-08-12 20:48:53 +08:00
neil 578c338d40 Display ZeroSSL usage 2020-08-12 20:48:53 +08:00
neil 389518e1b8 1. move email to ca conf
2. get EAB credentials from Zerossl by email automatically
2020-08-12 20:48:53 +08:00
neil d42ff227f1 fix format 2020-08-12 20:48:53 +08:00
neil 737e9e48ca 1. Support short names for `--server` parameter, The valid values are: letsencrypt, letsencrypt_test, buypass, buypass_test and zerossl
2. Support Zerossl.com acme protocol.
3. Add "--set-default-ca  --server xxxx" command to set the default CA to use.
2020-08-12 20:48:52 +08:00
neil f96d91cb6c eab 2020-08-12 20:48:52 +08:00
neil 85503655ab Display ZeroSSL usage 2020-08-12 20:47:17 +08:00
neil 8d811760a9 1. move email to ca conf
2. get EAB credentials from Zerossl by email automatically
2020-08-12 20:43:44 +08:00
neil 1e967eceef fix format 2020-08-11 23:45:12 +08:00
neil 7d20db93d3 1. Support short names for `--server` parameter, The valid values are: letsencrypt, letsencrypt_test, buypass, buypass_test and zerossl
2. Support Zerossl.com acme protocol.
3. Add "--set-default-ca  --server xxxx" command to set the default CA to use.
2020-08-11 23:28:52 +08:00
neil e932be0fb3 eab 2020-08-09 09:53:22 +08:00
neil af740592c9
Merge pull request #3073 from vi9076/dev
Fix failed test in acmetest. Item alpine:latest - test 12
2020-08-02 14:41:40 +08:00
neil c9452c9f31
Merge pull request #2574 from rewqazxv/master
Fix sudo issue
2020-08-02 14:31:45 +08:00
Vinton Huang 4f3f4e23e4 Fix failed test in acmetest. Item alpine:latest - test 12: le_test_standandalone_deactivate_v2
- Message of failed test [1]: /root/.acme.sh/acme.sh --deactivate -d testdocker.acme.sh [FAIL]
- Reason of failure: left brace was not escaped. According to the standard [2], if special chars appear first in an ERE, it will produce undefined results.
- egrep from busybox (and thus alpine) take it as an error, but egrep from GNU grep (included in most distros) and *BSD are more tolerant, just ignore it.
- Fix: consider the right brace at the right-hand side of the ERE, the result string will not contain right brace. So the left-hand side should not contain left brace, too.
[1] 446939706e/logs/alpine-latest.out (L119)
[2] 9.4.3 ERE Special Characters, The Open Group Base Specifications. https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html
2020-07-27 03:55:07 +08:00
neil e2a5af1cf7 fix format 2020-07-14 21:49:50 +08:00
neil f31debc09c fix format 2020-07-13 21:03:57 +08:00
neil 6654d7a919 fix format 2020-07-13 20:56:58 +08:00
neil 0ab2cfaf8b
Merge pull request #3029 from licaon-kter/patch-2
Fix typo candindates
2020-07-08 22:25:20 +08:00
grindsa a329547682 prepending for ecc signature
leftpadding "0" if _ec_s and _ec_r are to short
2020-07-08 11:59:20 +02:00
Licaon_Kter dbc435506c
Fix typo candindates 2020-07-07 12:06:37 +00:00
Tony Gravagno 94787d537a
Issue #2849 Trivial variable name fix from apacheMajer to apacheMajor 2020-06-29 11:51:55 -07:00
Tony Gravagno eca57beec1
Issue #2850 : grammar corrections for "exists" and "exist". 2020-06-29 11:29:10 -07:00
grindsa 1fe8235a85 Update acme.sh 2020-05-25 20:28:05 +02:00
neil 15dded712c fix retry
https://github.com/acmesh-official/acme.sh/issues/2939#issuecomment-632481658
2020-05-24 18:04:47 +08:00
Dan Dascalescu 427c278012
Fix sloppy English 2020-05-22 10:28:29 -07:00
neil 59fd48cfe2 support Retry-After header
https://github.com/acmesh-official/acme.sh/issues/2939
2020-05-21 22:32:19 +08:00
neil cc78ab4855
Merge pull request #2923 from mdbraber/add-provider-transip
Add TransIP provider
2020-05-21 22:27:50 +08:00
Maarten den Braber 63031fb278 bugfixes 2020-05-19 20:04:23 +02:00
neil 114f2a1465 fix https://github.com/acmesh-official/acme.sh/issues/2880 2020-05-19 23:26:58 +08:00
Maarten den Braber 5d2777634a Fix forgotten then 2020-05-19 16:43:39 +02:00
Maarten den Braber 2d5b4a0003 Change if-statement for private keys to more portable version 2020-05-19 16:39:49 +02:00
Maarten den Braber a4c57ee363 Add TransIP provider 2020-05-13 15:35:51 +02:00
neil 9044adecb5 start 2.8.7 2020-05-04 08:43:47 +08:00
neil 6ba1eda96f fix https://github.com/acmesh-official/acme.sh/issues/2883#issuecomment-619215961 2020-04-25 22:44:00 +08:00
neil a995333081 fix format 2020-04-18 22:34:32 +08:00
neil 1041c9f9fc support revoke reason.
https://github.com/acmesh-official/acme.sh/issues/2856
2020-04-18 20:03:48 +08:00
Simon Wydooghe 2febdfc363
Fix: allow removal of email address as contact
It seems the current code doesn't allow for removing the email address
from the contact field. This fixes that. This only removes the email
address if an explicit empty email address is specified on the command
line or in the account.conf file. If it is left unspecified on the
command line it still just uses whatever was configured in the
account.conf.
2020-04-17 15:53:15 +02:00
neil 93de1e4903 un-escape json chars
fix https://github.com/acmesh-official/acme.sh/issues/2833
2020-04-12 11:48:24 +08:00
Oliver Burgmaier 7595808d26 fix #2828 mailto compliant to RFC6068
This fix removes the space between "mailto:" and the email address to
make the contact attribute compliant to RFC6068.
2020-04-01 20:35:07 +02:00
Oliver Burgmaier 37d22a144a fix #2830 Autorization segment typo fixed
This fixes the parsing of the authorization segment in the response of
an order. Without this fix the start of the array is not found
correctly and therefore the finalize URL is part of the authorization
segment. Changing the regex to *\[[^\[]*\] fix this. Seems to be a typo
which has not been recognized so far. This can be only recognized if
the response is in a single line.
2020-04-01 20:31:06 +02:00
Oliver Burgmaier dc697a6862 fix #2830 Autorization segment typo fixed
This fixes the parsing of the authorization segment in the response of
an order. Without this fix the start of the array is not found
correctly and therefore the finalize URL is part of the authorization
segment. Changing the regex to *\[[^\[]*\] fix this. Seems to be a typo
which has not been recognized so far. This can be only recognized if
the response is in a single line.
2020-04-01 20:24:40 +02:00
Xiaohui Lam ff9be30f86
resolved #2818 2020-03-31 03:10:12 +08:00
Oliver Blaha cb7e38577d add support for upgrade from tag 2020-03-24 14:44:35 +01:00
neil 3d81641139 fix format 2020-03-09 19:04:32 +08:00
neil 0f24417cb3
Merge pull request #2769 from ianw/update-account-json
Update account.json on account update
2020-03-07 19:50:17 +08:00
neil f84a87f2a2 remove DEFAULT_DNS_SLEEP.
fix https://github.com/acmesh-official/acme.sh/issues/2773
2020-03-07 18:26:22 +08:00
Ian Wienand 72e1a1b2e9 Update account.json on account update
When running --updateaccount, the ca/<ca>/account.json file isn't
updated with the new response showing the updated account details.
This can be a bit confusing if you add an email to the account but
then you're not sure if it actually applied looking at this file.

Write out the new response on successful account updates.
2020-03-04 12:28:21 +11:00
alex 22f9a3b467 Fix error on docker deploy command with spaces.
This adds quotes to the last eval in _getdeployconf which is reponsible
for loading and exporting saved environment variables back into the
acme.sh process. This caused some errors if used with the docker
deploy-hook and the example nginx "service nginx force-reload" command
as it contains spaces.
2020-02-25 12:37:46 +01:00
xpac1985 463df9e4ba
Make socat debug output show version + features instead of help text 2020-02-18 16:26:15 +01:00
neil 490fbfc13e
Merge pull request #2701 from xpac1985/patch-1
Updated/fixed some entries in --help output
2020-01-31 16:32:13 +08:00
neilpang 09f74a9af8 start v2.8.6, change the repo name 2020-01-30 10:50:39 +08:00
neilpang f8b225e70e fix format 2020-01-27 23:30:36 +08:00
neilpang fc3a181779 move the error message 2020-01-27 23:07:10 +08:00
neilpang 9541ea6a9f fix bug https://github.com/Neilpang/acme.sh/issues/2695
If a domain was already verified by http-01 method,  when we try to issue a cert for them same domain with dns-01 method, we just get only one challenge object of type http-01 with "valid" status, from the authz-v3 url. So, we report error that we are not able the validate the domain, because of that we don't find dns-01 challenge.
This behavior is not the same as before. I believe it was changed by the letsencrypt CA.
2020-01-27 23:07:10 +08:00
neilpang f716f6060e minor check update hash for branch name 2020-01-27 23:02:09 +08:00
neilpang 05aa26e619 minor, remove space key 2020-01-27 21:22:42 +08:00
xpac1985 b6552aff75
Added maximum account key length to --help output 2020-01-22 21:21:38 +01:00
xpac1985 3c98fae4f2
Updated/fixed some entries in --help output 2020-01-22 20:00:04 +01:00
rewqazxv 79ad0ff56b Simplify code 2020-01-15 22:11:34 +08:00
neilpang baff032e3b Merge branch 'up' into dev 2020-01-15 22:05:37 +08:00
neilpang 26309f51e3 start 2.8.5 2020-01-15 22:04:49 +08:00
neilpang f8f53a6bd9 debug 2020-01-15 22:01:34 +08:00
neilpang ac3667c765 fix https://github.com/Neilpang/acme.sh/issues/2693 2020-01-15 21:43:49 +08:00
neil 0712e98904 fix https://github.com/Neilpang/acme.sh/pull/2559 2020-01-12 13:36:24 +08:00
neilpang 7a3c61b744 check upgrade hash
https://github.com/Neilpang/acme.sh/issues/2667
2020-01-03 21:38:47 +08:00
neil f59f484c01
Merge pull request #2657 from gildea/master
Return failure when falling through limiting loop
2020-01-01 18:28:30 +08:00
gildea a44ea0ddf0
Return failure when falling through limiting loop
In _send_signed_request and _check_dns_entries, return 1 when the
timeout (or number of retries) has been exhausted.  This allows
the calling function to correctly handle the error.
2019-12-31 20:22:08 -08:00
Zbyszek Żółkiewski 5014f83b86
Fix case sensitive detection of domain in the response request 2019-12-06 09:59:35 +01:00
neil aac9f089d9
Merge pull request #2583 from JohnVillalovos/dev
debug_bash_helper: Use eval as busybox systems have problems
2019-11-15 22:23:07 +08:00
John L. Villalovos adce8f52e8 debug_bash_helper: Use eval as busybox systems have problems
In _debug_bash_helper use eval as we are seeing issues with busybox
systems having issues with array access. Even though they aren't
actually running the code they appear to be parsing it and failing.

Also older versions of busybox have a bug with eval and double quotes,
so make sure to use single quotes when using eval.

Resolves: #2579
2019-11-13 14:30:19 -08:00
arlecchino 867ec010ab
Fix callhook error in manual mode
Fixes #1586  
Check force manual switch before causing error about it.
2019-11-12 19:58:36 +01:00
rewqazxv 6a5ee72722 format code style 2019-11-06 20:27:12 +08:00
rewqazxv c6ec8bc0d9 fix sudo issue 2019-11-06 18:57:05 +08:00
neil eb6238781d
Merge pull request #2546 from JohnVillalovos/master
Improve debug capabilities when using bash
2019-11-03 19:41:51 +08:00
neilpang 5698bec621 fix https://github.com/Neilpang/acme.sh/issues/2566 2019-11-02 09:48:41 +08:00