Skip to content

fix(controller): no cert domain do not redirect https #162

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

Merged
duanhongyi merged 1 commit into from
Sep 14, 2024
Merged

fix(controller): no cert domain do not redirect https #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion rootfs/api/models/gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from django.conf import settings
from django.shortcuts import get_object_or_404
from django.contrib.auth import get_user_model
from django.db.models import Q

from api.exceptions import ServiceUnavailable
from scheduler import KubeException
Expand Down Expand Up @@ -196,6 +197,15 @@ def hostnames(self):
return [domain.domain for domain in self.app.domain_set.filter(
ptype=self.ptype)]

@property
def tls_force_hostnames(self):
tls = self.app.tls_set.latest()
q = Q(ptype=self.ptype)
if not tls.certs_auto_enabled:
q &= Q(certificate__isnull=False)
domains = self.app.domain_set.filter(q)
return [domain.domain for domain in domains]

@property
def default_rules(self):
service = get_object_or_404(self.app.service_set, ptype=self.ptype)
Expand Down Expand Up @@ -350,7 +360,7 @@ def _https_enforced_to_k8s(self, parent_refs):
}
}]
}],
"hostnames": self.hostnames,
"hostnames": self.tls_force_hostnames,
"parent_refs": parent_refs,
}
try:
Expand Down