From d281f112d9f2ad19cb7369f5689439a45c1f27bb Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 14 Jul 2017 11:08:22 +0200 Subject: [PATCH] Rev2154, Fix same origin checking in proxy mode --- src/Config.py | 2 +- src/Ui/UiRequest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Config.py b/src/Config.py index 5fdf9f87..8f615d5f 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.5.6" - self.rev = 2153 + self.rev = 2154 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index 6edf82e7..d555d7ee 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -169,7 +169,7 @@ class UiRequest(object): def getRequestUrl(self): if self.isProxyRequest(): - if self.env["PATH_INFO"].startswith("http://zero"): + if self.env["PATH_INFO"].startswith("http://zero/"): return self.env["PATH_INFO"] else: # Add http://zero to direct domain access return self.env["PATH_INFO"].replace("http://", "http://zero/", 1) @@ -178,7 +178,7 @@ class UiRequest(object): def getReferer(self): referer = self.env.get("HTTP_REFERER") - if referer and self.isProxyRequest() and not referer.startswith("http://zero"): + if referer and self.isProxyRequest() and not referer.startswith("http://zero/"): return referer.replace("http://", "http://zero/", 1) else: return referer