Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

email-mirror-postfix: Choose scheme based on http_only config. 

Fixes #16659.
If the server is behind a reverse proxy with http_only=True, the
requests made by email-mirror-postfix need to use http, as https
doesn't work.
This commit is contained in:
Mateusz Mandera 2020-10-31 16:44:13 +01:00 committed by Tim Abbott
parent 8ce1fd1c50
commit 06c0a29e47
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/lib/email-mirror-postfix
View File

@ -49,9 +49,12 @@ import ssl
import sys import sys
from configparser import RawConfigParser from configparser import RawConfigParser
from urllib.error import HTTPError from urllib.error import HTTPError
from urllib.parse import urlencode, urljoin from urllib.parse import urlencode, urljoin, urlparse
from urllib.request import Request, urlopen from urllib.request import Request, urlopen
sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
from scripts.lib.zulip_tools import get_config, get_config_file
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-r", "--recipient", default="", help="Original recipient.") parser.add_argument("-r", "--recipient", default="", help="Original recipient.")
@ -62,9 +65,10 @@ parser.add_argument(
"-d", "-d",
"--dst-host", "--dst-host",
dest="host", dest="host",
default="https://127.0.0.1", default="127.0.0.1",
help="Destination server address for uploading email from email mirror. " help="Destination server address for uploading email from email mirror. "
"Address must contain a HTTP protocol.", "Address must contain a HTTP protocol. Otherwise, default value is assumed "
"based on the http_only setting.",
) )
parser.add_argument( parser.add_argument(
@ -126,6 +130,13 @@ def send_email_mirror(
if test: if test:
exit(0) exit(0)
if not urlparse(host).scheme:
config_file = get_config_file()
http_only_config = get_config(config_file, "application_server", "http_only", "")
http_only = http_only_config == "true"
scheme = "http://" if http_only else "https://"
host = scheme + host
if host == "https://127.0.0.1": if host == "https://127.0.0.1":
# Don't try to verify SSL when posting to 127.0.0.1; it won't # Don't try to verify SSL when posting to 127.0.0.1; it won't
# work, and connections to 127.0.0.1 are secure without SSL. # work, and connections to 127.0.0.1 are secure without SSL.