Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing web credentials from debug log #2072

Merged
merged 6 commits into from
Feb 17, 2022
Merged

Removing web credentials from debug log #2072

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4e9001
Hashing web credentials
pkaramol Feb 16, 2022
1126101
Fix syntactic error
pkaramol Feb 16, 2022
80ef892
Using strong cryptogrpahic primitive
pkaramol Feb 16, 2022
6b9d411
Entirely removing credentials
pkaramol Feb 17, 2022
f0c549b
Removing unused constant
pkaramol Feb 17, 2022
119c2a5
Removing redundant formatting parameters
pkaramol Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions server/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/runatlantis/atlantis/server/logging"
"github.com/urfave/negroni"
"golang.org/x/crypto/bcrypt"
)

// NewRequestLogger creates a RequestLogger.
Expand All @@ -30,6 +31,8 @@ func NewRequestLogger(s *Server) *RequestLogger {
}
}

const redacted = "[REDACTED]"

// RequestLogger logs requests and their response codes.
// as well as handle the basicauth on the requests
type RequestLogger struct {
Expand All @@ -42,6 +45,10 @@ type RequestLogger struct {
// ServeHTTP implements the middleware function. It logs all requests at DEBUG level.
func (l *RequestLogger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
l.logger.Debug("%s %s – from %s", r.Method, r.URL.RequestURI(), r.RemoteAddr)
var (
hashUser, hashPass []byte
err error
)
allowed := false
if !l.WebAuthentication ||
r.URL.Path == "/events" ||
Expand All @@ -50,15 +57,25 @@ func (l *RequestLogger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next
allowed = true
} else {
user, pass, ok := r.BasicAuth()
hashUser, err = hashData([]byte(user))
if err != nil {
l.logger.Debug("unable to hash username, defaulting to %s", redacted)
hashUser = []byte(redacted)
}
hashPass, err = hashData([]byte(pass))
if err != nil {
l.logger.Debug("unable to hash password, defaulting to %s", redacted)
hashPass = []byte(redacted)
}
if ok {
r.SetBasicAuth(user, pass)
l.logger.Debug("user: %s / pass: %s >> url: %s", user, pass, r.URL.RequestURI())
l.logger.Debug("user(hash): %s / pass(hash): %s >> url: %s", string(hashUser), string(hashPass), r.URL.RequestURI())
if user == l.WebUsername && pass == l.WebPassword {
l.logger.Debug("[VALID] user: %s / pass: %s >> url: %s", user, pass, r.URL.RequestURI())
l.logger.Debug("[VALID] user(hash): %s / pass(hash): %s >> url: %s", string(hashUser), string(hashPass), r.URL.RequestURI())
allowed = true
} else {
allowed = false
l.logger.Info("[INVALID] user: %s / pass: %s >> url: %s", user, pass, r.URL.RequestURI())
l.logger.Info("[INVALID] user(hash): %s / pass(hash): %s >> url: %s", string(hashUser), string(hashPass), r.URL.RequestURI())
}
}
}
Expand All @@ -70,3 +87,11 @@ func (l *RequestLogger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next
}
l.logger.Debug("%s %s – respond HTTP %d", r.Method, r.URL.RequestURI(), rw.(negroni.ResponseWriter).Status())
}

func hashData(data []byte) ([]byte, error) {
hashed, err := bcrypt.GenerateFromPassword(data, bcrypt.DefaultCost)
if err != nil {
return nil, err
}
return hashed, nil
}