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

Fix HTTPS config and redirect #268 #289

Merged
merged 6 commits into from
Jul 13, 2023
Merged

Fix HTTPS config and redirect #268 #289

merged 6 commits into from
Jul 13, 2023

Conversation

maia-iyer
Copy link
Collaborator

This PR closes #268 by doing the following:

  • Allow TLS configuration
  • Flatten the configuration format of HTTPS
  • Set default documented ports to be 10000 for HTTP to avoid problem where browser reserves previous default
  • Fix redirect instead of hardcoded port - to defined port in config
  • Adds documentation

TODO:

  • currently, when both are set, HTTP will always run and redirect to HTTPS URL even if HTTPS fails. Should this error too to trigger restart of container?

@maia-iyer
Fixed config format and TLS
34b46b5 
Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com>
@maia-iyer
Fixed redirect
5e23408 
Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com>
@maia-iyer
Added documentation
e3408e1 
Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com>
@maia-iyer maia-iyer added bug Something isn't working backend Tornjak API (Backend) labels Jul 12, 2023
@maia-iyer maia-iyer added this to the 1.4.x milestone Jul 12, 2023
@maia-iyer maia-iyer requested a review from lumjjb as a code owner July 12, 2023 15:59
@maia-iyer maia-iyer self-assigned this Jul 12, 2023
mrsabath
mrsabath reviewed Jul 12, 2023
View reviewed changes
docs/config-tornjak-server.md Outdated Show resolved Hide resolved
docs/config-tornjak-server.md Outdated Show resolved Hide resolved
docs/config-tornjak-server.md Outdated Show resolved Hide resolved
examples/tls_mtls/README.md Outdated Show resolved Hide resolved
examples/tls_mtls/README.md Outdated Show resolved Hide resolved
examples/tls_mtls/README.md Outdated Show resolved Hide resolved
examples/tls_mtls/README.md Outdated Show resolved Hide resolved
examples/tls_mtls/README.md Outdated Show resolved Hide resolved
maia-iyer and others added 3 commits July 12, 2023 14:38
@maia-iyer @mrsabath
Apply suggestions from code review
268cda7 
Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com>

Co-authored-by: Mariusz Sabath <mrsabath@gmail.com>
@maia-iyer
HTTP opens upon HTTPS failure to start
5ecc383 
Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com>
@maia-iyer
Lint fix
3e72200 
Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com>
mrsabath
mrsabath approved these changes Jul 13, 2023
View reviewed changes
Copy link
Collaborator

@mrsabath mrsabath left a comment

Choose a reason for hiding this comment

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

Thank you @maia-iyer for a quick turnaround and all the fixes!

@mrsabath mrsabath merged commit 33a7c9f into v1.4 Jul 13, 2023
6 checks passed
@mrsabath mrsabath deleted the mtls_fix branch July 13, 2023 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrsabath mrsabath mrsabath approved these changes

@lumjjb lumjjb Awaiting requested review from lumjjb lumjjb is a code owner

@mamy-CS mamy-CS Awaiting requested review from mamy-CS mamy-CS is a code owner

Assignees

@maia-iyer maia-iyer

Labels
backend Tornjak API (Backend) bug Something isn't working
Projects
None yet
Milestone
1.4.x
Development

Successfully merging this pull request may close these issues.

Backend: Enable two ports for HTTP and HTTPS
2 participants
@maia-iyer @mrsabath