11package httpserver
22
33import (
4+ "crypto/tls"
45 "errors"
56 "net/http"
67 "os"
@@ -23,7 +24,9 @@ type Options struct {
2324 BasicAuthReal string
2425 Verbose bool
2526 Sandbox bool
27+ HTTP1Only bool
2628 MaxFileSize int // 50Mb
29+ MaxDumpBodySize int64
2730}
2831
2932// HTTPServer instance
@@ -32,6 +35,9 @@ type HTTPServer struct {
3235 layers http.Handler
3336}
3437
38+ // LayerHandler is the interface of all layer funcs
39+ type Middleware func (http.Handler ) http.Handler
40+
3541// New http server instance with options
3642func New (options * Options ) (* HTTPServer , error ) {
3743 var h HTTPServer
@@ -50,18 +56,44 @@ func New(options *Options) (*HTTPServer, error) {
5056 if options .Sandbox {
5157 dir = SandboxFileSystem {fs : http .Dir (options .Folder ), RootFolder : options .Folder }
5258 }
53- h .layers = h .loglayer (http .FileServer (dir ))
59+
60+ httpHandler := http .FileServer (dir )
61+ addHandler := func (newHandler Middleware ) {
62+ httpHandler = newHandler (httpHandler )
63+ }
64+
65+ // middleware
66+ if options .EnableUpload {
67+ addHandler (h .uploadlayer )
68+ }
69+
5470 if options .BasicAuthUsername != "" || options .BasicAuthPassword != "" {
55- h . layers = h . loglayer (h .basicauthlayer ( http . FileServer ( dir )) )
71+ addHandler (h .basicauthlayer )
5672 }
73+
74+ httpHandler = h .loglayer (httpHandler )
75+
76+ // add handler
77+ h .layers = httpHandler
5778 h .options = options
5879
5980 return & h , nil
6081}
6182
83+ func (t * HTTPServer ) makeHTTPServer (tlsConfig * tls.Config ) * http.Server {
84+ httpServer := & http.Server {Addr : t .options .ListenAddress }
85+ if t .options .HTTP1Only {
86+ httpServer .TLSNextProto = make (map [string ]func (* http.Server , * tls.Conn , http.Handler ))
87+ }
88+ httpServer .TLSConfig = tlsConfig
89+ httpServer .Handler = t .layers
90+ return httpServer
91+ }
92+
6293// ListenAndServe requests over http
6394func (t * HTTPServer ) ListenAndServe () error {
64- return http .ListenAndServe (t .options .ListenAddress , t .layers )
95+ httpServer := t .makeHTTPServer (nil )
96+ return httpServer .ListenAndServe ()
6597}
6698
6799// ListenAndServeTLS requests over https
@@ -73,11 +105,7 @@ func (t *HTTPServer) ListenAndServeTLS() error {
73105 if err != nil {
74106 return err
75107 }
76- httpServer := & http.Server {
77- Addr : t .options .ListenAddress ,
78- TLSConfig : tlsConfig ,
79- }
80- httpServer .Handler = t .layers
108+ httpServer := t .makeHTTPServer (tlsConfig )
81109 return httpServer .ListenAndServeTLS ("" , "" )
82110 }
83111 return http .ListenAndServeTLS (t .options .ListenAddress , t .options .Certificate , t .options .CertificateKey , t .layers )
0 commit comments