@@ -56,6 +56,9 @@ describe("templateErrorMessage", () => {
5656 "secretKey" ,
5757 "sessionId" ,
5858 "connectionString" ,
59+ "privatekey" ,
60+ "privateKey" ,
61+ "PRIVATEKEY" ,
5962 ] ) ( "masks the exact credential alias %s" , ( key ) => {
6063 expect ( templateErrorMessage ( `request failed: ${ key } =wrong user` ) ) . toBe ( "request failed <x>" )
6164 expect ( templateErrorMessage ( `${ key } : connection refused` ) ) . toBe ( "<x>" )
@@ -71,14 +74,63 @@ describe("templateErrorMessage", () => {
7174 expect ( templateErrorMessage ( raw ) ) . toBe ( "request failed <x>" )
7275 } )
7376
77+ test . each ( [
78+ [ "DATABASE_CONNECTION_STRING=wrong user" , "database <x>" ] ,
79+ [ "db_connection_string=wrong user" , "<x>" ] ,
80+ [ "connection_string_value=wrong user" , "<x>" ] ,
81+ [ "request failed: DB_Connection_String_Value=connection refused" , "request failed <x>" ] ,
82+ [ "request failed: 123connection_string456=wrong user" , "request failed <x>" ] ,
83+ [ "request failed: _connection-string_=wrong user" , "request failed <x>" ] ,
84+ [ "request failed: éconnection_string中=wrong user" , "request failed <x>" ] ,
85+ [ "request failed: \x1b[31mDATABASE_CONNECTION_STRING\x1b[0m=wrong user" , "request failed database <x>" ] ,
86+ [ "request failed: db_connection_string_value=wrong user" , "request failed <x>" ] ,
87+ ] ) ( "uses tokenizer boundaries for connection string keys: %j" , ( raw , expected ) => {
88+ expect ( templateErrorMessage ( raw ) ) . toBe ( expected )
89+ } )
90+
91+ test . each ( [
92+ [ "connection string=wrong user" , "<x>" ] ,
93+ [ "connection string:wrong user" , "<x>" ] ,
94+ [ "connection string: invalid" , "<x>" ] ,
95+ [ "request failed: connection string=wrong user" , "request failed <x>" ] ,
96+ [ "request failed: Connection String : connection refused" , "request failed <x>" ] ,
97+ [ "request failed: CONNECTION\tSTRING\t=\twrong user" , "request failed <x>" ] ,
98+ [ "request failed: connection string = connection refused" , "request failed <x>" ] ,
99+ [ 'request failed: "connection string" = "wrong user"' , "request failed <x>" ] ,
100+ [ "request failed: 'connection string': 'wrong user'" , "request failed <x>" ] ,
101+ [ "request failed: `connection string` = wrong user" , "request failed <x>" ] ,
102+ [ "request failed: \x1b[31mconnection string\x1b[0m=wrong user" , "request failed <x>" ] ,
103+ [ "request failed: connec\x1b[31mtion str\x1b[0ming=wrong user" , "request failed <x>" ] ,
104+ ] ) ( "masks spaced connection string assignments: %j" , ( raw , expected ) => {
105+ expect ( templateErrorMessage ( raw ) ) . toBe ( expected )
106+ } )
107+
108+ test . each ( [ "\n" , "\r" , "\r\n" , "\u2028" , "\u2029" ] ) (
109+ "keeps spaced key assignments on the first line: %j" ,
110+ ( newline ) => {
111+ expect ( templateErrorMessage ( `connection${ newline } string=wrong user` ) ) . toBe ( "connection" )
112+ expect ( templateErrorMessage ( `connection string${ newline } =wrong user` ) ) . toBe ( "connection string" )
113+ expect ( templateErrorMessage ( `connection string: wrong user${ newline } connection refused` ) ) . toBe ( "<x>" )
114+ } ,
115+ )
116+
74117 test . each ( [
75118 [ "connection string is invalid" , "connection string is invalid" ] ,
119+ [ "connection string" , "connection string" ] ,
120+ [ "connection string invalid" , "connection string invalid" ] ,
121+ [ '"connection string" is invalid' , "connection string is invalid" ] ,
122+ [ "disconnection string=wrong user" , "<x> string wrong user" ] ,
123+ [ "connection stringify=wrong user" , "connection <x> wrong user" ] ,
124+ [ "connection strings: invalid" , "connection <x> invalid" ] ,
76125 [ "connection refused" , "connection refused" ] ,
77126 [ "signal received" , "signal received" ] ,
78127 [ "connection_stringify is invalid" , "connection <x> is invalid" ] ,
79128 [ "disconnection_string is invalid" , "<x> string is invalid" ] ,
80129 [ "connection_strings are invalid" , "connection <x> are invalid" ] ,
81- [ "apikeyboard sigil signatured tokenizer failed" , "<x> failed" ] ,
130+ [ "db_disconnection_string is invalid" , "<x> string is invalid" ] ,
131+ [ "db_connection_stringify is invalid" , "<x> connection <x> is invalid" ] ,
132+ [ "connection_strings_value is invalid" , "connection <x> value is invalid" ] ,
133+ [ "privatekeyboard apikeyboard sigil signatured tokenizer failed" , "<x> failed" ] ,
82134 ] ) ( "keeps diagnostics without an exact credential marker: %s" , ( raw , expected ) => {
83135 expect ( templateErrorMessage ( raw ) ) . toBe ( expected )
84136 } )
0 commit comments