Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
KubeCube
Commits
046b32a6
Commit
046b32a6
authored
3 years ago
by
zhujf1989
Browse files
Options
Download
Email Patches
Plain Diff
Revert "fix audit event name"
This reverts commit
182540fb
.
parent
54ffdb9f
main
adapt_hnc_ga
add_swagger_doc
add_v1.2.3_changelog
add_v1.2.4_changelog
apis_support_multi_auth
bugfix-audit-login
changelog-1.6.1
delete_cluster_only
enhanch_multi_cluster_mgr_pkg
extand_cluster_info_quota
extend-service-port-check
feat_version_convert_proxy
feature-audit-international
feature-delete-tenant-project
feature-extend-filter
feature-multi-filter
feature-mv-fliter
feature-restapi-rbac
feature-service-extend
feature-support-list-pod-by-deploy
feature-support-node-selector
feature-support-pvc-mountBy
feature-update-cluster
feature_version_conversion
feature_version_convert_proxy
fix-audit
fix-audit-middleware
fix-audit-outbound
fix-jwt-version
fix-supoort-http-1.3
fix/scheme-init
fix_auth_access_api
fix_auth_get_ns_list
fix_cluster_nil_pointor
fix_quota_populate
get_clusters_by_related_project
get_kubeconfig_return_file
get_user_form_context_for_auth
modify_local_up_script
modify_svc_const
move_crd_controller_to_warden
move_project_tenant_controller
optimize_cluster_info_api
optimize_mutli_cluster_sync_logic
optimize_quota_handle
optimize_version_convert
release-v1.1
release-v1.2
release-v1.3
release-v1.4
release-v1.5
release-v1.6
support-specify-scheme
support_cluster_cn_name
support_filter_node
support_rbac_for_crds
support_version_convert_for_client
support_warden_register
widen_cluster_name_limit
v1.6.1
v1.6.0
v1.5.1
v1.5.0
v1.4.2
v1.4.1
v1.4.0
v1.3.2
v1.3.1
v1.3.0
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.1.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/apiserver/middlewares/audit/audit.go
+3
-3
pkg/apiserver/middlewares/audit/audit.go
pkg/apiserver/middlewares/audit/audit_test.go
+14
-5
pkg/apiserver/middlewares/audit/audit_test.go
with
17 additions
and
8 deletions
+17
-8
pkg/apiserver/middlewares/audit/audit.go
+
3
-
3
View file @
046b32a6
...
...
@@ -221,11 +221,11 @@ func getEventName(c *gin.Context, e Event) *Event {
break
}
}
objectType
=
objectType
[
:
len
(
objectType
)
-
1
]
e
.
EventName
=
methodStr
+
strings
.
Title
(
objectType
)
e
.
EventName
=
methodStr
+
objectType
e
.
Description
=
e
.
Description
+
audit
.
ResourceType
[
objectType
]
e
.
ResourceReports
=
[]
Resource
{{
ResourceType
:
objectType
,
ResourceType
:
objectType
[
:
len
(
objectType
)
-
1
]
,
ResourceName
:
objectName
,
}}
return
&
e
...
...
This diff is collapsed.
Click to expand it.
pkg/apiserver/middlewares/audit/audit_test.go
+
14
-
5
View file @
046b32a6
...
...
@@ -69,27 +69,36 @@ func TestSendEvent(t *testing.T) {
}
func
TestGetEventName
(
t
*
testing
.
T
)
{
// check post method
e
:=
&
Event
{}
router
:=
gin
.
New
()
// check get method
router
.
GET
(
"/api/v1/cube/proxy/clusters/:cluster/apis/apps/v1/namespaces/:namespace/statefulsets/:name"
,
func
(
c
*
gin
.
Context
)
{
e
=
getEventName
(
c
,
*
e
)
return
})
_
=
performRequest
(
router
,
http
.
MethodGet
,
"/api/v1/cube/proxy/clusters/pivot-cluster/apis/apps/v1/namespaces/dev/statefulsets/stsA"
,
[]
byte
(
""
))
if
e
.
EventName
!=
"[KubeCube] query statefulsets"
{
t
.
Fail
()
}
// check post method
router
.
POST
(
"/api/v1/cube/proxy/clusters/:cluster/api/v1/namespaces/:namespace/services"
,
func
(
c
*
gin
.
Context
)
{
e
=
getEventName
(
c
,
*
e
)
return
})
_
=
performRequest
(
router
,
http
.
MethodPost
,
"/api/v1/cube/proxy/clusters/pivot-cluster/api/v1/namespaces/dev/services"
,
[]
byte
(
""
))
if
e
.
EventName
!=
"create
S
ervice"
{
if
e
.
EventName
!=
"
[KubeCube]
create
s
ervice
s
"
{
t
.
Fail
()
}
// check put method
e
=
&
Event
{}
router
=
gin
.
New
()
router
.
PUT
(
"/api/v1/cube/proxy/clusters/:cluster/api/v1/namespaces/:namespace/secrets/:name"
,
func
(
c
*
gin
.
Context
)
{
e
=
getEventName
(
c
,
*
e
)
return
})
_
=
performRequest
(
router
,
http
.
MethodPut
,
"/api/v1/cube/proxy/clusters/pivot-cluster/api/v1/namespaces/dev/secrets/secretA"
,
[]
byte
(
""
))
if
e
.
EventName
!=
"update
S
ecret"
{
if
e
.
EventName
!=
"
[KubeCube]
update
s
ecret
s
"
{
t
.
Fail
()
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help