Mercurial > hg > nginx-tests
changeset 1069:1b11a12be179
Tests: pass both issuer/subject variable formats where appropriate.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Fri, 21 Oct 2016 16:37:23 +0300 |
| parents | d0ec761774a5 |
| children | efccab043dd3 |
| files | mail_imap_ssl.t proxy_ssl_certificate.t stream_proxy_ssl_certificate.t |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mail_imap_ssl.t +++ b/mail_imap_ssl.t @@ -216,11 +216,11 @@ my $f = $t->read_file('auth.log'); like($f, qr/^-:-:-:-:-:-:-\x0d?\x0a?:s1$/m, 'log - plain connection'); like($f, qr/^on:NONE:-:-:-:-:-\x0d?\x0a?:s2$/m, 'log - no cert'); -like($f, qr!^on:FAILED:/CN=1.example.com:/CN=1.example.com:\w+:\w+:[^:]+:s3$!m, +like($f, qr!^on:FAILED:(/?CN=1.example.com):\1:\w+:\w+:[^:]+:s3$!m, 'log - bad cert'); -like($f, qr!^on:SUCCESS:/CN=2.example.com:/CN=2.example.com:\w+:\w+:[^:]+:s4$!m, +like($f, qr!^on:SUCCESS:(/?CN=2.example.com):\1:\w+:\w+:[^:]+:s4$!m, 'log - good cert'); -like($f, qr!^on:SUCCESS:/CN=3.example.com:/CN=3.example.com:\w+:\w+:[^:]+:s5$!m, +like($f, qr!^on:SUCCESS:(/?CN=3.example.com):\1:\w+:\w+:[^:]+:s5$!m, 'log - trusted cert'); ###############################################################################
--- a/proxy_ssl_certificate.t +++ b/proxy_ssl_certificate.t @@ -139,7 +139,7 @@ like(http_get('/verify'), qr/X-Verify: S like(http_get('/fail'), qr/X-Verify: FAILED/ms, 'fail certificate'); like(http_get('/encrypted'), qr/X-Verify: SUCCESS/ms, 'with encrypted key'); -like(http_get('/verify'), qr!X-Name: /CN=1.example!, 'valid certificate'); -unlike(http_get('/fail'), qr!X-Name: /CN=1.example!, 'invalid certificate'); +like(http_get('/verify'), qr!X-Name: /?CN=1.example!, 'valid certificate'); +unlike(http_get('/fail'), qr!X-Name: /?CN=1.example!, 'invalid certificate'); ###############################################################################
--- a/stream_proxy_ssl_certificate.t +++ b/stream_proxy_ssl_certificate.t @@ -147,9 +147,9 @@ like(http_get('/', socket => getconn('12 qr/X-Verify: SUCCESS/ms, 'with encrypted key'); like(http_get('/', socket => getconn('127.0.0.1:' . port(8082))), - qr!X-Name: /CN=1.example!, 'valid certificate'); + qr!X-Name: /?CN=1.example!, 'valid certificate'); unlike(http_get('/', socket => getconn('127.0.0.1:' . port(8083))), - qr!X-Name: /CN=1.example!, 'invalid certificate'); + qr!X-Name: /?CN=1.example!, 'invalid certificate'); ###############################################################################