diff --git a/plugins/Zeroname/UiRequestPlugin.py b/plugins/Zeroname/UiRequestPlugin.py
index 513b8e1b..d1e71362 100644
--- a/plugins/Zeroname/UiRequestPlugin.py
+++ b/plugins/Zeroname/UiRequestPlugin.py
@@ -13,7 +13,7 @@ class UiRequestPlugin(object):
# Media request
def actionSiteMedia(self, path):
- match = re.match("/media/(?P
[A-Za-z0-9]+\.[A-Za-z0-9\.]+)(?P/.*|$)", path)
+ match = re.match("/media/(?P[A-Za-z0-9-]+\.[A-Za-z0-9\.-]+)(?P/.*|$)", path)
if match: # Its a valid domain, resolve first
domain = match.group("address")
address = self.site_manager.resolveDomain(domain)
@@ -33,7 +33,7 @@ class UiRequestPlugin(object):
referer = re.sub("^http://zero[/]+", "http://", referer) # Allow /zero access
referer_site_address = re.match("http[s]{0,1}://(.*?)(/|$)", referer).group(1)
else: # Match to request path
- referer_site_address = re.match("/(?P[A-Za-z0-9\.]+)(?P/.*|$)", referer_path).group("address")
+ referer_site_address = re.match("/(?P[A-Za-z0-9\.-]+)(?P/.*|$)", referer_path).group("address")
if referer_site_address == site_address: # Referer site address as simple address
return True
diff --git a/plugins/disabled-Dnschain/UiRequestPlugin.py b/plugins/disabled-Dnschain/UiRequestPlugin.py
index 65a386f1..e1a095a5 100644
--- a/plugins/disabled-Dnschain/UiRequestPlugin.py
+++ b/plugins/disabled-Dnschain/UiRequestPlugin.py
@@ -11,7 +11,7 @@ class UiRequestPlugin(object):
# Media request
def actionSiteMedia(self, path):
- match = re.match("/media/(?P[A-Za-z0-9]+\.[A-Za-z0-9\.]+)(?P/.*|$)", path)
+ match = re.match("/media/(?P[A-Za-z0-9-]+\.[A-Za-z0-9\.-]+)(?P/.*|$)", path)
if match: # Its a valid domain, resolve first
domain = match.group("address")
address = self.site_manager.resolveDomain(domain)
@@ -23,7 +23,7 @@ class UiRequestPlugin(object):
# Is mediarequest allowed from that referer
def isMediaRequestAllowed(self, site_address, referer):
referer_path = re.sub("http[s]{0,1}://.*?/", "/", referer).replace("/media", "") # Remove site address
- referer_site_address = re.match("/(?P[A-Za-z0-9\.]+)(?P/.*|$)", referer_path).group("address")
+ referer_site_address = re.match("/(?P[A-Za-z0-9\.-]+)(?P/.*|$)", referer_path).group("address")
if referer_site_address == site_address: # Referer site address as simple address
return True
diff --git a/plugins/disabled-Zeroname-local/UiRequestPlugin.py b/plugins/disabled-Zeroname-local/UiRequestPlugin.py
index a70ec0a9..462e485f 100644
--- a/plugins/disabled-Zeroname-local/UiRequestPlugin.py
+++ b/plugins/disabled-Zeroname-local/UiRequestPlugin.py
@@ -11,7 +11,7 @@ class UiRequestPlugin(object):
# Media request
def actionSiteMedia(self, path):
- match = re.match("/media/(?P[A-Za-z0-9]+\.[A-Za-z0-9\.]+)(?P/.*|$)", path)
+ match = re.match("/media/(?P[A-Za-z0-9-]+\.[A-Za-z0-9\.-]+)(?P/.*|$)", path)
if match: # Its a valid domain, resolve first
domain = match.group("address")
address = self.site_manager.resolveDomain(domain)
@@ -29,7 +29,7 @@ class UiRequestPlugin(object):
referer = re.sub("^http://zero[/]+", "http://", referer) # Allow /zero access
referer_site_address = re.match("http[s]{0,1}://(.*?)(/|$)", referer).group(1)
else: # Match to request path
- referer_site_address = re.match("/(?P[A-Za-z0-9\.]+)(?P/.*|$)", referer_path).group("address")
+ referer_site_address = re.match("/(?P[A-Za-z0-9\.-]+)(?P/.*|$)", referer_path).group("address")
if referer_site_address == site_address: # Referer site address as simple address
return True