Rev2180, Allow ajax requests using ajax_key http get parameter

src/Config.py

@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.7"
-        self.rev = 2180
+        self.rev = 2184
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"

src/Site/Site.py

@@ -68,6 +68,10 @@ class Site(object):
             self.settings["wrapper_key"] = CryptHash.random()
             self.log.debug("New wrapper key: %s" % self.settings["wrapper_key"])
 
+        if not self.settings.get("ajax_key"):  # To auth websocket permissions
+            self.settings["ajax_key"] = CryptHash.random()
+            self.log.debug("New ajax key: %s" % self.settings["ajax_key"])
+
     def __str__(self):
         return "Site %s" % self.address_short
 

src/Ui/UiRequest.py

@@ -77,7 +77,10 @@ class UiRequest(object):
                 content_type = self.getContentType("index.html")
             else:
                 content_type = self.getContentType(path)
-            self.sendHeader(content_type=content_type)
+
+            extra_headers = [("Access-Control-Allow-Origin", "null")]
+
+            self.sendHeader(content_type=content_type, extra_headers=extra_headers)
             return ""
 
         if path == "/":
@@ -369,6 +372,7 @@ class UiRequest(object):
             meta_tags=meta_tags,
             query_string=re.escape(query_string),
             wrapper_key=site.settings["wrapper_key"],
+            ajax_key=site.settings["ajax_key"],
             wrapper_nonce=wrapper_nonce,
             postmessage_nonce_security=postmessage_nonce_security,
             permissions=json.dumps(site.settings["permissions"]),
@@ -450,13 +454,23 @@ class UiRequest(object):
                 DebugMedia.merge(file_path)
         if not address or address == ".":
             return self.error403(path_parts["inner_path"])
+
         if os.path.isfile(file_path):  # File exists
-            return self.actionFile(file_path, header_length=header_length, header_noscript=header_noscript)
+            header_allow_ajax = False
+            if self.get.get("ajax_key"):
+                site = SiteManager.site_manager.get(path_parts["request_address"])
+                if self.get["ajax_key"] == site.settings["ajax_key"]:
+                    header_allow_ajax = True
+                else:
+                    return self.error403("Invalid ajax_key")
+            return self.actionFile(file_path, header_length=header_length, header_noscript=header_noscript, header_allow_ajax=header_allow_ajax)
+
         elif os.path.isdir(file_path):  # If this is actually a folder, add "/" and redirect
             if path_parts["inner_path"]:
                 return self.actionRedirect("./%s/" % path_parts["inner_path"].split("/")[-1])
             else:
                 return self.actionRedirect("./%s/" % path_parts["address"])
+
         else:  # File not exists, try to download
             if address not in SiteManager.site_manager.sites:  # Only in case if site already started downloading
                 return self.actionSiteAddPrompt(path)
@@ -515,7 +529,7 @@ class UiRequest(object):
         return template
 
     # Stream a file to client
-    def actionFile(self, file_path, block_size=64 * 1024, send_header=True, header_length=True, header_noscript=False):
+    def actionFile(self, file_path, block_size=64 * 1024, send_header=True, header_length=True, header_noscript=False, header_allow_ajax=False):
         if ".." in file_path:
             raise Exception("Invalid path")
         if os.path.isfile(file_path):
@@ -542,6 +556,8 @@ class UiRequest(object):
                     status = 206
                 else:
                     status = 200
+                if header_allow_ajax:
+                    extra_headers["Access-Control-Allow-Origin"] = "null"
                 self.sendHeader(status, content_type=content_type, noscript=header_noscript, extra_headers=extra_headers.items())
             if self.env["REQUEST_METHOD"] != "OPTIONS":
                 file = open(file_path, "rb")

src/Ui/media/Wrapper.coffee

@@ -132,6 +132,8 @@ class Wrapper
 			window.history.replaceState(message.params[0], message.params[1], query)
 		else if cmd == "wrapperGetState"
 			@sendInner {"cmd": "response", "to": message.id, "result": window.history.state}
+		else if cmd == "wrapperGetAjaxKey"
+			@sendInner {"cmd": "response", "to": message.id, "result": window.ajax_key}
 		else if cmd == "wrapperOpenWindow"
 			@actionOpenWindow(message.params)
 		else if cmd == "wrapperPermissionAdd"

src/Ui/media/all.js

@@ -982,6 +982,12 @@ jQuery.extend( jQuery.easing,
           "to": message.id,
           "result": window.history.state
         });
+      } else if (cmd === "wrapperGetAjaxKey") {
+        return this.sendInner({
+          "cmd": "response",
+          "to": message.id,
+          "result": window.ajax_key
+        });
       } else if (cmd === "wrapperOpenWindow") {
         return this.actionOpenWindow(message.params);
       } else if (cmd === "wrapperPermissionAdd") {

src/Ui/template/wrapper.html

@@ -60,6 +60,7 @@ document.getElementById("inner-iframe").src = "{file_url}{query_string}"
 address = "{address}"
 wrapper_nonce = "{wrapper_nonce}"
 wrapper_key = "{wrapper_key}"
+ajax_key = "{ajax_key}"
 postmessage_nonce_security = {postmessage_nonce_security}
 file_inner_path = "{file_inner_path}"
 permissions = {permissions}