scgi

Author: Michael Lauer

py_test.go

@@ -3,13 +3,35 @@
 package gofcgisrv
 
 import (
+	"errors"
+	"net"
 	"os"
 	"os/exec"
 	"strings"
 	"testing"
 	"time"
 )
 
+func waitForConn(addr string, timeout time.Duration) error {
+	ticker := time.NewTicker(time.Millisecond * 10)
+	timer := time.NewTimer(timeout)
+	defer timer.Stop()
+	defer ticker.Stop()
+	for {
+		select {
+		case <-ticker.C:
+			c, err := net.Dial("tcp", addr)
+			if err == nil {
+				c.Close()
+				return nil
+			}
+		case <-timer.C:
+			return errors.New("timeout")
+		}
+	}
+	panic("Unreachable")
+}
+
 func TestPyServer(t *testing.T) {
 	cmd := exec.Command("python", "./testdata/cgi_test.py", "--port=9001")
 	cmd.Stdout = os.Stdout
@@ -18,10 +40,9 @@ func TestPyServer(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error running cgi_test.py: %v", err)
 	}
-	defer time.Sleep(time.Millisecond * 10)
 	defer cmd.Process.Kill()
 
-	time.Sleep(time.Millisecond * 100)
+	waitForConn("127.0.0.1:9001", time.Second)
 	s := NewServer("127.0.0.1:9001")
 	testRequester(t, httpTestData{
 		name:     "py fastcgi",
@@ -33,7 +54,6 @@ func TestPyServer(t *testing.T) {
 }
 
 func TestPyCGI(t *testing.T) {
-	time.Sleep(time.Millisecond * 90)
 	s := NewCGI("python", "./testdata/cgi_test.py", "--cgi")
 	testRequester(t, httpTestData{
 		name:     "py cgi",
@@ -43,3 +63,22 @@ func TestPyCGI(t *testing.T) {
 		expected: "This is a test",
 	})
 }
+
+func TestPySCGI(t *testing.T) {
+	cmd := exec.Command("python", "./testdata/cgi_test.py", "--scgi", "--port=9002")
+	// flup barfs some output. Why?? Seems wrong to me.
+	err := cmd.Start()
+	if err != nil {
+		t.Fatalf("Error running cgi_test.py: %v", err)
+	}
+	defer cmd.Process.Kill()
+	waitForConn("127.0.0.1:9002", time.Second)
+	s := NewSCGI("127.0.0.1:9002")
+	testRequester(t, httpTestData{
+		name:     "py scgi",
+		f:        s,
+		body:     strings.NewReader("This is a test"),
+		status:   200,
+		expected: "This is a test",
+	})
+}

scgi.go

@@ -0,0 +1,66 @@
+package gofcgisrv
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net"
+	"strings"
+)
+
+type SCGIRequester struct {
+	applicationAddr string
+}
+
+func (sr *SCGIRequester) Request(env []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
+	// Make a connection
+	conn, err := net.Dial("tcp", sr.applicationAddr)
+	if err != nil {
+		return err
+	}
+
+	// Send the environment
+	header := bytes.NewBuffer(nil)
+	// Content length has to go first.
+	for _, envstring := range env {
+		splits := strings.SplitN(envstring, "=", 2)
+		if len(splits) == 2 && splits[0] == "CONTENT_LENGTH" {
+			fmt.Fprintf(header, "%s\000%s\000", splits[0], splits[1])
+		}
+	}
+	io.WriteString(header, "SCGI:\x001\x00")
+	for _, envstring := range env {
+		splits := strings.SplitN(envstring, "=", 2)
+		if len(splits) == 2 && splits[0] != "CONTENT_LENGTH" {
+			fmt.Fprintf(header, "%s\000%s\000", splits[0], splits[1])
+		}
+	}
+
+	_, err = fmt.Fprintf(conn, "%d:%s,", header.Len(), header.Bytes())
+	if err != nil {
+		conn.Close()
+		return err
+	}
+	_, err = io.Copy(conn, stdin)
+	if err != nil {
+		conn.Close()
+		return err
+	}
+
+	// Flup needs the write side closed. I don't think that's right, but there it is.
+	if cw, ok := conn.(interface {
+		CloseWrite() error
+	}); ok {
+		cw.CloseWrite()
+	}
+	_, err = io.Copy(stdout, conn)
+	// If we have an error, just log it to stderr.
+	if err != nil {
+		stderr.Write([]byte(err.Error()))
+	}
+	return nil
+}
+
+func NewSCGI(addr string) *SCGIRequester {
+	return &SCGIRequester{applicationAddr: addr}
+}