3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove :443 or :80 from proxy URLs in authclient (#1733)

Browse source 
* remove :443 or :80 from proxy URLs in authclient

* handle buffered bytes
This commit is contained in:
Caleb Doxsey 2021-01-04 16:06:24 -07:00 • committed by GitHub
parent f837c92741
commit 672b9c7a72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/authclient/authclient.go
View file

@ -94,7 +94,17 @@ func (client *AuthClient) runHTTPServer(ctx context.Context, li net.Listener, in
}
func (client *AuthClient) runOpenBrowser(ctx context.Context, li net.Listener, serverURL *url.URL) error {
dst := serverURL.ResolveReference(&url.URL{
browserURL := new(url.URL)
*browserURL = *serverURL
// remove unnecessary ports to avoid HMAC error
if browserURL.Scheme == "http" && browserURL.Host == browserURL.Hostname()+":80" {
browserURL.Host = browserURL.Hostname()
} else if browserURL.Scheme == "https" && browserURL.Host == browserURL.Hostname()+":443" {
browserURL.Host = browserURL.Hostname()
}
dst := browserURL.ResolveReference(&url.URL{
Path: "/.pomerium/api/v1/login",
RawQuery: url.Values{
"pomerium_redirect_uri": {fmt.Sprintf("http://%s", li.Addr().String())},

9
internal/tcptunnel/tcptunnel.go
View file

@ -197,7 +197,7 @@ func (tun *Tunnel) run(ctx context.Context, local io.ReadWriter, rawJWT string,
errc <- err
}()
go func() {
_, err := io.Copy(local, remote)
_, err := io.Copy(local, deBuffer(br, remote))
errc <- err
}()
@ -215,3 +215,10 @@ func (tun *Tunnel) run(ctx context.Context, local io.ReadWriter, rawJWT string,
func (tun *Tunnel) jwtCacheKey() string {
return fmt.Sprintf("%s|%s|%v", tun.cfg.dstHost, tun.cfg.proxyHost, tun.cfg.tlsConfig != nil)
}
func deBuffer(br *bufio.Reader, underlying io.Reader) io.Reader {
if br.Buffered() == 0 {
return underlying
}
return io.MultiReader(io.LimitReader(br, int64(br.Buffered())), underlying)
}

4
internal/tcptunnel/tcptunnel_test.go
View file

@ -50,7 +50,7 @@ func TestTunnel(t *testing.T) {
w.WriteHeader(200)
in, _, err := w.(http.Hijacker).Hijack()
in, brw, err := w.(http.Hijacker).Hijack()
if !assert.NoError(t, err) {
return
}
@ -68,7 +68,7 @@ func TestTunnel(t *testing.T) {
errc <- err
}()
go func() {
_, err := io.Copy(out, in)
_, err := io.Copy(out, deBuffer(brw.Reader, in))
errc <- err
}()
<-errc