Changeset de063b in indico

Timestamp:

02/10/10 15:45:19 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

39625d

Parents:

893942

Message:

[FIX] Added no-cache headers for files

• Compensates for previous addition of Last-Modified;
• Fixes #161;

Location:

indico

Files:

• MaKaC/webinterface/rh/base.py (modified) (3 diffs)
• MaKaC/webinterface/rh/fileAccess.py (modified) (1 diff)
• MaKaC/webinterface/rh/materialDisplay.py (modified) (2 diffs)
• htdocs/js/indico/MaterialEditor/Editor.js (modified) (2 diffs)

indico/MaKaC/webinterface/rh/base.py

@@ -232 +232 @@
         return self._req.headers_in
 
+    def _disableCaching(self):
+        """
+        Disables caching, i.e. for materials
+        """
+
+        self._req.headers_out["Pragma"] = "no-cache"
+        self._req.headers_out["Cache-Control"] = "no-store, no-cache, must-revalidate"
+
+
     def _redirect( self, targetURL, noCache=False ):
         """Utility for redirecting the client web browser to the specified
@@ -243 +252 @@
                 raise MaKaCError(_("http header CRLF injection detected"))
         self._req.headers_out["Location"] = str(targetURL)
-        
+
         if noCache:
-            # Http 1.1
-            self._req.headers_out["Cache-Control"] = "no-store, no-cache, must-revalidate"
-            # Http 1.0
-            self._req.headers_out["Pragma"] = "no-cache"
-        
+            self._disableCaching()
         try:
             self._req.status = apache.HTTP_MOVED_PERMANENTLY
         except NameError:
             pass
-    
+
     def _checkHttpsRedirect(self):
         if self._tohttps and not self._req.is_https():
@@ -752 +757 @@
             # let Private OAI harvesters access protected (display) pages
             return
-        
+
         if not self._target.canAccess( self.getAW() ):
             from MaKaC.conference import Link, LocalFile, Category

indico/MaKaC/webinterface/rh/fileAccess.py

@@ -44 +44 @@
     
     def _process( self ):
+
+        self._disableCaching()
+
         if self._file.getId() != "minutes":
             #self._req.headers_out["Accept-Ranges"] = "bytes"

indico/MaKaC/webinterface/rh/materialDisplay.py

@@ -55 +55 @@
     
     def _process( self ):
+
+        # material pages should not be cached, since protection can change
+        self._disableCaching()
+
         if len(self._material.getResourceList()) == 1:
             res = self._material.getResourceList()[0]
@@ -64 +68 @@
                 elif url.find(".flv") != -1 or url.find(".f4v") != -1 or url.find("rtmp://") != -1:
                     urlflash = urlHandlers.UHVideoFlashAccess().getURL(res)
-                    self._redirect( urlflash)
+                    self._redirect( urlflash, noCache=True)
                 else:
-                    self._redirect( res.getURL() )
+                    self._redirect( res.getURL(), noCache=True )
             elif isinstance(res, conference.LocalFile):
-                self._redirect( urlHandlers.UHFileAccess.getURL( res ) )
+                self._redirect( urlHandlers.UHFileAccess.getURL( res ), noCache=True )
         else:
             #raise "%s"%self._material.getOwner()

indico/htdocs/js/indico/MaterialEditor/Editor.js

@@ -1 @@
-var debugVar, debugVar2;
 
 type("AddMaterialDialog", ["ExclusivePopup"], {
@@ -784 +783 @@
                          material);
 
-                debugVar = self;
-                debugVar2 = material;
+
             }
         });