Merge pull request ether#2 from mconf/export-read-only

Fix readOnly pad export
pedrobmarin · Sep 16, 2020 · 5e1526b · 5e1526b
2 parents 3bc93aa + ca0547e
commit 5e1526b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/src/node/db/ReadOnlyManager.js b/src/node/db/ReadOnlyManager.js
@@ -22,6 +22,15 @@
 var db = require("./DB");
 var randomString = require("../utils/randomstring");
 
+/**
+ * checks if the id pattern matches a read-only pad id
+ * @param {String} the pad's id
+ */
+exports.isReadOnlyId = function(id)
+{
+ return id.indexOf("r.") === 0;
+}
+
 /**
  * returns a read only id for a pad
  * @param {String} padId the id of the pad

diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
@@ -49,9 +49,9 @@ const tempDirectory = os.tmpdir();
 /**
  * do a requested export
  */
-async function doExport(req, res, padId, type)
+async function doExport(req, res, padId, readOnlyId, type)
 {
- var fileName = padId;
+ var fileName = readOnlyId ? readOnlyId : padId;
 
  // allow fileName to be overwritten by a hook, the type type is kept static for security reasons
  let hookFileName = await hooks.aCallFirst("exportFileName", padId);
@@ -130,9 +130,9 @@ async function doExport(req, res, padId, type)
  }
 }
 
-exports.doExport = function(req, res, padId, type)
+exports.doExport = function(req, res, padId, readOnlyId, type)
 {
- doExport(req, res, padId, type).catch(err => {
+ doExport(req, res, padId, readOnlyId, type).catch(err => {
  if (err !== "stop") {
  throw err;
  }

diff --git a/src/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js
@@ -3,6 +3,7 @@ var settings = require('../../utils/Settings');
 var exportHandler = require('../../handler/ExportHandler');
 var importHandler = require('../../handler/ImportHandler');
 var padManager = require("../../db/PadManager");
+var readOnlyManager = require("../../db/ReadOnlyManager");
 
 exports.expressCreateServer = function (hook_name, args, cb) {
  args.app.get('/p/:pad/:rev?/export/:type', async function(req, res, next) {
@@ -23,12 +24,20 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 
  if (await hasPadAccess(req, res)) {
  console.log('req.params.pad', req.params.pad);
- let exists = await padManager.doesPadExists(req.params.pad);
+ let padId = req.params.pad;
+
+ let readOnlyId = null;
+ if (readOnlyManager.isReadOnlyId(padId)) {
+ readOnlyId = padId;
+ padId = await readOnlyManager.getPadId(readOnlyId);
+ }
+
+ let exists = await padManager.doesPadExists(padId);
  if (!exists) {
  return next();
  }
 
- exportHandler.doExport(req, res, req.params.pad, req.params.type);
+ exportHandler.doExport(req, res, padId, readOnlyId, req.params.type);
  }
  });
 

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
@@ -22,9 +22,6 @@ textarea {
 iframe {
  position: absolute
 }
-.readonly .acl-write {
- display: none;
-}
 
 #users {
  background: #f7f7f7;