Merge 2e2e8b0 into bd0072a

wikimedia · Oct 15, 2019 · a75275e · a75275e
2 parents bd0072a + 2e2e8b0
commit a75275e
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/sys/parsoid.js b/sys/parsoid.js
@@ -596,8 +596,24 @@ class ParsoidService {
             contentPromise = P.resolve(undefined);
         } else {
             if (etag && etag.suffix === 'stash' && from === 'html' && to === 'wikitext') {
+                // T235465: RB should trust its own ETag over the client-supplied revision, but
+                // allow for the client to be right, so provide their revision as a fall-back
+                const revMismatch = etag.rev !== rp.revision;
+                if (revMismatch) {
+                    // the ETag and URI parameter do not agree, log this (for now?)
+                    hyper.logger.log('warn/parsoid/etag_rev', {
+                        msg: 'The revisions in If-Match and URI differ'
+                    });
+                }
                 contentPromise = this._getStashedContent(hyper, rp.domain,
-                    rp.title, rp.revision, tid);
+                    rp.title, etag.rev, etag.tid)
+                .catch({ status: 404 }, (e) => {
+                    if (!revMismatch) {
+                        // the revisions match, so this is a genuine 404
+                        throw e;
+                    }
+                    return this._getStashedContent(hyper, rp.domain, rp.title, rp.revision, tid);
+                });
             } else {
                 contentPromise = this._getOriginalContent(hyper, req, rp.revision, tid);
             }