deblan/woodpecker-email
deblan/woodpecker-email
1
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Flip starttls flag to fix #58

Browse source
This commit is contained in:
Michael de Wit 2021-11-01 18:56:45 +01:00
parent c75190e21a
commit 7340d3d417
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DOCS.md
View file

@ -10,7 +10,7 @@ You can configure the plugin using the following parameters:
* **username** - SMTP username * **username** - SMTP username
* **password** - SMTP password * **password** - SMTP password
* **skip_verify** - Skip verification of SSL certificates, defaults to `false` * **skip_verify** - Skip verification of SSL certificates, defaults to `false`
* **starttls** - Enable/Disable STARTTLS * **no_starttls** - Enable/Disable STARTTLS
* **recipients** - List of recipients to send this mail to (besides the commit author) * **recipients** - List of recipients to send this mail to (besides the commit author)
* **recipients_file** - Filename to load additional recipients from (textfile with one email per line) (besides the commit author) * **recipients_file** - Filename to load additional recipients from (textfile with one email per line) (besides the commit author)
* **recipients_only** - Do not send mails to the commit author, but only to **recipients**, defaults to `false` * **recipients_only** - Do not send mails to the commit author, but only to **recipients**, defaults to `false`
@ -145,5 +145,5 @@ steps:
host: smtp.mailgun.org host: smtp.mailgun.org
username: octocat username: octocat
password: 12345 password: 12345
+ starttls: false + no_starttls: true
``` ```

6
main.go
View file

@ -67,9 +67,9 @@ func main() {
EnvVar: "PLUGIN_SKIP_VERIFY", EnvVar: "PLUGIN_SKIP_VERIFY",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "starttls", Name: "no.starttls",
Usage: "Enable/Disable STARTTLS", Usage: "Enable/Disable STARTTLS",
EnvVar: "PLUGIN_STARTTLS", EnvVar: "PLUGIN_NO_STARTTLS",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "recipients.file", Name: "recipients.file",
@ -412,7 +412,7 @@ func run(c *cli.Context) error {
Username: c.String("username"), Username: c.String("username"),
Password: c.String("password"), Password: c.String("password"),
SkipVerify: c.Bool("skip.verify"), SkipVerify: c.Bool("skip.verify"),
StartTLS: c.Bool("starttls"), NoStartTLS: c.Bool("no.starttls"),
Recipients: c.StringSlice("recipients"), Recipients: c.StringSlice("recipients"),
RecipientsFile: c.String("recipients.file"), RecipientsFile: c.String("recipients.file"),
RecipientsOnly: c.Bool("recipients.only"), RecipientsOnly: c.Bool("recipients.only"),

4
plugin.go
View file

@ -88,7 +88,7 @@ type (
Username string Username string
Password string Password string
SkipVerify bool SkipVerify bool
StartTLS bool NoStartTLS bool
Recipients []string Recipients []string
RecipientsFile string RecipientsFile string
RecipientsOnly bool RecipientsOnly bool
@ -153,7 +153,7 @@ func (p Plugin) Exec() error {
dialer.TLSConfig = &tls.Config{InsecureSkipVerify: true} dialer.TLSConfig = &tls.Config{InsecureSkipVerify: true}
} }
if !p.Config.StartTLS { if p.Config.NoStartTLS {
dialer.StartTLSPolicy = gomail.NoStartTLS dialer.StartTLSPolicy = gomail.NoStartTLS
} }