1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00

tests: Fix the line endings for the SASL alt-auth tests

- Change data and protocol sections to CRLF line endings.

Prior to this change the tests would fail or hang, which is because
certain sections such as protocol require CRLF line endings.

Follow-up to a9499ff from today which added the tests.

Ref: https://github.com/curl/curl/pull/3790
This commit is contained in:
Jay Satiro 2019-05-23 04:01:09 -04:00
parent dc0a671213
commit c2a8d52a13
6 changed files with 44 additions and 44 deletions

View File

@ -17,13 +17,13 @@ REPLY AUTHENTICATE +
REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed
</servercmd> </servercmd>
<data> <data>
From: me@somewhere From: me@somewhere
To: fake@nowhere To: fake@nowhere
body body
-- --
yours sincerely yours sincerely
</data> </data>
</reply> </reply>
@ -45,12 +45,12 @@ IMAP plain authentication with alternative authorization identity
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<protocol> <protocol>
A001 CAPABILITY A001 CAPABILITY
A002 AUTHENTICATE PLAIN A002 AUTHENTICATE PLAIN
c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
A003 SELECT 848 A003 SELECT 848
A004 FETCH 1 BODY[] A004 FETCH 1 BODY[]
A005 LOGOUT A005 LOGOUT
</protocol> </protocol>
</verify> </verify>
</testcase> </testcase>

View File

@ -43,9 +43,9 @@ IMAP plain authentication with alternative authorization identity (Not authorize
# The multi interface considers a broken "CONNECT" as a prematurely broken # The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT" # transfer and such a connection will not get a "LOGOUT"
<protocol> <protocol>
A001 CAPABILITY A001 CAPABILITY
A002 AUTHENTICATE PLAIN A002 AUTHENTICATE PLAIN
dXJzZWwAa3VydAB4aXBqM3BsbXE= dXJzZWwAa3VydAB4aXBqM3BsbXE=
</protocol> </protocol>
</verify> </verify>
</testcase> </testcase>

View File

@ -19,13 +19,13 @@ REPLY AUTH +
REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful
</servercmd> </servercmd>
<data> <data>
From: me@somewhere From: me@somewhere
To: fake@nowhere To: fake@nowhere
body body
-- --
yours sincerely yours sincerely
</data> </data>
</reply> </reply>
@ -47,11 +47,11 @@ pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<protocol> <protocol>
CAPA CAPA
AUTH PLAIN AUTH PLAIN
c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
RETR 892 RETR 892
QUIT QUIT
</protocol> </protocol>
</verify> </verify>
</testcase> </testcase>

View File

@ -45,9 +45,9 @@ pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel
# The multi interface considers a broken "CONNECT" as a prematurely broken # The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT" # transfer and such a connection will not get a "QUIT"
<protocol> <protocol>
CAPA CAPA
AUTH PLAIN AUTH PLAIN
dXJzZWwAa3VydAB4aXBqM3BsbXE= dXJzZWwAa3VydAB4aXBqM3BsbXE=
</protocol> </protocol>
</verify> </verify>
</testcase> </testcase>

View File

@ -29,7 +29,7 @@ smtp
SMTP plain authentication with alternative authorization identity SMTP plain authentication with alternative authorization identity
</name> </name>
<stdin> <stdin>
mail body mail body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
@ -40,17 +40,17 @@ smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sende
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<protocol> <protocol>
EHLO 953 EHLO 953
AUTH PLAIN AUTH PLAIN
dXJzZWwAa3VydAB4aXBqM3BsbXE= dXJzZWwAa3VydAB4aXBqM3BsbXE=
MAIL FROM:<sender@example.com> MAIL FROM:<sender@example.com>
RCPT TO:<recipient@example.com> RCPT TO:<recipient@example.com>
DATA DATA
QUIT QUIT
</protocol> </protocol>
<upload> <upload>
mail body mail body
. .
</upload> </upload>
</verify> </verify>
</testcase> </testcase>

View File

@ -47,9 +47,9 @@ smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sende
# The multi interface considers a broken "CONNECT" as a prematurely broken # The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT" # transfer and such a connection will not get a "QUIT"
<protocol> <protocol>
EHLO 954 EHLO 954
AUTH PLAIN AUTH PLAIN
dXJzZWwAa3VydAB4aXBqM3BsbXE= dXJzZWwAa3VydAB4aXBqM3BsbXE=
</protocol> </protocol>
</verify> </verify>
</testcase> </testcase>