oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve domain in parsePath function

Browse source
This commit is contained in:
shortcutme 2019-10-06 03:20:16 +02:00
parent 924a61309a
commit 43a5742258
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/Zeroname/UiRequestPlugin.py
View file

@ -11,16 +11,6 @@ class UiRequestPlugin(object):
self.site_manager = SiteManager.site_manager self.site_manager = SiteManager.site_manager
super(UiRequestPlugin, self).__init__(*args, **kwargs) super(UiRequestPlugin, self).__init__(*args, **kwargs)
# Media request
def actionSiteMedia(self, path, **kwargs):
match = re.match(r"/media/(?P<address>[A-Za-z0-9-]+\.[A-Za-z0-9\.-]+)(?P<inner_path>/.*|$)", path)
if match: # Its a valid domain, resolve first
domain = match.group("address")
address = self.site_manager.resolveDomain(domain)
if address:
path = "/media/" + address + match.group("inner_path")
return super(UiRequestPlugin, self).actionSiteMedia(path, **kwargs) # Get the wrapper frame output
@PluginManager.registerTo("ConfigPlugin") @PluginManager.registerTo("ConfigPlugin")
class ConfigPlugin(object): class ConfigPlugin(object):
def createArguments(self): def createArguments(self):

4
src/Ui/UiRequest.py
View file

@ -310,6 +310,7 @@ class UiRequest(object):
# Renders a template # Renders a template
def render(self, template_path, *args, **kwargs): def render(self, template_path, *args, **kwargs):
template = open(template_path, encoding="utf8").read() template = open(template_path, encoding="utf8").read()
def renderReplacer(m): def renderReplacer(m):
return "%s" % kwargs.get(m.group(1), "") return "%s" % kwargs.get(m.group(1), "")
@ -559,6 +560,8 @@ class UiRequest(object):
match = re.match(r"/media/(?P<address>[A-Za-z0-9]+[A-Za-z0-9\._-]+)(?P<inner_path>/.*|$)", path) match = re.match(r"/media/(?P<address>[A-Za-z0-9]+[A-Za-z0-9\._-]+)(?P<inner_path>/.*|$)", path)
if match: if match:
path_parts = match.groupdict() path_parts = match.groupdict()
if self.isDomain(path_parts["address"]):
path_parts["address"] = self.resolveDomain(path_parts["address"])
path_parts["request_address"] = path_parts["address"] # Original request address (for Merger sites) path_parts["request_address"] = path_parts["address"] # Original request address (for Merger sites)
path_parts["inner_path"] = path_parts["inner_path"].lstrip("/") path_parts["inner_path"] = path_parts["inner_path"].lstrip("/")
if not path_parts["inner_path"]: if not path_parts["inner_path"]:
@ -578,6 +581,7 @@ class UiRequest(object):
return self.error404(path) return self.error404(path)
address = path_parts["address"] address = path_parts["address"]
file_path = "%s/%s/%s" % (config.data_dir, address, path_parts["inner_path"]) file_path = "%s/%s/%s" % (config.data_dir, address, path_parts["inner_path"])
if (config.debug or config.merge_media) and file_path.split("/")[-1].startswith("all."): if (config.debug or config.merge_media) and file_path.split("/")[-1].startswith("all."):