[arch-commits] Commit in hedgedoc/trunk (4 files)

[Jelle van der Waa]

    Date: Tuesday, May 4, 2021 @ 14:29:33
  Author: jelle
Revision: 927377

Update, add unix socket support

Modified:
  hedgedoc/trunk/PKGBUILD
  hedgedoc/trunk/hedgedoc.service
  hedgedoc/trunk/tmpfiles.conf
Deleted:
  hedgedoc/trunk/fix-path-traversal.patch

--------------------------+
 PKGBUILD                 |    4 ++--
 fix-path-traversal.patch |   31 -------------------------------
 hedgedoc.service         |    2 +-
 tmpfiles.conf            |    1 +
 4 files changed, 4 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-04 12:56:34 UTC (rev 927376)
+++ PKGBUILD	2021-05-04 14:29:33 UTC (rev 927377)
@@ -20,8 +20,8 @@
 options=(!emptydirs)
 sha1sums=('f06b8f0c4a93918f92b58c2075fbe81f47988f63'
           'dc4220c9d7e21d2b5b5c54462bb681375d1cce62'
-          'faee704ac2e65e565f7bdcb527c2d0c73c20e682'
-          'c0a8ea9c6a27a1810c56365609d9b42d8d2ed935')
+          '090b12e0214386e34e4390dd647cb07fd75f8ec0'
+          '7630e5fddc4f1bd88a8bdc3011af41e6de836f3f')
 
 build() {
   cd "${pkgname}-${pkgver}"

Deleted: fix-path-traversal.patch
===================================================================
--- fix-path-traversal.patch	2021-05-04 12:56:34 UTC (rev 927376)
+++ fix-path-traversal.patch	2021-05-04 14:29:33 UTC (rev 927377)
@@ -1,31 +0,0 @@
-diff --git a/lib/models/note.js b/lib/models/note.js
-index 9fe02359..49b7ce84 100644
---- a/lib/models/note.js
-+++ b/lib/models/note.js
-@@ -96,7 +96,7 @@ module.exports = function (sequelize, DataTypes) {
-             if (!note.alias) {
-               filePath = config.defaultNotePath
-             } else {
--              filePath = path.join(config.docsPath, note.alias + '.md')
-+              filePath = path.join(config.docsPath, path.basename(note.alias) + '.md')
-             }
-             if (Note.checkFileExist(filePath)) {
-               var fsCreatedTime = moment(fs.statSync(filePath).ctime)
-@@ -195,7 +195,7 @@ module.exports = function (sequelize, DataTypes) {
-           }
-         }).then(function (note) {
-           if (note) {
--            let filePath = path.join(config.docsPath, noteId + '.md')
-+            let filePath = path.join(config.docsPath, path.basename(noteId) + '.md')
-             if (Note.checkFileExist(filePath)) {
-               // if doc in filesystem have newer modified time than last change time
-               // then will update the doc in db
-@@ -237,7 +237,7 @@ module.exports = function (sequelize, DataTypes) {
-               return callback(null, note.id)
-             }
-           } else {
--            var filePath = path.join(config.docsPath, noteId + '.md')
-+            var filePath = path.join(config.docsPath, path.basename(noteId) + '.md')
-             if (Note.checkFileExist(filePath)) {
-               Note.create({
-                 alias: noteId,

Modified: hedgedoc.service
===================================================================
--- hedgedoc.service	2021-05-04 12:56:34 UTC (rev 927376)
+++ hedgedoc.service	2021-05-04 14:29:33 UTC (rev 927377)
@@ -38,7 +38,7 @@
 ProtectSystem=strict
 ProtectHome=true
 PrivateTmp=true
-ReadWritePaths=/var/lib/hedgedoc
+ReadWritePaths=/var/lib/hedgedoc /run/hedgedoc
 
 SystemCallArchitectures=native
 SystemCallFilter=@system-service

Modified: tmpfiles.conf
===================================================================
--- tmpfiles.conf	2021-05-04 12:56:34 UTC (rev 927376)
+++ tmpfiles.conf	2021-05-04 14:29:33 UTC (rev 927377)
@@ -1,2 +1,3 @@
 d  /var/lib/hedgedoc          0750  hedgedoc  hedgedoc  -
 d  /var/lib/hedgedoc/uploads  0750  hedgedoc  hedgedoc  -
+d  /run/hedgedoc          0750  hedgedoc  hedgedoc  -