Commit Graph

995 Commits

Author SHA1 Message Date
PMExtra 057c95bd1c improve `wget --content-on-error` condition 2022-12-23 17:39:51 +08:00
PMExtra 0cafc00c4f append --fail-with-body argument to curl if supported 2022-12-23 17:22:12 +08:00
neil 75d2898efd
Merge pull request #4441 from plummer86/bugfix/_wget_out_fix
Fix assignment: _wget_out
2022-12-19 10:23:00 +08:00
plummer86 764a4c99fa Fix assignment to _wget_out 2022-12-18 22:32:49 +00:00
neil a2af26635f use ecc cert 2022-12-04 15:05:30 +08:00
neil 63869deeb2
Merge pull request #4091 from PMExtra/feature/ssh_scp
Refact ssh hook to use deploy config, support scp and support specifying port
2022-12-03 13:58:31 +08:00
neil a19f7481b2
Merge pull request #4410 from kirisakow/patch-1
Trim trailing slash in `--home` argument's value from the get-go to avoid that subsequently created paths contain two adjacent slashes in the middle
2022-11-28 09:58:46 +08:00
Kiril Isakov 264b9819ff
Replace the BASH parameter substitution mechanism (unsupported by sh) with standard commands (supported by sh) 2022-11-27 09:22:06 +01:00
Kiril Isakov 9f942a6b65
Trim trailing slash in `--home` argument's value
# What's expected

Since in `acme.sh` path strings are concatenated with a hardcoded slash in between, the left operand must never end with a trailing slash for the resulting path to be valid. Otherwise, obviously, the resulting path will have two adjacent slashes in the middle and will not be valid.

# What actually happens

Even though I cannot tell for each of the input params, I know this for sure for the the `--home` argument's value.

If I run `acme.sh` with `--home` argument's value being a path ending in a trailing slash,

```sh
acme.sh ... --debug ... --home /some/path/ ... -d somedomainna.me ...
```

I get the following (distinct) occurrencies of resulting invalid paths containing two adjacent slashes:

```
[...] Using config home:/some/path/

[...] DOMAIN_PATH='/some/path//somedomainna.me'

[...] _CURL='curl --silent --dump-header /some/path//http.header  -L  -g '

[...] The domain key is here: /some/path//somedomainna.me/somedomainna.me.key

[...] _CURL='curl --silent --dump-header /some/path//http.header  -L  -g  -I  '

[...] Your cert is in: /some/path//somedomainna.me/somedomainna.me.cer

[...] Your cert key is in: /some/path//somedomainna.me/somedomainna.me.key

[...] The intermediate CA cert is in: /some/path//somedomainna.me/ca.cer

[...] And the full chain certs is there: /some/path//somedomainna.me/fullchain.cer

```

# Suggested fix

Trim trailing slash in `--home` argument's value from the get-go.
2022-11-26 16:00:03 +01:00
neil ec0e871592 Use ec-256 as default key length
fix https://github.com/acmesh-official/acme.sh/issues/2350#issuecomment-1324029469
2022-11-23 21:57:38 +08:00
neil 7a756ebc4d start v3.0.6 2022-11-23 21:55:19 +08:00
neil c9a55f395b fix doh
https://github.com/acmesh-official/acme.sh/issues/4369
2022-10-29 10:08:42 +08:00
neil 1c16931e26 add Le_Next_Domain_Key for tlsa
fix https://github.com/acmesh-official/acme.sh/issues/3096
Usage: https://github.com/acmesh-official/acme.sh/wiki/tlsa-next-key
2022-10-16 16:06:01 +08:00
Adam Tao 666c716bda Fix error during saving conf
There might be '|' in __val (e.g., SYNO_Password), which will cause that
all content of the conf file is cleared. Fix it by escaping '|'
manually.

Signed-off-by: Adam Tao <tcx4c70@gmail.com>
2022-10-11 20:45:31 +08:00
neil be477d7ae3
Merge pull request #4259 from Mon-ius/master
fix a issue, when profile not end with newline
2022-10-05 14:20:01 +08:00
neil f8ca6d9833 fix https://github.com/acmesh-official/acme.sh/issues/1335 2022-10-05 13:14:25 +08:00
neil dbab519004
Merge pull request #4252 from agowa338/agowa338-patch-1
Fix missing HTTP_HEADER for _get with wget
2022-10-04 11:20:12 +08:00
neilpang d761bdc1b1 minor, just indent usage 2022-09-30 18:03:47 +08:00
Klaus Frank 41dbf1ddac
use _contains instead of grep 2022-09-27 22:47:35 +02:00
neil dd207e1f02 fix https://github.com/acmesh-official/acme.sh/issues/4285 2022-09-24 22:00:39 +08:00
Klaus Frank c2a7e384ba
Fix linting issue 2022-09-18 22:03:52 +02:00
Klaus Frank 4a8b35ef5f
Merge branch 'acmesh-official:master' into agowa338-patch-1 2022-09-18 22:00:49 +02:00
neil 0a47f48191 fix https://github.com/acmesh-official/acme.sh/issues/4301 2022-09-08 22:09:39 +08:00
neil 8601267b90 fix https://github.com/acmesh-official/acme.sh/issues/4301 2022-09-08 21:56:49 +08:00
Klaus Frank 864315f6d1 Use literal space
Replace [[:space:]] with " "
2022-08-24 19:34:37 +02:00
Klaus Frank 713b7338ea demultiplex wget debug output 2022-08-24 19:34:37 +02:00
Klaus Frank 53117b2f4c Fix missing HTTP_HEADER for _get with wget
Save http header to file for _get with wget.
2022-08-24 19:34:36 +02:00
Monius b95f836256 final try 2022-08-23 06:30:09 +08:00
Monius 5a604bfdee shfmt check? 2022-08-22 15:16:30 +08:00
Monius 6502a71083 fix, but remove debug info 2022-08-22 05:26:12 +08:00
Monius f2634b44cd add EOF, if $__conf not end with one 2022-08-21 12:26:37 +08:00
Monius dcf9c467c3 fix issue, when profile not end with newline 2022-08-20 19:37:51 +08:00
neil 7169060425 fix https://github.com/acmesh-official/acme.sh/issues/4248#issuecomment-1217378906 2022-08-20 10:54:17 +08:00
neil 039e4c662d rename the csr/key file if the cert is revoked. 2022-08-18 21:10:38 +08:00
neilpang 204e5f4418 fix https://github.com/acmesh-official/acme.sh/issues/4232 2022-08-08 18:22:07 +08:00
neil d0c2fb9761 fix https://github.com/acmesh-official/acme.sh/issues/3833#issuecomment-1203652970 2022-08-03 23:07:13 +08:00
neil 328dbd57d4 fix for solaris 2022-07-24 16:20:44 +08:00
neil 9c757bbe6e
Update acme.sh 2022-07-07 20:01:43 +08:00
Ian Wienand be7840c827 Exit with separate failure if in DNS manual mode
In our environment we use DNS manual mode and take the TXT record
output of acme.sh and process it with Ansible to install the records
(then we call renew later when the records have been pushed to the DNS
servers by a whole bunch of other bits).

One problem is that after getting/showing the TXT records, acme.sh
always returns 1.  This makes it difficult to tell if there is
actually an error condition.

Since we have set the manual-mode flag, not installing the DNS records
is an expected correct result.  This returns a separate error code for
this situation (3), which can be distinguished in automation.
2022-07-06 06:20:28 +10:00
neilpang 7746042adc fix https://github.com/acmesh-official/acme.sh/issues/4160
fix https://github.com/acmesh-official/acme.sh/issues/4160
2022-06-30 23:07:18 +08:00
neilpang 5440fcdf54 check the file path before copying 2022-06-01 18:05:51 +08:00
PM Extra f90cbb636a fix format 2022-05-14 22:41:59 +08:00
PM Extra 9fb5bb620d refact ssh hook to use deploy config 2022-05-14 22:28:02 +08:00
Clark Boylan b376dfa1e6 Fix Le_Keylength checks during renewals
When performing renewals acme.sh checks key length values to determine
if a new key should be created with createDomainKey(). However, older
acme.sh stored key length as an empty value if the default of 2048 was
desired. Now it is explicit and the explict check of 2048 against "" is
causing createDomainKey() to always be called with fails without
--force.

Fix this by converting the keylength value to 2048 if an empty string is
returned from the config file. acme.sh will then write out 2048 updating
old keys and configs to the explicit version.

Issue: 4077
2022-05-10 10:42:19 -07:00
neil e1d7a6b9ac fix renew server 2022-05-10 22:22:13 +08:00
neil 38778f8adc fix renew server 2022-05-10 22:22:12 +08:00
neil 8b7a86bd17 support "server" for renew and renewall 2022-05-10 22:22:12 +08:00
neilpang 619bae745b start 3.0.5 2022-05-10 22:22:12 +08:00
neilpang 8d783e8e1f fix https://github.com/acmesh-official/acme.sh/issues/4069 2022-05-06 18:04:29 +08:00
neilpang f03098551e start 3.0.4 2022-05-04 18:44:37 +08:00