Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
36bab003
Commit
36bab003
authored
May 09, 2019
by
galal-hussein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make kubeconfig not world readable and issue warning with kubectl wrapper
parent
1d42fc97
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
main.go
pkg/kubectl/main.go
+16
-0
server.go
pkg/server/server.go
+1
-1
No files found.
pkg/kubectl/main.go
View file @
36bab003
...
@@ -8,6 +8,7 @@ import (
...
@@ -8,6 +8,7 @@ import (
"time"
"time"
"github.com/rancher/k3s/pkg/server"
"github.com/rancher/k3s/pkg/server"
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"
"github.com/spf13/pflag"
utilflag
"k8s.io/component-base/cli/flag"
utilflag
"k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
"k8s.io/component-base/logs"
...
@@ -21,6 +22,9 @@ func Main() {
...
@@ -21,6 +22,9 @@ func Main() {
if
_
,
serr
:=
os
.
Stat
(
config
);
err
==
nil
&&
serr
==
nil
{
if
_
,
serr
:=
os
.
Stat
(
config
);
err
==
nil
&&
serr
==
nil
{
os
.
Setenv
(
"KUBECONFIG"
,
config
)
os
.
Setenv
(
"KUBECONFIG"
,
config
)
}
}
if
err
:=
checkReadConfigPermissions
(
config
);
err
!=
nil
{
logrus
.
Warn
(
err
)
}
}
}
main
()
main
()
...
@@ -45,3 +49,15 @@ func main() {
...
@@ -45,3 +49,15 @@ func main() {
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
}
}
func
checkReadConfigPermissions
(
configFile
string
)
error
{
file
,
err
:=
os
.
OpenFile
(
configFile
,
os
.
O_RDONLY
,
0600
)
if
err
!=
nil
{
if
os
.
IsPermission
(
err
)
{
return
fmt
.
Errorf
(
"Unable to read %s, please start server "
+
"with --write-kubeconfig-mode to modify kube config permissions"
,
configFile
)
}
}
file
.
Close
()
return
nil
}
pkg/server/server.go
View file @
36bab003
...
@@ -231,7 +231,7 @@ func writeKubeConfig(certs string, tlsConfig *dynamiclistener.UserConfig, config
...
@@ -231,7 +231,7 @@ func writeKubeConfig(certs string, tlsConfig *dynamiclistener.UserConfig, config
logrus
.
Errorf
(
"failed to set %s to mode %s: %v"
,
kubeConfig
,
os
.
FileMode
(
mode
),
err
)
logrus
.
Errorf
(
"failed to set %s to mode %s: %v"
,
kubeConfig
,
os
.
FileMode
(
mode
),
err
)
}
}
}
else
{
}
else
{
os
.
Chmod
(
kubeConfig
,
os
.
FileMode
(
06
44
))
os
.
Chmod
(
kubeConfig
,
os
.
FileMode
(
06
00
))
}
}
logrus
.
Infof
(
"Wrote kubeconfig %s"
,
kubeConfig
)
logrus
.
Infof
(
"Wrote kubeconfig %s"
,
kubeConfig
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment