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

Fix some null pointers during message retrieval

Browse Source
This commit is contained in:
James Hillyerd
2018-04-07 14:40:54 -07:00
parent 12f98868ba
commit c6bb7d1d4d
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/message/manager.go
View File

@@ -112,7 +112,7 @@ func (s *StoreManager) GetMetadata(mailbox string) ([]*Metadata, error) {
// GetMessage returns the specified message. // GetMessage returns the specified message.
func (s *StoreManager) GetMessage(mailbox, id string) (*Message, error) { func (s *StoreManager) GetMessage(mailbox, id string) (*Message, error) {
sm, err := s.Store.GetMessage(mailbox, id) sm, err := s.Store.GetMessage(mailbox, id)
if err != nil { if err != nil || sm == nil {
return nil, err return nil, err
} }
r, err := sm.Source() r, err := sm.Source()
@@ -148,7 +148,7 @@ func (s *StoreManager) RemoveMessage(mailbox, id string) error {
// SourceReader allows the stored message source to be read. // SourceReader allows the stored message source to be read.
func (s *StoreManager) SourceReader(mailbox, id string) (io.ReadCloser, error) { func (s *StoreManager) SourceReader(mailbox, id string) (io.ReadCloser, error) {
sm, err := s.Store.GetMessage(mailbox, id) sm, err := s.Store.GetMessage(mailbox, id)
if err != nil { if err != nil || sm == nil {
return nil, err return nil, err
} }
return sm.Source() return sm.Source()

18
pkg/rest/apiv1_controller.go
View File

@@ -53,14 +53,13 @@ func MailboxShowV1(w http.ResponseWriter, req *http.Request, ctx *web.Context) (
return err return err
} }
msg, err := ctx.Manager.GetMessage(name, id) msg, err := ctx.Manager.GetMessage(name, id)
if err == storage.ErrNotExist { if err != nil && err != storage.ErrNotExist {
return fmt.Errorf("GetMessage(%q) failed: %v", id, err)
}
if msg == nil {
http.NotFound(w, req) http.NotFound(w, req)
return nil return nil
} }
if err != nil {
// This doesn't indicate empty, likely an IO error
return fmt.Errorf("GetMessage(%q) failed: %v", id, err)
}
attachParts := msg.Attachments() attachParts := msg.Attachments()
attachments := make([]*model.JSONMessageAttachmentV1, len(attachParts)) attachments := make([]*model.JSONMessageAttachmentV1, len(attachParts))
for i, part := range attachParts { for i, part := range attachParts {
@@ -146,14 +145,13 @@ func MailboxSourceV1(w http.ResponseWriter, req *http.Request, ctx *web.Context)
return err return err
} }
r, err := ctx.Manager.SourceReader(name, id) r, err := ctx.Manager.SourceReader(name, id)
if err == storage.ErrNotExist { if err != nil && err != storage.ErrNotExist {
return fmt.Errorf("SourceReader(%q) failed: %v", id, err)
}
if r == nil {
http.NotFound(w, req) http.NotFound(w, req)
return nil return nil
} }
if err != nil {
// This doesn't indicate missing, likely an IO error
return fmt.Errorf("SourceReader(%q) failed: %v", id, err)
}
// Output message source // Output message source
w.Header().Set("Content-Type", "text/plain") w.Header().Set("Content-Type", "text/plain")
_, err = io.Copy(w, r) _, err = io.Copy(w, r)

6
pkg/storage/mem/store.go
View File

@@ -93,7 +93,11 @@ func (s *Store) AddMessage(message storage.Message) (id string, err error) {
// GetMessage gets a mesage. // GetMessage gets a mesage.
func (s *Store) GetMessage(mailbox, id string) (m storage.Message, err error) { func (s *Store) GetMessage(mailbox, id string) (m storage.Message, err error) {
s.withMailbox(mailbox, false, func(mb *mbox) { s.withMailbox(mailbox, false, func(mb *mbox) {
m = mb.messages[id] var ok bool
m, ok = mb.messages[id]
if !ok {
m = nil
}
}) })
return m, err return m, err
} }