This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 35f3003485347685dc161b935dead30c7716aa7f Author: Sebb <[email protected]> AuthorDate: Sun Jan 23 23:57:00 2022 +0000 Simplify conditional --- server/plugins/session.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/server/plugins/session.py b/server/plugins/session.py index ccb8ce7..433fd5b 100644 --- a/server/plugins/session.py +++ b/server/plugins/session.py @@ -117,10 +117,7 @@ async def get_session( # In case the session is used twice within the same loop session = copy.copy(x_session) session.database = await server.dbpool.get() - if "X-Forwarded-Host" in request.headers: - session.host = request.headers["X-Forwarded-Host"] - else: - session.host = request.host + session.host = request.headers.get("X-Forwarded-Host", request.host) session.remote = request.remote # Do we need to update the timestamp in ES? @@ -133,10 +130,7 @@ async def get_session( # If not in local memory, start a new session object session = SessionObject(server) session.database = await server.dbpool.get() - if "X-Forwarded-Host" in request.headers: - session.host = request.headers["X-Forwarded-Host"] - else: - session.host = request.host or "??" + session.host = request.headers.get("X-Forwarded-Host", request.host or "??") session.remote = request.remote or "??" # If a cookie was supplied, look for a session object in ES
