fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: disable DisableHTMLEscape on logrus json logging

Browse Source 
Fixes #3363

Without this, we emit illegal json logs, the user-agent
ends up as:

```
"http.request.useragent": "docker/19.03.4 go/go1.12.10 git-commit/9013bf583a kernel/5.10.10-051010-generic os/linux arch/amd64 UpstreamClient(Docker-Client/19.03.4 \(linux\))"
```

which is not valid according to [spec](https://www.json.org/json-en.html)

specifically, string: "<any codepoint except " or \ or control>*"

Signed-off-by: Don Bowman <don@agilicus.com>
This commit is contained in:
Don Bowman 2021-02-15 13:16:27 -05:00
parent 22c074842e
commit 9c43ba9dcc
No known key found for this signature in database
GPG Key ID: D21D0E75160D9894
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
registry/registry.go
View File

@ -277,7 +277,8 @@ func configureLogging(ctx context.Context, config *configuration.Configuration)
switch formatter { switch formatter {
case "json": case "json":
log.SetFormatter(&log.JSONFormatter{ log.SetFormatter(&log.JSONFormatter{
TimestampFormat: time.RFC3339Nano, TimestampFormat: time.RFC3339Nano,
DisableHTMLEscape: true,
}) })
case "text": case "text":
log.SetFormatter(&log.TextFormatter{ log.SetFormatter(&log.TextFormatter{