Skip to content

Commit cca8a28

Browse files
alicebobalicebob
authored
Merge pull request #156 from alicebob/redis6
support for redis 6
2 parents 34d9a7a + 6babcaf commit cca8a28

22 files changed

+359
-365
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ Commands which will probably not be implemented:
302302

303303
## &c.
304304

305-
Tests are run against Redis 5.0.7. The [./integration](./integration/) subdir
305+
Tests are run against Redis 6.0.5. The [./integration](./integration/) subdir
306306
compares miniredis against a real redis instance.
307307

308308
If you want to test Redis Sentinel have a look at [minisentinel](https://github.com/Bose/minisentinel).

‎cmd_connection.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (m *Miniredis) cmdAuth(c *server.Peer, cmd string, args []string) {
6060
c.WriteError(errWrongNumber(cmd))
6161
return
6262
}
63-
if m.checkPubsub(c) {
63+
if m.checkPubsub(c, cmd) {
6464
return
6565
}
6666
if getCtx(c).nested {
@@ -72,11 +72,11 @@ func (m *Miniredis) cmdAuth(c *server.Peer, cmd string, args []string) {
7272

7373
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
7474
if m.password == "" {
75-
c.WriteError("ERR Client sent AUTH, but no password is set")
75+
c.WriteError("ERR AUTH <password> called without any password configured for the default user. Are you sure your configuration is correct?")
7676
return
7777
}
7878
if m.password != pw {
79-
c.WriteError("ERR invalid password")
79+
c.WriteError("WRONGPASS invalid username-password pair")
8080
return
8181
}
8282

@@ -95,7 +95,7 @@ func (m *Miniredis) cmdEcho(c *server.Peer, cmd string, args []string) {
9595
if !m.handleAuth(c) {
9696
return
9797
}
98-
if m.checkPubsub(c) {
98+
if m.checkPubsub(c, cmd) {
9999
return
100100
}
101101

@@ -115,7 +115,7 @@ func (m *Miniredis) cmdSelect(c *server.Peer, cmd string, args []string) {
115115
if !m.handleAuth(c) {
116116
return
117117
}
118-
if m.checkPubsub(c) {
118+
if m.checkPubsub(c, cmd) {
119119
return
120120
}
121121

‎cmd_connection_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAuth(t *testing.T) {
2121
mustFail(t, err, "NOAUTH Authentication required.")
2222

2323
_, err = c.Do("AUTH", "wrongpasswd")
24-
mustFail(t, err, "ERR invalid password")
24+
mustFail(t, err, "WRONGPASS invalid username-password pair")
2525

2626
_, err = c.Do("AUTH", "nocomment")
2727
ok(t, err)

‎cmd_generic.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func makeCmdExpire(m *Miniredis, unix bool, d time.Duration) func(*server.Peer,
5050
if !m.handleAuth(c) {
5151
return
5252
}
53-
if m.checkPubsub(c) {
53+
if m.checkPubsub(c, cmd) {
5454
return
5555
}
5656

@@ -98,7 +98,7 @@ func (m *Miniredis) cmdTouch(c *server.Peer, cmd string, args []string) {
9898
if !m.handleAuth(c) {
9999
return
100100
}
101-
if m.checkPubsub(c) {
101+
if m.checkPubsub(c, cmd) {
102102
return
103103
}
104104

@@ -131,7 +131,7 @@ func (m *Miniredis) cmdTTL(c *server.Peer, cmd string, args []string) {
131131
if !m.handleAuth(c) {
132132
return
133133
}
134-
if m.checkPubsub(c) {
134+
if m.checkPubsub(c, cmd) {
135135
return
136136
}
137137

@@ -166,7 +166,7 @@ func (m *Miniredis) cmdPTTL(c *server.Peer, cmd string, args []string) {
166166
if !m.handleAuth(c) {
167167
return
168168
}
169-
if m.checkPubsub(c) {
169+
if m.checkPubsub(c, cmd) {
170170
return
171171
}
172172

@@ -201,7 +201,7 @@ func (m *Miniredis) cmdPersist(c *server.Peer, cmd string, args []string) {
201201
if !m.handleAuth(c) {
202202
return
203203
}
204-
if m.checkPubsub(c) {
204+
if m.checkPubsub(c, cmd) {
205205
return
206206
}
207207

@@ -232,7 +232,7 @@ func (m *Miniredis) cmdDel(c *server.Peer, cmd string, args []string) {
232232
if !m.handleAuth(c) {
233233
return
234234
}
235-
if m.checkPubsub(c) {
235+
if m.checkPubsub(c, cmd) {
236236
return
237237
}
238238

@@ -266,7 +266,7 @@ func (m *Miniredis) cmdType(c *server.Peer, cmd string, args []string) {
266266
if !m.handleAuth(c) {
267267
return
268268
}
269-
if m.checkPubsub(c) {
269+
if m.checkPubsub(c, cmd) {
270270
return
271271
}
272272

@@ -295,7 +295,7 @@ func (m *Miniredis) cmdExists(c *server.Peer, cmd string, args []string) {
295295
if !m.handleAuth(c) {
296296
return
297297
}
298-
if m.checkPubsub(c) {
298+
if m.checkPubsub(c, cmd) {
299299
return
300300
}
301301

@@ -322,7 +322,7 @@ func (m *Miniredis) cmdMove(c *server.Peer, cmd string, args []string) {
322322
if !m.handleAuth(c) {
323323
return
324324
}
325-
if m.checkPubsub(c) {
325+
if m.checkPubsub(c, cmd) {
326326
return
327327
}
328328

@@ -358,7 +358,7 @@ func (m *Miniredis) cmdKeys(c *server.Peer, cmd string, args []string) {
358358
if !m.handleAuth(c) {
359359
return
360360
}
361-
if m.checkPubsub(c) {
361+
if m.checkPubsub(c, cmd) {
362362
return
363363
}
364364

@@ -385,7 +385,7 @@ func (m *Miniredis) cmdRandomkey(c *server.Peer, cmd string, args []string) {
385385
if !m.handleAuth(c) {
386386
return
387387
}
388-
if m.checkPubsub(c) {
388+
if m.checkPubsub(c, cmd) {
389389
return
390390
}
391391

@@ -417,7 +417,7 @@ func (m *Miniredis) cmdRename(c *server.Peer, cmd string, args []string) {
417417
if !m.handleAuth(c) {
418418
return
419419
}
420-
if m.checkPubsub(c) {
420+
if m.checkPubsub(c, cmd) {
421421
return
422422
}
423423

@@ -446,7 +446,7 @@ func (m *Miniredis) cmdRenamenx(c *server.Peer, cmd string, args []string) {
446446
if !m.handleAuth(c) {
447447
return
448448
}
449-
if m.checkPubsub(c) {
449+
if m.checkPubsub(c, cmd) {
450450
return
451451
}
452452

@@ -480,7 +480,7 @@ func (m *Miniredis) cmdScan(c *server.Peer, cmd string, args []string) {
480480
if !m.handleAuth(c) {
481481
return
482482
}
483-
if m.checkPubsub(c) {
483+
if m.checkPubsub(c, cmd) {
484484
return
485485
}
486486

‎cmd_geo.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (m *Miniredis) cmdGeoadd(c *server.Peer, cmd string, args []string) {
3232
if !m.handleAuth(c) {
3333
return
3434
}
35-
if m.checkPubsub(c) {
35+
if m.checkPubsub(c, cmd) {
3636
return
3737
}
3838
key, args := args[0], args[1:]
@@ -91,7 +91,7 @@ func (m *Miniredis) cmdGeodist(c *server.Peer, cmd string, args []string) {
9191
if !m.handleAuth(c) {
9292
return
9393
}
94-
if m.checkPubsub(c) {
94+
if m.checkPubsub(c, cmd) {
9595
return
9696
}
9797

@@ -149,7 +149,7 @@ func (m *Miniredis) cmdGeopos(c *server.Peer, cmd string, args []string) {
149149
if !m.handleAuth(c) {
150150
return
151151
}
152-
if m.checkPubsub(c) {
152+
if m.checkPubsub(c, cmd) {
153153
return
154154
}
155155
key, args := args[0], args[1:]
@@ -195,7 +195,7 @@ func (m *Miniredis) cmdGeoradius(c *server.Peer, cmd string, args []string) {
195195
if !m.handleAuth(c) {
196196
return
197197
}
198-
if m.checkPubsub(c) {
198+
if m.checkPubsub(c, cmd) {
199199
return
200200
}
201201

@@ -382,7 +382,7 @@ func (m *Miniredis) cmdGeoradiusbymember(c *server.Peer, cmd string, args []stri
382382
if !m.handleAuth(c) {
383383
return
384384
}
385-
if m.checkPubsub(c) {
385+
if m.checkPubsub(c, cmd) {
386386
return
387387
}
388388

‎cmd_hash.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (m *Miniredis) cmdHset(c *server.Peer, cmd string, args []string) {
3838
if !m.handleAuth(c) {
3939
return
4040
}
41-
if m.checkPubsub(c) {
41+
if m.checkPubsub(c, cmd) {
4242
return
4343
}
4444

@@ -72,7 +72,7 @@ func (m *Miniredis) cmdHsetnx(c *server.Peer, cmd string, args []string) {
7272
if !m.handleAuth(c) {
7373
return
7474
}
75-
if m.checkPubsub(c) {
75+
if m.checkPubsub(c, cmd) {
7676
return
7777
}
7878

@@ -111,7 +111,7 @@ func (m *Miniredis) cmdHmset(c *server.Peer, cmd string, args []string) {
111111
if !m.handleAuth(c) {
112112
return
113113
}
114-
if m.checkPubsub(c) {
114+
if m.checkPubsub(c, cmd) {
115115
return
116116
}
117117

@@ -150,7 +150,7 @@ func (m *Miniredis) cmdHget(c *server.Peer, cmd string, args []string) {
150150
if !m.handleAuth(c) {
151151
return
152152
}
153-
if m.checkPubsub(c) {
153+
if m.checkPubsub(c, cmd) {
154154
return
155155
}
156156

@@ -187,7 +187,7 @@ func (m *Miniredis) cmdHdel(c *server.Peer, cmd string, args []string) {
187187
if !m.handleAuth(c) {
188188
return
189189
}
190-
if m.checkPubsub(c) {
190+
if m.checkPubsub(c, cmd) {
191191
return
192192
}
193193

@@ -235,7 +235,7 @@ func (m *Miniredis) cmdHexists(c *server.Peer, cmd string, args []string) {
235235
if !m.handleAuth(c) {
236236
return
237237
}
238-
if m.checkPubsub(c) {
238+
if m.checkPubsub(c, cmd) {
239239
return
240240
}
241241

@@ -272,7 +272,7 @@ func (m *Miniredis) cmdHgetall(c *server.Peer, cmd string, args []string) {
272272
if !m.handleAuth(c) {
273273
return
274274
}
275-
if m.checkPubsub(c) {
275+
if m.checkPubsub(c, cmd) {
276276
return
277277
}
278278

@@ -309,7 +309,7 @@ func (m *Miniredis) cmdHkeys(c *server.Peer, cmd string, args []string) {
309309
if !m.handleAuth(c) {
310310
return
311311
}
312-
if m.checkPubsub(c) {
312+
if m.checkPubsub(c, cmd) {
313313
return
314314
}
315315

@@ -345,7 +345,7 @@ func (m *Miniredis) cmdHvals(c *server.Peer, cmd string, args []string) {
345345
if !m.handleAuth(c) {
346346
return
347347
}
348-
if m.checkPubsub(c) {
348+
if m.checkPubsub(c, cmd) {
349349
return
350350
}
351351

@@ -381,7 +381,7 @@ func (m *Miniredis) cmdHlen(c *server.Peer, cmd string, args []string) {
381381
if !m.handleAuth(c) {
382382
return
383383
}
384-
if m.checkPubsub(c) {
384+
if m.checkPubsub(c, cmd) {
385385
return
386386
}
387387

@@ -414,7 +414,7 @@ func (m *Miniredis) cmdHmget(c *server.Peer, cmd string, args []string) {
414414
if !m.handleAuth(c) {
415415
return
416416
}
417-
if m.checkPubsub(c) {
417+
if m.checkPubsub(c, cmd) {
418418
return
419419
}
420420

@@ -455,7 +455,7 @@ func (m *Miniredis) cmdHincrby(c *server.Peer, cmd string, args []string) {
455455
if !m.handleAuth(c) {
456456
return
457457
}
458-
if m.checkPubsub(c) {
458+
if m.checkPubsub(c, cmd) {
459459
return
460460
}
461461

@@ -495,7 +495,7 @@ func (m *Miniredis) cmdHincrbyfloat(c *server.Peer, cmd string, args []string) {
495495
if !m.handleAuth(c) {
496496
return
497497
}
498-
if m.checkPubsub(c) {
498+
if m.checkPubsub(c, cmd) {
499499
return
500500
}
501501

@@ -535,7 +535,7 @@ func (m *Miniredis) cmdHscan(c *server.Peer, cmd string, args []string) {
535535
if !m.handleAuth(c) {
536536
return
537537
}
538-
if m.checkPubsub(c) {
538+
if m.checkPubsub(c, cmd) {
539539
return
540540
}
541541

0 commit comments

Comments
 (0)