Do not cache static files if revs mismatch. (#3962)

mozilla-services · Mar 1, 2018 · dc1bc84 · dc1bc84
1 parent 0c074e4
commit dc1bc84
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/server/src/caching.js b/server/src/caching.js
@@ -29,5 +29,6 @@ function createCacheSetter(maxAge, flags) {
   }
 }
 
+exports.doNotCache = createCacheSetter(0);
 exports.setMonthlyCache = createCacheSetter(exports.cacheTime);
 exports.setDailyCache = createCacheSetter(aDayInSeconds, `s-maxage=${tenMinutesInSeconds}`);
diff --git a/server/src/server.js b/server/src/server.js
@@ -45,7 +45,7 @@ const gaActivation = require("./ga-activation");
 const genUuid = require("nodify-uuid");
 const statsd = require("./statsd");
 const { notFound } = require("./pages/not-found/server");
-const { cacheTime, setMonthlyCache, setDailyCache } = require("./caching");
+const { setMonthlyCache, setDailyCache, doNotCache } = require("./caching");
 const { captureRavenException, sendRavenMessage,
         addRavenRequestHandler, addRavenErrorHandler } = require("./ravenclient");
 const { errorResponse, simpleResponse, jsResponse } = require("./responses");
@@ -184,10 +184,18 @@ app.use((req, res, next) => {
 app.use(bodyParser.urlencoded({extended: false}));
 app.use(bodyParser.json({limit: config.requestBodySizeLimit}));
 
-app.use("/static", express.static(path.join(__dirname, "static"), {
-  index: false,
-  maxAge: cacheTime ? cacheTime * 1000 : null
-}));
+app.use(
+  "/static",
+  function(req, res, next) {
+    if (req.query.rev && req.query.rev === linker.getGitRevision()) {
+      setMonthlyCache(res);
+    } else {
+      doNotCache(res);
+    }
+    next();
+  },
+  express.static(path.join(__dirname, "static"), {index: false})
+);
 
 const xpidir = path.join(__dirname, "..", "xpi");
 app.use("/xpi", express.static(xpidir, {index: false}));