Unverified Commit db8ec1fa authored by Jay Satiro's avatar Jay Satiro Committed by Daniel Stenberg
Browse files

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 a14d72ca a9499ff1 8c1cc369 c2a8d52a 0edf6907

Details for all reverted commits:

Revert "os400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid()."

This reverts commit 0edf6907.

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

This reverts commit c2a8d52a.

Revert "examples: Added SASL PLAIN authorisation identity (authzid) examples"

This reverts commit 8c1cc369.

Revert "curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool"

This reverts commit a9499ff1.

Revert "sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID"

This reverts commit a14d72ca.
parent 84086b39

docs/cmdline-opts/Makefile.inc

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ DPAGES = \ 
  retry-delay.d					\

  retry-max-time.d				\

  retry.d					\

  sasl-authzid.d					\

  sasl-ir.d					\

  service-name.d				\

  show-error.d					\

docs/cmdline-opts/sasl-authzid.d

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
Long: sasl-authzid

Help: Use this identity to act as during SASL PLAIN authentication

Added: 7.66.0

---

Use this authorisation identity (authzid), during SASL PLAIN authentication,

in addition to the authentication identity (authcid) as specified by --user.



If the option isn't specified, the server will derive the authzid from the

authcid, but if specified, and depending on the server implementation, it may

be used to access another user's inbox, that the user has been granted access

to, or a shared mailbox for example.

docs/examples/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -35,7 +35,7 @@ check_PROGRAMS = 10-at-a-time anyauthput cookie_interface debug fileupload \ 
  http2-upload http2-serverpush getredirect ftpuploadfrommem               \

  ftpuploadresume sslbackend postit2-formadd multi-formadd                 \

  shared-connection-cache sftpuploadresume http2-pushinmemory parseurl     \

  urlapi imap-authzid pop3-authzid smtp-authzid

  urlapi



# These examples require external dependencies that may not be commonly

# available on POSIX systems, so don't bother attempting to compile them here.

docs/examples/imap-authzid.c

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at https://curl.haxx.se/docs/copyright.html.

 *

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 ***************************************************************************/



/* <DESC>

 * IMAP example showing how to retreieve e-mails from a shared mailed box

 * </DESC>

 */



#include <stdio.h>

#include <curl/curl.h>



/* This is a simple example showing how to fetch mail using libcurl's IMAP

 * capabilities.

 *

 * Note that this example requires libcurl 7.66.0 or above.

 */



int main(void)

{

  CURL *curl;

  CURLcode res = CURLE_OK;



  curl = curl_easy_init();

  if(curl) {

    /* Set the username and password */

    curl_easy_setopt(curl, CURLOPT_USERNAME, "user");

    curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret");



    /* Set the authorisation identity (identity to act as) */

    curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox");



    /* Force PLAIN authentication */

    curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, "AUTH=PLAIN");



    /* This will fetch message 1 from the user's inbox */

    curl_easy_setopt(curl, CURLOPT_URL,

                     "imap://imap.example.com/INBOX/;UID=1");



    /* Perform the fetch */

    res = curl_easy_perform(curl);



    /* Check for errors */

    if(res != CURLE_OK)

      fprintf(stderr, "curl_easy_perform() failed: %s\n",

              curl_easy_strerror(res));



    /* Always cleanup */

    curl_easy_cleanup(curl);

  }



  return (int)res;

}

docs/examples/pop3-authzid.c

deleted100644 → 0
+0 −70
Original line number Diff line number Diff line 
/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at https://curl.haxx.se/docs/copyright.html.

 *

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 ***************************************************************************/



/* <DESC>

 * POP3 example showing how to retrieve e-mails from a shared mailbox

 * </DESC>

 */



#include <stdio.h>

#include <curl/curl.h>



/* This is a simple example showing how to retrieve mail using libcurl's POP3

 * capabilities.

 *

 * Note that this example requires libcurl 7.66.0 or above.

 */



int main(void)

{

  CURL *curl;

  CURLcode res = CURLE_OK;



  curl = curl_easy_init();

  if(curl) {

    /* Set the username and password */

    curl_easy_setopt(curl, CURLOPT_USERNAME, "user");

    curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret");



    /* Set the authorisation identity (identity to act as) */

    curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox");



    /* Force PLAIN authentication */

    curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, "AUTH=PLAIN");



    /* This will retrieve message 1 from the user's mailbox */

    curl_easy_setopt(curl, CURLOPT_URL, "pop3://pop.example.com/1");



    /* Perform the retr */

    res = curl_easy_perform(curl);



    /* Check for errors */

    if(res != CURLE_OK)

      fprintf(stderr, "curl_easy_perform() failed: %s\n",

              curl_easy_strerror(res));



    /* Always cleanup */

    curl_easy_cleanup(curl);

  }



  return (int)res;

}