From 77060795e6c3dbf48c96e045c5af0fece4c736ca Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Mon, 27 Dec 2021 16:53:50 +0100 Subject: [PATCH] feat: Add `O_RDONLY`, `O_WRONLY` and `O_RDWR` flag support --- internal/fs/file.go | 28 ++++++++++++++++++++++++++-- internal/fs/filesystem.go | 8 ++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/internal/fs/file.go b/internal/fs/file.go index 988b484..5dc8228 100644 --- a/internal/fs/file.go +++ b/internal/fs/file.go @@ -34,8 +34,8 @@ type WriteCache interface { } type FileFlags struct { - readOnly bool - writeOnly bool + read bool + write bool append bool createIfNotExists bool @@ -326,6 +326,10 @@ func (f *File) Read(p []byte) (n int, err error) { return -1, ErrIsDirectory } + if !f.flags.read { + return -1, os.ErrPermission + } + f.ioLock.Lock() defer f.ioLock.Unlock() @@ -387,6 +391,10 @@ func (f *File) ReadAt(p []byte, off int64) (n int, err error) { return -1, ErrIsDirectory } + if !f.flags.read { + return -1, os.ErrPermission + } + if _, err := f.Seek(off, io.SeekStart); err != nil { return -1, err } @@ -481,6 +489,10 @@ func (f *File) Write(p []byte) (n int, err error) { return -1, ErrIsDirectory } + if !f.flags.write { + return -1, os.ErrPermission + } + f.ioLock.Lock() defer f.ioLock.Unlock() @@ -505,6 +517,10 @@ func (f *File) WriteAt(p []byte, off int64) (n int, err error) { return -1, ErrIsDirectory } + if !f.flags.write { + return -1, os.ErrPermission + } + f.ioLock.Lock() defer f.ioLock.Unlock() @@ -522,6 +538,10 @@ func (f *File) WriteString(s string) (ret int, err error) { return -1, ErrIsDirectory } + if !f.flags.write { + return -1, os.ErrPermission + } + f.ioLock.Lock() defer f.ioLock.Unlock() @@ -539,6 +559,10 @@ func (f *File) Truncate(size int64) error { return ErrIsDirectory } + if !f.flags.write { + return os.ErrPermission + } + f.ioLock.Lock() defer f.ioLock.Unlock() diff --git a/internal/fs/filesystem.go b/internal/fs/filesystem.go index 3f27710..473b784 100644 --- a/internal/fs/filesystem.go +++ b/internal/fs/filesystem.go @@ -184,16 +184,16 @@ func (f *FileSystem) OpenFile(name string, flag int, perm os.FileMode) (afero.Fi flags := &FileFlags{} if flag&os.O_RDONLY != 0 { - flags.readOnly = true + flags.read = true } if flag&os.O_WRONLY != 0 { - flags.writeOnly = true + flags.write = true } if flag&os.O_RDWR != 0 { - flags.readOnly = true - flags.writeOnly = true + flags.read = true + flags.write = true } if flag&os.O_APPEND != 0 {