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

martian: enable gosec, errcheck and bodyclose linters #973

Merged
merged 18 commits into from
Dec 4, 2024
Merged

martian: enable gosec, errcheck and bodyclose linters #973

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c1b8d27
golangci(martian): enable gosec
mmatczuk Dec 3, 2024
8e4a237
martian: use math/rand/v2 and disable gosec
mmatczuk Dec 3, 2024
af1af05
martian/mitm: use sha256 instead of sha1
mmatczuk Dec 3, 2024
ddc6853
martian: set min TLS version to 1.2
mmatczuk Dec 3, 2024
5f54dbe
martian/h2: internalize cybervillains certs
mmatczuk Dec 3, 2024
3a7bd47
martian: add nolint:gosec where it complains about overflow
mmatczuk Dec 3, 2024
62cf7ba
martian/mitm: remove Config.skipVerify
mmatczuk Dec 3, 2024
bdc6785
martian/h2/testing: add nolint tags
mmatczuk Dec 4, 2024
43c17e9
golangci(martian): enable errcheck
mmatczuk Dec 4, 2024
7027647
martian: log close write errors
mmatczuk Dec 4, 2024
e023cc2
martian: harden buffer draining
mmatczuk Dec 4, 2024
4e23465
martian: harden clearing connection deadline
mmatczuk Dec 4, 2024
a78cb72
martian: harden parsing X-Martian-Terminate-Tls
mmatczuk Dec 4, 2024
b705951
martian: harden traceWroteResponse() calling in proxyHandler.tunnel()
mmatczuk Dec 4, 2024
f15e06d
martian/h2/testing: log Proxy.Serve() error
mmatczuk Dec 4, 2024
89cd833
martian/h2/testing: use Proxy.Close() instead of Shutdown()
mmatczuk Dec 4, 2024
1158203
martian: ignore parse error in isTextEventStream()
mmatczuk Dec 4, 2024
4f94833
golangci: enable bodyclose
mmatczuk Dec 4, 2024
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
25 changes: 11 additions & 14 deletions internal/martian/proxy_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,18 @@ func (p proxyHandler) handleUpgradeResponse(rw http.ResponseWriter, req *http.Re
}
}

func (p proxyHandler) tunnel(name string, rw http.ResponseWriter, req *http.Request, res *http.Response, crw io.ReadWriteCloser) error {
func (p proxyHandler) tunnel(name string, rw http.ResponseWriter, req *http.Request, res *http.Response, crw io.ReadWriteCloser) (ferr error) {
rc := http.NewResponseController(rw)

defer func() {
p.traceWroteResponse(res, ferr)
}()
Comment on lines +163 to +165
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good!


var cc []copier
switch req.ProtoMajor {
case 1:
conn, brw, err := rc.Hijack()
if err != nil {
p.traceWroteResponse(res, err)
return err
}
defer conn.Close()
Expand All @@ -175,12 +178,12 @@ func (p proxyHandler) tunnel(name string, rw http.ResponseWriter, req *http.Requ
brw: brw,
conn: conn,
}
pc.writeResponse(res)
if err := pc.writeResponse(res); err != nil {
return err
}

if err := drainBuffer(crw, brw.Reader); err != nil {
err := fmt.Errorf("got error while draining buffer: %w", err)
p.traceWroteResponse(res, err)
return err
return fmt.Errorf("got error while draining buffer: %w", err)
}

cc = []copier{
Expand All @@ -192,19 +195,15 @@ func (p proxyHandler) tunnel(name string, rw http.ResponseWriter, req *http.Requ
rw.WriteHeader(res.StatusCode)

if err := rc.Flush(); err != nil {
err := fmt.Errorf("got error while flushing response back to client: %w", err)
p.traceWroteResponse(res, err)
return err
return fmt.Errorf("got error while flushing response back to client: %w", err)
}

cc = []copier{
{"upstream " + name, crw, req.Body},
{"downstream " + name, makeH2Writer(rw, rc, req), crw},
}
default:
err := fmt.Errorf("unsupported protocol version: %d", req.ProtoMajor)
p.traceWroteResponse(res, err)
return err
return fmt.Errorf("unsupported protocol version: %d", req.ProtoMajor)
}

ctx := req.Context()
Expand All @@ -213,8 +212,6 @@ func (p proxyHandler) tunnel(name string, rw http.ResponseWriter, req *http.Requ
bicopy(ctx, cc...)
log.Debugf(ctx, "closed %s tunnel duration=%s", name, ContextDuration(ctx))

p.traceWroteResponse(res, nil)

return nil
}

Expand Down