`,
+ },
+ {
+ "open close",
+ ``,
+ ``,
+ },
+ {
+ "inner text",
+ `
`, + `
`, + }, + { + "open params", + `
foo bar
`,
+ `foo bar
`,
+ },
+ {
+ "self close",
+ ``, + `
`, + }, + { + "open params", + `
`,
+ `
`,
+ },
+ {
+ "open params squote",
+ `
`,
+ `
`,
+ },
+ {
+ "open style",
+ `
`,
+ `
`,
+ },
+ {
+ "open style squote",
+ `
`,
+ `
`,
+ },
+ {
+ "open style mixed case",
+ `
`,
+ `
`,
+ },
+ {
+ "closed style",
+ `
`, + `
`, + }, + { + "mixed case style", + `
`, + `
`, + }, + { + "mixed case invalid style", + `
`, + `
`, + }, + { + "mixed", + `
`, + `
`, + }, + { + "mixed case style", + `
`, + `
`, + }, + { + "mixed case invalid style", + `
`, + `
`, + }, + { + "mixed", + `
some text
`, + `some text
`, + }, + { + "invalid styles", + ``,
+ `
{{end}}
-
+
+`,
+ },
+ }
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ got, err := sanitize.HTML(tc.input)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if got != tc.want {
+ t.Errorf("input: %s\ngot : %s\nwant: %s", tc.input, got, tc.want)
+ }
+ })
+ }
+}
diff --git a/smtpd/handler.go b/smtpd/handler.go
index 7353194..f6c4397 100644
--- a/smtpd/handler.go
+++ b/smtpd/handler.go
@@ -12,8 +12,10 @@ import (
"strings"
"time"
+ "github.com/jhillyerd/inbucket/datastore"
"github.com/jhillyerd/inbucket/log"
"github.com/jhillyerd/inbucket/msghub"
+ "github.com/jhillyerd/inbucket/stringutil"
)
// State tracks the current mode of our SMTP state machine
@@ -71,7 +73,7 @@ var commands = map[string]bool{
// recipientDetails for message delivery
type recipientDetails struct {
address, localPart, domainPart string
- mailbox Mailbox
+ mailbox datastore.Mailbox
}
// Session holds the state of an SMTP session
@@ -265,7 +267,7 @@ func (ss *Session) readyHandler(cmd string, arg string) {
return
}
from := m[1]
- if _, _, err := ParseEmailAddress(from); err != nil {
+ if _, _, err := stringutil.ParseEmailAddress(from); err != nil {
ss.send("501 Bad sender address syntax")
ss.logWarn("Bad address as MAIL arg: %q, %s", from, err)
return
@@ -314,7 +316,7 @@ func (ss *Session) mailHandler(cmd string, arg string) {
}
// This trim is probably too forgiving
recip := strings.Trim(arg[3:], "<> ")
- if _, _, err := ParseEmailAddress(recip); err != nil {
+ if _, _, err := stringutil.ParseEmailAddress(recip); err != nil {
ss.send("501 Bad recipient address syntax")
ss.logWarn("Bad address as RCPT arg: %q, %s", recip, err)
return
@@ -354,7 +356,7 @@ func (ss *Session) dataHandler() {
if ss.server.storeMessages {
for e := ss.recipients.Front(); e != nil; e = e.Next() {
recip := e.Value.(string)
- local, domain, err := ParseEmailAddress(recip)
+ local, domain, err := stringutil.ParseEmailAddress(recip)
if err != nil {
ss.logError("Failed to parse address for %q", recip)
ss.send(fmt.Sprintf("451 Failed to open mailbox for %v", recip))
@@ -510,20 +512,16 @@ func (ss *Session) send(msg string) {
// readByteLine reads a line of input into the provided buffer. Does
// not reset the Buffer - please do so prior to calling.
-func (ss *Session) readByteLine(buf *bytes.Buffer) error {
+func (ss *Session) readByteLine(buf io.Writer) error {
if err := ss.conn.SetReadDeadline(ss.nextDeadline()); err != nil {
return err
}
- for {
- line, err := ss.reader.ReadBytes('\n')
- if err != nil {
- return err
- }
- if _, err = buf.Write(line); err != nil {
- return err
- }
- return nil
+ line, err := ss.reader.ReadBytes('\n')
+ if err != nil {
+ return err
}
+ _, err = buf.Write(line)
+ return err
}
// Reads a line of input
@@ -572,7 +570,7 @@ func (ss *Session) parseCmd(line string) (cmd string, arg string, ok bool) {
// The leading space is mandatory.
func (ss *Session) parseArgs(arg string) (args map[string]string, ok bool) {
args = make(map[string]string)
- re := regexp.MustCompile(" (\\w+)=(\\w+)")
+ re := regexp.MustCompile(` (\w+)=(\w+)`)
pm := re.FindAllStringSubmatch(arg, -1)
if pm == nil {
ss.logWarn("Failed to parse arg string: %q")
diff --git a/smtpd/handler_test.go b/smtpd/handler_test.go
index 61d4f69..e541f4e 100644
--- a/smtpd/handler_test.go
+++ b/smtpd/handler_test.go
@@ -14,6 +14,7 @@ import (
"time"
"github.com/jhillyerd/inbucket/config"
+ "github.com/jhillyerd/inbucket/datastore"
"github.com/jhillyerd/inbucket/msghub"
)
@@ -25,17 +26,13 @@ type scriptStep struct {
// Test commands in GREET state
func TestGreetState(t *testing.T) {
// Setup mock objects
- mds := &MockDataStore{}
- mb1 := &MockMailbox{}
- mds.On("MailboxFor").Return(mb1, nil)
+ mds := &datastore.MockDataStore{}
server, logbuf, teardown := setupSMTPServer(mds)
defer teardown()
- var script []scriptStep
-
// Test out some mangled HELOs
- script = []scriptStep{
+ script := []scriptStep{
{"HELO", 501},
{"EHLO", 501},
{"HELLO", 500},
@@ -86,17 +83,13 @@ func TestGreetState(t *testing.T) {
// Test commands in READY state
func TestReadyState(t *testing.T) {
// Setup mock objects
- mds := &MockDataStore{}
- mb1 := &MockMailbox{}
- mds.On("MailboxFor").Return(mb1, nil)
+ mds := &datastore.MockDataStore{}
server, logbuf, teardown := setupSMTPServer(mds)
defer teardown()
- var script []scriptStep
-
// Test out some mangled READY commands
- script = []scriptStep{
+ script := []scriptStep{
{"HELO localhost", 250},
{"FOOB", 500},
{"HELO", 503},
@@ -151,10 +144,10 @@ func TestReadyState(t *testing.T) {
// Test commands in MAIL state
func TestMailState(t *testing.T) {
// Setup mock objects
- mds := &MockDataStore{}
- mb1 := &MockMailbox{}
- msg1 := &MockMessage{}
- mds.On("MailboxFor").Return(mb1, nil)
+ mds := &datastore.MockDataStore{}
+ mb1 := &datastore.MockMailbox{}
+ msg1 := &datastore.MockMessage{}
+ mds.On("MailboxFor", "u1").Return(mb1, nil)
mb1.On("NewMessage").Return(msg1, nil)
mb1.On("Name").Return("u1")
msg1.On("ID").Return("")
@@ -168,10 +161,8 @@ func TestMailState(t *testing.T) {
server, logbuf, teardown := setupSMTPServer(mds)
defer teardown()
- var script []scriptStep
-
// Test out some mangled READY commands
- script = []scriptStep{
+ script := []scriptStep{
{"HELO localhost", 250},
{"MAIL FROM:", 250},
{"FOOB", 500},
@@ -268,10 +259,10 @@ func TestMailState(t *testing.T) {
// Test commands in DATA state
func TestDataState(t *testing.T) {
// Setup mock objects
- mds := &MockDataStore{}
- mb1 := &MockMailbox{}
- msg1 := &MockMessage{}
- mds.On("MailboxFor").Return(mb1, nil)
+ mds := &datastore.MockDataStore{}
+ mb1 := &datastore.MockMailbox{}
+ msg1 := &datastore.MockMessage{}
+ mds.On("MailboxFor", "u1").Return(mb1, nil)
mb1.On("NewMessage").Return(msg1, nil)
mb1.On("Name").Return("u1")
msg1.On("ID").Return("")
@@ -376,7 +367,7 @@ func (m *mockConn) SetDeadline(t time.Time) error { return nil }
func (m *mockConn) SetReadDeadline(t time.Time) error { return nil }
func (m *mockConn) SetWriteDeadline(t time.Time) error { return nil }
-func setupSMTPServer(ds DataStore) (s *Server, buf *bytes.Buffer, teardown func()) {
+func setupSMTPServer(ds datastore.DataStore) (s *Server, buf *bytes.Buffer, teardown func()) {
// Test Server Config
cfg := config.SMTPConfig{
IP4address: net.IPv4(127, 0, 0, 1),
diff --git a/smtpd/listener.go b/smtpd/listener.go
index 5fd4529..60953b6 100644
--- a/smtpd/listener.go
+++ b/smtpd/listener.go
@@ -11,13 +11,35 @@ import (
"time"
"github.com/jhillyerd/inbucket/config"
+ "github.com/jhillyerd/inbucket/datastore"
"github.com/jhillyerd/inbucket/log"
"github.com/jhillyerd/inbucket/msghub"
)
+func init() {
+ m := expvar.NewMap("smtp")
+ m.Set("ConnectsTotal", expConnectsTotal)
+ m.Set("ConnectsHist", expConnectsHist)
+ m.Set("ConnectsCurrent", expConnectsCurrent)
+ m.Set("ReceivedTotal", expReceivedTotal)
+ m.Set("ReceivedHist", expReceivedHist)
+ m.Set("ErrorsTotal", expErrorsTotal)
+ m.Set("ErrorsHist", expErrorsHist)
+ m.Set("WarnsTotal", expWarnsTotal)
+ m.Set("WarnsHist", expWarnsHist)
+
+ log.AddTickerFunc(func() {
+ expReceivedHist.Set(log.PushMetric(deliveredHist, expReceivedTotal))
+ expConnectsHist.Set(log.PushMetric(connectsHist, expConnectsTotal))
+ expErrorsHist.Set(log.PushMetric(errorsHist, expErrorsTotal))
+ expWarnsHist.Set(log.PushMetric(warnsHist, expWarnsTotal))
+ })
+}
+
// Server holds the configuration and state of our SMTP server
type Server struct {
// Configuration
+ host string
domain string
domainNoStore string
maxRecips int
@@ -26,10 +48,10 @@ type Server struct {
storeMessages bool
// Dependencies
- dataStore DataStore // Mailbox/message store
- globalShutdown chan bool // Shuts down Inbucket
- msgHub *msghub.Hub // Pub/sub for message info
- retentionScanner *RetentionScanner // Deletes expired messages
+ dataStore datastore.DataStore // Mailbox/message store
+ globalShutdown chan bool // Shuts down Inbucket
+ msgHub *msghub.Hub // Pub/sub for message info
+ retentionScanner *datastore.RetentionScanner // Deletes expired messages
// State
listener net.Listener // Incoming network connections
@@ -61,9 +83,10 @@ var (
func NewServer(
cfg config.SMTPConfig,
globalShutdown chan bool,
- ds DataStore,
+ ds datastore.DataStore,
msgHub *msghub.Hub) *Server {
return &Server{
+ host: fmt.Sprintf("%v:%v", cfg.IP4address, cfg.IP4port),
domain: cfg.Domain,
domainNoStore: strings.ToLower(cfg.DomainNoStore),
maxRecips: cfg.MaxRecipients,
@@ -73,16 +96,14 @@ func NewServer(
globalShutdown: globalShutdown,
dataStore: ds,
msgHub: msgHub,
- retentionScanner: NewRetentionScanner(ds, globalShutdown),
+ retentionScanner: datastore.NewRetentionScanner(ds, globalShutdown),
waitgroup: new(sync.WaitGroup),
}
}
// Start the listener and handle incoming connections
func (s *Server) Start(ctx context.Context) {
- cfg := config.GetSMTPConfig()
- addr, err := net.ResolveTCPAddr("tcp4", fmt.Sprintf("%v:%v",
- cfg.IP4address, cfg.IP4port))
+ addr, err := net.ResolveTCPAddr("tcp4", s.host)
if err != nil {
log.Errorf("Failed to build tcp4 address: %v", err)
s.emergencyShutdown()
@@ -110,10 +131,8 @@ func (s *Server) Start(ctx context.Context) {
go s.serve(ctx)
// Wait for shutdown
- select {
- case <-ctx.Done():
- log.Tracef("SMTP shutdown requested, connections will be drained")
- }
+ <-ctx.Done()
+ log.Tracef("SMTP shutdown requested, connections will be drained")
// Closing the listener will cause the serve() go routine to exit
if err := s.listener.Close(); err != nil {
@@ -165,7 +184,7 @@ func (s *Server) serve(ctx context.Context) {
func (s *Server) emergencyShutdown() {
// Shutdown Inbucket
select {
- case _ = <-s.globalShutdown:
+ case <-s.globalShutdown:
default:
close(s.globalShutdown)
}
@@ -178,44 +197,3 @@ func (s *Server) Drain() {
log.Tracef("SMTP connections have drained")
s.retentionScanner.Join()
}
-
-// When the provided Ticker ticks, we update our metrics history
-func metricsTicker(t *time.Ticker) {
- ok := true
- for ok {
- _, ok = <-t.C
- expReceivedHist.Set(pushMetric(deliveredHist, expReceivedTotal))
- expConnectsHist.Set(pushMetric(connectsHist, expConnectsTotal))
- expErrorsHist.Set(pushMetric(errorsHist, expErrorsTotal))
- expWarnsHist.Set(pushMetric(warnsHist, expWarnsTotal))
- expRetentionDeletesHist.Set(pushMetric(retentionDeletesHist, expRetentionDeletesTotal))
- expRetainedHist.Set(pushMetric(retainedHist, expRetainedCurrent))
- }
-}
-
-// pushMetric adds the metric to the end of the list and returns a comma separated string of the
-// previous 61 entries. We return 61 instead of 60 (an hour) because the chart on the client
-// tracks deltas between these values - there is nothing to compare the first value against.
-func pushMetric(history *list.List, ev expvar.Var) string {
- history.PushBack(ev.String())
- if history.Len() > 61 {
- history.Remove(history.Front())
- }
- return JoinStringList(history)
-}
-
-func init() {
- m := expvar.NewMap("smtp")
- m.Set("ConnectsTotal", expConnectsTotal)
- m.Set("ConnectsHist", expConnectsHist)
- m.Set("ConnectsCurrent", expConnectsCurrent)
- m.Set("ReceivedTotal", expReceivedTotal)
- m.Set("ReceivedHist", expReceivedHist)
- m.Set("ErrorsTotal", expErrorsTotal)
- m.Set("ErrorsHist", expErrorsHist)
- m.Set("WarnsTotal", expWarnsTotal)
- m.Set("WarnsHist", expWarnsHist)
-
- t := time.NewTicker(time.Minute)
- go metricsTicker(t)
-}
diff --git a/smtpd/retention_test.go b/smtpd/retention_test.go
deleted file mode 100644
index 5e76b42..0000000
--- a/smtpd/retention_test.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package smtpd
-
-import (
- "fmt"
- "io"
- "net/mail"
- "testing"
- "time"
-
- "github.com/jhillyerd/enmime"
- "github.com/stretchr/testify/mock"
-)
-
-func TestDoRetentionScan(t *testing.T) {
- // Create mock objects
- mds := &MockDataStore{}
-
- mb1 := &MockMailbox{}
- mb2 := &MockMailbox{}
- mb3 := &MockMailbox{}
-
- // Mockup some different aged messages (num is in hours)
- new1 := mockMessage(0)
- new2 := mockMessage(1)
- new3 := mockMessage(2)
- old1 := mockMessage(4)
- old2 := mockMessage(12)
- old3 := mockMessage(24)
-
- // First it should ask for all mailboxes
- mds.On("AllMailboxes").Return([]Mailbox{mb1, mb2, mb3}, nil)
-
- // Then for all messages on each box
- mb1.On("GetMessages").Return([]Message{new1, old1, old2}, nil)
- mb2.On("GetMessages").Return([]Message{old3, new2}, nil)
- mb3.On("GetMessages").Return([]Message{new3}, nil)
-
- // Test 4 hour retention
- rs := &RetentionScanner{
- ds: mds,
- retentionPeriod: 4*time.Hour - time.Minute,
- retentionSleep: 0,
- }
- if err := rs.doScan(); err != nil {
- t.Error(err)
- }
-
- // Check our assertions
- mds.AssertExpectations(t)
- mb1.AssertExpectations(t)
- mb2.AssertExpectations(t)
- mb3.AssertExpectations(t)
-
- // Delete should not have been called on new messages
- new1.AssertNotCalled(t, "Delete")
- new2.AssertNotCalled(t, "Delete")
- new3.AssertNotCalled(t, "Delete")
-
- // Delete should have been called once on old messages
- old1.AssertNumberOfCalls(t, "Delete", 1)
- old2.AssertNumberOfCalls(t, "Delete", 1)
- old3.AssertNumberOfCalls(t, "Delete", 1)
-}
-
-// Make a MockMessage of a specific age
-func mockMessage(ageHours int) *MockMessage {
- msg := &MockMessage{}
- msg.On("ID").Return(fmt.Sprintf("MSG[age=%vh]", ageHours))
- msg.On("Date").Return(time.Now().Add(time.Duration(ageHours*-1) * time.Hour))
- msg.On("Delete").Return(nil)
- return msg
-}
-
-// Mock DataStore object
-type MockDataStore struct {
- mock.Mock
-}
-
-func (m *MockDataStore) MailboxFor(name string) (Mailbox, error) {
- args := m.Called()
- return args.Get(0).(Mailbox), args.Error(1)
-}
-
-func (m *MockDataStore) AllMailboxes() ([]Mailbox, error) {
- args := m.Called()
- return args.Get(0).([]Mailbox), args.Error(1)
-}
-
-// Mock Mailbox object
-type MockMailbox struct {
- mock.Mock
-}
-
-func (m *MockMailbox) GetMessages() ([]Message, error) {
- args := m.Called()
- return args.Get(0).([]Message), args.Error(1)
-}
-
-func (m *MockMailbox) GetMessage(id string) (Message, error) {
- args := m.Called(id)
- return args.Get(0).(Message), args.Error(1)
-}
-
-func (m *MockMailbox) Purge() error {
- args := m.Called()
- return args.Error(0)
-}
-
-func (m *MockMailbox) NewMessage() (Message, error) {
- args := m.Called()
- return args.Get(0).(Message), args.Error(1)
-}
-
-func (m *MockMailbox) Name() string {
- args := m.Called()
- return args.String(0)
-}
-
-func (m *MockMailbox) String() string {
- args := m.Called()
- return args.String(0)
-}
-
-// Mock Message object
-type MockMessage struct {
- mock.Mock
-}
-
-func (m *MockMessage) ID() string {
- args := m.Called()
- return args.String(0)
-}
-
-func (m *MockMessage) From() string {
- args := m.Called()
- return args.String(0)
-}
-
-func (m *MockMessage) To() []string {
- args := m.Called()
- return args.Get(0).([]string)
-}
-
-func (m *MockMessage) Date() time.Time {
- args := m.Called()
- return args.Get(0).(time.Time)
-}
-
-func (m *MockMessage) Subject() string {
- args := m.Called()
- return args.String(0)
-}
-
-func (m *MockMessage) ReadHeader() (msg *mail.Message, err error) {
- args := m.Called()
- return args.Get(0).(*mail.Message), args.Error(1)
-}
-
-func (m *MockMessage) ReadBody() (body *enmime.Envelope, err error) {
- args := m.Called()
- return args.Get(0).(*enmime.Envelope), args.Error(1)
-}
-
-func (m *MockMessage) ReadRaw() (raw *string, err error) {
- args := m.Called()
- return args.Get(0).(*string), args.Error(1)
-}
-
-func (m *MockMessage) RawReader() (reader io.ReadCloser, err error) {
- args := m.Called()
- return args.Get(0).(io.ReadCloser), args.Error(1)
-}
-
-func (m *MockMessage) Size() int64 {
- args := m.Called()
- return int64(args.Int(0))
-}
-
-func (m *MockMessage) Append(data []byte) error {
- // []byte arg seems to mess up testify/mock
- return nil
-}
-
-func (m *MockMessage) Close() error {
- args := m.Called()
- return args.Error(0)
-}
-
-func (m *MockMessage) Delete() error {
- args := m.Called()
- return args.Error(0)
-}
-
-func (m *MockMessage) String() string {
- args := m.Called()
- return args.String(0)
-}
diff --git a/smtpd/utils.go b/stringutil/utils.go
similarity index 88%
rename from smtpd/utils.go
rename to stringutil/utils.go
index a8dcfb7..450ae1f 100644
--- a/smtpd/utils.go
+++ b/stringutil/utils.go
@@ -1,8 +1,7 @@
-package smtpd
+package stringutil
import (
"bytes"
- "container/list"
"crypto/sha1"
"fmt"
"io"
@@ -42,7 +41,7 @@ func ParseMailboxName(localPart string) (result string, err error) {
return result, nil
}
-// HashMailboxName accepts a mailbox name and hashes it. Inbucket uses this as
+// HashMailboxName accepts a mailbox name and hashes it. filestore uses this as
// the directory to house the mailbox
func HashMailboxName(mailbox string) string {
h := sha1.New()
@@ -53,18 +52,6 @@ func HashMailboxName(mailbox string) string {
return fmt.Sprintf("%x", h.Sum(nil))
}
-// JoinStringList joins a List containing strings by commas
-func JoinStringList(listOfStrings *list.List) string {
- if listOfStrings.Len() == 0 {
- return ""
- }
- s := make([]string, 0, listOfStrings.Len())
- for e := listOfStrings.Front(); e != nil; e = e.Next() {
- s = append(s, e.Value.(string))
- }
- return strings.Join(s, ",")
-}
-
// ValidateDomainPart returns true if the domain part complies to RFC3696, RFC1035
func ValidateDomainPart(domain string) bool {
if len(domain) == 0 {
@@ -143,15 +130,24 @@ LOOP:
switch {
case ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'):
// Letters are OK
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
case '0' <= c && c <= '9':
// Numbers are OK
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
case bytes.IndexByte([]byte("!#$%&'*+-/=?^_`{|}~"), c) >= 0:
// These specials can be used unquoted
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
case c == '.':
// A single period is OK
@@ -159,13 +155,19 @@ LOOP:
// Sequence of periods is not permitted
return "", "", fmt.Errorf("Sequence of periods is not permitted")
}
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
case c == '\\':
inCharQuote = true
case c == '"':
if inCharQuote {
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
} else if inStringQuote {
inStringQuote = false
@@ -178,7 +180,10 @@ LOOP:
}
case c == '@':
if inCharQuote || inStringQuote {
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
} else {
// End of local-part
@@ -195,7 +200,10 @@ LOOP:
return "", "", fmt.Errorf("Characters outside of US-ASCII range not permitted")
default:
if inCharQuote || inStringQuote {
- _ = buf.WriteByte(c)
+ err = buf.WriteByte(c)
+ if err != nil {
+ return
+ }
inCharQuote = false
} else {
return "", "", fmt.Errorf("Character %q must be quoted", c)
diff --git a/smtpd/utils_test.go b/stringutil/utils_test.go
similarity index 99%
rename from smtpd/utils_test.go
rename to stringutil/utils_test.go
index ae4fda3..330bfbd 100644
--- a/smtpd/utils_test.go
+++ b/stringutil/utils_test.go
@@ -1,4 +1,4 @@
-package smtpd
+package stringutil
import (
"strings"
diff --git a/swaks-tests/nonmime-html-inlined.raw b/swaks-tests/nonmime-html-inlined.raw
new file mode 100644
index 0000000..99c80cf
--- /dev/null
+++ b/swaks-tests/nonmime-html-inlined.raw
@@ -0,0 +1,393 @@
+Date: %DATE%
+To: %TO_ADDRESS%
+From: %FROM_ADDRESS%
+Subject: tutsplus responsive inlined CSS
+MIME-Version: 1.0
+Content-Type: text/html; charset="UTF-8"
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/swaks-tests/nonmime-html-responsive.raw b/swaks-tests/nonmime-html-responsive.raw
index 84fd54e..7db14df 100644
--- a/swaks-tests/nonmime-html-responsive.raw
+++ b/swaks-tests/nonmime-html-responsive.raw
@@ -1,7 +1,7 @@
Date: %DATE%
To: %TO_ADDRESS%
From: %FROM_ADDRESS%
-Subject: tutsplus responsive
+Subject: tutsplus responsive external CSS
MIME-Version: 1.0
Content-Type: text/html; charset="UTF-8"
diff --git a/swaks-tests/nonmime-html.raw b/swaks-tests/nonmime-html.raw
index 7f45889..3079d65 100644
--- a/swaks-tests/nonmime-html.raw
+++ b/swaks-tests/nonmime-html.raw
@@ -5,4 +5,6 @@ Subject: Swaks HTML
MIME-Version: 1.0
Content-Type: text/html; charset="UTF-8"
-This is a test of HTML at the top level.
+
@@ -78,7 +78,22 @@
+
+
+
+
+
+
+ 
+ |
+ |||||||||
+
|
+ |||||||||
|
+
+
+
+
+
+
+
+
|
+ |||||||||
|
+
+
+
+
+
+
+
+
+
+
+
|
+ |||||||||
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
+ |||||||||
|
+
+
+
+
+
+
+
+
|
+ |||||||||
|
+
+
+
+
+
+
+
+
|
+
+ 
+ 
+ 
+ 
+ 
+ 
+ + This is a test of HTML at the top level. +
diff --git a/swaks-tests/run-tests.sh b/swaks-tests/run-tests.sh index 0784a11..c9a93b8 100755 --- a/swaks-tests/run-tests.sh +++ b/swaks-tests/run-tests.sh @@ -53,5 +53,6 @@ swaks $* --data gmail.raw # Outlook test swaks $* --data outlook.raw -# Nonemime responsive HTML test +# Non-mime responsive HTML test swaks $* --data nonmime-html-responsive.raw +swaks $* --data nonmime-html-inlined.raw diff --git a/themes/bootstrap/public/inbucket.css b/themes/bootstrap/public/inbucket.css index c3c9f49..c895626 100644 --- a/themes/bootstrap/public/inbucket.css +++ b/themes/bootstrap/public/inbucket.css @@ -51,12 +51,17 @@ body { } } +#body-tabs > li > a { + padding-top: 6px; + padding-bottom: 6px; +} + .message-body { - padding: 0 5px; + padding: 10px 4px; } .message-attachments { - margin-top: 20px; + margin-top: 5px; padding: 10px 10px 0 0; } diff --git a/themes/bootstrap/public/mailbox.js b/themes/bootstrap/public/mailbox.js index f7e229a..5a624c6 100644 --- a/themes/bootstrap/public/mailbox.js +++ b/themes/bootstrap/public/mailbox.js @@ -22,6 +22,17 @@ function deleteMessage(id) { }) } +// deleteMailbox clears the mailbox +function deleteMailbox() { + if (confirm("Are you sure you want delete this mailbox?")) { + $.ajax({ + type: 'DELETE', + url: '/api/v1/mailbox/' + mailbox, + success: loadList + }) + } +} + // flashTooltip temporarily changes the text of a tooltip function flashTooltip(el, text) { var prevText = $(el).attr('data-original-title'); @@ -43,7 +54,7 @@ function loadList() { dataType: "json", url: '/api/v1/mailbox/' + mailbox, success: function(data) { - messageListData = data; + messageListData = data.reverse(); // Render list $('#message-list').loadTemplate($('#list-entry-template'), data); $('.message-list-entry').click(onMessageListClick); @@ -144,6 +155,7 @@ function onMessageLoaded(responseText, textStatus, XMLHttpRequest) { return; } onDocumentChange(); + $('#body-tabs a:first').tab('show') var top = $('#message-container').offset().top - navBarOffset; $(window).scrollTop(top); } diff --git a/themes/bootstrap/public/monitor.js b/themes/bootstrap/public/monitor.js index e670621..3a03ed6 100644 --- a/themes/bootstrap/public/monitor.js +++ b/themes/bootstrap/public/monitor.js @@ -30,7 +30,7 @@ function startMonitor(mailbox) { $('#monitor-message-list').loadTemplate( $('#message-template'), msg, - { append: true }); + { prepend: true }); }); ws.addEventListener('close', function (e) { $('#conn-status').text('Disconnected!'); diff --git a/themes/bootstrap/templates/mailbox/_show.html b/themes/bootstrap/templates/mailbox/_show.html index 33a9975..49621f0 100644 --- a/themes/bootstrap/templates/mailbox/_show.html +++ b/themes/bootstrap/templates/mailbox/_show.html @@ -24,7 +24,7 @@ class="btn btn-primary" onClick="htmlView('{{.message.ID}}');"> - HTML + Raw HTML {{end}}
+
+
+
{{with .attachments}}
diff --git a/webui/mailbox_controller.go b/webui/mailbox_controller.go
index 35126db..7f2d6e8 100644
--- a/webui/mailbox_controller.go
+++ b/webui/mailbox_controller.go
@@ -7,9 +7,11 @@ import (
"net/http"
"strconv"
+ "github.com/jhillyerd/inbucket/datastore"
"github.com/jhillyerd/inbucket/httpd"
"github.com/jhillyerd/inbucket/log"
- "github.com/jhillyerd/inbucket/smtpd"
+ "github.com/jhillyerd/inbucket/sanitize"
+ "github.com/jhillyerd/inbucket/stringutil"
)
// MailboxIndex renders the index page for a particular mailbox
@@ -23,7 +25,7 @@ func MailboxIndex(w http.ResponseWriter, req *http.Request, ctx *httpd.Context)
http.Redirect(w, req, httpd.Reverse("RootIndex"), http.StatusSeeOther)
return nil
}
- name, err = smtpd.ParseMailboxName(name)
+ name, err = stringutil.ParseMailboxName(name)
if err != nil {
ctx.Session.AddFlash(err.Error(), "errors")
_ = ctx.Session.Save(req, w)
@@ -50,7 +52,7 @@ func MailboxIndex(w http.ResponseWriter, req *http.Request, ctx *httpd.Context)
func MailboxLink(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
id := ctx.Vars["id"]
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
ctx.Session.AddFlash(err.Error(), "errors")
_ = ctx.Session.Save(req, w)
@@ -66,7 +68,7 @@ func MailboxLink(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
// MailboxList renders a list of messages in a mailbox. Renders a partial
func MailboxList(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
return err
}
@@ -93,7 +95,7 @@ func MailboxList(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
id := ctx.Vars["id"]
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
return err
}
@@ -103,7 +105,7 @@ func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
return fmt.Errorf("Failed to get mailbox for %q: %v", name, err)
}
msg, err := mb.GetMessage(id)
- if err == smtpd.ErrNotExist {
+ if err == datastore.ErrNotExist {
http.NotFound(w, req)
return nil
}
@@ -117,6 +119,14 @@ func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
}
body := template.HTML(httpd.TextToHTML(mime.Text))
htmlAvailable := mime.HTML != ""
+ var htmlBody template.HTML
+ if htmlAvailable {
+ if str, err := sanitize.HTML(mime.HTML); err == nil {
+ htmlBody = template.HTML(str)
+ } else {
+ log.Warnf("HTML sanitizer failed: %s", err)
+ }
+ }
// Render partial template
return httpd.RenderPartial("mailbox/_show.html", w, map[string]interface{}{
"ctx": ctx,
@@ -124,6 +134,7 @@ func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
"message": msg,
"body": body,
"htmlAvailable": htmlAvailable,
+ "htmlBody": htmlBody,
"mimeErrors": mime.Errors,
"attachments": mime.Attachments,
})
@@ -133,7 +144,7 @@ func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
func MailboxHTML(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
id := ctx.Vars["id"]
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
return err
}
@@ -143,7 +154,7 @@ func MailboxHTML(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
return fmt.Errorf("Failed to get mailbox for %q: %v", name, err)
}
message, err := mb.GetMessage(id)
- if err == smtpd.ErrNotExist {
+ if err == datastore.ErrNotExist {
http.NotFound(w, req)
return nil
}
@@ -170,7 +181,7 @@ func MailboxHTML(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
func MailboxSource(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
id := ctx.Vars["id"]
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
return err
}
@@ -180,7 +191,7 @@ func MailboxSource(w http.ResponseWriter, req *http.Request, ctx *httpd.Context)
return fmt.Errorf("Failed to get mailbox for %q: %v", name, err)
}
message, err := mb.GetMessage(id)
- if err == smtpd.ErrNotExist {
+ if err == datastore.ErrNotExist {
http.NotFound(w, req)
return nil
}
@@ -205,7 +216,7 @@ func MailboxSource(w http.ResponseWriter, req *http.Request, ctx *httpd.Context)
func MailboxDownloadAttach(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
id := ctx.Vars["id"]
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
ctx.Session.AddFlash(err.Error(), "errors")
_ = ctx.Session.Save(req, w)
@@ -226,7 +237,7 @@ func MailboxDownloadAttach(w http.ResponseWriter, req *http.Request, ctx *httpd.
return fmt.Errorf("Failed to get mailbox for %q: %v", name, err)
}
message, err := mb.GetMessage(id)
- if err == smtpd.ErrNotExist {
+ if err == datastore.ErrNotExist {
http.NotFound(w, req)
return nil
}
@@ -257,7 +268,7 @@ func MailboxDownloadAttach(w http.ResponseWriter, req *http.Request, ctx *httpd.
// MailboxViewAttach sends the attachment to the client for online viewing
func MailboxViewAttach(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) {
// Don't have to validate these aren't empty, Gorilla returns 404
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
ctx.Session.AddFlash(err.Error(), "errors")
_ = ctx.Session.Save(req, w)
@@ -279,7 +290,7 @@ func MailboxViewAttach(w http.ResponseWriter, req *http.Request, ctx *httpd.Cont
return fmt.Errorf("Failed to get mailbox for %q: %v", name, err)
}
message, err := mb.GetMessage(id)
- if err == smtpd.ErrNotExist {
+ if err == datastore.ErrNotExist {
http.NotFound(w, req)
return nil
}
diff --git a/webui/root_controller.go b/webui/root_controller.go
index 651e686..9a64bc5 100644
--- a/webui/root_controller.go
+++ b/webui/root_controller.go
@@ -8,7 +8,7 @@ import (
"github.com/jhillyerd/inbucket/config"
"github.com/jhillyerd/inbucket/httpd"
- "github.com/jhillyerd/inbucket/smtpd"
+ "github.com/jhillyerd/inbucket/stringutil"
)
// RootIndex serves the Inbucket landing page
@@ -58,7 +58,7 @@ func RootMonitorMailbox(w http.ResponseWriter, req *http.Request, ctx *httpd.Con
http.Redirect(w, req, httpd.Reverse("RootIndex"), http.StatusSeeOther)
return nil
}
- name, err := smtpd.ParseMailboxName(ctx.Vars["name"])
+ name, err := stringutil.ParseMailboxName(ctx.Vars["name"])
if err != nil {
ctx.Session.AddFlash(err.Error(), "errors")
_ = ctx.Session.Save(req, w)