Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sendmail command #13079

Merged
merged 25 commits into from
Oct 24, 2020
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
016b35b
Add SendSync method
zhiburt Oct 8, 2020
538d0db
Add sendmail command
zhiburt Oct 8, 2020
8ecbcc7
add checks that if either title or content is empty then error out
zhiburt Oct 9, 2020
5c0524a
Add a confirmation step
zhiburt Oct 9, 2020
2abad3e
Add --force option to bypass confirm step
zhiburt Oct 9, 2020
9c98e13
Move implementation of runSendMail to a different file
zhiburt Oct 9, 2020
a750b18
Add copyrighting comment
zhiburt Oct 9, 2020
3cb7d18
Make content optional
zhiburt Oct 12, 2020
d3723b5
Fix import style
zhiburt Oct 12, 2020
087129c
Merge branch 'master' of https://github.com/go-gitea/gitea into sendm…
zhiburt Oct 15, 2020
2ed24b5
Use batch when getting all users
zhiburt Oct 15, 2020
6f4b38d
Merge branch 'sendmail_command' of github.com:zhiburt/gitea into send…
zhiburt Oct 15, 2020
59a1bee
Send emails one by one instead of as one chunck
zhiburt Oct 16, 2020
f5a108d
Send messages concurantly
zhiburt Oct 16, 2020
5b5f8c5
Use SendAsync+Flush instead of SendSync
zhiburt Oct 19, 2020
042c259
Add timeout parameter to sendemail command
zhiburt Oct 19, 2020
a25d8be
Fix spelling mistake
zhiburt Oct 19, 2020
b350eea
Update cmd/admin.go
zhiburt Oct 23, 2020
3d5b393
Connect to a running Gitea instance
zhiburt Oct 23, 2020
cee82ff
Merge branch 'sendmail_command' of github.com:zhiburt/gitea into send…
zhiburt Oct 23, 2020
6968eb9
Fix mispelling
zhiburt Oct 23, 2020
af3cff6
Add copyright comment
zhiburt Oct 23, 2020
b959bf1
Merge branch 'master' into sendmail_command
lunny Oct 24, 2020
1b9f0ee
Merge branch 'master' into sendmail_command
techknowlogick Oct 24, 2020
490fa03
Merge branch 'master' into sendmail_command
techknowlogick Oct 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions cmd/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ var (
subcmdRepoSyncReleases,
subcmdRegenerate,
subcmdAuth,
subcmdSendMail,
},
}

Expand Down Expand Up @@ -253,6 +254,33 @@ var (
Action: runAddOauth,
Flags: oauthCLIFlags,
}

subcmdSendMail = cli.Command{
Name: "sendmail",
Usage: "Send a message to all users",
Action: runSendMail,
Flags: []cli.Flag{
cli.StringFlag{
Name: "title",
Usage: `a title of a message`,
Value: "",
},
cli.StringFlag{
Name: "content",
Usage: "a content of a message",
Value: "",
},
cli.BoolFlag{
Name: "force,f",
Usage: "A flag to bypass a confirmation step",
},
cli.DurationFlag{
Name: "timeout",
Usage: "A timeout of sending emails",
zhiburt marked this conversation as resolved.
Show resolved Hide resolved
Value: 0,
zhiburt marked this conversation as resolved.
Show resolved Hide resolved
},
},
}
)

func runChangePassword(c *cli.Context) error {
Expand Down
20 changes: 20 additions & 0 deletions cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package cmd
import (
"errors"
"fmt"
"strings"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting"
Expand All @@ -32,6 +33,25 @@ func argsSet(c *cli.Context, args ...string) error {
return nil
}

// confirm waits for user input which confirms an action
func confirm() (bool, error) {
var response string

_, err := fmt.Scanln(&response)
if err != nil {
return false, err
}

switch strings.ToLower(response) {
case "y", "yes":
return true, nil
case "n", "no":
return false, nil
default:
return false, errors.New(response + " isn't a correct confirmation string")
}
}

func initDB() error {
return initDBDisableConsole(false)
}
Expand Down
70 changes: 70 additions & 0 deletions cmd/mailer.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
// Copyright 2020 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package cmd

import (
"errors"
"fmt"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/services/mailer"
zhiburt marked this conversation as resolved.
Show resolved Hide resolved

"github.com/urfave/cli"
)

func runSendMail(c *cli.Context) error {
if err := argsSet(c, "title"); err != nil {
return err
}

if err := initDB(); err != nil {
return err
}

subject := c.String("title")
confirmSkiped := c.Bool("force")
body := c.String("content")
timeout := c.Duration("timeout")

if !confirmSkiped {
if len(body) == 0 {
fmt.Print("warning: Content is empty")
}

fmt.Print("Proceed with sending email? [Y/n] ")
isConfirmed, err := confirm()
if err != nil {
return err
} else if !isConfirmed {
fmt.Println("The mail was not sent")
return nil
}
}

var emails []string
err := models.IterateUser(func(user *models.User) error {
emails = append(emails, user.Email)
return nil
})
if err != nil {
return errors.New("Cann't find users")
}

fmt.Printf("Sending %d emails", len(emails))

mailer.NewContext()

for _, email := range emails {
msg := mailer.NewMessage([]string{email}, subject, body)
mailer.SendAsync(msg)
}

err = mailer.FlushMessages(timeout)
if err != nil {
return err
}

return nil
}
7 changes: 7 additions & 0 deletions services/mailer/mailer.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,13 @@ func NewContext() {
go graceful.GetManager().RunWithShutdownFns(mailQueue.Run)
}

// FlushMessages a messages which were published to the mailQueue
//
// Function blocks until the queue become empty or an operation exceed timeout duration.
func FlushMessages(timeout time.Duration) error {
return mailQueue.Flush(timeout)
}

// SendAsync send mail asynchronously
func SendAsync(msg *Message) {
go func() {
Expand Down