Commit Graph

4186 Commits

Author SHA1 Message Date
czeming
17f5e557ed
Update dns_dp.sh
没有encode中文字符会导致提交失败
2021-02-20 17:16:33 +08:00
neil
c33e5bc40f
Merge pull request #3416 from acmesh-official/dev
sync
2021-02-19 21:33:44 +08:00
neil
06d1a98ad2
Merge pull request #3330 from medmunds/feature/notify-smtp
Implement smtp notify hook
2021-02-19 09:20:24 +08:00
medmunds
afe6f4030e Change default SMTP_SECURE to "tls"
Secure by default. Also try to minimize configuration errors.
(Many ESPs/ISPs require STARTTLS, and most support it.)
2021-02-17 11:39:16 -08:00
medmunds
6e49c4ffe0 Prefer Python to curl when both available 2021-02-17 11:28:50 -08:00
medmunds
28d9f00610 Use email.policy.default in Python 3 implementation
Improves standards compatibility and utf-8 handling
in Python 3.3-3.8. (email.policy.default becomes the
default in Python 3.9.)
2021-02-17 09:57:44 -08:00
medmunds
8f688e5e13 Add Date email header in Python implementation 2021-02-17 09:46:13 -08:00
medmunds
5a182eddbf Clarify _readaccountconf_mutable_default 2021-02-16 14:41:21 -08:00
medmunds
4b615cb3a9 Clean email headers and warn on unsupported address format
Just in case, make sure CR or NL don't end up in
an email header.
2021-02-16 14:02:09 -08:00
medmunds
b36247a091 Implement _rfc2822_date helper 2021-02-16 13:13:26 -08:00
medmunds
6e77756d6a Rework read/save config to not save default values
Add and use _readaccountconf_mutable_default and
_saveaccountconf_mutable_default helpers to capture
common default value handling.

New approach also eliminates need for separate
underscore-prefixed version of each conf var.
2021-02-16 12:49:27 -08:00
medmunds
585c0c3818 Add _clearaccountconf_mutable() 2021-02-16 09:33:39 -08:00
medmunds
6ff75f9a9f Use PROJECT_NAME and VER for X-Mailer header
Also add X-Mailer header to Python version
2021-02-15 12:23:48 -08:00
neilpang
906ef43c00 make the fix for rsa key only 2021-02-15 21:35:59 +08:00
neilpang
4528957235 support openssl 3.0
fix https://github.com/acmesh-official/acme.sh/issues/3399
2021-02-15 21:25:27 +08:00
neil
9d448a42a7
Merge pull request #3409 from eastonman/master
DNSAPI, Huaweicloud DNS: Add error handling
2021-02-15 20:44:09 +08:00
neil
979e10f9d5
Merge pull request #3410 from acmesh-official/dev
sync
2021-02-15 20:03:32 +08:00
Easton Man
31f65b89bb
fix: fix freebsd and solaris 2021-02-15 15:19:18 +08:00
Easton Man
86639dbc02
feat: add huaweicloud error handling 2021-02-15 15:18:49 +08:00
Mike Edmunds
bf8c33703c
Fix: Unifi deploy hook support Unifi Cloud Key (#3327)
* fix: unifi deploy hook also update Cloud Key nginx certs

When running on a Unifi Cloud Key device, also deploy to
/etc/ssl/private/cloudkey.{crt,key} and reload nginx. This
makes the new cert available for the Cloud Key management
app running via nginx on port 443 (as well as the port 8443
Unifi Controller app the deploy hook already supported).

Fixes #3326

* Improve settings documentation comments

* Improve Cloud Key pre-flight error messaging

* Fix typo

* Add support for UnifiOS (Cloud Key Gen2)

Since UnifiOS does not use the Java keystore (like a Unifi
Controller or Cloud Key Gen1 deploy), this also reworks
the settings validation and error messaging somewhat.

* PR review fixes

* Detect unsupported Cloud Key java keystore location

* Don't try to restart inactive services

(and remove extra spaces from reload command)

* Clean up error messages and internal variables

* Change to _getdeployconf/_savedeployconf

* Switch from cp to cat to preserve file permissions
2021-02-15 15:01:21 +08:00
medmunds
ffe7ef4764 More than one blank line is an abomination, apparently
I will not try to use whitespace to group code visually
2021-02-14 20:06:07 -08:00
medmunds
30dae70e2b Implement curl version of smtp notify-hook 2021-02-14 19:56:23 -08:00
medmunds
557a747d55 Prep for curl or Python; clean up SMTP_* variable usage 2021-02-14 16:42:25 -08:00
medmunds
fe273b3829 Add instructions for reporting bugs 2021-02-14 13:10:30 -08:00
medmunds
2439bb30e8 Only save config if send is successful 2021-02-14 13:10:30 -08:00
medmunds
e48b6bd22d Make shfmt happy
(I'm open to better ways of formatting the heredoc
that embeds the Python script.)
2021-02-14 13:10:30 -08:00
medmunds
1de9ffacb0 Implement smtp notify hook
Support notifications via direct SMTP server connection.
Uses Python (2.7.x or 3.4+) to communicate with SMTP server.
2021-02-14 13:10:30 -08:00
jerrm
b7c3e6099c
duckdns - fix "integer expression expected" errors (#3397)
* fix "integer expression expected" errors

* duckdns fix

* Update dns_duckdns.sh

* Update dns_duckdns.sh
2021-02-13 18:58:44 +08:00
neilpang
d8163e9835 upgrade freebsd and solaris 2021-02-13 17:27:22 +08:00
neil
12b1916599
Chain (#3408)
* fix https://github.com/acmesh-official/acme.sh/issues/3384
match the issuer to the root CA cert subject

* fix format

* fix https://github.com/acmesh-official/acme.sh/issues/3384

* remove the alt files. https://github.com/acmesh-official/acme.sh/issues/3384
2021-02-13 16:22:31 +08:00
neil
9d8cdb5976
Merge pull request #3401 from gnought/bugfix/preferred_chain_isrg
Updated --preferred-chain to issue ISRG properly
2021-02-12 14:33:02 +08:00
neil
29a7c1938a
Merge pull request #3403 from manuelm/dev
dnsapi/pdns: also normalize json response in detecting root zone
2021-02-12 11:03:38 +08:00
manuel
8636d3139e dnsapi/pdns: also normalize json response in detecting root zone 2021-02-11 11:24:21 +01:00
Gnought
987571ce91
Updated --preferred-chain to issue ISRG properly
To support different openssl crl2pkcs7 help cli format
2021-02-11 01:08:08 +08:00
Alexander Kulumbeg
aa479948f9
Final try, leaving _hmac as before 2021-02-04 19:03:35 +01:00
Alexander Kulumbeg
fa3cee9d58
Update dns_websupport.sh 2021-02-04 18:38:40 +01:00
Alexander Kulumbeg
0021fb8a33
Changing the _hmac auth back
It only works this way, apparently
2021-02-04 17:27:39 +01:00
Alexander Kulumbeg
c8c727e6c6
added hex param to _hmac
but removed "printf "s%" ...
2021-02-04 17:21:33 +01:00
Alexander Kulumbeg
b8494ab3cc
Update dns_websupport.sh 2021-02-04 17:15:22 +01:00
Alexander Kulumbeg
2eda03f5de
Changing the _hmac call into Neil's suggestion 2021-02-04 15:32:51 +01:00
Alexander Kulumbeg
3a38358946
Trying the original solution
_hmac sha1 "$(printf "%s" "$WS_ApiSecret" | _hex_dump | tr -d " ")" hex)
2021-02-04 15:22:53 +01:00
neil
e7fc697e57
Merge pull request #3338 from fvahid/master
update arvan api script
2021-02-04 22:20:00 +08:00
Alexander Kulumbeg
6c9845b9f3
adding the hex parameter to _hmac call 2021-02-04 15:18:39 +01:00
Alexander Kulumbeg
9e146a8a5a
Typo
Forgot a quotation mark on line 161
2021-02-04 15:15:17 +01:00
Alexander Kulumbeg
433d9bfb02
Implementing/testing Neil's suggestions 2021-02-04 15:11:53 +01:00
Alexander Kulumbeg
94917e315e
Testing double 2>/dev/null into _utc_date with sed 2021-02-04 11:18:22 +01:00
Alexander Kulumbeg
ced6852735
2>/dev/null/ to 2>/dev/null
Silly mistake with a "/" -.-
2021-02-04 11:15:13 +01:00
Alexander Kulumbeg
8dc55f417d
Extra test - adding date -u -d
Adding this to at least partially prevent the virtually nonexistent possibility of timestamp and _utc_date() mismatch. If the normal date -u -d does not get converted (looking at you Solaris!), the poor man's method with manipulating the _utc_date() string output kicks in.
2021-02-04 10:13:36 +01:00
Alexander Kulumbeg
3d338bba3c
Fixing the shebang accident 2021-02-04 00:31:46 +01:00
Alexander Kulumbeg
631398f700
sed workaround for "datez" 2021-02-04 00:21:08 +01:00