Merge remote-tracking branch 'origin/2.10.x'

sebaciv · sebaciv · commit 54c276e06f00 · 2023-11-22T13:49:24.000+01:00
diff --git a/redis/src/main/scala/com/avsystem/commons/redis/commands/connection.scala b/redis/src/main/scala/com/avsystem/commons/redis/commands/connection.scala
@@ -50,6 +50,10 @@ trait ConnectionConnectionApi extends NodeConnectionApi {
 
   private final class Auth(username: Opt[String], password: String) extends RedisUnitCommand with ConnectionCommand {
     val encoded: Encoded = encoder("AUTH").optAdd(username).add(password).result
+
+    // hide password value in error messages
+    override def toString: String =
+      s""""AUTH" ${username.mapOr("", u => s""""$u" """)}"<password>""""
   }
 
   private object Quit extends RedisUnitCommand with ConnectionCommand {
@@ -60,4 +64,3 @@ trait ConnectionConnectionApi extends NodeConnectionApi {
     val encoded: Encoded = encoder("SELECT").add(index).result
   }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ trait ConnectionConnectionApi extends NodeConnectionApi {`
`50`	`50`
`51`	`51`	`private final class Auth(username: Opt[String], password: String) extends RedisUnitCommand with ConnectionCommand {`
`52`	`52`	`val encoded: Encoded = encoder("AUTH").optAdd(username).add(password).result`
	`53`	`+`
	`54`	`+ // hide password value in error messages`
	`55`	`+ override def toString: String =`
	`56`	`+ s""""AUTH" ${username.mapOr("", u => s""""$u" """)}"<password>""""`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`private object Quit extends RedisUnitCommand with ConnectionCommand {`
`@@ -60,4 +64,3 @@ trait ConnectionConnectionApi extends NodeConnectionApi {`
`60`	`64`	`val encoded: Encoded = encoder("SELECT").add(index).result`
`61`	`65`	`}`
`62`	`66`	`}`
`63`		`-`