Skip to content

Commit c1925e2

Browse files
committed
#488 set socket perm 0660 in .defaults.yml
1 parent fdaa429 commit c1925e2

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

.defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ vouch:
99
testing: false
1010
listen: 0.0.0.0
1111
port: 9090
12+
socket_mode: 0660
1213
# document_root:
1314
# domains:
1415
allowAllUsers: false
@@ -18,7 +19,6 @@ vouch:
1819
writeTimeout: 15
1920
readTimeout: 15
2021
idleTimeout: 15
21-
2222
tls:
2323
# cert:
2424
# key:

main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@ func listen() (lis net.Listener, cleanupFn func(), err error) {
243243
return nil, nil, fmt.Errorf("listen %s: %w", socketPath, err)
244244
}
245245

246-
if cfg.Cfg.SocketMode == 0 {
247-
cfg.Cfg.SocketMode = 0777
248-
}
249246
mode := fs.FileMode(cfg.Cfg.SocketMode)
250247
if err = os.Chmod(socketPath, mode); err != nil {
251248
return nil, nil, fmt.Errorf("chmod socket file %s %#o", socketPath, mode)

main_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package main
22

33
import (
4-
"github.com/stretchr/testify/assert"
5-
"github.com/vouch/vouch-proxy/pkg/cfg"
64
"io/fs"
75
"os"
86
"path/filepath"
97
"strings"
108
"testing"
9+
10+
"github.com/stretchr/testify/assert"
11+
"github.com/vouch/vouch-proxy/pkg/cfg"
1112
)
1213

1314
func Test_listenUds(t *testing.T) {
@@ -27,7 +28,7 @@ func Test_listenUds(t *testing.T) {
2728

2829
fi, err := os.Stat(socketPath)
2930
assert.NoError(t, err)
30-
assert.Equal(t, fs.FileMode(0777), fi.Mode().Perm())
31+
assert.Equal(t, fs.FileMode(0660), fi.Mode().Perm())
3132

3233
assert.NotNil(t, lis)
3334
assert.NoError(t, lis.Close())

0 commit comments

Comments
 (0)