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

fix: enable HttpOnly and Secure using TLS #24524

Merged
merged 4 commits into from
Dec 20, 2023
Merged

fix: enable HttpOnly and Secure using TLS #24524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5b864a
fix: enable HttpOnly and Secure using TLS
davidby-influx Dec 20, 2023
e01e707
fix: cookie exemplar in testing
davidby-influx Dec 20, 2023
41cdc08
fix: HttpOnly always true in cookies
davidby-influx Dec 20, 2023
dd2ca4b
chore: update test exemplar
davidby-influx Dec 20, 2023
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
6 changes: 4 additions & 2 deletions session/http_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (h *SessionHandler) handleSignin(w http.ResponseWriter, r *http.Request) {
return
}

encodeCookieSession(w, s)
encodeCookieSession(w, s, (r != nil) && (r.TLS != nil))
w.WriteHeader(http.StatusNoContent)
}

Expand Down Expand Up @@ -163,7 +163,7 @@ func decodeSignoutRequest(ctx context.Context, r *http.Request) (*signoutRequest

const cookieSessionName = "influxdb-oss-session"

func encodeCookieSession(w http.ResponseWriter, s *influxdb.Session) {
func encodeCookieSession(w http.ResponseWriter, s *influxdb.Session, tlsEnabled bool) {
// We only need the session cookie for accesses to "/api/...", so limit
// it to that using "Path".
//
Expand Down Expand Up @@ -208,6 +208,8 @@ func encodeCookieSession(w http.ResponseWriter, s *influxdb.Session) {
Path: "/api/", // since UI doesn't need it, limit cookie usage to API requests
Expires: s.ExpiresAt,
SameSite: http.SameSiteStrictMode,
HttpOnly: true,
Secure: tlsEnabled,
}

http.SetCookie(w, c)
Expand Down
2 changes: 1 addition & 1 deletion session/http_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestSessionHandler_handleSignin(t *testing.T) {
password: "supersecret",
},
wants: wants{
cookie: "influxdb-oss-session=abc123xyz; Path=/api/; Expires=Thu, 26 Sep 2030 00:00:00 GMT; SameSite=Strict",
cookie: "influxdb-oss-session=abc123xyz; Path=/api/; Expires=Thu, 26 Sep 2030 00:00:00 GMT; HttpOnly; SameSite=Strict",
code: http.StatusNoContent,
},
},
Expand Down
Loading