Skip to content

Reuse validation logic #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2025
Merged

Reuse validation logic #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d101ba
plug in isValidCmd for other command types
alyssaruth Jun 16, 2025
cb77477
fix integration tests - validate args first
alyssaruth Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions cmd_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,7 @@ func (m *Miniredis) cmdHello(c *server.Peer, cmd string, args []string) {

// ECHO
func (m *Miniredis) cmdEcho(c *server.Peer, cmd string, args []string) {
if len(args) != 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(1)) {
return
}

Expand Down
54 changes: 11 additions & 43 deletions cmd_geo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@ func commandsGeo(m *Miniredis) {

// GEOADD
func (m *Miniredis) cmdGeoadd(c *server.Peer, cmd string, args []string) {
if len(args) < 3 || len(args[1:])%3 != 0 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
if !m.isValidCMD(c, cmd, args, atLeast(3)) {
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {

if len(args[1:])%3 != 0 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}

key, args := args[0], args[1:]

withTx(m, c, func(c *server.Peer, ctx *connCtx) {
Expand Down Expand Up @@ -83,15 +82,7 @@ func (m *Miniredis) cmdGeoadd(c *server.Peer, cmd string, args []string) {

// GEODIST
func (m *Miniredis) cmdGeodist(c *server.Peer, cmd string, args []string) {
if len(args) < 3 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(3)) {
return
}

Expand Down Expand Up @@ -141,17 +132,10 @@ func (m *Miniredis) cmdGeodist(c *server.Peer, cmd string, args []string) {

// GEOPOS
func (m *Miniredis) cmdGeopos(c *server.Peer, cmd string, args []string) {
if len(args) < 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(1)) {
return
}

key, args := args[0], args[1:]

withTx(m, c, func(c *server.Peer, ctx *connCtx) {
Expand Down Expand Up @@ -187,15 +171,7 @@ type geoDistance struct {

// GEORADIUS and GEORADIUS_RO
func (m *Miniredis) cmdGeoradius(c *server.Peer, cmd string, args []string) {
if len(args) < 5 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(5)) {
return
}

Expand Down Expand Up @@ -374,15 +350,7 @@ func (m *Miniredis) cmdGeoradius(c *server.Peer, cmd string, args []string) {

// GEORADIUSBYMEMBER and GEORADIUSBYMEMBER_RO
func (m *Miniredis) cmdGeoradiusbymember(c *server.Peer, cmd string, args []string) {
if len(args) < 4 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(4)) {
return
}

Expand Down
160 changes: 16 additions & 144 deletions cmd_hash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,7 @@ func commandsHash(m *Miniredis) {

// HSET
func (m *Miniredis) cmdHset(c *server.Peer, cmd string, args []string) {
if len(args) < 3 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(3)) {
return
}

Expand All @@ -66,15 +58,7 @@ func (m *Miniredis) cmdHset(c *server.Peer, cmd string, args []string) {

// HSETNX
func (m *Miniredis) cmdHsetnx(c *server.Peer, cmd string, args []string) {
if len(args) != 3 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(3)) {
return
}

Expand Down Expand Up @@ -113,15 +97,7 @@ func (m *Miniredis) cmdHsetnx(c *server.Peer, cmd string, args []string) {

// HMSET
func (m *Miniredis) cmdHmset(c *server.Peer, cmd string, args []string) {
if len(args) < 3 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(3)) {
return
}

Expand Down Expand Up @@ -151,15 +127,7 @@ func (m *Miniredis) cmdHmset(c *server.Peer, cmd string, args []string) {

// HGET
func (m *Miniredis) cmdHget(c *server.Peer, cmd string, args []string) {
if len(args) != 2 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(2)) {
return
}

Expand Down Expand Up @@ -188,15 +156,7 @@ func (m *Miniredis) cmdHget(c *server.Peer, cmd string, args []string) {

// HDEL
func (m *Miniredis) cmdHdel(c *server.Peer, cmd string, args []string) {
if len(args) < 2 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(2)) {
return
}

Expand Down Expand Up @@ -242,15 +202,7 @@ func (m *Miniredis) cmdHdel(c *server.Peer, cmd string, args []string) {

// HEXISTS
func (m *Miniredis) cmdHexists(c *server.Peer, cmd string, args []string) {
if len(args) != 2 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(2)) {
return
}

Expand Down Expand Up @@ -285,15 +237,7 @@ func (m *Miniredis) cmdHexists(c *server.Peer, cmd string, args []string) {

// HGETALL
func (m *Miniredis) cmdHgetall(c *server.Peer, cmd string, args []string) {
if len(args) != 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(1)) {
return
}

Expand Down Expand Up @@ -322,15 +266,7 @@ func (m *Miniredis) cmdHgetall(c *server.Peer, cmd string, args []string) {

// HKEYS
func (m *Miniredis) cmdHkeys(c *server.Peer, cmd string, args []string) {
if len(args) != 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(1)) {
return
}

Expand Down Expand Up @@ -358,15 +294,7 @@ func (m *Miniredis) cmdHkeys(c *server.Peer, cmd string, args []string) {

// HSTRLEN
func (m *Miniredis) cmdHstrlen(c *server.Peer, cmd string, args []string) {
if len(args) != 2 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(2)) {
return
}

Expand All @@ -392,15 +320,7 @@ func (m *Miniredis) cmdHstrlen(c *server.Peer, cmd string, args []string) {

// HVALS
func (m *Miniredis) cmdHvals(c *server.Peer, cmd string, args []string) {
if len(args) != 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(1)) {
return
}

Expand Down Expand Up @@ -429,15 +349,7 @@ func (m *Miniredis) cmdHvals(c *server.Peer, cmd string, args []string) {

// HLEN
func (m *Miniredis) cmdHlen(c *server.Peer, cmd string, args []string) {
if len(args) != 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(1)) {
return
}

Expand All @@ -462,15 +374,7 @@ func (m *Miniredis) cmdHlen(c *server.Peer, cmd string, args []string) {

// HMGET
func (m *Miniredis) cmdHmget(c *server.Peer, cmd string, args []string) {
if len(args) < 2 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(2)) {
return
}

Expand Down Expand Up @@ -503,15 +407,7 @@ func (m *Miniredis) cmdHmget(c *server.Peer, cmd string, args []string) {

// HINCRBY
func (m *Miniredis) cmdHincrby(c *server.Peer, cmd string, args []string) {
if len(args) != 3 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(3)) {
return
}

Expand Down Expand Up @@ -546,15 +442,7 @@ func (m *Miniredis) cmdHincrby(c *server.Peer, cmd string, args []string) {

// HINCRBYFLOAT
func (m *Miniredis) cmdHincrbyfloat(c *server.Peer, cmd string, args []string) {
if len(args) != 3 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, exactly(3)) {
return
}

Expand Down Expand Up @@ -593,15 +481,7 @@ func (m *Miniredis) cmdHincrbyfloat(c *server.Peer, cmd string, args []string) {

// HSCAN
func (m *Miniredis) cmdHscan(c *server.Peer, cmd string, args []string) {
if len(args) < 2 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, atLeast(2)) {
return
}

Expand Down Expand Up @@ -685,15 +565,7 @@ func (m *Miniredis) cmdHscan(c *server.Peer, cmd string, args []string) {

// HRANDFIELD
func (m *Miniredis) cmdHrandfield(c *server.Peer, cmd string, args []string) {
if len(args) > 3 || len(args) < 1 {
setDirty(c)
c.WriteError(errWrongNumber(cmd))
return
}
if !m.handleAuth(c) {
return
}
if m.checkPubsub(c, cmd) {
if !m.isValidCMD(c, cmd, args, between(1, 3)) {
return
}

Expand Down
Loading