Skip to content

Commit 2383d3b

Browse files
(cmd/tls) use vars for dir and file perms for better readability
1 parent abad241 commit 2383d3b

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

command/tls/ca/create/tls_ca_create.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ func New(ui cli.Ui) *cmd {
2121
return c
2222
}
2323

24+
const (
25+
// DirectoryPerms represents read+write+execute for owner, read+execute for group and others (0755)
26+
DirectoryPerms = 0755
27+
// PublicFilePerms represents read+write for owner, read-only for group and others (0644)
28+
PublicFilePerms = 0644
29+
// PrivateFilePerms represents read+write for owner only (0600)
30+
PrivateFilePerms = 0600
31+
)
32+
2433
type cmd struct {
2534
UI cli.Ui
2635
flags *flag.FlagSet
@@ -83,14 +92,14 @@ func (c *cmd) Run(args []string) int {
8392
}
8493

8594
// public CA cert file
86-
if err := file.WriteAtomicWithPerms(certFileName, []byte(ca), 0755, 0644); err != nil {
95+
if err := file.WriteAtomicWithPerms(certFileName, []byte(ca), DirectoryPerms, PublicFilePerms); err != nil {
8796
c.UI.Error(err.Error())
8897
return 1
8998
}
9099
c.UI.Output("==> Saved " + certFileName)
91100

92101
// CA private key
93-
if err := file.WriteAtomicWithPerms(pkFileName, []byte(pk), 0755, 0600); err != nil {
102+
if err := file.WriteAtomicWithPerms(pkFileName, []byte(pk), DirectoryPerms, PrivateFilePerms); err != nil {
94103
c.UI.Error(err.Error())
95104
return 1
96105
}

command/tls/cert/create/tls_cert_create.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ func New(ui cli.Ui) *cmd {
2424
return c
2525
}
2626

27+
const (
28+
// DirectoryPerms represents read+write+execute for owner, read+execute for group and others (0755)
29+
DirectoryPerms = 0755
30+
// PublicFilePerms represents read+write for owner, read-only for group and others (0644)
31+
PublicFilePerms = 0644
32+
// PrivateFilePerms represents read+write for owner only (0600)
33+
PrivateFilePerms = 0600
34+
)
35+
2736
type cmd struct {
2837
UI cli.Ui
2938
flags *flag.FlagSet
@@ -194,14 +203,14 @@ func (c *cmd) Run(args []string) int {
194203
}
195204

196205
// public cert
197-
if err := file.WriteAtomicWithPerms(certFileName, []byte(pub), 0755, 0644); err != nil {
206+
if err := file.WriteAtomicWithPerms(certFileName, []byte(pub), DirectoryPerms, PublicFilePerms); err != nil {
198207
c.UI.Error(err.Error())
199208
return 1
200209
}
201210
c.UI.Output("==> Saved " + certFileName)
202211

203212
// private key
204-
if err := file.WriteAtomicWithPerms(pkFileName, []byte(priv), 0755, 0600); err != nil {
213+
if err := file.WriteAtomicWithPerms(pkFileName, []byte(priv), DirectoryPerms, PublicFilePerms); err != nil {
205214
c.UI.Error(err.Error())
206215
return 1
207216
}

0 commit comments

Comments
 (0)