1e604add99
deps: Require Node.js 12.17.0 or later
...
This makes it possible to use dynamic `import()`.
2022-01-27 01:27:10 -05:00
151f954fea
fix: upgrade rate-limiter-flexible from 2.3.5 to 2.3.6
...
Snyk has created this PR to upgrade rate-limiter-flexible from 2.3.5 to 2.3.6.
See this package in npm:
https://www.npmjs.com/package/rate-limiter-flexible
See this project in Snyk:
https://app.snyk.io/org/johnmclear/project/d9a12bfb-7ccd-443f-9e22-f30d339cc8c5?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-01-26 20:05:06 -05:00
9b671efd5b
build(deps): bump node-fetch from 2.6.6 to 2.6.7 in /src
...
Bumps [node-fetch](https://github.com/node-fetch/node-fetch ) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases )
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7 )
---
updated-dependencies:
- dependency-name: node-fetch
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-26 20:03:19 -05:00
e44d1c4400
build(deps-dev): bump eslint-config-etherpad from 2.0.2 to 2.0.3 in /src
...
Bumps [eslint-config-etherpad](https://github.com/ether/eslint-config-etherpad ) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/ether/eslint-config-etherpad/releases )
- [Commits](https://github.com/ether/eslint-config-etherpad/compare/v2.0.2...v2.0.3 )
---
updated-dependencies:
- dependency-name: eslint-config-etherpad
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-26 20:02:42 -05:00
de66bd4799
build(deps): bump http-errors from 1.8.1 to 2.0.0 in /src
...
Bumps [http-errors](https://github.com/jshttp/http-errors ) from 1.8.1 to 2.0.0.
- [Release notes](https://github.com/jshttp/http-errors/releases )
- [Changelog](https://github.com/jshttp/http-errors/blob/master/HISTORY.md )
- [Commits](https://github.com/jshttp/http-errors/compare/1.8.1...v2.0.0 )
---
updated-dependencies:
- dependency-name: http-errors
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-26 20:01:53 -05:00
abe8a98a4d
build(deps-dev): bump mocha from 9.1.3 to 9.2.0 in /src
...
Bumps [mocha](https://github.com/mochajs/mocha ) from 9.1.3 to 9.2.0.
- [Release notes](https://github.com/mochajs/mocha/releases )
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mochajs/mocha/compare/v9.1.3...v9.2.0 )
---
updated-dependencies:
- dependency-name: mocha
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-27 00:58:49 +00:00
867922c8d8
build(deps): bump follow-redirects from 1.14.6 to 1.14.7 in /src
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-26 19:56:56 -05:00
ae9114f140
Edit settings.js
...
Added formal panics for invalid JSON.
2022-01-26 19:35:21 -05:00
315bcccc14
Localisation updates from https://translatewiki.net .
2022-01-24 13:03:53 +01:00
e4a336e875
plugins: Add npm packages to etherpad org
2022-01-20 20:33:24 -05:00
692749d1cf
express-session: Extend session lifetime if user is active
2022-01-17 21:45:56 -05:00
9c1f52f1b0
express-session: Install package from `@etherpad` scope
...
This allows us to use some in-progress features.
2022-01-17 21:45:56 -05:00
023e58cfe6
express-session: Set a finite cookie lifetime
2022-01-17 21:45:56 -05:00
ec10700dff
express-session: Don't save uninitialized sessions
...
This should avoid frivolous session records, such as when the user
gets a 404 (unless login was required to see the 404).
2022-01-17 21:45:56 -05:00
7255dd7ef0
express-session: Inherit proxy trust from Express
2022-01-17 21:45:56 -05:00
945e6848e2
SessionStore: Delete DB record when session expires
...
This only deletes records known to the current Etherpad instance --
old records from previous runs are not automatically cleaned up.
2022-01-17 21:45:56 -05:00
72cd983f0f
SessionStore: Option to update DB record on `touch()`
2022-01-17 21:45:52 -05:00
b991948e21
SessionStore: Don't write DB record if already expired
2022-01-17 21:33:58 -05:00
4d498725c7
SessionStore: Improve cookie expiration check
...
* Don't mutate `sess.cookie.expires`.
* Allow `sess.cookie` to be nullish.
* Always compare `Date` objects.
2022-01-17 18:17:40 -05:00
928c598ecf
tests: Add SessionStore backend tests
2022-01-17 17:51:08 -05:00
efab3aed0c
deps: Update ueberdb2 to 2.0.1 to get proper JSON support
2022-01-14 00:45:47 -05:00
d3984aa621
express: Move `preAuthorize` hook after `express-session`
...
The `ep_openid_connect` plugin needs access to session state before
authorization checks are made (to securely redirect the user back to
the start page when authentication completes). Now that the
`expressPreSession` hook exists, the rationale for moving
`preAuthorize` before the `express-session` middleware is gone.
This change undoes the following commits:
* bf35dcfc500b1ec20c5c30544b564e
2022-01-14 00:44:54 -05:00
75637708c0
express: Move up `cookie-parser` middleware
...
This makes it possible for the `preAuthorize` and `preExpressSession`
hooks to easily read or set cookies.
2022-01-14 00:44:54 -05:00
ab85db4426
webaccess: Silence prototype pollution warning
2022-01-14 00:44:54 -05:00
dcd43e9849
webaccess: Use `.startsWith()` instead of `.search()`
2022-01-14 00:44:54 -05:00
b9118c22ba
Localisation updates from https://translatewiki.net .
2022-01-13 13:02:54 +01:00
fd9b770579
PadManager: Refactor `padList` to avoid duplicate loads
2022-01-02 20:44:42 -05:00
66ce2b50a9
openapi: Convert `Promise.catch()` to `catch` block
2022-01-02 19:17:20 -05:00
fa8bdb0348
promises: Add a comment explaining a subtlety in `Gate`
2022-01-02 18:57:44 -05:00
a115c475ad
promises: Expose `reject` in `Gate`
2022-01-02 18:57:44 -05:00
b72db7ebd6
promises: Return a `Promise` from `Gate.then()`
...
It doesn't make sense to return a `Gate` from `Gate.then()`, and this
eliminates the semantically confusing constructor parameter.
2022-01-02 18:57:44 -05:00
78a67801f3
promises: Move Gate from `server.js` (to enable reuse)
2022-01-02 18:57:44 -05:00
c8d45586c1
server: Fix stop Gate creation and check
2022-01-02 18:57:44 -05:00
10c55a2328
Changeset: Explain why number of removals doesn't matter
2021-12-31 22:53:59 -05:00
6495b1e6f4
tests: Disable deprecation warnings when testing deprecated functions
2021-12-31 22:15:03 -05:00
c0471dd238
tests: Avoid deprecated `Changeset.opIterator`
2021-12-31 22:14:07 -05:00
0af728ffee
textLinesMutator: coverage for changed attributes in multiline keeps
2021-12-30 18:44:29 -05:00
93447b7493
easysync tests: cover more string operation scenarios
2021-12-30 18:44:29 -05:00
395cbc01bb
Changeset.js: refine comments
2021-12-30 18:44:29 -05:00
55c47efd4c
easysync tests: add some more smartOpAssembler tests
2021-12-30 18:44:29 -05:00
12ebca897d
easysync: add clear method to stringAssembler
2021-12-30 18:44:29 -05:00
0cc15df9b9
Prevent pad translation and crash
...
Prevent "TypeError: Cannot read properties of null (reading 'sheet')"
exception because google chrome can translate `<style type="text/css" title="dynamicsyntax"></style>` title attribute
2021-12-22 17:46:32 +01:00
cb257de8f9
Bump version to v1.9.0 for plugin `peerDependencies`
...
This allows plugins to depend on the not-yet-released API by bumping
their `peerDependencies` to `>=1.9.0`.
IMPORTANT: v1.9.0 IS NOT RELEASED YET. I tried to bump the version to
1.9.0-alpha.0 instead, but unfortunately that doesn't satisfy
`>=1.8.6` which would break just about every plugin.
2021-12-21 17:23:56 -05:00
02a56dc58c
PadMessageHandler: Allow `handleMessageSecurity` to grant one-time write access
2021-12-21 17:23:56 -05:00
31b025bd9d
PadMessageHandler: Pass session info to `handleMessageSecurity` hook
2021-12-21 17:23:56 -05:00
1b52c9f0c4
PadMessageHandler: Deprecate `client` context property
2021-12-21 17:23:56 -05:00
f1856cf95a
Docker: Use new `/health` endpoint for HEALTHCHECK
2021-12-21 17:19:56 -05:00
83f2898723
package.json: Define `etherpad` binary
2021-12-21 17:19:56 -05:00
696f9c3367
specialpages: New `/health` endpoint for health checking
...
This endpoint is intended to conform with:
https://www.ietf.org/archive/id/draft-inadarei-api-health-check-06.html
2021-12-21 17:19:56 -05:00
2e4c546c7f
Pad: Add new `.spliceText()` method
...
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-12-21 17:00:18 -05:00
30544b564e
express: Skip express-session middleware if pre-authorized
2021-12-20 20:08:19 -05:00
649fbdccf5
express: Move static handlers to `expressPreSession`
...
This avoids the need to exempt the paths from authentication checks,
and it eliminates unnecessary express-session state.
2021-12-20 20:08:19 -05:00
72f4ae444d
express: New `expressPreSession` server-side hook
2021-12-20 20:08:19 -05:00
0b1ec20c5c
express: Move `preAuthorize` middleware before express-session
2021-12-20 20:08:19 -05:00
bf35dcfc50
webaccess: Move `preAuthorize` to its own middleware
2021-12-20 20:08:19 -05:00
7f3d0e71f7
express: Check access before `expressConfigure` middleware
...
There are no guarantees about the order of execution of hook
functions, which means that a plugin's `expressConfigure` hook
function could theoretically register a handler/middleware before the
access check middleware is registered. If that happens, the plugin's
handler would run before the access check, which would be bad. Avoid
the problem by explicitly installing the `webaccess.checkAccess`
middleware before running the `expressConfigure` hook.
2021-12-20 20:08:18 -05:00
472eddc821
webaccess: Skip checks if `next` is called in `preAuthenticate`
2021-12-20 20:08:18 -05:00
fc498f0ae6
tests: Delete test pad before attempting import
2021-12-20 20:08:18 -05:00
02d1b90d30
tests: Factor out USER_CHANGES/ACCEPT_COMMIT helpers
...
This will make it possible for other tests to reuse the code.
2021-12-19 16:53:24 -05:00
674a0ccedc
fix: upgrade openapi-backend from 5.0.0 to 5.0.1
...
Snyk has created this PR to upgrade openapi-backend from 5.0.0 to 5.0.1.
See this package in npm:
https://www.npmjs.com/package/openapi-backend
See this project in Snyk:
https://app.snyk.io/org/johnmclear/project/d9a12bfb-7ccd-443f-9e22-f30d339cc8c5?utm_source=github&utm_medium=referral&page=upgrade-pr
2021-12-19 00:54:20 -05:00
8b73f2ee70
padurlsanitize: Don't crash if `sanitizePadId()` throws
...
Let Express send a 500 status code to the user instead.
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-12-18 18:47:01 -05:00
4733c7d8d3
SessionStore: Promisify to the extent permitted by express-session
2021-12-18 18:29:04 -05:00
694d3f630e
SessionStore: Propagate database errors to express-session
...
Send a 500 HTTP status code to the client if the session entry could
not be fetched from the database. This is useful in case the database
is busy and can't respond to the query in time. In this case we want
to abort the client connection as soon as possible.
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-12-18 18:29:04 -05:00
7572040836
Pad: Simplify `Pad.copy()` logic
2021-12-18 18:28:58 -05:00
0040f5984e
db: await more database operations
...
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-12-18 18:23:27 -05:00
e64462323b
Localisation updates from https://translatewiki.net .
2021-12-16 13:03:26 +01:00
748d661495
Changeset: Fix off-by-one bug in `makeSplice`
2021-12-16 00:48:07 -05:00
30d68df396
Changeset: Add range checks to `makeSplice`
2021-12-16 00:48:07 -05:00
fdf1fdbc23
Changeset: Improve readability of `makeSplice()`
2021-12-16 00:48:07 -05:00
b1d0848701
Pad: Improve readability of `appendText`
2021-12-16 00:48:07 -05:00
a6bf7816ce
Pad: Simplify `setText`
2021-12-16 00:48:07 -05:00
3693a0574f
fix: upgrade jsdom from 18.1.0 to 18.1.1
...
Snyk has created this PR to upgrade jsdom from 18.1.0 to 18.1.1.
See this package in npm:
https://www.npmjs.com/package/jsdom
See this project in Snyk:
https://app.snyk.io/org/johnmclear/project/d9a12bfb-7ccd-443f-9e22-f30d339cc8c5?utm_source=github&utm_medium=referral&page=upgrade-pr
2021-12-14 01:05:47 -05:00
d94f380141
API: Fix race conditions in `setText`, `appendText`, `restoreRevision`
2021-12-14 01:02:00 -05:00
cff089e54e
PadMessageHandler: Accept retransmissions of USER_CHANGES
2021-12-14 01:02:00 -05:00
a370cfa5c6
Pad: Don't create no-op revisions
2021-12-14 01:02:00 -05:00
56b7671422
Pad: Return new rev number from `appendRevision()`
2021-12-14 01:02:00 -05:00
c05ee7ce72
PadMessageHandler: Move `ACCEPT_COMMIT` after changeset save
2021-12-14 01:02:00 -05:00
dbacc73c36
tests: Basic USER_CHANGES backend tests
2021-12-14 01:02:00 -05:00
2cae414473
Localisation updates from https://translatewiki.net .
2021-12-13 13:03:50 +01:00
1fe01c66fd
getCorePlugins.sh: Various improvements
...
* Factor out plugin query.
* Make idempotent.
* Improve logging.
* Install by symlinking to a parallel directory rather than cloning
into `etherpad-lite/node_modules`.
2021-12-11 02:01:35 -05:00
5915c2243d
checkPlugin: Redo README.md and LICENSE
2021-12-11 02:01:35 -05:00
d81546ad7b
checkPlugin: Delete Travis badge from README.md template
2021-12-11 02:01:35 -05:00
2c05de7033
checkPlugin: Update ESLint dependencies
2021-12-11 02:01:35 -05:00
3563fc1df9
checkPlugin: Relax repo checks
2021-12-11 02:01:35 -05:00
4716975c37
checkPlugin: Do case-sensitive filename checks
2021-12-11 02:01:35 -05:00
9a85bce212
checkPlugin: Only consider `README{,.md}` (case-insensitive)
...
This avoids false positives such as `README-foo.md`.
2021-12-11 02:01:35 -05:00
753d16af8a
checkPlugin: Promisify file system accesses
2021-12-11 02:01:35 -05:00
b50c6d07d4
checkPlugin: Improve readability of `files` assignment
2021-12-11 02:01:35 -05:00
b546867adb
checkPlugin: Replace `.indexOf()` with `.includes()`
2021-12-11 02:01:35 -05:00
34a4a74634
checkPlugin: Change `autocommit` to not push
2021-12-11 02:01:35 -05:00
48222449b5
checkPlugin: Add `frontend-tests.yml` GitHub workflow
2021-12-11 02:01:35 -05:00
51c530a3a0
checkPlugin: Compare entire file
2021-12-11 02:01:34 -05:00
f0669a8d31
checkPlugin: Automatically determine plugin name in `backend-tests.yml`
2021-12-11 02:01:34 -05:00
314b67b7fe
checkPlugin: Improve `eslintConfig`, `funding`, `scripts` checking
2021-12-11 02:01:34 -05:00
b7dce95802
checkPlugin: Use `updateDeps` to manage `engine`
2021-12-10 14:44:02 -05:00
f0ab112c2d
checkPlugin: Factor out duplicate file update logic and simplify
2021-12-10 14:44:02 -05:00
b7de4faf42
checkPlugin: Don't bump version if there are no changes
2021-12-10 14:44:01 -05:00
4d457f6296
ImportHandler: Pass `ImportError` to `import` hook
2021-12-10 02:34:13 -05:00
d1da8f1ebd
Localisation updates from https://translatewiki.net .
2021-12-09 13:03:48 +01:00
841bc10039
Localisation updates from https://translatewiki.net .
2021-12-06 13:03:04 +01:00
6cca27dea6
API: `getText` with old revision should only return text, not atext
...
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-12-05 18:50:39 -05:00
99fae2ec6e
pad: Fix application of `padOptions` values from `settings.json`
2021-12-04 23:06:17 -05:00
f8b4189bc4
pad: Always pass strings to pad option callbacks
2021-12-04 23:06:17 -05:00
8c857a85ac
pad: Use `null` as default for `userName`, `userColor` options
...
These options are used as strings, so it doesn't make sense to default
them to a boolean value.
Note that this change has no effect due to a bug in how pad options
are processed; that bug will be fixed in a future commit.
2021-12-04 23:06:16 -05:00
61b608e264
pad: Use `null` as default for `lang` option
...
It doesn't make sense to override the browser's language with `en-gb`
by default.
Note that this change has no effect due to a bug in how pad options
are processed; that bug will be fixed in a future commit.
2021-12-04 23:06:16 -05:00
7ff71cd41e
pad: Ignore `null` values in `padOptions` from `settings.json`
2021-12-04 23:06:16 -05:00
f4257a28ba
pad: Delete duplicate `decodeURIComponent()` calls
...
`URL.searchParams` already decodes the value.
Also delete some useless comments.
2021-12-04 23:06:09 -05:00
6beb5dcaf5
tests: Disable deprecation warnings when testing deprecated functions
2021-11-30 23:17:35 -05:00
c4f18a9b3a
padutils: Rename `warnWithStack()` to `warnDeprecated()`
...
This makes it more legitimate for tests to disable the warnings when
testing deprecated functionality.
2021-11-30 23:11:23 -05:00
a02e45499d
Use the new AttributeMap and Changeset APIs
2021-11-28 23:47:27 -05:00
f00b1ae89b
Merge branch 'master' into develop
2021-11-28 23:10:45 -05:00
142a47cbbc
Release v1.8.16
2021-11-28 23:03:58 -05:00
77bcb507b3
ImportEtherpad: Limit in-flight DB queries
2021-11-28 22:28:55 -05:00
5b3575acf0
ImportEtherpad: Use AttributePool to check attributes
2021-11-28 22:28:55 -05:00
19909eae53
ImportEtherpad: Rigorously check imported data
2021-11-28 22:28:55 -05:00
885ff3bcde
Pad: Move `padLoad` hook invocation to `PadManager.js`
...
This puts global state change logic with the rest of the global state
management logic. This also makes it possible to create temporary Pad
objects without triggering plugin actions.
2021-11-28 22:28:55 -05:00
f7d4abdabe
Pad: Inject the database dependency
2021-11-28 22:28:55 -05:00
7c870f8a58
Pad: Add strict validation checks
2021-11-28 22:28:55 -05:00
2608a81654
Changeset: Stricter validation checks
2021-11-28 22:28:55 -05:00
ad78b24113
ImportEtherpad: Warn about unsupported attrib at encounter
2021-11-28 22:28:55 -05:00
23f8a12922
ImportEtherpad: Don't make any changes if data is bad
2021-11-28 22:28:55 -05:00
a2e77a7128
ImportEtherpad: Enforce single-pad records
2021-11-28 22:28:54 -05:00
33778281b9
ImportEtherpad: Simplify attribute key iteration
2021-11-28 22:28:54 -05:00
00fc7c8e86
ImportEtherpad: Reject unknown DB records
2021-11-28 22:27:44 -05:00
8e9bc8d325
ImportEtherpad: Avoid false positives when checking apool
2021-11-28 19:00:44 -05:00
003e5cbd4b
ImportEtherpad: Fix DB key pad ID transformation
2021-11-28 19:00:44 -05:00
fea7948b05
ImportEtherpad: Fix author info processing
2021-11-28 19:00:44 -05:00
777d045246
GroupManager: Clean up any mappings when deleting a group
2021-11-28 14:06:47 +00:00
5b37a56197
GroupManager: Use `.setSub()` and parallel queries to avoid races
...
This also simplfies the code.
2021-11-27 22:20:03 -05:00
9d63700da0
SessionManager: Use `.setSub()` and parallel queries to avoid races
...
This also simplfies the code.
2021-11-27 22:20:03 -05:00
3070cee9ca
Delete group after removing it from the group list
2021-11-27 22:20:03 -05:00
09c9e32d72
Delete session after corresponding group2session and author2session
2021-11-27 22:20:03 -05:00
2f0561abc0
ImportEtherpad: Remove unnecessary variable
2021-11-25 18:39:07 -05:00
9bc90128cb
ImportEtherpad: Fix async logic
2021-11-25 18:39:07 -05:00
0983985dd5
easysync tests: Split into multiple files
2021-11-23 21:07:08 -05:00
617515bcbb
easysync tests: Group related tests
2021-11-23 21:07:08 -05:00
310444f5d3
easysync tests: Rename tests
2021-11-23 21:07:08 -05:00
ec3833ab66
easysync tests: Convert IIFE into a `describe()`
2021-11-23 21:07:08 -05:00
6a7b54313f
easysync tests: Move shared helper functions to the top
...
This will make it easier to split `easysync.js` into multiple files.
2021-11-23 21:07:08 -05:00
d3427240c6
tests: Serve all of `src/tests/frontend/`, not just specs
2021-11-23 21:07:07 -05:00
89fe40e080
Changeset: Migrate from `OpIter` to `deserializeOps()`
2021-11-23 01:21:49 -05:00
0eca0251f2
Changeset: Use a generator to implement `OpIter`
2021-11-23 01:21:49 -05:00
a4aec006dc
Changeset: Turn `opIterator()` into a real class
2021-11-23 01:21:12 -05:00
86959f7ebc
Changeset: Throw on unexpected chars while iterating ops
2021-11-23 01:21:12 -05:00
657492e191
Changeset: Turn `newOp()` into a real class
2021-11-23 01:21:12 -05:00
fba0bb6dff
Changeset: Turn `textLinesMutator()` into a real class
2021-11-23 01:21:12 -05:00
dab881139d
Pad: Fix `copyPadWithoutHistory` apool corruption bug
2021-11-22 18:40:22 -05:00
ed78b56079
tests: Refine `copyPadWithoutHistory` tests
2021-11-22 18:40:22 -05:00
d74dd235a4
Changeset: Replace `appendATextToAssembler()` with a generator
2021-11-22 18:10:37 -05:00
9e772df991
deps: Bump dependencies
2021-11-21 21:31:53 -05:00
Richard Hansen