|
324 | 324 | "$common_connstr sslrootcert=invalid",'-c', |
325 | 325 | "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()" |
326 | 326 | ], |
327 | | -qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\n |
328 | | -^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,_null_,_null_,_null_$}mx, |
| 327 | +qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\r?\n |
| 328 | +^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,_null_,_null_,_null_\r?$}mx, |
329 | 329 | 'pg_stat_ssl view without client certificate'); |
330 | 330 |
|
331 | 331 | ### Server-side tests. |
|
365 | 365 | '-c', |
366 | 366 | "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()" |
367 | 367 | ], |
368 | | -qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\n |
369 | | -^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,/CN=ssltestuser,1,\Q/CN=Test CA for PostgreSQL SSL regression test client certs\E$}mx, |
| 368 | +qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\r?\n |
| 369 | +^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,/CN=ssltestuser,1,\Q/CN=Test CA for PostgreSQL SSL regression test client certs\E\r?$}mx, |
370 | 370 | 'pg_stat_ssl with client certificate'); |
371 | 371 |
|
372 | 372 | # client key with wrong permissions |
373 | | -test_connect_fails( |
374 | | -$common_connstr, |
375 | | -"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_wrongperms_tmp.key", |
376 | | -qr!\Qprivate key file "ssl/client_wrongperms_tmp.key" has group or world access\E!, |
377 | | -"certificate authorization fails because of file permissions"); |
| 373 | +SKIP: |
| 374 | +{ |
| 375 | +skip"Permissions check not enforced on Windows", 2if ($windows_os); |
| 376 | + |
| 377 | +test_connect_fails( |
| 378 | +$common_connstr, |
| 379 | +"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_wrongperms_tmp.key", |
| 380 | +qr!\Qprivate key file "ssl/client_wrongperms_tmp.key" has group or world access\E!, |
| 381 | +"certificate authorization fails because of file permissions"); |
| 382 | +} |
378 | 383 |
|
379 | 384 | # client cert belonging to another user |
380 | 385 | test_connect_fails( |
|