Commit Graph

4471 Commits

Author SHA1 Message Date
Brian Hartvigsen
dcb51683c5
shellcheck cleanup
shellcheck sees '\\' as trying to escape the trailing quote (see
koalaman/shellcheck#1548 ).
2021-05-26 15:25:58 -06:00
Brian Hartvigsen
74a4a788b1
Make certificate descriptions sed safe
This escapes special characters used in POSIX sed to prevent mismatches.
e.g. `SYNO_Certficiate=*.example.com` would not match a description of
"*.example.com" and would look to match any number of double quotes (the
last character in the sed regex prior to certificate description),
followed by any single character, followed by "example", followed by any
character, followed by "com".

After this change, it will properly match `*.example.com` and not
`""zexamplefcom`.

Additionally we now store the certificate description as base64 encoded
to prevent issues with single quotes.

Tested on DSM 7.0-41222 (VDSM) and DSM 6.2.4-25556 (DS1515+).
2021-05-26 15:25:58 -06:00
neilpang
7909273a21 add debug info 2021-05-25 21:57:15 +08:00
neil
130e8dbd40
Merge pull request #3522 from acmesh-official/dev
sync
2021-05-23 23:55:23 +08:00
neil
40e2ebed95 remove ngrok token 2021-05-23 23:16:04 +08:00
neil
bf9b33acec use cloudflare tunnel to test 2021-05-23 23:12:46 +08:00
neil
7710a33b6c fix format 2021-05-22 23:48:39 +08:00
neil
af3ea2d4fd remove ACME v1 support 2021-05-22 23:45:50 +08:00
neil
52a3255936
Merge pull request #3520 from tresni/synology_dsm
Better fix for Synology DSM setting wrong default
2021-05-20 23:05:34 +08:00
Brian Hartvigsen
5ab9ca1c0d
Better fix for Synology DSM setting wrong default
As noted by @buxm, previous fix didn't work for all versions of DSM 6.
The better fix appears to be simply not outputting the "as_default"
parameter unless we are doing something with the default certificate.
2021-05-19 13:21:34 -06:00
neil
461f602992
Merge pull request #3505 from willbrowningme/patch-1
dnsapi/dns_desec.sh remove DEDYN_NAME variable
2021-05-08 21:12:56 +08:00
neilpang
46180435cc minor 2021-05-08 21:09:56 +08:00
neil
7f2699c6da
Merge pull request #3511 from acmesh-official/dev
Dev
2021-05-08 21:00:02 +08:00
neilpang
aede5c486b fix https://github.com/acmesh-official/acme.sh/issues/3504
check invalid status first.
2021-05-07 22:02:40 +08:00
neilpang
fb2407386f Merge branch 'dev' of https://github.com/acmesh-official/acme.sh into dev 2021-05-07 21:50:22 +08:00
neilpang
aa59c46c4c fix https://github.com/acmesh-official/acme.sh/issues/3504 2021-05-07 21:49:47 +08:00
Benoit Garret
07afc4953a Fix the shfmt check 2021-05-07 12:12:30 +02:00
Will Browning
c5557fc488
Remove DEDYN_NAME variable from dns_desec.sh 2021-05-06 16:51:43 +01:00
neil
8c14150536
Merge pull request #3350 from temoffey/deploy-gcore_cdn
Deploy gcore_cdn fix
2021-05-05 23:48:37 +08:00
Benoit Garret
c127903127 Add Consul deploy hook 2021-05-05 10:01:09 +02:00
neilpang
0881cf1379 start 2.9.0 2021-05-04 13:32:59 +08:00
neil
d0a16b0ec0
Merge pull request #3499 from acmesh-official/dev
sync
2021-05-03 22:20:20 +08:00
neil
290beb90a7 minor 2021-05-03 17:14:54 +08:00
neil
0a4ef17135 fix nginx relative path issue:
https://github.com/acmesh-official/acme.sh/issues/1743
https://github.com/acmesh-official/acme.sh/issues/1914
2021-05-03 17:11:02 +08:00
neil
e0c32ce700 minor 2021-05-03 16:42:09 +08:00
neil
e65144a105 fix https://github.com/acmesh-official/acme.sh/issues/3487
suppor Ali doh and dnspod doh.
2021-05-03 16:37:13 +08:00
neil
ae40445dba
Merge pull request #3498 from tresni/synology_dsm
FIX: Synology sets "default" on wrong certificate
2021-05-03 15:57:09 +08:00
neil
25a8240d12 fix https://github.com/acmesh-official/acme.sh/issues/3421 2021-05-03 15:52:56 +08:00
Brian Hartvigsen
1a4a180e8c
FIX: Synology sets "default" on wrong certificate
For some DSM installs, it appears that setting the "default" flag to the
string "false" actually sets it to true.  This causes Synology to set
the last updated certificate to be the default certificate.  Using an
empty string appears to still be accepted as a false-y value for DSMs
where this isn't happening and corrects the behavior in the cases that
it was.

Credit to @Run-King for identifying the fix and @buxm for reporting.
2021-05-02 13:37:59 -06:00
neilpang
aea10a3b93 Merge branch 'dev' of https://github.com/acmesh-official/acme.sh into dev 2021-05-02 22:20:27 +08:00
neilpang
f855862ade upgrade freebsd 2021-05-02 22:20:04 +08:00
neil
91d37c7875 fix compatibility issue 2021-05-01 22:32:44 +08:00
neil
5707b93110
Merge pull request #3493 from goekesmi/master
Pass content via printf string format and argument
2021-05-01 10:16:30 +08:00
Jeff Goeke-Smith
81b2d0732f
arguments passed to printf are more generic
On systems that /bin/sh is served by shells other than bash, or 
shells that don't implement the same syntax as the bash printf builtin,
printf -- fails to produce the output necessary for standalone operation.

The test case for this was SmartOS, which uses ksh93 as its /bin/sh.

This change uses the more generic method of passing a format parameter
of a single string, and then the argument to replace it with.
2021-04-29 16:46:32 -04:00
neil
ec0538d251
Merge pull request #3455 from ecm75/notify_fix
fix _exists error message if MAIL_BIN env variable is not set
2021-04-29 22:34:11 +08:00
Eike-Christian Müller
eb0c629fad
more simple mail.sh fix
Reverted the original patch and changed it to the obvious simple solution provided by @Neilpang.
2021-04-29 12:53:13 +02:00
neil
509d3f6d30
Merge pull request #3392 from akulumbeg/dev
Adding DNSAPI wrapper for Websupport webhosting (Slovakia)
2021-04-19 09:46:33 +08:00
neil
c576af7c6f
Merge pull request #3460 from JaZo/feature/aurora
Add Aurora DNS API
2021-04-17 22:17:35 +08:00
neilpang
f3682f0e8e fix format 2021-04-17 22:09:59 +08:00
Jasper Zonneveld
1c58913eeb
Add Aurora DNS API 2021-04-15 08:59:16 +02:00
neilpang
cfbc294832 fix onecom api 2021-04-14 22:18:01 +08:00
neil
64ad8b1dac
Merge pull request #3479 from mjbnz/dev
Update Telegram notification
2021-04-09 10:08:48 +08:00
Mike Beattie
fb079f9e50
Update telegram.sh
(fix shellcheck failure)
2021-04-08 16:44:22 +12:00
Mike Beattie
39b09f8f87 Dump _post() call output to /dev/null
Signed-off-by: Mike Beattie <mike@ethernal.org>
2021-04-08 16:38:00 +12:00
Mike Beattie
53d26e5c5c Add debug output of $_data variable to aid diagnosis
Signed-off-by: Mike Beattie <mike@ethernal.org>
2021-04-08 16:37:27 +12:00
Mike Beattie
e21f3e6c73 Escape asterisks in notification content
This messes with markdown parsing

Signed-off-by: Mike Beattie <mike@ethernal.org>
2021-04-08 16:36:42 +12:00
neil
edd46eb3d1
Merge pull request #3478 from acmesh-official/dev
sync
2021-04-07 22:04:08 +08:00
neil
e71238571a
Merge pull request #3464 from jpbede/cleverreach-deploy-sublient
CleverReach Deploy Hook: Allow deploy to agency subaccounts
2021-04-04 19:03:33 +08:00
Jan-Philipp Benecke
2867ec509e
Make CI happy 2021-03-30 09:18:33 +02:00
Jan-Philipp Benecke
d853a9ebbe
Make uploading cert to subaccount possible 2021-03-30 09:13:32 +02:00