update to redis 6

thomas-kielbus · Jun 10, 2020 · 19f451d · 19f451d
1 parent 34d9a7a
commit 19f451d
Show file tree

Hide file tree

Showing 20 changed files with 258 additions and 255 deletions.
diff --git a/README.md b/README.md
@@ -302,7 +302,7 @@ Commands which will probably not be implemented:
 
 ## &c.
 
-Tests are run against Redis 5.0.7. The [./integration](./integration/) subdir
+Tests are run against Redis 6.0.5. The [./integration](./integration/) subdir
 compares miniredis against a real redis instance.
 
 If you want to test Redis Sentinel have a look at [minisentinel](https://github.com/Bose/minisentinel).

diff --git a/cmd_connection.go b/cmd_connection.go
@@ -60,7 +60,7 @@ func (m *Miniredis) cmdAuth(c *server.Peer, cmd string, args []string) {
 		c.WriteError(errWrongNumber(cmd))
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 	if getCtx(c).nested {
@@ -72,11 +72,11 @@ func (m *Miniredis) cmdAuth(c *server.Peer, cmd string, args []string) {
 
 	withTx(m, c, func(c *server.Peer, ctx *connCtx) {
 		if m.password == "" {
-			c.WriteError("ERR Client sent AUTH, but no password is set")
+			c.WriteError("ERR AUTH <password> called without any password configured for the default user. Are you sure your configuration is correct?")
 			return
 		}
 		if m.password != pw {
-			c.WriteError("ERR invalid password")
+			c.WriteError("WRONGPASS invalid username-password pair")
 			return
 		}
 
@@ -95,7 +95,7 @@ func (m *Miniredis) cmdEcho(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -115,7 +115,7 @@ func (m *Miniredis) cmdSelect(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 

diff --git a/cmd_connection_test.go b/cmd_connection_test.go
@@ -21,7 +21,7 @@ func TestAuth(t *testing.T) {
 	mustFail(t, err, "NOAUTH Authentication required.")
 
 	_, err = c.Do("AUTH", "wrongpasswd")
-	mustFail(t, err, "ERR invalid password")
+	mustFail(t, err, "WRONGPASS invalid username-password pair")
 
 	_, err = c.Do("AUTH", "nocomment")
 	ok(t, err)

diff --git a/cmd_generic.go b/cmd_generic.go
@@ -50,7 +50,7 @@ func makeCmdExpire(m *Miniredis, unix bool, d time.Duration) func(*server.Peer,
 		if !m.handleAuth(c) {
 			return
 		}
-		if m.checkPubsub(c) {
+		if m.checkPubsub(c, cmd) {
 			return
 		}
 
@@ -98,7 +98,7 @@ func (m *Miniredis) cmdTouch(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -131,7 +131,7 @@ func (m *Miniredis) cmdTTL(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -166,7 +166,7 @@ func (m *Miniredis) cmdPTTL(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -201,7 +201,7 @@ func (m *Miniredis) cmdPersist(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -232,7 +232,7 @@ func (m *Miniredis) cmdDel(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -266,7 +266,7 @@ func (m *Miniredis) cmdType(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -295,7 +295,7 @@ func (m *Miniredis) cmdExists(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -322,7 +322,7 @@ func (m *Miniredis) cmdMove(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -358,7 +358,7 @@ func (m *Miniredis) cmdKeys(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -385,7 +385,7 @@ func (m *Miniredis) cmdRandomkey(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -417,7 +417,7 @@ func (m *Miniredis) cmdRename(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -446,7 +446,7 @@ func (m *Miniredis) cmdRenamenx(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -480,7 +480,7 @@ func (m *Miniredis) cmdScan(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 

diff --git a/cmd_geo.go b/cmd_geo.go
@@ -32,7 +32,7 @@ func (m *Miniredis) cmdGeoadd(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 	key, args := args[0], args[1:]
@@ -91,7 +91,7 @@ func (m *Miniredis) cmdGeodist(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -149,7 +149,7 @@ func (m *Miniredis) cmdGeopos(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 	key, args := args[0], args[1:]
@@ -195,7 +195,7 @@ func (m *Miniredis) cmdGeoradius(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -382,7 +382,7 @@ func (m *Miniredis) cmdGeoradiusbymember(c *server.Peer, cmd string, args []stri
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 

diff --git a/cmd_hash.go b/cmd_hash.go
@@ -38,7 +38,7 @@ func (m *Miniredis) cmdHset(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -72,7 +72,7 @@ func (m *Miniredis) cmdHsetnx(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -111,7 +111,7 @@ func (m *Miniredis) cmdHmset(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -150,7 +150,7 @@ func (m *Miniredis) cmdHget(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -187,7 +187,7 @@ func (m *Miniredis) cmdHdel(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -235,7 +235,7 @@ func (m *Miniredis) cmdHexists(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -272,7 +272,7 @@ func (m *Miniredis) cmdHgetall(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -309,7 +309,7 @@ func (m *Miniredis) cmdHkeys(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -345,7 +345,7 @@ func (m *Miniredis) cmdHvals(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -381,7 +381,7 @@ func (m *Miniredis) cmdHlen(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -414,7 +414,7 @@ func (m *Miniredis) cmdHmget(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -455,7 +455,7 @@ func (m *Miniredis) cmdHincrby(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -495,7 +495,7 @@ func (m *Miniredis) cmdHincrbyfloat(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}
 
@@ -535,7 +535,7 @@ func (m *Miniredis) cmdHscan(c *server.Peer, cmd string, args []string) {
 	if !m.handleAuth(c) {
 		return
 	}
-	if m.checkPubsub(c) {
+	if m.checkPubsub(c, cmd) {
 		return
 	}