Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save files in local storage as group readable #21198

Merged
merged 7 commits into from
Sep 24, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/storage/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ func (l *LocalStorage) Save(path string, r io.Reader, size int64) (int64, error)
if err := util.Rename(tmp.Name(), p); err != nil {
return 0, err
}
// Golang's tmp file (os.CreateTemp) always have 0o600 mode, so we need to change the file to follow the umask (as what Create/MkDir does)
if err := util.ApplyUmask(p, os.ModePerm); err != nil {
return 0, err
}

tmpRemoved = true

Expand Down
28 changes: 28 additions & 0 deletions modules/util/file_unix.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

//go:build !windows

package util

import (
"os"

"golang.org/x/sys/unix"
)

var defaultUmask int

func init() {
// at the moment, the umask could only be gotten by calling unix.Umask(newUmask)
// use 0o077 as temp new umask to reduce the risks if this umask is used anywhere else before the correct umask is recovered
tempUmask := 0o077
defaultUmask = unix.Umask(tempUmask)
unix.Umask(defaultUmask)
}

func ApplyUmask(f string, newMode os.FileMode) error {
mod := newMode & ^os.FileMode(defaultUmask)
return os.Chmod(f, mod)
}
32 changes: 32 additions & 0 deletions modules/util/file_unix_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package util

import (
"github.com/stretchr/testify/assert"
"os"
"testing"
)

func TestApplyUmask(t *testing.T) {
f, err := os.CreateTemp(t.TempDir(), "test-filemode-")
assert.NoError(t, err)

err = os.Chmod(f.Name(), 0777)
assert.NoError(t, err)
st, err := os.Stat(f.Name())
assert.NoError(t, err)
assert.EqualValues(t, 0o777, st.Mode().Perm()&0o777)

oldDefaultUmask := defaultUmask
defaultUmask = 0o037
defer func() {
defaultUmask = oldDefaultUmask
}()
err = ApplyUmask(f.Name(), os.ModePerm)
st, err = os.Stat(f.Name())
assert.NoError(t, err)
assert.EqualValues(t, 0o740, st.Mode().Perm()&0o777)
}
12 changes: 12 additions & 0 deletions modules/util/file_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

//go:build windows

package util

func ApplyUmask(f string, newMode os.FileMode) error {
// do nothing for Windows, because Windows doesn't use umask
return nil
}