This repository has been archived by the owner on May 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* redact secrets from logs Change-Id: Ibffbceb807e61506e5518b599016e006bd0429ac * appease golint Change-Id: I68e72c5df188182230b7111756ec3d59c0bc3f38
- Loading branch information
Showing
7 changed files
with
148 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2018 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| ) | ||
|
|
||
| // SprintfRedacts truncates secret strings to len(5) | ||
| func SprintfRedacts(redacts []interface{}, format string, a ...interface{}) string { | ||
| s := fmt.Sprintf(format, a) | ||
| for _, r := range redacts { | ||
| if r, ok := r.(string); ok { | ||
| truncated := Truncate(r, 5) | ||
| s = strings.Replace(s, r, truncated, -1) | ||
| } | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| // Truncate truncates secret strings to arbitrary length and adds "..." as indication | ||
| func Truncate(in string, end int) string { | ||
| out := in | ||
| if len(out) > end { | ||
| out = fmt.Sprintf("%s...", out[0:end]) | ||
| } | ||
| return out | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // Copyright 2018 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "istio.io/istio/mixer/template/authorization" | ||
| ) | ||
|
|
||
| func TestSprintfRedacted(t *testing.T) { | ||
|
|
||
| superman := "Clark Kent" | ||
| batman := "Bruce Wayne" | ||
| ironman := "Tony Stark" | ||
|
|
||
| inst := &authorization.Instance{ | ||
| Subject: &authorization.Subject{ | ||
| Properties: map[string]interface{}{ | ||
| "superman": superman, | ||
| "ironman": ironman, | ||
| "batman": batman, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| redacts := []interface{}{superman, batman} | ||
| result := SprintfRedacts(redacts, "%#v", *inst.Subject) | ||
|
|
||
| if strings.Contains(result, superman) { | ||
| t.Errorf("should not contain %s, got: %s", superman, result) | ||
| } | ||
| if strings.Contains(result, batman) { | ||
| t.Errorf("should not contain %s, got: %s", batman, result) | ||
| } | ||
| if !strings.Contains(result, ironman) { | ||
| t.Errorf("should contain %s, got: %s", ironman, result) | ||
| } | ||
| } | ||
|
|
||
| func TestTruncate(t *testing.T) { | ||
| for _, ea := range []struct { | ||
| in string | ||
| end int | ||
| want string | ||
| }{ | ||
| {"hello world", 5, "hello..."}, | ||
| {"hello", 5, "hello"}, | ||
| {"he", 5, "he"}, | ||
| } { | ||
| t.Logf("in: '%s' end: %d", ea.in, ea.end) | ||
| got := Truncate(ea.in, 5) | ||
| if got != ea.want { | ||
| t.Errorf("want: '%s', got: '%s'", ea.want, got) | ||
| } | ||
| } | ||
| } |