hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-29 12:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify unix socket permission format (#3014)

Browse source 
### Pull Request Checklist

<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->

* [x] I have added Go unit tests or [Complement integration
tests](https://github.com/matrix-org/complement) for this PR _or_ I have
justified why this PR doesn't need tests
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately

Signed-off-by: `Boris Rybalkin <ribalkin@gmail.com>`
This commit is contained in:
Boris Rybalkin 2023-03-16 07:51:21 +00:00 • committed by GitHub
parent 2c58bab6a8
commit d88f71ab71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
setup/config/config_address.go
View file

@ -3,6 +3,7 @@ package config
import (
"io/fs"
"net/url"
"strconv"
)
const (
@ -32,8 +33,12 @@ func (s ServerAddress) Network() string {
}
}
func UnixSocketAddress(path string, perm fs.FileMode) ServerAddress {
return ServerAddress{Address: path, Scheme: NetworkUnix, UnixSocketPermission: perm}
func UnixSocketAddress(path string, perm string) (ServerAddress, error) {
permission, err := strconv.ParseInt(perm, 8, 32)
if err != nil {
return ServerAddress{}, err
}
return ServerAddress{Address: path, Scheme: NetworkUnix, UnixSocketPermission: fs.FileMode(permission)}, nil
}
func HTTPAddress(urlAddress string) (ServerAddress, error) {

20
setup/config/config_address_test.go
View file

@ -20,6 +20,24 @@ func TestHttpAddress_ParseBad(t *testing.T) {
}
func TestUnixSocketAddress_Network(t *testing.T) {
address := UnixSocketAddress("/tmp", fs.FileMode(0755))
address, err := UnixSocketAddress("/tmp", "0755")
assert.NoError(t, err)
assert.Equal(t, "unix", address.Network())
}
func TestUnixSocketAddress_Permission_LeadingZero_Ok(t *testing.T) {
address, err := UnixSocketAddress("/tmp", "0755")
assert.NoError(t, err)
assert.Equal(t, fs.FileMode(0755), address.UnixSocketPermission)
}
func TestUnixSocketAddress_Permission_NoLeadingZero_Ok(t *testing.T) {
address, err := UnixSocketAddress("/tmp", "755")
assert.NoError(t, err)
assert.Equal(t, fs.FileMode(0755), address.UnixSocketPermission)
}
func TestUnixSocketAddress_Permission_NonOctal_Bad(t *testing.T) {
_, err := UnixSocketAddress("/tmp", "855")
assert.Error(t, err)
}