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

gofmt'ing the IMAP changes

pull/1867/head
Jordan Wright 2020-06-16 20:13:24 -05:00
parent 61bbb22f7c
commit 0f6439de5a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imap/imap.go
View File

@ -191,7 +191,6 @@ func (mbox *Mailbox) newClient() (*client.Client, error) {
return imapClient, err return imapClient, err
} }
err = imapClient.Login(mbox.User, mbox.Pwd) err = imapClient.Login(mbox.User, mbox.Pwd)
if err != nil { if err != nil {
return imapClient, err return imapClient, err

12
imap/monitor.go
View File

@ -9,11 +9,11 @@ package imap
import ( import (
"bytes" "bytes"
"context" "context"
"path/filepath"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"path/filepath"
log "github.com/gophish/gophish/logger" log "github.com/gophish/gophish/logger"
"github.com/jordan-wright/email" "github.com/jordan-wright/email"
@ -135,7 +135,7 @@ func checkForNewEmails(im models.IMAP) {
if len(msgs) > 0 { if len(msgs) > 0 {
log.Debugf("%d new emails for %s", len(msgs), im.Username) log.Debugf("%d new emails for %s", len(msgs), im.Username)
var reportingFailed []uint32 // SeqNums of emails that were unable to be reported to phishing server, mark as unread var reportingFailed []uint32 // SeqNums of emails that were unable to be reported to phishing server, mark as unread
var deleteEmails []uint32 // SeqNums of campaign emails. If DeleteReportedCampaignEmail is true, we will delete these var deleteEmails []uint32 // SeqNums of campaign emails. If DeleteReportedCampaignEmail is true, we will delete these
for _, m := range msgs { for _, m := range msgs {
// Check if sender is from company's domain, if enabled. TODO: Make this an IMAP filter // Check if sender is from company's domain, if enabled. TODO: Make this an IMAP filter
if im.RestrictDomain != "" { // e.g domainResitct = widgets.com if im.RestrictDomain != "" { // e.g domainResitct = widgets.com
@ -152,7 +152,7 @@ func checkForNewEmails(im models.IMAP) {
if err != nil { if err != nil {
log.Errorf("Error searching email for rids from user '%s': %s", m.Email.From, err.Error()) log.Errorf("Error searching email for rids from user '%s': %s", m.Email.From, err.Error())
continue continue
} }
if len(rids) < 1 { if len(rids) < 1 {
// In the future this should be an alert in Gophish // In the future this should be an alert in Gophish
log.Infof("User '%s' reported email with subject '%s'. This is not a GoPhish campaign; you should investigate it.", m.Email.From, m.Email.Subject) log.Infof("User '%s' reported email with subject '%s'. This is not a GoPhish campaign; you should investigate it.", m.Email.From, m.Email.Subject)
@ -174,7 +174,7 @@ func checkForNewEmails(im models.IMAP) {
deleteEmails = append(deleteEmails, m.SeqNum) deleteEmails = append(deleteEmails, m.SeqNum)
} }
} }
} }
// Check if any emails were unable to be reported, so we can mark them as unread // Check if any emails were unable to be reported, so we can mark them as unread
if len(reportingFailed) > 0 { if len(reportingFailed) > 0 {
@ -192,13 +192,13 @@ func checkForNewEmails(im models.IMAP) {
log.Error("Failed to delete emails: ", err.Error()) log.Error("Failed to delete emails: ", err.Error())
} }
} }
} else { } else {
log.Debug("No new emails for ", im.Username) log.Debug("No new emails for ", im.Username)
} }
} }
func checkRIDs(em *email.Email, rids map[string]bool){ func checkRIDs(em *email.Email, rids map[string]bool) {
// Check Text and HTML // Check Text and HTML
emailContent := string(em.Text) + string(em.HTML) emailContent := string(em.Text) + string(em.HTML)
for _, r := range goPhishRegex.FindAllStringSubmatch(emailContent, -1) { for _, r := range goPhishRegex.FindAllStringSubmatch(emailContent, -1) {