mirror of
https://github.com/mjl-/mox.git
synced 2024-12-28 01:13:47 +03:00
28fae96a9b
getting mox to compile required changing code in only a few places where package "syscall" was used: for accessing file access times and for umask handling. an open problem is how to start a process as an unprivileged user on windows. that's why "mox serve" isn't implemented yet. and just finding a way to implement it now may not be good enough in the near future: we may want to starting using a more complete privilege separation approach, with a process handling sensitive tasks (handling private keys, authentication), where we may want to pass file descriptors between processes. how would that work on windows? anyway, getting mox to compile for windows doesn't mean it works properly on windows. the largest issue: mox would normally open a file, rename or remove it, and finally close it. this happens during message delivery. that doesn't work on windows, the rename/remove would fail because the file is still open. so this commit swaps many "remove" and "close" calls. renames are a longer story: message delivery had two ways to deliver: with "consuming" the (temporary) message file (which would rename it to its final destination), and without consuming (by hardlinking the file, falling back to copying). the last delivery to a recipient of a message (and the only one in the common case of a single recipient) would consume the message, and the earlier recipients would not. during delivery, the already open message file was used, to parse the message. we still want to use that open message file, and the caller now stays responsible for closing it, but we no longer try to rename (consume) the file. we always hardlink (or copy) during delivery (this works on windows), and the caller is responsible for closing and removing (in that order) the original temporary file. this does cost one syscall more. but it makes the delivery code (responsibilities) a bit simpler. there is one more obvious issue: the file system path separator. mox already used the "filepath" package to join paths in many places, but not everywhere. and it still used strings with slashes for local file access. with this commit, the code now uses filepath.FromSlash for path strings with slashes, uses "filepath" in a few more places where it previously didn't. also switches from "filepath" to regular "path" package when handling mailbox names in a few places, because those always use forward slashes, regardless of local file system conventions. windows can handle forward slashes when opening files, so test code that passes path strings with forward slashes straight to go stdlib file i/o functions are left unchanged to reduce code churn. the regular non-test code, or test code that uses path strings in places other than standard i/o functions, does have the paths converted for consistent paths (otherwise we would end up with paths with mixed forward/backward slashes in log messages). windows cannot dup a listening socket. for "mox localserve", it isn't important, and we can work around the issue. the current approach for "mox serve" (forking a process and passing file descriptors of listening sockets on "privileged" ports) won't work on windows. perhaps it isn't needed on windows, and any user can listen on "privileged" ports? that would be welcome. on windows, os.Open cannot open a directory, so we cannot call Sync on it after message delivery. a cursory internet search indicates that directories cannot be synced on windows. the story is probably much more nuanced than that, with long deep technical details/discussions/disagreement/confusion, like on unix. for "mox localserve" we can get away with making syncdir a no-op.
84 lines
2.4 KiB
Go
84 lines
2.4 KiB
Go
package store
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
"testing"
|
|
)
|
|
|
|
func TestMsgreader(t *testing.T) {
|
|
_, err := io.Copy(io.Discard, &MsgReader{prefix: []byte("hello"), path: "bogus.txt", size: int64(len("hello"))})
|
|
if err == nil || !os.IsNotExist(err) {
|
|
t.Fatalf("expected error for non-existing file, got %s", err)
|
|
}
|
|
|
|
if err := os.WriteFile("emptyfile_test.txt", []byte{}, 0660); err != nil {
|
|
t.Fatalf("writing emptyfile_test.txt: %s", err)
|
|
}
|
|
defer os.Remove("emptyfile_test.txt")
|
|
mr := &MsgReader{prefix: []byte("hello"), path: "emptyfile_test.txt", size: int64(len("hello"))}
|
|
defer mr.Close()
|
|
if buf, err := io.ReadAll(mr); err != nil {
|
|
t.Fatalf("readall: %s", err)
|
|
} else if string(buf) != "hello" {
|
|
t.Fatalf("got %q, expected %q", buf, "hello")
|
|
}
|
|
|
|
if err := os.WriteFile("msgreader_test.txt", []byte(" world"), 0660); err != nil {
|
|
t.Fatalf("writing msgreader_test.txt: %s", err)
|
|
}
|
|
defer os.Remove("msgreader_test.txt")
|
|
mr = &MsgReader{prefix: []byte("hello"), path: "msgreader_test.txt", size: int64(len("hello world"))}
|
|
defer mr.Close()
|
|
if buf, err := io.ReadAll(mr); err != nil {
|
|
t.Fatalf("readall: %s", err)
|
|
} else if string(buf) != "hello world" {
|
|
t.Fatalf("got %q, expected %q", buf, "hello world")
|
|
}
|
|
|
|
mr.Reset()
|
|
buf := make([]byte, 32)
|
|
if n, err := mr.ReadAt(buf, 1); err != nil && err != io.EOF {
|
|
t.Fatalf("readat: n %d, s %q, err %s", n, buf[:n], err)
|
|
} else if n != len("ello world") || string(buf[:n]) != "ello world" {
|
|
t.Fatalf("readat: got %d bytes (%q), expected %d (%q)", n, buf, int64(len("ello world")), "ello world")
|
|
}
|
|
|
|
// Read with 1 byte at a time to exercise the offset/buffer-length calculations.
|
|
buf = make([]byte, 1)
|
|
var result []byte
|
|
mr = &MsgReader{prefix: []byte("hello"), path: "msgreader_test.txt", size: int64(len("hello world"))}
|
|
for {
|
|
n, err := mr.Read(buf)
|
|
if n > 0 {
|
|
result = append(result, buf...)
|
|
}
|
|
if err == io.EOF {
|
|
break
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("read: %s", err)
|
|
}
|
|
}
|
|
if string(result) != "hello world" {
|
|
t.Fatalf("got %q, want %q", result, "hello world")
|
|
}
|
|
|
|
if err := mr.Close(); err != nil {
|
|
t.Fatalf("close: %v", err)
|
|
}
|
|
|
|
f, err := os.Open("msgreader_test.txt")
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
mr = FileMsgReader([]byte("hello"), f)
|
|
|
|
if mr.Size() != int64(len("hello world")) {
|
|
t.Fatalf("size, got %d, expect %d", mr.Size(), len("hello world"))
|
|
}
|
|
|
|
if err := mr.Close(); err != nil {
|
|
t.Fatalf("close: %v", err)
|
|
}
|
|
}
|