cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing issues - get values from non objects (#1773) 

After calls to get Template, Page, and SMTP, if the objects aren't found then we're currently trying to display error message using the name values of the non objects. This changes this behavior such that we use the name values from the campaign object to give better log messages.
pull/1785/head
Jordan Wright 2020-03-05 07:31:19 -06:00 committed by GitHub
parent 2e3aacd22d
commit 6251ea6a02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/campaign.go
View File

@ -491,7 +491,7 @@ func PostCampaign(c *Campaign, uid int64) error {
t, err := GetTemplateByName(c.Template.Name, uid) t, err := GetTemplateByName(c.Template.Name, uid)
if err == gorm.ErrRecordNotFound { if err == gorm.ErrRecordNotFound {
log.WithFields(logrus.Fields{ log.WithFields(logrus.Fields{
"template": t.Name, "template": c.Template.Name,
}).Error("Template does not exist") }).Error("Template does not exist")
return ErrTemplateNotFound return ErrTemplateNotFound
} else if err != nil { } else if err != nil {
@ -504,7 +504,7 @@ func PostCampaign(c *Campaign, uid int64) error {
p, err := GetPageByName(c.Page.Name, uid) p, err := GetPageByName(c.Page.Name, uid)
if err == gorm.ErrRecordNotFound { if err == gorm.ErrRecordNotFound {
log.WithFields(logrus.Fields{ log.WithFields(logrus.Fields{
"page": p.Name, "page": c.Page.Name,
}).Error("Page does not exist") }).Error("Page does not exist")
return ErrPageNotFound return ErrPageNotFound
} else if err != nil { } else if err != nil {
@ -517,7 +517,7 @@ func PostCampaign(c *Campaign, uid int64) error {
s, err := GetSMTPByName(c.SMTP.Name, uid) s, err := GetSMTPByName(c.SMTP.Name, uid)
if err == gorm.ErrRecordNotFound { if err == gorm.ErrRecordNotFound {
log.WithFields(logrus.Fields{ log.WithFields(logrus.Fields{
"smtp": s.Name, "smtp": c.SMTP.Name,
}).Error("Sending profile does not exist") }).Error("Sending profile does not exist")
return ErrSMTPNotFound return ErrSMTPNotFound
} else if err != nil { } else if err != nil {