Cs and refactoring

9 files changed, 0 insertions, 817 deletions

diff --git a/http/config.go b/http/config.go
deleted file mode 100644
index 2a64dbab..00000000
--- a/http/config.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"github.com/spiral/roadrunner/service"
-	"github.com/spiral/roadrunner/utils"
-	"os"
-	"path"
-	"strings"
-)
-
-// Configures RoadRunner HTTP server.
-type Config struct {
-	// serve enables static file serving from desired root directory.
-	ServeStatic bool
-
-	// Root directory, required when serve set to true.
-	Root string
-
-	// TmpDir contains name of temporary directory to store uploaded files passed to underlying PHP process.
-	TmpDir string
-
-	// MaxRequest specified max size for payload body in bytes, set 0 to unlimited.
-	MaxRequest int64
-
-	// ForbidUploads specifies list of file extensions which are forbidden for uploads.
-	// Example: .php, .exe, .bat, .htaccess and etc.
-	ForbidUploads []string
-}
-
-// ForbidUploads must return true if file extension is not allowed for the upload.
-func (cfg Config) Forbidden(filename string) bool {
-	ext := strings.ToLower(path.Ext(filename))
-
-	for _, v := range cfg.ForbidUploads {
-		if ext == v {
-			return true
-		}
-	}
-
-	return false
-}
-
-type serviceConfig struct {
-	Enabled    bool
-	Host       string
-	Port       string
-	MaxRequest string
-	Static     struct {
-		Serve bool
-		Root  string
-	}
-
-	Uploads struct {
-		TmpDir string
-		Forbid []string
-	}
-
-	Pool service.PoolConfig
-
-	//todo: verbose ?
-}
-
-func (cfg *serviceConfig) httpAddr() string {
-	return fmt.Sprintf("%s:%v", cfg.Host, cfg.Port)
-}
-
-func (cfg *serviceConfig) httpConfig() *Config {
-	tmpDir := cfg.Uploads.TmpDir
-	if tmpDir == "" {
-		tmpDir = os.TempDir()
-	}
-
-	return &Config{
-		ServeStatic:   cfg.Static.Serve,
-		Root:          cfg.Static.Root,
-		TmpDir:        tmpDir,
-		MaxRequest:    utils.ParseSize(cfg.MaxRequest),
-		ForbidUploads: cfg.Uploads.Forbid,
-	}
-}
-
-func (cfg *serviceConfig) Valid() error {
-	return nil
-}
diff --git a/http/data.go b/http/data.go
deleted file mode 100644
index e6b8344f..00000000
--- a/http/data.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package http
-
-import (
-	"net/http"
-	"strings"
-)
-
-const maxLevel = 127
-
-type dataTree map[string]interface{}
-
-// parsePost parses incoming request body into data tree.
-func parsePost(r *http.Request) (dataTree, error) {
-	data := make(dataTree)
-
-	for k, v := range r.PostForm {
-		data.push(k, v)
-	}
-
-	for k, v := range r.MultipartForm.Value {
-		data.push(k, v)
-	}
-
-	return data, nil
-}
-
-func (d dataTree) push(k string, v []string) {
-	if len(v) == 0 {
-		// skip empty values
-		return
-	}
-
-	indexes := make([]string, 0)
-	for _, index := range strings.Split(k, "[") {
-		indexes = append(indexes, strings.Trim(index, "]"))
-	}
-
-	if len(indexes) <= maxLevel {
-		d.mount(indexes, v)
-	}
-}
-
-// mount mounts data tree recursively.
-func (d dataTree) mount(i []string, v []string) {
-	if len(v) == 0 {
-		return
-	}
-
-	if len(i) == 1 {
-		// single value context
-		d[i[0]] = v[0]
-		return
-	}
-
-	if len(i) == 2 && i[1] == "" {
-		// non associated array of elements
-		d[i[0]] = v
-		return
-	}
-
-	if p, ok := d[i[0]]; ok {
-		p.(dataTree).mount(i[1:], v)
-	}
-
-	d[i[0]] = make(dataTree)
-	d[i[0]].(dataTree).mount(i[1:], v)
-}
diff --git a/http/request.go b/http/request.go
deleted file mode 100644
index fd483744..00000000
--- a/http/request.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package http
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/spiral/roadrunner"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-const (
-	defaultMaxMemory = 32 << 20 // 32 MB
-)
-
-// Request maps net/http requests to PSR7 compatible structure and managed state of temporary uploaded files.
-type Request struct {
-	// Protocol includes HTTP protocol version.
-	Protocol string `json:"protocol"`
-
-	// Method contains name of HTTP method used for the request.
-	Method string `json:"method"`
-
-	// Uri contains full request Uri with scheme and query.
-	Uri string `json:"uri"`
-
-	// Headers contains list of request headers.
-	Headers http.Header `json:"headers"`
-
-	// Cookies contains list of request cookies.
-	Cookies map[string]string `json:"cookies"`
-
-	// RawQuery contains non parsed query string (to be parsed on php end).
-	RawQuery string `json:"rawQuery"`
-
-	// Parsed indicates that request body has been parsed on RR end.
-	Parsed bool `json:"parsed"`
-
-	// Uploads contains list of uploaded files, their names, sized and associations with temporary files.
-	Uploads *Uploads `json:"uploads"`
-
-	// request body can be parsedData or []byte
-	body interface{}
-}
-
-// NewRequest creates new PSR7 compatible request using net/http request.
-func NewRequest(r *http.Request) (req *Request, err error) {
-	req = &Request{
-		Protocol: r.Proto,
-		Method:   r.Method,
-		Uri:      uri(r),
-		Headers:  r.Header,
-		Cookies:  make(map[string]string),
-		RawQuery: r.URL.RawQuery,
-	}
-
-	for _, c := range r.Cookies() {
-		req.Cookies[c.Name] = c.Value
-	}
-
-	if !req.parsable() {
-		req.body, err = ioutil.ReadAll(r.Body)
-		return req, err
-	}
-
-	if err = r.ParseMultipartForm(defaultMaxMemory); err != nil {
-		return nil, err
-	}
-
-	if req.body, err = parsePost(r); err != nil {
-		return nil, err
-	}
-
-	if req.Uploads, err = parseUploads(r); err != nil {
-		return nil, err
-	}
-
-	req.Parsed = true
-	return req, nil
-}
-
-// Open moves all uploaded files to temporary directory so it can be given to php later.
-func (r *Request) Open(cfg *Config) error {
-	if r.Uploads == nil {
-		return nil
-	}
-
-	return r.Uploads.Open(cfg)
-}
-
-// Close clears all temp file uploads
-func (r *Request) Close() {
-	if r.Uploads == nil {
-		return
-	}
-
-	r.Uploads.Clear()
-}
-
-// Payload request marshaled RoadRunner payload based on PSR7 data. Default encode method is JSON. Make sure to open
-// files prior to calling this method.
-func (r *Request) Payload() (p *roadrunner.Payload, err error) {
-	p = &roadrunner.Payload{}
-
-	if p.Context, err = json.Marshal(r); err != nil {
-		return nil, err
-	}
-
-	if r.Parsed {
-		if p.Body, err = json.Marshal(r.body); err != nil {
-			return nil, err
-		}
-	} else if r.body != nil {
-		p.Body = r.body.([]byte)
-	}
-
-	return p, nil
-}
-
-// parsable returns true if request payload can be parsed (POST dataTree, file tree).
-func (r *Request) parsable() bool {
-	if r.Method != "POST" && r.Method != "PUT" && r.Method != "PATCH" {
-		return false
-	}
-
-	ct := r.Headers.Get("content-type")
-	return strings.Contains(ct, "multipart/form-data") || ct == "application/x-www-form-urlencoded"
-}
-
-// uri fetches full uri from request in a form of string (including https scheme if TLS connection is enabled).
-func uri(r *http.Request) string {
-	if r.TLS != nil {
-		return fmt.Sprintf("https://%s%s", r.Host, r.URL.String())
-	}
-
-	return fmt.Sprintf("http://%s%s", r.Host, r.URL.String())
-}
diff --git a/http/response.go b/http/response.go
deleted file mode 100644
index 2736c4ab..00000000
--- a/http/response.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package http
-
-import (
-	"encoding/json"
-	"github.com/spiral/roadrunner"
-	"net/http"
-)
-
-// Response handles PSR7 response logic.
-type Response struct {
-	// Status contains response status.
-	Status int `json:"status"`
-
-	// Headers contains list of response headers.
-	Headers map[string][]string `json:"headers"`
-
-	// associated body payload.
-	body []byte
-}
-
-// NewResponse creates new response based on given roadrunner payload.
-func NewResponse(p *roadrunner.Payload) (*Response, error) {
-	r := &Response{body: p.Body}
-	if err := json.Unmarshal(p.Context, r); err != nil {
-		return nil, err
-	}
-
-	return r, nil
-}
-
-// Write writes response headers, status and body into ResponseWriter.
-func (r *Response) Write(w http.ResponseWriter) {
-	for k, v := range r.Headers {
-		for _, h := range v {
-			w.Header().Add(k, h)
-
-		}
-	}
-
-	w.WriteHeader(r.Status)
-	w.Write(r.body)
-}
diff --git a/http/rpc.go b/http/rpc.go
deleted file mode 100644
index 38db9a61..00000000
--- a/http/rpc.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package http
-
-import (
-	"github.com/sirupsen/logrus"
-	"github.com/spiral/roadrunner/utils"
-	"github.com/pkg/errors"
-)
-
-type rpcServer struct {
-	service *Service
-}
-
-// WorkerList contains list of workers.
-type WorkerList struct {
-	// Workers is list of workers.
-	Workers []utils.Worker `json:"workers"`
-}
-
-// Reset resets underlying RR worker pool and restarts all of it's workers.
-func (rpc *rpcServer) Reset(reset bool, r *string) error {
-	if rpc.service.srv == nil {
-		return errors.New("no http server")
-	}
-
-	logrus.Info("http: restarting worker pool")
-	*r = "OK"
-
-	err := rpc.service.srv.rr.Reset()
-	if err != nil {
-		logrus.Errorf("http: %s", err)
-	}
-
-	return err
-}
-
-// Workers returns list of active workers and their stats.
-func (rpc *rpcServer) Workers(list bool, r *WorkerList) error {
-	if rpc.service.srv == nil {
-		return errors.New("no http server")
-	}
-
-	r.Workers = utils.FetchWorkers(rpc.service.srv.rr)
-	return nil
-}
diff --git a/http/server.go b/http/server.go
deleted file mode 100644
index db1f22ef..00000000
--- a/http/server.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package http
-
-import (
-	"errors"
-	"github.com/sirupsen/logrus"
-	"github.com/spiral/roadrunner"
-	"net/http"
-	"strconv"
-)
-
-// service serves http connections to underlying PHP application using PSR-7 protocol. Context will include request headers,
-// parsed files and query, payload will include parsed form dataTree (if any).
-type Server struct {
-	cfg    *Config
-	static *staticServer
-	rr     *roadrunner.Server
-}
-
-// NewServer returns new instance of HTTP PSR7 server.
-func NewServer(cfg *Config, server *roadrunner.Server) *Server {
-	h := &Server{cfg: cfg, rr: server}
-
-	if cfg.ServeStatic {
-		h.static = &staticServer{root: http.Dir(h.cfg.Root)}
-	}
-
-	return h
-}
-
-// ServeHTTP serve using PSR-7 requests passed to underlying application. Attempts to serve static files first if enabled.
-func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if srv.cfg.ServeStatic && srv.static.serve(w, r) {
-		return
-	}
-
-	// validating request size
-	if srv.cfg.MaxRequest != 0 {
-		if length := r.Header.Get("content-length"); length != "" {
-			if size, err := strconv.ParseInt(length, 10, 64); err != nil {
-				srv.sendError(w, r, err)
-				return
-			} else if size > srv.cfg.MaxRequest {
-				srv.sendError(w, r, errors.New("request body max size is exceeded"))
-				return
-			}
-		}
-	}
-
-	req, err := NewRequest(r)
-	if err != nil {
-		srv.sendError(w, r, err)
-		return
-	}
-
-	if err = req.Open(srv.cfg); err != nil {
-		srv.sendError(w, r, err)
-		return
-	}
-	defer req.Close()
-
-	p, err := req.Payload()
-	if err != nil {
-		srv.sendError(w, r, err)
-		return
-	}
-
-	rsp, err := srv.rr.Exec(p)
-	if err != nil {
-		srv.sendError(w, r, err)
-		return
-	}
-
-	resp, err := NewResponse(rsp)
-	if err != nil {
-		srv.sendError(w, r, err)
-		return
-	}
-
-	resp.Write(w)
-}
-
-// sendError sends error
-func (srv *Server) sendError(w http.ResponseWriter, r *http.Request, err error) {
-	logrus.Errorf("http: %s", err)
-	w.WriteHeader(500)
-	w.Write([]byte(err.Error()))
-}
diff --git a/http/service.go b/http/service.go
deleted file mode 100644
index 5d45240b..00000000
--- a/http/service.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package http
-
-import (
-	"context"
-	"github.com/sirupsen/logrus"
-	"github.com/spiral/roadrunner/service"
-	"net/http"
-	"github.com/spiral/roadrunner"
-)
-
-type Service struct {
-	cfg  *serviceConfig
-	http *http.Server
-	srv  *Server
-}
-
-func (s *Service) Name() string {
-	return "http"
-}
-
-func (s *Service) Configure(cfg service.Config) (bool, error) {
-	config := &serviceConfig{}
-	if err := cfg.Unmarshal(config); err != nil {
-		return false, err
-	}
-
-	if !config.Enabled {
-		return false, nil
-	}
-
-	if err := config.Valid(); err != nil {
-		return false, err
-	}
-
-	s.cfg = config
-	return true, nil
-}
-
-func (s *Service) RPC() interface{} {
-	return &rpcServer{s}
-}
-
-func (s *Service) Serve() error {
-	logrus.Debugf("http: started")
-	defer logrus.Debugf("http: stopped")
-
-	rr, term, err := s.cfg.Pool.NewServer()
-	if err != nil {
-		return err
-	}
-	defer term()
-
-	//todo: remove
-	rr.Observe(func(event int, ctx interface{}) {
-		switch event {
-		case roadrunner.EventPoolError:
-			logrus.Error(ctx)
-		case roadrunner.EventWorkerError:
-			logrus.Errorf("%s: %s", ctx.(roadrunner.WorkerError).Worker, ctx.(roadrunner.WorkerError).Error())
-		}
-	})
-
-	s.srv = NewServer(s.cfg.httpConfig(), rr)
-	s.http = &http.Server{
-		Addr:    s.cfg.httpAddr(),
-		Handler: s.srv,
-	}
-
-	if err := s.http.ListenAndServe(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *Service) Stop() error {
-	return s.http.Shutdown(context.Background())
-}
diff --git a/http/static.go b/http/static.go
deleted file mode 100644
index d7030c3f..00000000
--- a/http/static.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package http
-
-import (
-	"github.com/sirupsen/logrus"
-	"net/http"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-)
-
-var (
-	forbiddenFiles = []string{".php", ".htaccess"}
-)
-
-// staticServer serves static files
-type staticServer struct {
-	root http.Dir
-}
-
-// serve attempts to serve static file and returns true in case of success, will return false in case if file not
-// found, not allowed or on read error.
-func (svr *staticServer) serve(w http.ResponseWriter, r *http.Request) bool {
-	fpath := r.URL.Path
-	if !strings.HasPrefix(fpath, "/") {
-		fpath = "/" + fpath
-	}
-	fpath = path.Clean(fpath)
-
-	if svr.forbidden(fpath) {
-		logrus.Warningf("attempt to access forbidden file %s", fpath) // todo: better logs
-		return false
-	}
-
-	f, err := svr.root.Open(fpath)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			logrus.Error(err) //todo: rr or access error
-		}
-
-		return false
-	}
-	defer f.Close()
-
-	d, err := f.Stat()
-	if err != nil {
-		logrus.Error(err) //todo: rr or access error
-		return false
-	}
-
-	if d.IsDir() {
-		// do not serve directories
-		return false
-	}
-
-	http.ServeContent(w, r, d.Name(), d.ModTime(), f)
-	return true
-}
-
-// forbidden returns true if file has forbidden extension.
-func (svr *staticServer) forbidden(path string) bool {
-	ext := strings.ToLower(filepath.Ext(path))
-	for _, exl := range forbiddenFiles {
-		if ext == exl {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/http/uploads.go b/http/uploads.go
deleted file mode 100644
index 468e8a19..00000000
--- a/http/uploads.go
+++ /dev/null
@@ -1,207 +0,0 @@
-package http
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"mime/multipart"
-	"net/http"
-	"os"
-	"strings"
-	"sync"
-)
-
-const (
-	// There is no error, the file uploaded with success.
-	UploadErrorOK = 0
-
-	// No file was uploaded.
-	UploadErrorNoFile = 4
-
-	// Missing a temporary folder.
-	UploadErrorNoTmpDir = 5
-
-	// Failed to write file to disk.
-	UploadErrorCantWrite = 6
-
-	// ForbidUploads file extension.
-	UploadErrorExtension = 7
-)
-
-// FileUpload represents singular file wrapUpload.
-type FileUpload struct {
-	// Name contains filename specified by the client.
-	Name string `json:"name"`
-
-	// MimeType contains mime-type provided by the client.
-	MimeType string `json:"type"`
-
-	// Size of the uploaded file.
-	Size int64 `json:"size"`
-
-	// Error indicates file upload error (if any). See http://php.net/manual/en/features.file-upload.errors.php
-	Error int `json:"error"`
-
-	// TempFilename points to temporary file location.
-	TempFilename string `json:"tmpName"`
-
-	// associated file header
-	header *multipart.FileHeader
-}
-
-func (f *FileUpload) Open(cfg *Config) error {
-	if cfg.Forbidden(f.Name) {
-		f.Error = UploadErrorExtension
-		return nil
-	}
-
-	file, err := f.header.Open()
-	if err != nil {
-		f.Error = UploadErrorNoFile
-		return err
-	}
-	defer file.Close()
-
-	tmp, err := ioutil.TempFile(cfg.TmpDir, "upload")
-	if err != nil {
-		// most likely cause of this issue is missing tmp dir
-		f.Error = UploadErrorNoTmpDir
-		return err
-	}
-
-	f.TempFilename = tmp.Name()
-	defer tmp.Close()
-
-	if f.Size, err = io.Copy(tmp, file); err != nil {
-		f.Error = UploadErrorCantWrite
-	}
-
-	return err
-}
-
-func wrapUpload(f *multipart.FileHeader) *FileUpload {
-	return &FileUpload{
-		Name:     f.Filename,
-		MimeType: f.Header.Get("Content-Type"),
-		Error:    UploadErrorOK,
-		header:   f,
-	}
-}
-
-type fileTree map[string]interface{}
-
-func (d fileTree) push(k string, v []*FileUpload) {
-	if len(v) == 0 {
-		// skip empty values
-		return
-	}
-
-	indexes := make([]string, 0)
-	for _, index := range strings.Split(k, "[") {
-		indexes = append(indexes, strings.Trim(index, "]"))
-	}
-
-	if len(indexes) <= maxLevel {
-		d.mount(indexes, v)
-	}
-}
-
-// mount mounts data tree recursively.
-func (d fileTree) mount(i []string, v []*FileUpload) {
-	if len(v) == 0 {
-		return
-	}
-
-	if len(i) == 1 {
-		// single value context
-		d[i[0]] = v[0]
-		return
-	}
-
-	if len(i) == 2 && i[1] == "" {
-		// non associated array of elements
-		d[i[0]] = v
-		return
-	}
-
-	if p, ok := d[i[0]]; ok {
-		p.(fileTree).mount(i[1:], v)
-	}
-
-	d[i[0]] = make(fileTree)
-	d[i[0]].(fileTree).mount(i[1:], v)
-}
-
-// tree manages uploaded files tree and temporary files.
-type Uploads struct {
-	// pre processed data tree for Uploads.
-	tree fileTree
-
-	// flat list of all file Uploads.
-	list []*FileUpload
-}
-
-// MarshalJSON marshal tree tree into JSON.
-func (u *Uploads) MarshalJSON() ([]byte, error) {
-	return json.Marshal(u.tree)
-}
-
-// Open moves all uploaded files to temp directory, return error in case of issue with temp directory. File errors
-// will be handled individually. @todo: do we need it?
-func (u *Uploads) Open(cfg *Config) error {
-	var wg sync.WaitGroup
-	for _, f := range u.list {
-		wg.Add(1)
-		go func(f *FileUpload) {
-			defer wg.Done()
-			f.Open(cfg)
-		}(f)
-	}
-
-	wg.Wait()
-	return nil
-}
-
-// Clear deletes all temporary files.
-func (u *Uploads) Clear() {
-	for _, f := range u.list {
-		if f.TempFilename != "" && exists(f.TempFilename) {
-			os.Remove(f.TempFilename)
-		}
-	}
-}
-
-// parse incoming dataTree request into JSON (including multipart form dataTree)
-func parseUploads(r *http.Request) (*Uploads, error) {
-	u := &Uploads{
-		tree: make(fileTree),
-		list: make([]*FileUpload, 0),
-	}
-
-	for k, v := range r.MultipartForm.File {
-		files := make([]*FileUpload, 0, len(v))
-		for _, f := range v {
-			files = append(files, wrapUpload(f))
-		}
-
-		u.list = append(u.list, files...)
-		u.tree.push(k, files)
-	}
-
-	return u, nil
-}
-
-// exists if file exists. by osutils; todo: better?
-func exists(path string) bool {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true
-	}
-
-	if os.IsNotExist(err) {
-		return false
-	}
-
-	panic(fmt.Errorf("unable to stat path %q; %v", path, err))
-}