Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 17:47:03 +00:00
Code Issues Releases Wiki Activity

storage: Make locking an implementation detail for #69

Browse Source 
- file: Store handles its own locking #77
- file: Move mbox into its own file
- file & test: remove LockFor()
This commit is contained in:
James Hillyerd
2018-03-17 14:02:50 -07:00
parent b9003a9328
commit e84b1f8952
5 changed files with 288 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/server/smtp/handler.go
View File

@@ -368,23 +368,10 @@ func (ss *Session) dataHandler() {
return
}
if bytes.Equal(lineBuf, []byte(".\r\n")) || bytes.Equal(lineBuf, []byte(".\n")) {
// Mail data complete
// Mail data complete.
for _, recip := range ss.recipients {
if recip.ShouldStore() {
// TODO temporary hack to fix #77 until datastore revamp
mu, err := ss.server.dataStore.LockFor(recip.LocalPart)
if err != nil {
ss.logError("Failed to get lock for %q: %s", recip.LocalPart, err)
// Delivery failure
ss.send(fmt.Sprintf("451 Failed to store message for %v", recip.LocalPart))
ss.reset()
return
}
mu.Lock()
ok := ss.deliverMessage(recip, msgBuf.Bytes())
mu.Unlock()
if !ok {
// Delivery failure
if ok := ss.deliverMessage(recip, msgBuf.Bytes()); !ok {
ss.send(fmt.Sprintf("451 Failed to store message for %v", recip.LocalPart))
ss.reset()
return
@@ -397,28 +384,22 @@ func (ss *Session) dataHandler() {
ss.reset()
return
}
// SMTP RFC says remove leading periods from input
// RFC says remove leading periods from input.
if len(lineBuf) > 0 && lineBuf[0] == '.' {
lineBuf = lineBuf[1:]
}
msgBuf.Write(lineBuf)
if msgBuf.Len() > ss.server.maxMessageBytes {
// Max message size exceeded
ss.send("552 Maximum message size exceeded")
ss.logWarn("Max message size exceeded while in DATA")
ss.reset()
return
}
} // end for
}
}
// deliverMessage creates and populates a new Message for the specified recipient
func (ss *Session) deliverMessage(recip *policy.Recipient, content []byte) (ok bool) {
name, err := policy.ParseMailboxName(recip.LocalPart)
if err != nil {
// This parse already succeeded when MailboxFor was called, shouldn't fail here.
return false
}
// TODO replace with something that only reads header?
env, err := enmime.ReadEnvelope(bytes.NewReader(content))
if err != nil {
@@ -441,7 +422,7 @@ func (ss *Session) deliverMessage(recip *policy.Recipient, content []byte) (ok b
ss.remoteDomain, ss.remoteHost, ss.server.domain, recip.Address, stamp))
delivery := &message.Delivery{
Meta: message.Metadata{
Mailbox: name,
Mailbox: recip.Mailbox,
From: from[0],
To: to,
Date: time.Now(),
@@ -455,8 +436,9 @@ func (ss *Session) deliverMessage(recip *policy.Recipient, content []byte) (ok b
return false
}
// Broadcast message information.
// TODO this belongs in message pkg.
broadcast := msghub.Message{
Mailbox: name,
Mailbox: recip.Mailbox,
ID: id,
From: delivery.From().String(),
To: stringutil.StringAddressList(delivery.To()),