github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #609 from xavpaice/xav/sc37229/ceph-secrets

Browse Source 
Add Ceph auth redactors
This commit is contained in:
xavpaice
2022-06-30 17:54:25 +12:00
committed by GitHub
parent 0996b3b1ad d98c01a3b9
commit ff5ee2b709
2 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/redact/redact.go
View File

@@ -304,6 +304,11 @@ func getRedactors(path string) ([]Redactor, error) {
line2: `(?i)("value": *")(?P<mask>.*[^\"]*)(")`,
name: "Redact usernames in multiline JSON",
},
{
line1: `(?i)"entity": *"(osd|client|mgr)\..*[^\"]*"`,
line2: `(?i)("key": *")(?P<mask>.{38}==[^\"]*)(")`,
name: "Redact 'key' values found in Ceph auth lists",
},
}
for _, l := range doubleLines {

98
pkg/redact/redact_test.go
View File

@@ -816,6 +816,53 @@ func Test_Redactors(t *testing.T) {
"status": {
"loadBalancer": {}
}
},
{
"auth_dump": [
{
"entity": "osd.0",
"key": "ABCxyzABCxyz/foo/bar123xyz/BAZAABBCCDD==",
"caps": {
"mgr": "allow profile osd",
"mon": "allow profile osd",
"osd": "allow *"
}
},
{
"entity": "client.admin",
"key": "ABCxyzABCxyz/foo/bar123xyz/BAZAABBCCDD==",
"caps": {
"mds": "allow *",
"mgr": "allow *",
"mon": "allow *",
"osd": "allow *"
}
},
{
"entity": "client.bootstrap-mds",
"key": "ABCxyzABCxyz/foo/bar123xyz/BAZAABBCCDD==",
"caps": {
"mon": "allow profile bootstrap-mds"
}
},
{
"entity": "client.rgw.rook.ceph.store.a",
"key": "ABCxyzABCxyz/foo/bar123xyz/BAZAABBCCDD==",
"caps": {
"mon": "allow rw",
"osd": "allow rwx"
}
},
{
"entity": "mgr.a",
"key": "ABCxyzABCxyz/foo/bar123xyz/BAZAABBCCDD==",
"caps": {
"mds": "allow *",
"mon": "allow profile mgr",
"osd": "allow *"
}
}
]
}
]`
@@ -1624,11 +1671,58 @@ func Test_Redactors(t *testing.T) {
"status": {
"loadBalancer": {}
}
},
{
"auth_dump": [
{
"entity": "osd.0",
"key": "***HIDDEN***",
"caps": {
"mgr": "allow profile osd",
"mon": "allow profile osd",
"osd": "allow *"
}
},
{
"entity": "client.admin",
"key": "***HIDDEN***",
"caps": {
"mds": "allow *",
"mgr": "allow *",
"mon": "allow *",
"osd": "allow *"
}
},
{
"entity": "client.bootstrap-mds",
"key": "***HIDDEN***",
"caps": {
"mon": "allow profile bootstrap-mds"
}
},
{
"entity": "client.rgw.rook.ceph.store.a",
"key": "***HIDDEN***",
"caps": {
"mon": "allow rw",
"osd": "allow rwx"
}
},
{
"entity": "mgr.a",
"key": "***HIDDEN***",
"caps": {
"mds": "allow *",
"mon": "allow profile mgr",
"osd": "allow *"
}
}
]
}
]`
wantRedactionsLen := 39
wantRedactionsCount := 25
wantRedactionsLen := 44
wantRedactionsCount := 26
t.Run("test default redactors", func(t *testing.T) {
req := require.New(t)