Added suport for pedantic mode and -ERR proto

test/pedantic_test.go

@@ -0,0 +1,81 @@
+// Copyright 2012 Apcera Inc. All rights reserved.
+
+package test
+
+import (
+	"testing"
+)
+
+func TestStartupPedantic(t *testing.T) {
+	s = startServer(t, PROTO_TEST_PORT, "")
+}
+
+func TestPedanticSub(t *testing.T) {
+	c := createClientConn(t, "localhost", PROTO_TEST_PORT)
+	doConnect(t, c, true, true, false)
+	send := sendCommand(t, c)
+	expect := expectCommand(t, c)
+
+	// Ping should still be same
+	send("PING\r\n")
+	expect(pongRe)
+
+	// Test malformed subjects for SUB
+	// Sub can contain wildcards, but
+	// subject must still be legit.
+
+	// Empty terminal token
+	send("SUB foo. 1\r\n")
+	expect(errRe)
+
+	// Empty beginning token
+	send("SUB .foo. 1\r\n")
+	expect(errRe)
+
+	// Empty middle token
+	send("SUB foo..bar 1\r\n")
+	expect(errRe)
+
+	// Bad non-terminal FWC
+	send("SUB foo.>.bar 1\r\n")
+	buf := expect(errRe)
+
+	// Check that itr is 'Invalid Subject'
+	matches := errRe.FindAllSubmatch(buf, -1)
+	if len(matches) != 1 {
+		t.Fatal("Wanted one overall match")
+	}
+	if string(matches[0][1]) != "'Invalid Subject'" {
+		t.Fatalf("Expected 'Invalid Subject', got %s", string(matches[0][1]))
+	}
+
+}
+
+func TestPedanticPub(t *testing.T) {
+	c := createClientConn(t, "localhost", PROTO_TEST_PORT)
+	doConnect(t, c, true, true, false)
+	send := sendCommand(t, c)
+	expect := expectCommand(t, c)
+
+	// Test malformed subjects for PUB
+	// PUB subjects can not have wildcards
+	// This will error in pedantic mode
+	send("PUB foo.* 2\r\nok\r\n")
+	expect(errRe)
+
+	send("PUB foo.> 2\r\nok\r\n")
+	expect(errRe)
+
+	send("PUB foo. 2\r\nok\r\n")
+	expect(errRe)
+
+	send("PUB .foo 2\r\nok\r\n")
+	expect(errRe)
+
+	send("PUB foo..* 2\r\nok\r\n")
+	expect(errRe)
+}
+
+func TestStopServerPedantic(t *testing.T) {
+	s.stopServer()
+}

test/proto_test.go

@@ -106,6 +106,7 @@ var (
 	pongRe = regexp.MustCompile(`\APONG\r\n`)
 	msgRe  = regexp.MustCompile(`(?:(?:MSG\s+([^\s]+)\s+([^\s]+)\s+(([^\s]+)[^\S\r\n]+)?(\d+)\r\n([^\\r\\n]*?)\r\n)+?)`)
 	okRe   = regexp.MustCompile(`\A\+OK\r\n`)
+	errRe  = regexp.MustCompile(`\A\-ERR\s+([^\r\n]+)\r\n`)
 )
 
 const (