listener with tls transport layer

This commit is contained in:
changx committed 2018-10-29 16:18:51 +08:00
1 parent 5383ac4fc0
commit e27601f648
12 files changed
+223 -140

No files matched your search

+40 -85
View File
@@ -6,7 +6,6 @@ package http
import (
"bufio"
"bytes"
"crypto/tls"
"encoding/base64"
"errors"
"fmt"
@@ -24,21 +23,16 @@ import (
// HTTP struct
type HTTP struct {
dialer proxy.Dialer
addr string
user string
password string
}
type HTTPS struct {
HTTP
tlsConfig *tls.Config
dialer proxy.Dialer
addr string
user string
password string
pretendAsWebServer bool
}
func init() {
proxy.RegisterDialer("http", NewHTTPDialer)
proxy.RegisterServer("http", NewHTTPServer)
proxy.RegisterServer("https", NewHTTPSServer)
}
// NewHTTP returns a http proxy.
@@ -54,44 +48,21 @@ func NewHTTP(s string, dialer proxy.Dialer) (*HTTP, error) {
pass, _ := u.User.Password()
h := &HTTP{
dialer: dialer,
addr: addr,
user: user,
password: pass,
dialer: dialer,
addr: addr,
user: user,
password: pass,
pretendAsWebServer: false,
}
pretend := u.Query().Get("pretend")
if pretend != "" {
h.pretendAsWebServer = true
}
return h, nil
}
func NewHTTPS(s string, dialer proxy.Dialer) (*HTTPS, error) {
u, _ := url.Parse(s)
// TODO: cert=&key=
certFile := u.Query().Get("cert")
keyFile := u.Query().Get("key")
cert, err := tls.LoadX509KeyPair(certFile, keyFile)
if err != nil {
log.F("unabled load cert: %s, key %s", certFile, keyFile)
return nil, err
}
tlsConfig := tls.Config{
Certificates: []tls.Certificate{cert},
}
http, err := NewHTTP(s, dialer)
if err != nil {
return nil, err
}
https := &HTTPS{
HTTP: *http,
tlsConfig: &tlsConfig,
}
return https, nil
}
// NewHTTPDialer returns a http proxy dialer.
func NewHTTPDialer(s string, dialer proxy.Dialer) (proxy.Dialer, error) {
return NewHTTP(s, dialer)
@@ -102,55 +73,32 @@ func NewHTTPServer(s string, dialer proxy.Dialer) (proxy.Server, error) {
return NewHTTP(s, dialer)
}
// NewHTTPSServer returns a https proxy server
func NewHTTPSServer(s string, dialer proxy.Dialer) (proxy.Server, error) {
return NewHTTPS(s, dialer)
}
// ListenAndServe serves tls http proxy
func (s *HTTPS) ListenAndServe() {
l, err := tls.Listen("tcp", s.addr, s.tlsConfig)
if err != nil {
log.F("failed to listen on tls %s: %v", s.addr, err)
return
}
defer l.Close()
for {
c, err := l.Accept()
if err != nil {
log.F("[https] failed to accept: %v", err)
continue
}
go s.HTTP.Serve(c)
}
}
// ListenAndServe .
func (s *HTTP) ListenAndServe() {
l, err := net.Listen("tcp", s.addr)
if err != nil {
log.F("failed to listen on %s: %v", s.addr, err)
return
}
defer l.Close()
log.F("listening TCP on %s", s.addr)
for {
c, err := l.Accept()
func (s *HTTP) ListenAndServe(c net.Conn) {
if c == nil {
l, err := net.Listen("tcp", s.addr)
if err != nil {
log.F("[http] failed to accept: %v", err)
continue
log.F("failed to listen on %s: %v", s.addr, err)
return
}
defer l.Close()
log.F("listening TCP on %s", s.addr)
for {
c, err := l.Accept()
if err != nil {
log.F("[http] failed to accept: %v", err)
continue
}
go s.Serve(c)
}
} else {
go s.Serve(c)
}
}
// Serve .
func (s *HTTP) Serve(c net.Conn) {
defer c.Close()
@@ -166,8 +114,15 @@ func (s *HTTP) Serve(c net.Conn) {
return
}
if s.pretendAsWebServer {
fmt.Fprintf(c, "%s 404 Not Found\r\nServer: nginx\r\n\r\n", proto)
log.F("[http pretender] being accessed as web server from %s", c.RemoteAddr().String())
return
}
if method == "CONNECT" {
s.servHTTPS(method, requestURI, proto, c)
//c.Write([]byte("HTTP/1.1 405\nAllow: GET, POST, HEAD, OPTION, PATCH\nServer: vsps/1.2\nContent-Type: \n\n"))
return
}