Commit Graph

65 Commits

Author SHA1 Message Date
medmunds 06f51a5c34 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-03-21 16:20:32 +01:00
medmunds db96778064 Prefer Python to curl when both available 2021-03-21 16:20:32 +01:00
medmunds d8918ea156 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-03-21 16:20:32 +01:00
medmunds 3503474bb8 Add Date email header in Python implementation 2021-03-21 16:20:32 +01:00
medmunds eb1606b086 Clarify _readaccountconf_mutable_default 2021-03-21 16:20:32 +01:00
medmunds 1330a092fa 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-03-21 16:20:32 +01:00
medmunds d3c74cfb45 Implement _rfc2822_date helper 2021-03-21 16:20:32 +01:00
medmunds d044545520 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-03-21 16:20:32 +01:00
medmunds dc8d91ea39 Use PROJECT_NAME and VER for X-Mailer header
Also add X-Mailer header to Python version
2021-03-21 16:20:32 +01:00
medmunds fe3e8a7bb6 More than one blank line is an abomination, apparently
I will not try to use whitespace to group code visually
2021-03-21 16:20:32 +01:00
medmunds ce2ff25edd Implement curl version of smtp notify-hook 2021-03-21 16:20:32 +01:00
medmunds 65a1b892e3 Prep for curl or Python; clean up SMTP_* variable usage 2021-03-21 16:20:32 +01:00
medmunds e272fde95e Add instructions for reporting bugs 2021-03-21 16:20:32 +01:00
medmunds d48bff0e20 Only save config if send is successful 2021-03-21 16:20:32 +01:00
medmunds 6e61c34f0f Make shfmt happy
(I'm open to better ways of formatting the heredoc
that embeds the Python script.)
2021-03-21 16:20:32 +01:00
medmunds 2d9506eb54 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-03-21 16:20:32 +01:00
Alexander Kulumbeg 8de3698b23 Revert "Syncing with the original repo (#2)"
This reverts commit c384ed960c.
2021-03-21 16:16:38 +01:00
Alexander Kulumbeg c384ed960c
Syncing with the original repo (#2)
* change arvan api script

* change Author name

* change name actor

* Updated --preferred-chain to issue ISRG properly

To support different openssl crl2pkcs7 help cli format

* dnsapi/pdns: also normalize json response in detecting root zone

* 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

* upgrade freebsd and solaris

* duckdns - fix "integer expression expected" errors (#3397)

* fix "integer expression expected" errors

* duckdns fix

* Update dns_duckdns.sh

* Update dns_duckdns.sh

* Implement smtp notify hook

Support notifications via direct SMTP server connection.
Uses Python (2.7.x or 3.4+) to communicate with SMTP server.

* Make shfmt happy

(I'm open to better ways of formatting the heredoc
that embeds the Python script.)

* Only save config if send is successful

* Add instructions for reporting bugs

* Prep for curl or Python; clean up SMTP_* variable usage

* Implement curl version of smtp notify-hook

* More than one blank line is an abomination, apparently

I will not try to use whitespace to group code visually

* 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

* feat: add huaweicloud error handling

* fix: fix freebsd and solaris

* support openssl 3.0
fix https://github.com/acmesh-official/acme.sh/issues/3399

* make the fix for rsa key only

* Use PROJECT_NAME and VER for X-Mailer header

Also add X-Mailer header to Python version

* Add _clearaccountconf_mutable()

* 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.

* Implement _rfc2822_date helper

* 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.

* Clarify _readaccountconf_mutable_default

* Add Date email header in Python implementation

* 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.)

* Prefer Python to curl when both available

* Change default SMTP_SECURE to "tls"

Secure by default. Also try to minimize configuration errors.
(Many ESPs/ISPs require STARTTLS, and most support it.)

* Update dns_dp.sh

没有encode中文字符会导致提交失败

* No need to include EC parameters explicitly with the private key.
(they are embedded)

* Fixes response handling and thereby allow issuing of subdomain certs

* Adds comment

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

* dnsapi/ionos: Use POST instead of PATCH for adding TXT record

The API now supports a POST route for adding records. Therefore
checking for already existing records and including them in a PATCH
request is no longer necessary.

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

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

* fix format

* Update dns_servercow.sh to support wildcard certs

Updated dns_servercow.sh to support txt records with multiple entries. This supports wildcard certificates that require txt records with the same name and different contents.

* Update dns_servercow.sh to support wildcard certs

Updated dns_servercow.sh to support txt records with multiple entries. This supports wildcard certificates that require txt records with the same name and different contents.

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

* fix format

* feat: add dns_porkbun

* fix: prevent rate limit

Co-authored-by: Vahid Fardi <vahid.fardi@snapp.cab>
Co-authored-by: neil <github@neilpang.com>
Co-authored-by: Gnought <1684105+gnought@users.noreply.github.com>
Co-authored-by: manuel <manuel@mausz.at>
Co-authored-by: jerrm <jerrm@users.noreply.github.com>
Co-authored-by: medmunds <medmunds@gmail.com>
Co-authored-by: Mike Edmunds <github@to.mikeedmunds.com>
Co-authored-by: Easton Man <manyang.me@outlook.com>
Co-authored-by: czeming <loser_wind@163.com>
Co-authored-by: Geert Hendrickx <geert@hendrickx.be>
Co-authored-by: Kristian Johansson <kristian.johansson86@gmail.com>
Co-authored-by: Lukas Brocke <lukas@brocke.net>
Co-authored-by: anom-human <80478363+anom-human@users.noreply.github.com>
Co-authored-by: neil <win10@neilpang.com>
Co-authored-by: Quentin Dreyer <quentin.dreyer@rgsystem.com>
2021-03-20 16:01:09 +01:00
Mike Beattie 584cc6de2e
Avoid usage of sed -e 2021-01-11 11:27:39 +13:00
Mike Beattie 2e5a6e21cf
Correct shebang 2021-01-11 11:21:46 +13:00
Mike Beattie 10de4b6b7b
Add Telegram notification script
Requires:
- API Token for a bot created with the Telegram Bot Father.
- A Chat ID for a user/group that the bot has permission to post to.
2021-01-04 18:41:02 +13:00
neil 19c4345162 fix shfmt 2020-08-17 22:18:20 +08:00
Honza Hommer 99793bb2c4
chore: remove shellcheck disable 2020-05-09 12:26:16 +02:00
Honza Hommer 24925a1739
feat: add default colors 2020-04-22 21:13:52 +02:00
Honza Hommer 74cdcde449
fix: remove :xdigit: 2020-04-19 23:59:35 +02:00
Honza Hommer a9c4b8dd1a
feat: Microsoft Teams notify 2020-04-19 01:03:04 +02:00
Honza Hommer 2a8746f6b0
Feat: add msmtp command 2020-03-11 22:32:37 +01:00
Honza Hommer 15b841da06
Feat: simplify conditions for bin and command 2020-03-08 04:47:55 +01:00
Victor Huang 5d88ad554f
Improved token processing method and misc bugfixes
Replace '_err' to '_debug' in the final error report.
Removed redundancy code.
2020-02-08 23:24:45 +08:00
Victor Huang 33670a5bd0
CQHTTP: Change shebang to "/usr/bin/env sh" 2020-02-06 11:26:56 +08:00
Victor Huang 64f8a222cb
Add support for CQHTTP QQ bot API 2020-02-06 11:12:14 +08:00
Vitalii Tverdokhlib f1f14040b8
DOCS: typo 2019-11-09 12:12:30 +02:00
neilpang 35b34c43ed fix format 2019-11-02 19:44:43 +08:00
neilpang 5698bec621 fix https://github.com/Neilpang/acme.sh/issues/2566 2019-11-02 09:48:41 +08:00
fgma b9994e52eb Notify xmpp (#2407)
* notify via xmpp (using sendxmpp)

* fix formatting in notify/xmpp.sh

* minor cleanup
2019-09-05 22:28:47 +08:00
neilpang 143eac092c fix notify message 2019-08-05 22:03:56 +08:00
lcdtyph d74dfb1f5c IFTTT Webhooks Notification (#2416)
* IFTTT webhooks Notification

* use sh instead of bash

* don't save value that is not set
2019-08-05 21:38:32 +08:00
neilpang 80af3d6ada minor 2019-07-22 21:26:47 +08:00
neilpang 28c153a0a2 fix errors 2019-07-20 12:36:28 +08:00
tdk1069 b8e6287774 PushOver notifications (#2325)
* PushOver notifications, using AppToken, UserKey, and optional sounds
2019-07-20 12:30:56 +08:00
Honza Hommer 51099bf148
Add postmark notify 2019-06-03 01:54:04 +02:00
neil 09bce5e6d6
sync (#2297)
* Create LICENSE.md

* remove _hostingde_parse_no_strip_whitespace function as this breaks API requests

* Fix sessionid parsing on BSD

* Make travis happy. (SC2020)

* fix for https://github.com/Neilpang/acme.sh/issues/2286

* Notify mail update (#2293)

* feat: disable e-mail validation if MAIL_NOVALIDATE is set

* fix: expose _MAIL_BIN variable

* fix: call _mail_body and _mail_cmnd directly to make sure that all used variables are exposed

* fix: update notify/mail.sh

Co-Authored-By: Matej Mihevc <zuexo@users.noreply.github.com>

* fix: remove useless echo, quote eval
2019-05-28 08:47:33 +08:00
neil 6a929d6a1a
Merge pull request #2264 from honzahommer/notify-slack
Add slack notify
2019-05-19 08:29:23 +08:00
neil ae380cb21e
Merge pull request #2259 from honzahommer/notify-sendmail
Add mail notify
2019-05-19 08:28:43 +08:00
Honza Hommer d83c9da830
add clearaccountconf MAIL_BIN 2019-05-18 18:21:19 +02:00
Honza Hommer 9a7c9e8d98
remove unset 2019-05-18 18:20:16 +02:00
Honza Hommer 73bbe25d26
add slack notify 2019-05-13 19:49:16 +02:00
Honza Hommer fc5e3a0aec
remove echo command 2019-05-13 18:59:58 +02:00
Honza Hommer 7625d66259
wip 2019-05-13 18:58:28 +02:00
Honza Hommer 30f2c2bd77
prevent _MAIL_BIN modification 2019-05-13 18:11:44 +02:00