hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-27 16:49:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

AUTH-2169 make access login page more generic

Browse Source
This commit is contained in:
Dalton
2020-06-05 09:26:06 -05:00
parent e02d09a731
commit 2f70b05c64
6 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
carrier/carrier.go
View File

@@ -66,7 +66,7 @@ func StartForwarder(conn Connection, address string, shutdownC <-chan struct{},
// StartClient will copy the data from stdin/stdout over a WebSocket connection
// to the edge (originURL)
func StartClient(conn Connection, stream io.ReadWriter, options *StartOptions) error {
return serveStream(conn, stream, options)
return conn.ServeStream(options, stream)
}
// Serve accepts incoming connections on the specified net.Listener.
@@ -103,12 +103,7 @@ func Serve(remoteConn Connection, listener net.Listener, shutdownC <-chan struct
// serveConnection handles connections for the Serve() call
func serveConnection(remoteConn Connection, c net.Conn, options *StartOptions) {
defer c.Close()
serveStream(remoteConn, c, options)
}
// serveStream will serve the data over the WebSocket stream
func serveStream(remoteConn Connection, conn io.ReadWriter, options *StartOptions) error {
return remoteConn.ServeStream(options, conn)
remoteConn.ServeStream(options, c)
}
// IsAccessResponse checks the http Response to see if the url location