go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-01-24 05:26:55 +02:00
Code Issues Releases Activity

Add x-oauth-basic nosec annotation & address gosec unhandled errors

Browse Source
This commit is contained in:
Nick Meves 2020-08-10 15:11:38 -07:00
parent d69fd6af22
commit b6e78efc1e
No known key found for this signature in database
GPG Key ID: 93BA8A3CEDCDD1CF
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@
## Changes since v6.0.0 ## Changes since v6.0.0
- [#719](https://github.com/oauth2-proxy/oauth2-proxy/pull/719) Add Gosec fixes to areas that are intermittently flagged on PRs (@NickMeves)
- [#718](https://github.com/oauth2-proxy/oauth2-proxy/pull/718) Allow Logging to stdout with separate Error Log Channel - [#718](https://github.com/oauth2-proxy/oauth2-proxy/pull/718) Allow Logging to stdout with separate Error Log Channel
- [#690](https://github.com/oauth2-proxy/oauth2-proxy/pull/690) Address GoSec security findings & remediate (@NickMeves) - [#690](https://github.com/oauth2-proxy/oauth2-proxy/pull/690) Address GoSec security findings & remediate (@NickMeves)
- [#689](https://github.com/oauth2-proxy/oauth2-proxy/pull/689) Fix finicky logging_handler_test from time drift (@NickMeves) - [#689](https://github.com/oauth2-proxy/oauth2-proxy/pull/689) Fix finicky logging_handler_test from time drift (@NickMeves)

12
pkg/logger/logger.go
View File

@ -144,11 +144,10 @@ func (l *Logger) formatLogMessage(calldepth int, message string) []byte {
panic(err) panic(err)
} }
_, err = l.writer.Write([]byte("\n")) _, err = logBuff.Write([]byte("\n"))
if err != nil { if err != nil {
panic(err) panic(err)
} }
logBuff.Write([]byte("\n"))
return logBuff.Bytes() return logBuff.Bytes()
} }
@ -162,11 +161,16 @@ func (l *Logger) Output(lvl Level, calldepth int, message string) {
return return
} }
msg := l.formatLogMessage(calldepth, message) msg := l.formatLogMessage(calldepth, message)
var err error
switch lvl { switch lvl {
case ERROR: case ERROR:
l.errWriter.Write(msg) _, err = l.errWriter.Write(msg)
default: default:
l.writer.Write(msg) _, err = l.writer.Write(msg)
}
if err != nil {
panic(err)
} }
} }

1
pkg/middleware/jwt_session.go
View File

@ -121,6 +121,7 @@ func (j *jwtSessionLoader) getBasicToken(token string) (string, error) {
// check user, user+password, or just password for a token // check user, user+password, or just password for a token
if j.jwtRegex.MatchString(user) { if j.jwtRegex.MatchString(user) {
// Support blank passwords or magic `x-oauth-basic` passwords - nothing else // Support blank passwords or magic `x-oauth-basic` passwords - nothing else
/* #nosec G101 */
if password == "" || password == "x-oauth-basic" { if password == "" || password == "x-oauth-basic" {
return user, nil return user, nil
} }