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

ACME config cleanups #4525

Merged
merged 3 commits into from Jan 30, 2019

Conversation

Projects
None yet
4 participants
@richvdh
Copy link
Member

richvdh commented Jan 30, 2019

Handle listening for ACME requests on IPv6 addresses:

the weird url-but-not-actually-a-url-string doesn't handle IPv6 addresses
without extra quoting. Building a string which you are about to parse again
seems like a weird choice. Let's just use listenTCP, which is consistent
with what we do elsewhere.

Make the default config look a bit more consistent with everything else, and
tweak the defaults to listen on port 80.

richvdh added some commits Jan 30, 2019

Handle listening for ACME requests on IPv6 addresses
the weird url-but-not-actually-a-url-string doesn't handle IPv6 addresses
without extra quoting. Building a string which you are about to parse again
seems like a weird choice. Let's just use listenTCP, which is consistent with
what we do elsewhere.
Clean up the default ACME config
make it look a bit more consistent with everything else, and tweak the defaults
to listen on port 80.

@richvdh richvdh requested a review from matrix-org/synapse-core Jan 30, 2019

@erikjohnston
Copy link
Member

erikjohnston left a comment

Looks reasonable, other than the defaults causing warnings on linux and macOS

self.acme_port = acme_config.get("port", 8449)
self.acme_bind_addresses = acme_config.get("bind_addresses", ["127.0.0.1"])
self.acme_port = acme_config.get("port", 80)
self.acme_bind_addresses = acme_config.get("bind_addresses", ['::', '0.0.0.0'])

This comment has been minimized.

@erikjohnston

erikjohnston Jan 30, 2019

Member

It feels odd that the default will cause warnings?

This comment has been minimized.

@richvdh

richvdh Jan 30, 2019

Author Member

well, mostly I wanted it to be consistent with what we do for the other listeners. I kinda agree, but :/

This comment has been minimized.

@erikjohnston

erikjohnston Jan 30, 2019

Member

fair enough, we can always clean it up later if necessary

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 30, 2019

Codecov Report

Merging #4525 into develop will increase coverage by <.01%.
The diff coverage is 54.54%.

@@             Coverage Diff             @@
##           develop    #4525      +/-   ##
===========================================
+ Coverage    74.74%   74.75%   +<.01%     
===========================================
  Files          337      337              
  Lines        34447    34456       +9     
  Branches      5615     5616       +1     
===========================================
+ Hits         25749    25758       +9     
+ Misses        7110     7108       -2     
- Partials      1588     1590       +2

@hawkowl hawkowl merged commit 7615a8c into develop Jan 30, 2019

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hawkowl hawkowl deleted the rav/acme_config branch Jan 30, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment