mirror of https://github.com/gophish/gophish
Added handling to /util/send_test_email to use default on empty template and accept a validated SMTP object from send test email workflow on sending profiles page
parent
ffb14b7927
commit
80fc04924d
|
@ -525,7 +525,25 @@ func API_Send_Test_Email(w http.ResponseWriter, r *http.Request) {
|
||||||
JSONResponse(w, models.Response{Success: false, Message: err.Error()}, http.StatusBadRequest)
|
JSONResponse(w, models.Response{Success: false, Message: err.Error()}, http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Get the template requested by name
|
|
||||||
|
// If a Template is not specified use a default
|
||||||
|
if s.Template.Name == "" {
|
||||||
|
//default message body
|
||||||
|
text := "It works!\n\nThis is an email letting you know that your gophish\nconfiguration was successful.\n" +
|
||||||
|
"Here are the details:\n\nWho you sent from: {{.From}}\n\nWho you sent to: \n" +
|
||||||
|
"{{if .FirstName}} First Name: {{.FirstName}}\n{{end}}" +
|
||||||
|
"{{if .LastName}} Last Name: {{.LastName}}\n{{end}}" +
|
||||||
|
"{{if .Position}} Position: {{.Position}}\n{{end}}" +
|
||||||
|
"{{if .TrackingURL}} Tracking URL: {{.TrackingURL}}\n{{end}}" +
|
||||||
|
"\nNow go send some phish!"
|
||||||
|
t := models.Template{
|
||||||
|
Subject: "Default Email from Gophish",
|
||||||
|
Text: text,
|
||||||
|
}
|
||||||
|
s.Template = t
|
||||||
|
// Try to lookup the Template by name
|
||||||
|
} else {
|
||||||
|
// Get the Template requested by name
|
||||||
s.Template, err = models.GetTemplateByName(s.Template.Name, ctx.Get(r, "user_id").(int64))
|
s.Template, err = models.GetTemplateByName(s.Template.Name, ctx.Get(r, "user_id").(int64))
|
||||||
if err == gorm.RecordNotFound {
|
if err == gorm.RecordNotFound {
|
||||||
Logger.Printf("Error - Template %s does not exist", s.Template.Name)
|
Logger.Printf("Error - Template %s does not exist", s.Template.Name)
|
||||||
|
@ -535,7 +553,11 @@ func API_Send_Test_Email(w http.ResponseWriter, r *http.Request) {
|
||||||
JSONResponse(w, models.Response{Success: false, Message: err.Error()}, http.StatusBadRequest)
|
JSONResponse(w, models.Response{Success: false, Message: err.Error()}, http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Get the sending profile requested by name
|
}
|
||||||
|
|
||||||
|
// If a complete sending profile is provided use it
|
||||||
|
if err := s.SMTP.Validate(); err != nil {
|
||||||
|
// Otherwise get the SMTP requested by name
|
||||||
s.SMTP, err = models.GetSMTPByName(s.SMTP.Name, ctx.Get(r, "user_id").(int64))
|
s.SMTP, err = models.GetSMTPByName(s.SMTP.Name, ctx.Get(r, "user_id").(int64))
|
||||||
if err == gorm.RecordNotFound {
|
if err == gorm.RecordNotFound {
|
||||||
Logger.Printf("Error - Sending profile %s does not exist", s.SMTP.Name)
|
Logger.Printf("Error - Sending profile %s does not exist", s.SMTP.Name)
|
||||||
|
@ -545,6 +567,8 @@ func API_Send_Test_Email(w http.ResponseWriter, r *http.Request) {
|
||||||
JSONResponse(w, models.Response{Success: false, Message: err.Error()}, http.StatusBadRequest)
|
JSONResponse(w, models.Response{Success: false, Message: err.Error()}, http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Send the test email
|
// Send the test email
|
||||||
err = worker.SendTestEmail(s)
|
err = worker.SendTestEmail(s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -89,12 +89,8 @@ type SendTestEmailRequest struct {
|
||||||
// is valid.
|
// is valid.
|
||||||
func (s *SendTestEmailRequest) Validate() error {
|
func (s *SendTestEmailRequest) Validate() error {
|
||||||
switch {
|
switch {
|
||||||
case s.Template.Name == "":
|
|
||||||
return ErrTemplateNotSpecified
|
|
||||||
case s.Email == "":
|
case s.Email == "":
|
||||||
return ErrEmailNotSpecified
|
return ErrEmailNotSpecified
|
||||||
case s.SMTP.Name == "":
|
|
||||||
return ErrSMTPNotSpecified
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue