Merge branch 'next' into version-2021.5

This commit is contained in:
Jens Langhammer 2021-05-09 20:57:23 +02:00
commit bbca90c93a
4 changed files with 11 additions and 6 deletions

View File

@ -116,9 +116,11 @@ class SourceFlowManager:
) )
return Action.DENY, None return Action.DENY, None
query = Q(username__exact=self.enroll_info.get("username", None)) query = Q(username__exact=self.enroll_info.get("username", None))
self._logger.debug("trying to link with existing user", query=query)
matching_users = User.objects.filter(query) matching_users = User.objects.filter(query)
# No matching users, always enroll # No matching users, always enroll
if not matching_users.exists(): if not matching_users.exists():
self._logger.debug("no matching users found, enrolling")
return Action.ENROLL, self.update_connection(new_connection, **kwargs) return Action.ENROLL, self.update_connection(new_connection, **kwargs)
user = matching_users.first() user = matching_users.first()

View File

@ -61,6 +61,7 @@ class KubernetesController(BaseController):
try: try:
for reconcile_key in self.reconcile_order: for reconcile_key in self.reconcile_order:
reconciler = self.reconcilers[reconcile_key](self) reconciler = self.reconcilers[reconcile_key](self)
self.logger.debug("Tearing down object", name=reconcile_key)
reconciler.down() reconciler.down()
except ApiException as exc: except ApiException as exc:

View File

@ -41,11 +41,9 @@ while True:
while True: while True:
try: try:
redis = Redis( redis = Redis.from_url(
host=CONFIG.y("redis.host"), f"redis://:{CONFIG.y('redis.password')}@{CONFIG.y('redis.host')}:6379"
port=6379, f"/{CONFIG.y('redis.ws_db')}"
db=CONFIG.y("redis.message_queue_db"),
password=CONFIG.y("redis.password"),
) )
redis.ping() redis.ping()
break break

View File

@ -344,7 +344,11 @@ func (p *OAuthProxy) AuthenticateOnly(rw http.ResponseWriter, req *http.Request)
} }
if _, ok := req.URL.Query()["traefik"]; ok { if _, ok := req.URL.Query()["traefik"]; ok {
host := getHost(req) host := getHost(req)
http.Redirect(rw, req, fmt.Sprintf("//%s%s", host, p.OAuthStartPath), http.StatusTemporaryRedirect) proto := req.Header.Get("X-Forwarded-Proto")
if proto != "" {
proto = proto + ":"
}
http.Redirect(rw, req, fmt.Sprintf("%s//%s%s", proto, host, p.OAuthStartPath), http.StatusTemporaryRedirect)
return return
} }
} }