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.

Sign up for GitHub

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

Jump to bottom

s2s config per host type #3523

Merged
merged 11 commits into from
Feb 3, 2022
Merged

s2s config per host type #3523

merged 11 commits into from
Feb 3, 2022

Commits on Feb 2, 2022

  1. Put all s2s options in one host-type map 

    - All options can be specified globally and per host type
- Host-type s2s section completely overrides the global one
- Options have defaults as specified in the docs
- Certfile path is checked now
- Nested maps are always included as they contain defaults
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    9afba36 View commit details
    Browse the repository at this point in the history

  2. Handle the new host-type options in s2s helpers 

    There is now a separate s2s shared secret for each host type
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    b6a7d59 View commit details
    Browse the repository at this point in the history

  3. Rework s2s_in logic to read options per host type 

    Main changes:
- Server is always checked as host type is needed
- Error handling is more consistent and covers more cases
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    65914c6 View commit details
    Browse the repository at this point in the history

  4. Rework s2s_out logic to read options per host type 

    Also: unify getting TLS options
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    2b675e3 View commit details
    Browse the repository at this point in the history

  5. Make default ciphers reusable in config specs

    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    901ffae View commit details
    Browse the repository at this point in the history

  6. Rework small tests with the new s2s config format 

    - Test options per host type
- Ensure that host-type options override global ones
- Put existing files as certificates
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    721aec2 View commit details
    Browse the repository at this point in the history

  7. Add a generic getter for RPC specs to improve code reuse

    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    85492b4 View commit details
    Browse the repository at this point in the history

  8. Rework s2s helper to utilize the fact that tls options are in a map

    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    5749038 View commit details
    Browse the repository at this point in the history

  9. Add s2s tests for error conditions 

    Also: parallelize, remove repetition
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    58179a2 View commit details
    Browse the repository at this point in the history

  10. Update docs for s2s options 

    - All options are allowed per host type
- s2s section overrides the whole global section now
    @chrzaszcz
    chrzaszcz committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    6babcd7 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. Clean up binary syntax

    @chrzaszcz
    chrzaszcz committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    db060ab View commit details
    Browse the repository at this point in the history