Commit graph

3182 commits

Author SHA1 Message Date
Erik Michelson
e54236d057
Remove unneeded polyfill
This polyfill was added because node versions less than 10.5.0 didn't include scrypt support. As we now raised the minimum required version to 12.0.0, this polyfill isn't needed anymore.

Signed-off-by: Erik Michelson <opensource@erik.michelson.eu>
2021-04-26 17:05:20 +02:00
Yannick Bungers
09466189ad
Merge pull request #1193 from hedgedoc/fix/logo-in-readme
Fix logo link in README.md
2021-04-25 22:56:23 +02:00
Tilman Vatteroth
117d9a292d
Fix logo link in README.md
Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
2021-04-25 22:49:24 +02:00
David Mehren
59f669e593
Merge pull request from GHSA-p528-555r-pf87
Fix Relative Path Traversal Attack on note creation
2021-04-25 21:28:18 +02:00
David Mehren
6cda639eef
Merge pull request #1176 from hedgedoc/renovate/master-mkdocs-material-7.x
Update dependency mkdocs-material to v7.1.3 (master)
2021-04-25 21:18:11 +02:00
David Mehren
fdebc29010
Merge pull request #1174 from hedgedoc/renovate/master-linters
Update dependency eslint to v7.25.0 (master)
2021-04-25 21:18:02 +02:00
Sheogorath
44b7f607a5
Fix Relative Path Traversal Attack on note creation
Impact
---

An attacker can read arbitrary `.md` files from the server's filesystem due to an [improper input validation](https://cwe.mitre.org/data/definitions/20.html), which results in the ability to perform a [relative path traversal](https://cwe.mitre.org/data/definitions/23.html).

CVSSv3 string: AV:N/AC:L/PR:N/UI:N/S:U/C:L/I:N/A:N

PoC / Quicktest
---

To verify if you are affected, you can try to open the following URL: `http://localhost:3000/..%2F..%2FREADME#` (replace `http://localhost:3000` with your instance's base-URL e.g. `https://demo.hedgedoc.org/..%2F..%2FREADME#`).
- If you see a README page being rendered, you run an affected version.

Analysis
---

The attack works due the fact that [the internal router, passes the url-encoded alias](https://github.com/hedgedoc/hedgedoc/blob/master/lib/web/note/router.js#L26) to the `noteController.showNote`-function. This function passes the input directly to [`findNote()`](78a732abe6/lib/web/note/util.js (L10)) utility function, that will pass it on the the [`parseNoteId()`](78a732abe6/lib/models/note.js (L188-L258))-function, that tries to make sense out of the noteId/alias and check if a note already exists and if so, if a corresponding file on disk was updated.

If no note exists the [note creation-function is called](78a732abe6/lib/models/note.js (L240-L245)), which pass this unvalidated alias, with a `.md` appended, into a [`path.join()`-function](78a732abe6/lib/models/note.js (L99)) which is read from the filesystem in the follow up routine and provides the pre-filled content of the new note.

This allows an attacker to not only read arbitrary `.md` files from the filesystem, but also  observes changes to them.

The usefulness of this attack can be considered limited, since mainly markdown files are use the file-ending `.md` and all markdown files contained in the hedgedoc project, like the README, are public anyway. If other protections such as a chroot or container or proper file permissions are in place, this attack's usefulness is rather limited.

Workarounds
---
On a reverse-proxy level one can force a URL-decode, which will prevent this attack because the router will not accept such a path.

For more information
---

If you have any questions or comments about this advisory:
* Open an topic on [our community forum](https://community.hedgedoc.org)
* Join our [matrix room](https://chat.hedgedoc.org)

Advisory link
---

https://github.com/hedgedoc/hedgedoc/security/advisories/GHSA-p528-555r-pf87

Signed-off-by: Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>
2021-04-25 20:40:17 +02:00
Renovate Bot
7d21e12d05
Update dependency mkdocs-material to v7.1.3
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-25 18:35:34 +00:00
Renovate Bot
1b1845d94e
Update dependency eslint to v7.25.0
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-25 18:34:59 +00:00
David Mehren
2faf5b6974
Merge pull request #1150 from hedgedoc/feature/prometheus_metrics 2021-04-25 20:34:03 +02:00
David Mehren
c8e2117452
Merge pull request #1167 from hedgedoc/maintenance/master/remove_node_10 2021-04-25 20:10:46 +02:00
David Mehren
cbe7b03b59
Document new Prometheus endpoint
Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-25 20:06:56 +02:00
David Mehren
5c70cc021f
Add custom prometheus metrics
This reuses the `realtime.getStatus` method to get the state of the
application state on every prometheus scrape cycle.

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-25 20:06:56 +02:00
David Mehren
8914df60a9
Add prometheus endpoint at /metrics
This is currently just using the default metrics of prometheus-api-metrics.

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-22 23:19:34 +02:00
David Mehren
dcf72148ce
Merge pull request #1153 from hedgedoc/renovate/master-lock-file-maintenance
Lock file maintenance (master)
2021-04-22 23:12:43 +02:00
Renovate Bot
1b9d11a4ad
Lock file maintenance
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-22 20:59:13 +00:00
Yannick Bungers
8ee2455b6b
Merge pull request #1117 from hedgedoc/improvement/use-upstream-imgur 2021-04-22 22:57:34 +02:00
David Mehren
d52a43e811
Fix version error wording in bin/setup
The previous error message stated that the version of Node or
Yarn is "outdated", which might be accurate coincidentally,
but is not what the script checks.

This commit changes the wording to use "not supported", which
is more accurate to the true check in the script.

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-22 22:52:53 +02:00
David Mehren
29e08cdb9f
CI: Stop running tests with Node.js 10
Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-22 22:52:51 +02:00
David Mehren
e1df30bd5c
Raise minimum required Node.js version to 12
As Node 10 will be EOL at April 30th, we should stop supporting
and/or promoting the usage of that version.

See also https://endoflife.date/nodejs

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-22 22:52:38 +02:00
Philip Molares
049ac32cc9 Changelog: Mention removal of node-imgur
Signed-off-by: Philip Molares <philip.molares@udo.edu>
2021-04-22 22:51:41 +02:00
Philip Molares
f34d927e8c ImageRouterImgur: Replace imgur library with note-fetch request
This kinda is a backport of https://github.com/hedgedoc/hedgedoc/pull/961

Signed-off-by: Philip Molares <philip.molares@udo.edu>
2021-04-22 21:23:27 +02:00
David Mehren
5cef3d4ac7
Merge pull request #1166 from hedgedoc/maintenance/master/node_16
CI: Run tests with Node.js 16 [master]
2021-04-22 21:06:24 +02:00
David Mehren
26f79c1d98
CI: Run tests with Node.js 16
Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-22 18:40:01 +02:00
David Mehren
2b105c4652
Merge pull request #1148 from hedgedoc/renovate/master-mkdocs-material-7.x
Update dependency mkdocs-material to v7.1.2 (master)
2021-04-22 18:25:41 +02:00
Renovate Bot
f697d6699a
Update dependency mkdocs-material to v7.1.2
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-22 15:14:44 +00:00
David Mehren
ec8182b12e
Merge pull request #1163 from hedgedoc/revert/docs
Docs: Revert changes to manual setup
2021-04-22 15:07:23 +02:00
Philip Molares
7192ec63f3 Docs: Revert changes to manual setup
This reverts the documentation changes of bf0a7ebee7. This is necessary as the omitted remarks about `.sequlizerc` can't be omitted until 1.8 is released.

Signed-off-by: Philip Molares <philip.molares@udo.edu>
2021-04-22 13:31:12 +02:00
David Mehren
2f579371cd
Merge pull request #1147 from hedgedoc/renovate/master-mini-css-extract-plugin-1.x
Update dependency mini-css-extract-plugin to v1.5.0 (master)
2021-04-19 22:51:41 +02:00
Renovate Bot
3ac1aadea4
Update dependency mini-css-extract-plugin to v1.5.0
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-19 20:42:19 +00:00
David Mehren
31eebcc487
Merge pull request #1157 from hedgedoc/renovate/master-helmet-4.x
Update dependency helmet to ^4.5.0 (master)
2021-04-19 22:40:34 +02:00
David Mehren
3c5f69c658
Merge pull request #1158 from hedgedoc/renovate/master-ws-7.x
Update dependency ws to ^7.4.4 (master)
2021-04-19 22:39:41 +02:00
David Mehren
d8ff664bd5
Merge pull request #1160 from hedgedoc/renovate/master-aws-sdk-2.x
Update dependency aws-sdk to ^2.888.0 (master)
2021-04-19 22:39:34 +02:00
David Mehren
c509cb5195
Merge pull request #1159 from hedgedoc/renovate/master-css-loader-5.x
Update dependency css-loader to v5.2.4 (master)
2021-04-19 22:38:36 +02:00
Renovate Bot
5d03095ef0
Update dependency css-loader to v5.2.4
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-19 19:37:39 +00:00
Renovate Bot
45d4649a7f
Update dependency aws-sdk to ^2.888.0
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-19 19:37:16 +00:00
Renovate Bot
2904bfab21
Update dependency ws to ^7.4.4
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-19 12:09:30 +00:00
Renovate Bot
13e0ee337e
Update dependency helmet to ^4.5.0
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-19 12:09:14 +00:00
Philip Molares
da811aca09 Dependency: Remove imgur
This dependency is outdated anyway (it still uses the old imgur api) and for our purposes we can substitute it with a simple POST request via note-fetch.

Signed-off-by: Philip Molares <philip.molares@udo.edu>
2021-04-19 12:29:44 +02:00
David Mehren
a15124ba35
Merge pull request #1145 from hedgedoc/docs/darkTheme
Documentation: Add toggleable dark theme
2021-04-18 22:50:50 +02:00
Philip Molares
60251d89ee
Documentation: Add toggleable dark theme
The dark theme is mostly built on top of the mkdocs slate theme.

Signed-off-by: Philip Molares <philip.molares@udo.edu>
Co-Authored-by: Tilman Vatteroth <git@tilmanvatteroth.de>
2021-04-18 22:44:02 +02:00
Yannick Bungers
58f5282ccb
Merge pull request #984 from hedgedoc/docs/upgrade-instructions 2021-04-17 16:33:49 +02:00
David Mehren
08e73d0070
Merge pull request #1128 from hedgedoc/renovate/master-lock-file-maintenance
Lock file maintenance (master)
2021-04-17 15:51:33 +02:00
Renovate Bot
f8e36a4ec1
Lock file maintenance
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2021-04-17 13:01:14 +00:00
David Mehren
ebd180c8f9
Merge pull request #1142 from hedgedoc/renovate/master-css-loader-5.x
Update dependency css-loader to v5.2.2 (master)
2021-04-17 14:59:36 +02:00
David Mehren
e8465aa8be
Docs: Fixup some wording in manual setup guide
Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-16 21:19:13 +02:00
David Mehren
c7104c94e4
Docs: Add hint about account creation
Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-16 21:19:13 +02:00
David Mehren
70a289aeba
Docs: Include minimal config on manual setup page
To make it easier to get started, this commit adds a minimal
`config.json` snipped to the manual setup instruction.

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-16 21:19:13 +02:00
David Mehren
87e0cea2f9
Docs: Cleanup docker page
Build instructions are not relevant for most users.

Contact info can already be found on the 'Home' page.

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-16 21:19:13 +02:00
David Mehren
a3ee2c6f8c
Docs: Move migration hints to getting started page
These are relevant for all installation methods, so they should be
placed at a 'global' place.

Signed-off-by: David Mehren <git@herrmehren.de>
2021-04-16 21:19:13 +02:00