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
59868984
Commit
59868984
authored
Sep 13, 2021
by
Brad Davidson
Committed by
Brad Davidson
Sep 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use SubjectAccessReview to validate CCM RBAC
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
dc556cbb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
8 deletions
+20
-8
server.go
pkg/daemons/control/server.go
+20
-8
No files found.
pkg/daemons/control/server.go
View file @
59868984
...
@@ -18,13 +18,13 @@ import (
...
@@ -18,13 +18,13 @@ import (
"github.com/rancher/k3s/pkg/daemons/executor"
"github.com/rancher/k3s/pkg/daemons/executor"
"github.com/rancher/k3s/pkg/util"
"github.com/rancher/k3s/pkg/util"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/generated/controllers/rbac"
"github.com/sirupsen/logrus"
"github.com/sirupsen/logrus"
a
pierrors
"k8s.io/apimachinery/pkg/api/errors
"
a
uthorizationv1
"k8s.io/api/authorization/v1
"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes"
authorizationv1client
"k8s.io/client-go/kubernetes/typed/authorization/v1"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
proxyutil
"k8s.io/kubernetes/pkg/proxy/util"
proxyutil
"k8s.io/kubernetes/pkg/proxy/util"
...
@@ -352,16 +352,28 @@ func checkForCloudControllerPrivileges(ctx context.Context, runtime *config.Cont
...
@@ -352,16 +352,28 @@ func checkForCloudControllerPrivileges(ctx context.Context, runtime *config.Cont
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
authClient
:=
authorizationv1client
.
NewForConfigOrDie
(
restConfig
)
sar
:=
&
authorizationv1
.
SubjectAccessReview
{
Spec
:
authorizationv1
.
SubjectAccessReviewSpec
{
User
:
version
.
Program
+
"-cloud-controller-manager"
,
ResourceAttributes
:
&
authorizationv1
.
ResourceAttributes
{
Namespace
:
metav1
.
NamespaceSystem
,
Verb
:
"get"
,
Resource
:
"configmaps"
,
Name
:
"extension-apiserver-authentication"
,
},
},
}
err
=
wait
.
PollImmediate
(
time
.
Second
,
timeout
,
func
()
(
bool
,
error
)
{
err
=
wait
.
PollImmediate
(
time
.
Second
,
timeout
,
func
()
(
bool
,
error
)
{
crb
:=
rbac
.
NewFactoryFromConfigOrDie
(
restConfig
)
.
Rbac
()
.
V1
()
.
ClusterRoleBinding
()
r
,
err
:=
authClient
.
SubjectAccessReviews
()
.
Create
(
ctx
,
sar
,
metav1
.
CreateOptions
{})
_
,
err
=
crb
.
Get
(
version
.
Program
+
"-cloud-controller-manager"
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
if
apierrors
.
IsNotFound
(
err
)
{
return
false
,
nil
}
return
false
,
err
return
false
,
err
}
}
return
true
,
nil
if
r
.
Status
.
Allowed
{
return
true
,
nil
}
return
false
,
nil
})
})
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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