TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-05 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

safeweb: add Server.Close method (#13160)

Browse Source 
Updates https://github.com/tailscale/corp/issues/14881

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
Andrew Lytvynov 2024-08-15 12:49:04 -05:00 committed by GitHub
parent e107977f75
commit d88be7cddf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
safeweb/http.go
View File

@ -300,3 +300,8 @@ func (s *Server) ServeRedirectHTTP(ln net.Listener, fqdn string) error {
func (s *Server) Serve(ln net.Listener) error {
return s.h.Serve(ln)
}
// Close closes all client connections and stops accepting new ones.
func (s *Server) Close() error {
return s.h.Close()
}

8
safeweb/http_test.go
View File

@ -80,6 +80,7 @@ func TestPostRequestContentTypeValidation(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest("POST", "/", nil)
req.Header.Set("Content-Type", tt.contentType)
@ -137,6 +138,7 @@ func TestAPIMuxCrossOriginResourceSharingHeaders(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest(tt.httpMethod, "/", nil)
w := httptest.NewRecorder()
@ -192,6 +194,7 @@ func TestCSRFProtection(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
// construct the test request
req := httptest.NewRequest("POST", "/", nil)
@ -267,6 +270,7 @@ func TestContentSecurityPolicyHeader(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()
@ -307,6 +311,7 @@ func TestCSRFCookieSecureMode(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()
@ -355,6 +360,7 @@ func TestRefererPolicy(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()
@ -379,6 +385,7 @@ func TestCSPAllowInlineStyles(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()
@ -474,6 +481,7 @@ func TestRouting(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer s.Close()
req := httptest.NewRequest("GET", tt.requestPath, nil)
w := httptest.NewRecorder()