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
bde5f800
Commit
bde5f800
authored
Feb 28, 2017
by
deads2k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow subject access review to non-existent namespace
parent
bf984aa3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
0 deletions
+37
-0
BUILD
plugin/pkg/admission/namespace/lifecycle/BUILD
+2
-0
admission.go
plugin/pkg/admission/namespace/lifecycle/admission.go
+16
-0
admission_test.go
plugin/pkg/admission/namespace/lifecycle/admission_test.go
+19
-0
No files found.
plugin/pkg/admission/namespace/lifecycle/BUILD
View file @
bde5f800
...
@@ -21,6 +21,7 @@ go_library(
...
@@ -21,6 +21,7 @@ go_library(
"//vendor:github.com/golang/glog",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apiserver/pkg/admission",
"//vendor:k8s.io/apiserver/pkg/admission",
"//vendor:k8s.io/apiserver/pkg/util/cache",
"//vendor:k8s.io/apiserver/pkg/util/cache",
...
@@ -41,6 +42,7 @@ go_test(
...
@@ -41,6 +42,7 @@ go_test(
"//pkg/kubeapiserver/admission:go_default_library",
"//pkg/kubeapiserver/admission:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apiserver/pkg/admission",
"//vendor:k8s.io/apiserver/pkg/admission",
...
...
plugin/pkg/admission/namespace/lifecycle/admission.go
View file @
bde5f800
...
@@ -25,6 +25,7 @@ import (
...
@@ -25,6 +25,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission"
utilcache
"k8s.io/apiserver/pkg/util/cache"
utilcache
"k8s.io/apiserver/pkg/util/cache"
...
@@ -103,6 +104,11 @@ func (l *lifecycle) Admit(a admission.Attributes) error {
...
@@ -103,6 +104,11 @@ func (l *lifecycle) Admit(a admission.Attributes) error {
return
nil
return
nil
}
}
// always allow access review checks. Returning status about the namespace would be leaking information
if
isAccessReview
(
a
)
{
return
nil
}
// we need to wait for our caches to warm
// we need to wait for our caches to warm
if
!
l
.
WaitForReady
()
{
if
!
l
.
WaitForReady
()
{
return
admission
.
NewForbidden
(
a
,
fmt
.
Errorf
(
"not yet ready to handle request"
))
return
admission
.
NewForbidden
(
a
,
fmt
.
Errorf
(
"not yet ready to handle request"
))
...
@@ -206,3 +212,13 @@ func (l *lifecycle) Validate() error {
...
@@ -206,3 +212,13 @@ func (l *lifecycle) Validate() error {
}
}
return
nil
return
nil
}
}
// accessReviewResources are resources which give a view into permissions in a namespace. Users must be allowed to create these
// resources because returning "not found" errors allows someone to search for the "people I'm going to fire in 2017" namespace.
var
accessReviewResources
=
map
[
schema
.
GroupResource
]
bool
{
schema
.
GroupResource
{
Group
:
"authorization.k8s.io"
,
Resource
:
"localsubjectaccessreviews"
}
:
true
,
}
func
isAccessReview
(
a
admission
.
Attributes
)
bool
{
return
accessReviewResources
[
a
.
GetResource
()
.
GroupResource
()]
}
plugin/pkg/admission/namespace/lifecycle/admission_test.go
View file @
bde5f800
...
@@ -23,6 +23,7 @@ import (
...
@@ -23,6 +23,7 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission"
...
@@ -91,6 +92,24 @@ func newPod(namespace string) api.Pod {
...
@@ -91,6 +92,24 @@ func newPod(namespace string) api.Pod {
}
}
}
}
func
TestAccessReviewCheckOnMissingNamespace
(
t
*
testing
.
T
)
{
namespace
:=
"test"
mockClient
:=
newMockClientForTest
(
map
[
string
]
api
.
NamespacePhase
{})
mockClient
.
AddReactor
(
"get"
,
"namespaces"
,
func
(
action
core
.
Action
)
(
bool
,
runtime
.
Object
,
error
)
{
return
true
,
nil
,
fmt
.
Errorf
(
"nope, out of luck"
)
})
handler
,
informerFactory
,
err
:=
newHandlerForTest
(
mockClient
)
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error initializing handler: %v"
,
err
)
}
informerFactory
.
Start
(
wait
.
NeverStop
)
err
=
handler
.
Admit
(
admission
.
NewAttributesRecord
(
nil
,
nil
,
schema
.
GroupVersionKind
{
Group
:
"authorization.k8s.io"
,
Version
:
"v1"
,
Kind
:
"LocalSubjectAccesReview"
},
namespace
,
""
,
schema
.
GroupVersionResource
{
Group
:
"authorization.k8s.io"
,
Version
:
"v1"
,
Resource
:
"localsubjectaccessreviews"
},
""
,
admission
.
Create
,
nil
))
if
err
!=
nil
{
t
.
Error
(
err
)
}
}
// TestAdmissionNamespaceDoesNotExist verifies pod is not admitted if namespace does not exist.
// TestAdmissionNamespaceDoesNotExist verifies pod is not admitted if namespace does not exist.
func
TestAdmissionNamespaceDoesNotExist
(
t
*
testing
.
T
)
{
func
TestAdmissionNamespaceDoesNotExist
(
t
*
testing
.
T
)
{
namespace
:=
"test"
namespace
:=
"test"
...
...
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