From db8ec1fa38a899d3542dd89ac8be0a6f00c805ac Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Fri, 24 May 2019 14:53:03 -0400 Subject: Revert all SASL authzid (new feature) commits - Revert all commits related to the SASL authzid feature since the next release will be a patch release, 7.65.1. Prior to this change CURLOPT_SASL_AUTHZID / --sasl-authzid was destined for the next release, assuming it would be a feature release 7.66.0. However instead the next release will be a patch release, 7.65.1 and will not contain any new features. After the patch release after the reverted commits can be restored by using cherry-pick: git cherry-pick a14d72c a9499ff 8c1cc36 c2a8d52 0edf690 Details for all reverted commits: Revert "os400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid()." This reverts commit 0edf6907ae37e2020722e6f61229d8ec64095b0a. Revert "tests: Fix the line endings for the SASL alt-auth tests" This reverts commit c2a8d52a1356a722ff9f4aeb983cd4eaf80ef221. Revert "examples: Added SASL PLAIN authorisation identity (authzid) examples" This reverts commit 8c1cc369d0c7163c6dcc91fd38edfea1f509ae75. Revert "curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool" This reverts commit a9499ff136d89987af885e2d7dff0a066a3e5817. Revert "sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID" This reverts commit a14d72ca2fec5d4eb5a043936e4f7ce08015c177. --- tests/data/Makefile.inc | 7 +++--- tests/data/test848 | 56 ------------------------------------------------ tests/data/test849 | 51 ------------------------------------------- tests/data/test892 | 57 ------------------------------------------------- tests/data/test893 | 53 --------------------------------------------- tests/data/test953 | 56 ------------------------------------------------ tests/data/test954 | 55 ----------------------------------------------- 7 files changed, 3 insertions(+), 332 deletions(-) delete mode 100644 tests/data/test848 delete mode 100644 tests/data/test849 delete mode 100644 tests/data/test892 delete mode 100644 tests/data/test893 delete mode 100644 tests/data/test953 delete mode 100644 tests/data/test954 (limited to 'tests') diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 552736341..afea1fb83 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -93,21 +93,20 @@ test809 test810 test811 test812 test813 test814 test815 test816 test817 \ test818 test819 test820 test821 test822 test823 test824 test825 test826 \ test827 test828 test829 test830 test831 test832 test833 test834 test835 \ test836 test837 test838 test839 test840 test841 test842 test843 test844 \ -test845 test846 test847 test848 test849 \ +test845 test846 test847 \ \ test850 test851 test852 test853 test854 test855 test856 test857 test858 \ test859 test860 test861 test862 test863 test864 test865 test866 test867 \ test868 test869 test870 test871 test872 test873 test874 test875 test876 \ test877 test878 test879 test880 test881 test882 test883 test884 test885 \ -test886 test887 test888 test889 test890 test891 test892 test893 \ +test886 test887 test888 test889 test890 test891 \ \ test900 test901 test902 test903 test904 test905 test906 test907 test908 \ test909 test910 test911 test912 test913 test914 test915 test916 test917 \ test918 test919 test920 test921 test922 test923 test924 test925 test926 \ test927 test928 test929 test930 test931 test932 test933 test934 test935 \ test936 test937 test938 test939 test940 test941 test942 test943 test944 \ -test945 test946 test947 test948 test949 test950 test951 test952 test953 \ -test954 \ +test945 test946 test947 test948 test949 test950 test951 test952 \ \ test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \ test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \ diff --git a/tests/data/test848 b/tests/data/test848 deleted file mode 100644 index 2b4a30b2a..000000000 --- a/tests/data/test848 +++ /dev/null @@ -1,56 +0,0 @@ - - - -IMAP -SASL -SASL AUTH PLAIN -RFC4616 - - - -# -# Server-side - - -AUTH PLAIN -REPLY AUTHENTICATE + -REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed - - -From: me@somewhere -To: fake@nowhere - -body - --- - yours sincerely - - - -# -# Client-side - - -imap - - -IMAP plain authentication with alternative authorization identity - - -'imap://%HOSTIP:%IMAPPORT/848/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox - - - -# -# Verify data after the test has been "shot" - - -A001 CAPABILITY -A002 AUTHENTICATE PLAIN -c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= -A003 SELECT 848 -A004 FETCH 1 BODY[] -A005 LOGOUT - - - diff --git a/tests/data/test849 b/tests/data/test849 deleted file mode 100644 index 8a4b39c00..000000000 --- a/tests/data/test849 +++ /dev/null @@ -1,51 +0,0 @@ - - - -IMAP -SASL -SASL AUTH PLAIN -RFC4616 - - - -# -# Server-side - - -AUTH PLAIN -REPLY AUTHENTICATE + -REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= A002 NO Not authorized - - - -# -# Client-side - - -imap - - -IMAP plain authentication with alternative authorization identity (Not authorized) - - -'imap://%HOSTIP:%IMAPPORT/849/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel - - - -# -# Verify data after the test has been "shot" - -# 67 - CURLE_LOGIN_DENIED - -67 - -# -# The multi interface considers a broken "CONNECT" as a prematurely broken -# transfer and such a connection will not get a "LOGOUT" - -A001 CAPABILITY -A002 AUTHENTICATE PLAIN -dXJzZWwAa3VydAB4aXBqM3BsbXE= - - - diff --git a/tests/data/test892 b/tests/data/test892 deleted file mode 100644 index 4b8318292..000000000 --- a/tests/data/test892 +++ /dev/null @@ -1,57 +0,0 @@ - - - -POP3 -SASL -SASL AUTH PLAIN -RFC1734 -RFC4616 -RFC5034 - - - -# -# Server-side - - -AUTH PLAIN -REPLY AUTH + -REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful - - -From: me@somewhere -To: fake@nowhere - -body - --- - yours sincerely - - - -# -# Client-side - - -pop3 - - -POP3 plain authentication with alternative authorization identity - - -pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox - - - -# -# Verify data after the test has been "shot" - - -CAPA -AUTH PLAIN -c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= -RETR 892 -QUIT - - - diff --git a/tests/data/test893 b/tests/data/test893 deleted file mode 100644 index 2a762fc21..000000000 --- a/tests/data/test893 +++ /dev/null @@ -1,53 +0,0 @@ - - - -POP3 -SASL -SASL AUTH PLAIN -RFC1734 -RFC4616 -RFC5034 - - - -# -# Server-side - - -AUTH PLAIN -REPLY AUTH + -REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= -ERR Not authorized - - - -# -# Client-side - - -pop3 - - -POP3 plain authentication with alternative authorization identity (Not authorized) - - -pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel - - - -# -# Verify data after the test has been "shot" - -# 67 - CURLE_LOGIN_DENIED - -67 - -# -# The multi interface considers a broken "CONNECT" as a prematurely broken -# transfer and such a connection will not get a "QUIT" - -CAPA -AUTH PLAIN -dXJzZWwAa3VydAB4aXBqM3BsbXE= - - - diff --git a/tests/data/test953 b/tests/data/test953 deleted file mode 100644 index 4a70e1f31..000000000 --- a/tests/data/test953 +++ /dev/null @@ -1,56 +0,0 @@ - - - -SMTP -SASL -SASL AUTH PLAIN -RFC4616 -RFC4954 - - - -# -# Server-side - - -AUTH PLAIN -REPLY AUTH 334 PLAIN supported -REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 235 Authenticated - - - -# -# Client-side - - -smtp - - -SMTP plain authentication with alternative authorization identity - - -mail body - - -smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO 953 -AUTH PLAIN -dXJzZWwAa3VydAB4aXBqM3BsbXE= -MAIL FROM: -RCPT TO: -DATA -QUIT - - -mail body -. - - - diff --git a/tests/data/test954 b/tests/data/test954 deleted file mode 100644 index a5e6bb0d3..000000000 --- a/tests/data/test954 +++ /dev/null @@ -1,55 +0,0 @@ - - - -SMTP -SASL -SASL AUTH PLAIN -RFC4616 -RFC4954 - - - -# -# Server-side - - -AUTH PLAIN -REPLY AUTH 334 PLAIN supported -REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 501 Not authorized - - - -# -# Client-side - - -smtp - - -SMTP plain authentication with alternative authorization identity (Not authorized) - - -mail body - - -smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - - - - -# -# Verify data after the test has been "shot" - -# 67 - CURLE_LOGIN_DENIED - -67 - -# -# The multi interface considers a broken "CONNECT" as a prematurely broken -# transfer and such a connection will not get a "QUIT" - -EHLO 954 -AUTH PLAIN -dXJzZWwAa3VydAB4aXBqM3BsbXE= - - - -- cgit v1.2.3