Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for STARTLS/STARTSSL in-band transport upgrades/renegotation #9100

Merged

Conversation

dirkx
Copy link
Contributor

@dirkx dirkx commented Jan 14, 2024

Split start_ssl_client into two phases; to allow the implementation of protocols that use some sort of in-band STARTTLS or STARTSSL signal to upgrade a plaint text connection to SSL/TLS. Examples of these protocols are XMPP, SMTP and various database TCP connections.

Addresses #9099. An example has been included as part of the documentation.

Description of Change

Option for Inline upgrading from a clear-text connection to an SSL/TLS connection.

Some protocols such as SMTP, XMPP, Mysql, Postgress and others allow, or require,
that you start the connection without encryption; and then send a command to switch
over to encryption.

E.g. a typical SMTP submission would entail a dialogue such as this:

  1. client connects to server in the clear
  2. server says hello
  3. client sents a EHLO
  4. server tells the client that it supports SSL/TLS
  5. client sends a 'STARTTLS' to make use of this faciltiy
  6. client/server negiotiate a SSL or TLS connection.
  7. client sends another EHLO
  8. server now tells the client what (else) is supported; such as additional authentication options.
    ... conversation continues encrypted.

This can be enabled in WiFiClientSecure by telling it to start in plaintext:

      client.setPlainStart();

and client is than a plain, TCP, connection (just as WiFiClient would be); until the client calls
the method:

      client.startTLS(); // returns zero on error; non zero on success.

After which things switch to TLS/SSL.

Tests scenarios

Please describe on what Hardware and Software combinations you have tested this Pull Request and how.

ESP32, ESP32S

Related links

Addresses
#9099 and issues raised over the year in EMailSender and XMPPClient

…f protocols that use some sort of in-band STARTTLS or STARTSSL signal to upgrade a plaint text connection to SSL/TLS. Examples of these protocols are XMPP, SMTP and various database TCP connections.
Copy link
Contributor

github-actions bot commented Jan 14, 2024

Warnings
⚠️

Some issues found for the commit messages in this PR:

  • the commit message "Apply suggestions from code review":
    • summary looks empty
    • type/action looks empty
  • the commit message "Fix another \(rightfull\) compiler warning iwth the version pointer":
    • summary looks empty
    • type/action looks empty
  • the commit message "Fix typo in directory name":
    • summary looks empty
    • type/action looks empty
  • the commit message "Newer versions of MBEDTLS make the client key struct private (and most of the x509 struct too), so absent of a non-null pointer we cannot check wether it is populated. Solve this by looking at the version (as 0 is not a valid x509 version).":
    • summary should not end with a period (full stop)
    • summary looks empty
    • type/action looks empty
  • the commit message "Quell CI/CD runs on non-WiFi supporting hardare":
    • summary looks empty
    • type/action looks empty
  • the commit message "Quell CI/CD runs on non-WiFi supporting hardare":
    • summary looks empty
    • type/action looks empty
  • the commit message "Quell compiler warning; use the right timeout":
    • summary looks empty
    • type/action looks empty
  • the commit message "Remove leftover file":
    • summary looks empty
    • type/action looks empty
  • the commit message "Remove removed setTimeout that was accidentally included (was removed for IDF >=5), bring timeout inline with the other timeouts (ints), fix cert/key checks to look if there is actually something there (all issues caught by the CI/CD on windows-latest":
    • summary looks empty
    • type/action looks empty
  • the commit message "Rename Files":
    • summary looks empty
    • type/action looks empty
  • the commit message "Split start_ssl_client into two phases; to allow the implementation of protocols that use some sort of in-band STARTTLS or STARTSSL signal to upgrade a plaint text connection to SSL/TLS. Examples of these protocols are XMPP, SMTP and various database TCP connections.":
    • summary should not end with a period (full stop)
    • summary looks empty
    • type/action looks empty

Please fix these commit messages - here are some basic tips:

  • follow Conventional Commits style
  • correct format of commit message should be: <type/action>(<scope/component>): <summary>, for example fix(esp32): Fixed startup timeout issue
  • allowed types are: change,ci,docs,feat,fix,refactor,remove,revert,test
  • sufficiently descriptive message summary should be between 20 to 72 characters and start with upper case letter
  • avoid Jira references in commit messages (unavailable/irrelevant for our customers)

TIP: Install pre-commit hooks and run this check when committing (uses the Conventional Precommit Linter).

⚠️ Please consider squashing your 18 commits (simplifying branch history).

👋 Hello dirkx, we appreciate your contribution to this project!


Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- Resolve all warnings (⚠️ ) before requesting a review from human reviewers - they will appreciate it.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against 067d2cd

dirkx and others added 5 commits January 14, 2024 16:31
… for IDF >=5), bring timeout inline with the other timeouts (ints), fix cert/key checks to look if there is actually something there (all issues caught by the CI/CD on windows-latest
…t of the x509 struct too), so absent of a non-null pointer we cannot check wether it is populated. Solve this by looking at the version (as 0 is not a valid x509 version).
@me-no-dev
Copy link
Member

@dirkx you need to add .skip.esp32h2 files in the example folders

dirkx added a commit to dirkx/EMailSender that referenced this pull request Jan 19, 2024
@me-no-dev
Copy link
Member

@lucasssvaz PTAL

@dirkx
Copy link
Contributor Author

dirkx commented Jan 23, 2024 via email

@lucasssvaz lucasssvaz added the Resolution: Awaiting response Waiting for response of author label Jan 23, 2024
Copy link
Member

@P-R-O-C-H-Y P-R-O-C-H-Y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dirkx PTAL on my comments

libraries/WiFiClientSecure/src/WiFiClientSecure.cpp Outdated Show resolved Hide resolved
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp Outdated Show resolved Hide resolved
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp Outdated Show resolved Hide resolved
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp Outdated Show resolved Hide resolved
libraries/WiFiClientSecure/src/WiFiClientSecure.h Outdated Show resolved Hide resolved
libraries/WiFiClientSecure/src/ssl_client.cpp Outdated Show resolved Hide resolved
libraries/WiFiClientSecure/src/ssl_client.cpp Outdated Show resolved Hide resolved
@VojtechBartoska VojtechBartoska added this to the 3.0.0-RC1 milestone Jan 30, 2024
@lucasssvaz lucasssvaz self-assigned this Feb 7, 2024
lucasssvaz and others added 3 commits February 7, 2024 13:07
@lucasssvaz lucasssvaz added Area: Libraries Issue is related to Library support. Status: Pending Merge Pull Request is ready to be merged and removed Resolution: Awaiting response Waiting for response of author labels Feb 7, 2024
@dirkx
Copy link
Contributor Author

dirkx commented Feb 9, 2024

Checked all the the changes & reran our testcases (against several mail provider (proton, freedom, against sendmail-sasl/etc, cyrus-imap, XMPP, OpenLDAP and against PosgreSQL) -- and nothing breaks.

AFAIK nothing from my end that needs to be done / anything you folks are waiting on from me ?

@lucasssvaz
Copy link
Collaborator

Checked all the the changes & reran our testcases (against several mail provider (proton, freedom, against sendmail-sasl/etc, cyrus-imap, XMPP, OpenLDAP and against PosgreSQL) -- and nothing breaks.

AFAIK nothing from my end that needs to be done / anything you folks are waiting on from me ?

This PR is all good. It is pending merge.

@me-no-dev me-no-dev merged commit 48072ee into espressif:master Feb 9, 2024
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Libraries Issue is related to Library support. Status: Pending Merge Pull Request is ready to be merged
Projects
Development

Successfully merging this pull request may close these issues.

5 participants