Commit Graph

848 Commits

Author SHA1 Message Date
yflory
b9e221b92b Merge branch 'main' into staging 2024-05-17 11:04:03 +02:00
yflory
4483b848ff Fix http server issue with node >= v20.13.0 2024-05-16 16:58:39 +02:00
zuzanna-maria
9231bb7ab8 appconfig 2024-05-07 18:29:13 +01:00
yflory
baa9fec876 Improve plugins system 2024-05-07 16:52:01 +02:00
zuzanna-maria
4f9a7031d6 initial changes to admin panel 2024-05-07 14:14:06 +01:00
yflory
131d3e8b4d Update plugin capabilities and prepare OnlyOffice API 2024-04-30 18:13:52 +02:00
yflory
0604b708dc Only allow loading onlyoffice fonts + update nginx #1472 2024-04-17 15:12:27 +02:00
yflory
a3f80b60b0 Fix loading resources using sandbox domain from outer #1472 2024-04-17 14:50:32 +02:00
Wolfgang Ginolas
6ee22b28bd Remove duplicate args_isString 2024-04-05 08:35:01 +02:00
Wolfgang Ginolas
1f54b8b26d Tighten eslint rules 2024-04-05 08:35:01 +02:00
yflory
0add556537 Fix timestamp issues with support tickets 2024-03-28 12:45:20 +01:00
yflory
5c4fa0a6bb Fix server error log on fresh install 2024-03-26 16:50:10 +01:00
yflory
769a605193 Merge branch 'staging' into admin-support-sidebar 2024-03-21 15:59:54 +01:00
Wolfgang Ginolas
708a3689f1 Fix issues found in code review 2024-03-20 13:15:29 +01:00
Wolfgang Ginolas
49ad62c461 Disable OnlyOffice apps when it is not installed 2024-03-20 13:15:29 +01:00
yflory
53707f20be Merge branch 'admin-customize' into support2 2024-03-20 12:36:34 +01:00
yflory
0dcce94ef0 Add color customization and add updated logo to loading screen 2024-03-19 18:16:01 +01:00
yflory
944fb6392e Merge branch 'staging' into admin-customize 2024-03-15 16:39:54 +01:00
yflory
fc3620d2bb lint compliance 2024-03-15 16:39:24 +01:00
yflory
21025c317f Upload logo: fix issue and add button to restore default logo 2024-03-15 16:38:06 +01:00
yflory
056073983c Allow admin to upload a new logo for the instance 2024-03-15 16:09:23 +01:00
yflory
25098e20de lint compliance 2024-03-13 16:51:22 +01:00
yflory
6a050ad736 Merge branch 'staging' into support2 2024-03-13 16:38:49 +01:00
yflory
13f92370cb Merge branch 'produpdate' into staging 2024-03-13 16:33:50 +01:00
yflory
1c2dc2cbef lint compliance 2024-03-07 14:58:14 +01:00
yflory
b902f281d7 Don't log clean websocket disconnections 2024-03-07 12:11:36 +01:00
yflory
447a7e183c Use latest chainpad-server and its updated events 2024-03-07 10:58:25 +01:00
Wolfgang Ginolas
fdc86ab130 Remove jshint 2024-03-01 07:44:00 +01:00
Wolfgang Ginolas
158164fbbe Added eslint and ignored most of the warnings and fixed some 2024-03-01 07:44:00 +01:00
yflory
267ccaefdf New support: fix sharedworker issue 2024-02-27 18:34:48 +01:00
yflory
0c156972bc New support: provide moderators unsafeKey 2024-02-27 18:04:42 +01:00
yflory
6f96127fcd Fix previous commit 2024-02-27 18:01:48 +01:00
yflory
dacb91e81c New support: fixes 2024-02-27 18:00:23 +01:00
yflory
d525852a8f New support: lint compliance and clean XXX 2024-02-27 17:17:45 +01:00
yflory
a62dc7cfae New support: key rotation part 2 2024-02-27 16:52:30 +01:00
yflory
20dd15b99d New support: rotate keys 2024-02-26 19:07:39 +01:00
yflory
dcc6f689fb lint compliance 2024-02-26 13:41:18 +01:00
yflory
757f30d4a1 New support: add moderator role 2024-02-22 18:46:26 +01:00
yflory
a67b1ea7cc New support: disable quota for the support pin log 2024-02-22 15:48:34 +01:00
yflory
1879fd2226 Add configurable server option to log user address (off by default) 2024-02-19 18:15:05 +01:00
yflory
070d8dc450 Support V2 prototype 2024-02-12 14:30:33 +01:00
yflory
93a285baa5 Fix consecutive separators in user menu #1402 2024-02-07 12:25:20 +01:00
David Benque
fe036f88e8 Fix REUSE compliance 2024-01-30 11:48:49 +00:00
yflory
605d75f091 Fix server crash with user directory 2024-01-30 12:28:29 +01:00
yflory
b42fbe7bc7
Merge pull request #1395 from cryptpad/invitations
Instance invitations and user directory
2024-01-29 17:44:40 +01:00
yflory
79caca130b
Merge pull request #1295 from cryptpad/drawio-image
Drawio image
2024-01-29 17:29:33 +01:00
yflory
ebcbf4570e Remove custom HTTP headers for diagrams 2024-01-29 16:15:56 +01:00
yflory
3c3a797be5 Use invitation and add known user even when registration is open 2024-01-25 15:46:35 +01:00
yflory
2ac4995146 Merge branch 'staging' into invitations 2024-01-18 16:35:41 +01:00
yflory
986b05fdfe Add ability to update known user name and email 2024-01-18 16:32:06 +01:00
yflory
044dff4108 Add email field for invitations and store by default 2024-01-18 15:46:35 +01:00
yflory
d92636bcf8 Fix DRY_RUN issue 2024-01-09 15:09:41 +01:00
yflory
ff3a40aa31 Fix TypeError 2024-01-08 19:11:20 +01:00
yflory
467e8ee7fe Use ctime to detect deletable archived blobs 2024-01-08 14:41:00 +01:00
yflory
b22441446c Fix eviction error and add DRY_RUN to the archive cleaning script 2024-01-08 14:12:04 +01:00
yflory
70d84838df Add DRY_RUN option to the eviction script 2024-01-08 14:08:26 +01:00
yflory
0e918643ce Check if a blob exists before creating the activity file 2024-01-05 17:46:04 +01:00
yflory
31b9bbf796 Support activity and placeholder in eviction script 2024-01-05 17:40:20 +01:00
yflory
a5103bc21b Account deletion for known users and fix UI 2024-01-04 18:34:13 +01:00
Wolfgang Ginolas
a96856bb3d Allow loading diagram images from Nextcloud
https://github.com/cryptpad/cryptpad/issues/1297
2023-12-22 09:00:59 +01:00
yflory
a3f9b2eceb Store user data for new SSO accounts (configurable) 2023-12-20 17:24:14 +01:00
yflory
e65baebadc Restrict SSO registration 2023-12-19 17:59:56 +01:00
yflory
e52d9f77c1 Merge branch 'staging' into invitations 2023-12-19 15:03:40 +01:00
David Benque
06f4b8e590 Add licensing information to new files 2023-12-19 11:38:26 +00:00
yflory
4c81c95a94 Remove missing SSO config log 2023-12-18 15:53:43 +01:00
yflory
30d956b52f Fix ws proxy issue with :: as httpAddress 2023-12-18 15:47:10 +01:00
yflory
568bff357e Fix server error 2023-12-18 10:08:52 +01:00
yflory
9b00a6e9d4 Merge branch '5.6-rc' of github.com:cryptpad/cryptpad into 5.6-rc 2023-12-15 16:07:22 +01:00
yflory
576e713d70 Add plugins directory 2023-12-15 15:39:12 +01:00
David Benque
9cd86d03a4 REUSE lint compliance 2023-12-15 15:38:01 +01:00
yflory
7ba29238b2 Merge branch 'forcemfa' into staging 2023-12-13 15:21:54 +01:00
yflory
df6b0a0e98 Merge branch 'authsso' into staging 2023-12-13 15:14:31 +01:00
yflory
641f224c71 Fix lost functions in Env in HTTP workers 2023-12-12 17:04:01 +01:00
yflory
7893031689
Merge pull request #1334 from cryptpad/clean-comments
Clean old // XXX comments
2023-12-12 16:33:58 +01:00
yflory
471b55460b Enforce max expiration time serverside 2023-12-12 16:32:55 +01:00
yflory
199dcc8c62 Merge branch 'staging' into authsso 2023-12-11 16:46:11 +01:00
yflory
ac090767ca Add admin panel option to enforce MFA 2023-12-11 16:40:05 +01:00
yflory
542111843a Merge branch 'staging' into forcemfa 2023-12-11 16:30:22 +01:00
yflory
e2dd7f6305 Merge branch 'authsso' into forcemfa 2023-12-11 16:30:18 +01:00
David Benque
fde1edd508 Clean old // XXX comments
- either removed or changed the comment type
2023-12-08 15:10:19 +00:00
Wolfgang Ginolas
d42539b3b2 Merge remote-tracking branch 'origin/staging' into drawio-image 2023-12-06 09:08:32 +01:00
yflory
23a799d960 Fix missing plugin functions in HTTP workers 2023-12-05 17:10:59 +01:00
yflory
5d801a00fc Remove incorrect error logs 2023-12-05 16:14:59 +01:00
yflory
f506e5a8cf Instance invitation and user management prototype 2023-12-01 15:44:20 +01:00
yflory
223dc9394b New plugin structure 2023-11-17 17:19:04 +01:00
yflory
982c15ae0e Add an option to enforce MFA for all accounts on the instance 2023-11-09 15:35:56 +01:00
yflory
72cb827e18 Make MFA session expiration configurable 2023-11-08 15:58:28 +01:00
yflory
046e7abeb8 option to enforce CryptPad password for SSO accounts 2023-11-07 16:02:27 +01:00
yflory
61b3ea50ce Merge branch 'staging' into authsso 2023-11-06 16:45:06 +01:00
yflory
ed97d28528 Make SSO plugin optional 2023-11-06 16:27:52 +01:00
Wolfgang Ginolas
7f55498bcc Update draw.io dependency and remove unneeded CSP headers 2023-11-01 09:19:46 +01:00
Wolfgang Ginolas
304fc6e970 Upgrade draw.io to 21.7.5 2023-11-01 09:19:45 +01:00
yflory
77e600ce80 Add signing certificate to SAML auth 2023-10-30 17:14:27 +01:00
yflory
7d3f67cd86 SSO + OTP account deletion and password change 2023-10-26 17:55:54 +02:00
yflory
49f6b69db5 SAML SSO login/registration 2023-10-20 18:20:31 +02:00
David Benque
8f0a6319a5 Apply headers 2023-10-20 15:35:26 +01:00
yflory
9b367a0468 SSO SAML test 2023-10-18 18:20:49 +02:00
yflory
e8d719c438 Fix OIDC sso issues 2023-10-18 15:39:54 +02:00
yflory
6e50b9d9dc Fix HPM error proxy websocket to undefined 2023-10-17 11:50:02 +02:00
Wolfgang Ginolas
13badd7ce4 Use correct mime type for .wasm files
https://github.com/cryptpad/cryptpad/issues/1277
2023-10-16 09:42:47 +02:00
yflory
37008242e2 Merge branch 'main' into authsso 2023-10-12 14:56:04 +02:00
yflory
16115de950 Fix expire channel task 2023-10-05 20:37:59 +02:00
yflory
d6a60075cd Fix DrawIO hash 2023-10-03 11:40:55 +02:00
yflory
d68dde07a9 Remove translation XXX 2023-09-28 18:33:03 +02:00
yflory
ef92d9217c Merge branch 'moderation' into staging 2023-09-28 17:56:46 +02:00
yflory
fd90827da9 Merge branch 'accessibility' into staging 2023-09-28 17:55:34 +02:00
yflory
30743c295a Bypass placeholder when removing a pad password 2023-09-28 14:57:45 +02:00
yflory
bc9a335e76 Lint compliance 2023-09-19 15:06:54 +02:00
yflory
f282db9121 Add new placeholder data and account script to admin panel 2023-09-14 17:49:16 +02:00
yflory
399d50e941 Clean unnecessary error log 2023-09-13 17:46:00 +02:00
yflory
235d5594f7 Detect placeholder when reading metadata 2023-09-13 16:54:05 +02:00
yflory
f69dcbdda9 Fix 'Unhandled RPC' log with isNewChannel 2023-09-13 14:48:16 +02:00
yflory
2c12ff5d72 Merge branch 'staging' into moderation 2023-09-11 12:08:07 +02:00
yflory
a0e59dd65b Fix form responses deletion #1239 2023-09-11 11:55:26 +02:00
yflory
975a177cbb Add UI/UX when reading a placeholder 2023-09-08 18:10:02 +02:00
yflory
91af47994b Placeholder on file deletion 2023-09-07 17:03:20 +02:00
yflory
dda4b8777c Add drive channel metadata to the pin log 2023-09-06 17:15:00 +02:00
yflory
708e36b3ee New admin command to archive an account 2023-09-05 16:31:04 +02:00
yflory
fde6f15270 Fix headers added by node for the recommended config 2023-09-05 13:01:41 +02:00
yflory
920c307608 Fix websocket issue with some dev instances 2023-09-04 12:10:48 +02:00
yflory
c09e191a16 Blob activity archive 2023-08-30 15:59:15 +02:00
yflory
27b9c9bac3 Update blob activity when loaded 2023-08-29 17:50:39 +02:00
yflory
9be21c21c4 WIP blob metadata 2023-08-29 15:19:34 +02:00
yflory
31a5cbafdb Fix typo 2023-08-23 10:59:02 +02:00
yflory
ce572e813e Update eviction script 2023-08-23 10:57:11 +02:00
yflory
cddfc7b5a1 Merge branch '541-rc' of github.com:cryptpad/cryptpad into 541-rc 2023-08-22 15:48:53 +02:00
yflory
395a1ebf5a Fix broadcast settings not applied instantly #1189 2023-08-22 15:48:43 +02:00
Wolfgang Ginolas
58331b067d Fix collaboration of Nextcloud integration 2023-08-22 13:31:29 +02:00
yflory
75cd470fb1 Fix checkup test when registration is restricted #1185 2023-08-21 16:42:04 +02:00
yflory
5807b4dddf Reduce memory usage for the eviction script 2023-08-21 12:45:18 +02:00
yflory
650e4c42ca Fix websocket only binds to localhost #1182 2023-08-18 10:40:35 +02:00
yflory
867efea83b Fix CSP headers mismatch between node and Nginx 2023-08-17 16:10:39 +02:00
yflory
cf17b6924a Fix typo in regex when listing channels 2023-07-20 16:28:31 +02:00
yflory
a70800f928 Remove false positive server error log on page reload 2023-07-13 14:49:07 +02:00
yflory
deb14c412f Fix XXX 2023-07-13 14:12:47 +02:00
yflory
b11333e7a0 lint compliance 2023-07-11 10:35:44 +02:00
yflory
c10fc37645 Merge branch 'totp-ui' into 5.4-rc 2023-07-11 10:30:36 +02:00
yflory
d1d26571cf SSO: fix issue with missing config 2023-07-02 12:04:21 +03:00
yflory
d6bf625733 SSO: prototype improvements 2023-06-29 12:32:45 +02:00
Wolfgang Ginolas
6f76972c47 Upgrade drawio to 21.5.2
https://github.com/jgraph/drawio/issues/3691
2023-06-29 10:23:49 +02:00
yflory
b93b5eae4e SSO: OIDC login and register 2023-06-27 16:04:32 +02:00
yflory
0c94c1a602 Merge branch 'totp-ui' into authsso 2023-06-23 19:07:11 +02:00
yflory
18d6ccdfd3 SSO: OIDC auth 2023-06-23 19:06:29 +02:00
yflory
da5626cbae TOTP: Use session token instead of JWT to prepare for SSO 2023-06-23 18:35:18 +02:00
Wolfgang Ginolas
f7d56eea16 Rename drawio to digram
https://github.com/cryptpad/cryptpad/issues/1062
2023-06-22 14:59:13 +02:00
Wolfgang Ginolas
b5c0cada55 Update draw.io script hashes 2023-06-22 14:39:06 +02:00
Wolfgang Ginolas
17e6d24de4 Use hashes instead of unsafe-eval to secure drawio 2023-06-22 14:39:06 +02:00
Wolfgang Ginolas
67362fc2b9 Remove unsave-eval from draw.ios CSP 2023-06-22 14:39:06 +02:00
yflory
2be39c3749 API: reload content on server restart 2023-06-22 14:39:04 +02:00
yflory
723ecc8bd6 Integration API prototype 2023-06-22 14:39:04 +02:00
yflory
9aac9d1c2f TOTP: Use HTTP challenges to write and remove blocks 2023-06-09 15:06:17 +02:00
yflory
b3a620edc0 lint compliance 2023-06-06 16:09:17 +02:00
yflory
36a1c604d8 Auth: Disable TOTP/MFA from the admin panel 2023-05-16 15:11:43 +02:00
Mathilde Grünig
f5fb24031e replace xwiki-labs by cryptpad 2023-05-16 14:54:39 +02:00
yflory
e893613b43 TOTP: recovery by secret key 2023-05-15 17:33:58 +02:00
yflory
d789627920 TOTP setup and revocation in settings 2023-05-12 18:21:19 +02:00
ansuz
bd19288869 notes on pending improvements to add before merge/release 2023-05-11 16:42:47 +05:30
ansuz
f82c877cbe serialize possible errors 2023-05-07 12:17:28 +05:30
ansuz
921c46956d fix a type error by ensuring Env.Log is defined 2023-05-06 20:42:11 +05:30
ansuz
493bf1346c Merge tag '5.3.0' into 5.3-auth 2023-05-06 15:26:21 +05:30
ansuz
31dc7b523a XXXs and TODOs for handling blocks now that 2FA is in play 2023-05-05 18:20:51 +05:30
ansuz
06232ab6d7 overwriting basic storage should fail with an error 2023-05-05 18:18:46 +05:30
ansuz
41e870d3db serverside protocol work for authentication enforcement and configuration 2023-05-05 18:17:58 +05:30
ansuz
b753a067ac avoid logging for common 404s 2023-05-03 16:32:09 +05:30
ansuz
e895990426 generate a secret at launch time
used for issuing and validating JWTs
2023-05-03 16:19:01 +05:30
ansuz
3c6a35b713 new types of storage for challenges, MFA settings, and sessions 2023-05-02 23:42:09 +05:30
yflory
7b03df37f7 Merge remote-tracking branch 'origin/deprecatedcache' into staging 2023-04-24 14:52:56 +02:00
yflory
6b743a787c Fix mailbox message deletion 2023-03-28 12:19:16 +02:00
ansuz
cbaff2f3c0 Merge branch 'soon' into staging 2023-03-07 15:34:00 +05:30
ansuz
b5a01231b7 Merge branch '5.3-storage' into merge-storage 2023-03-07 14:49:28 +05:30
ansuz
d231451b49 Merge branch 'http-workers' into merge-storage 2023-03-07 14:49:22 +05:30
ansuz
d8ef2c8371 print login block size when it exceeds the maximum 2023-03-07 13:30:30 +05:30
ansuz
64d24f8b20 clean up http-worker code and add comments 2023-03-07 11:17:46 +05:30
ansuz
8fce5bcaf6 use configured http ports 2023-03-02 12:45:38 +05:30
ansuz
b003d4d825 Merge branch 'staging' into http-workers 2023-03-02 11:59:58 +05:30
ansuz
6bb336034b Merge branch 'staging' into 5.3-storage 2023-03-02 10:53:05 +05:30
ansuz
47afa26fc5 Merge branch 'soon' into 5.3-storage 2023-02-09 16:16:26 +05:30
yflory
f4b477ee37 Clean XXX 2023-02-01 18:02:03 +01:00
ansuz
7b65d3e8c8 judge blob activity based on mtime instead of atime
and output a basic overview when eviction completes
2023-01-23 08:29:36 +05:30
ansuz
c7dedf4054 more logging for potentially long-running eviction processes 2023-01-19 10:14:22 +05:30
ansuz
0bf26588e5 Merge branch 'soon' into 5.3-storage 2023-01-19 09:57:16 +05:30
ansuz
15272a6604 relocate blobs that have been archived to the wrong location 2023-01-19 08:57:39 +05:30
ansuz
911c15df25 fix incorrectly constructed archival path for blobs 2023-01-19 08:56:32 +05:30
yflory
a0714b9cc8 Prevent type error with the new admin script 2023-01-12 15:54:16 +01:00
ansuz
b0d10c3777 oops - fix inverted not 2023-01-11 15:08:16 +05:30
ansuz
3f18a38714 report http-worker RPC errors to the main process for logging 2023-01-11 15:02:02 +05:30
ansuz
4968bbf961 WIP limit on block size 2023-01-11 14:50:16 +05:30
ansuz
96de4dffe9 fix an inverted not in a non-functional telemetry attribute 2023-01-11 13:03:10 +05:30
yflory
1971553e1f Flush cache when adding new admin 2022-12-20 17:25:54 +01:00
yflory
598e2fff27 Add priority to channels 2022-12-20 16:58:48 +01:00
yflory
70e602d9c9 Prototype install app 2022-12-20 16:57:51 +01:00
ansuz
953c817c5b clean up more prototype code:
* remove commented code
* serialize errors sent from http workers to the main process
* drop support for custom http headers set via config.js#httpHeaders
* websockets: only listen on localhost, respect websocketPort config in workers' proxy config
2022-12-20 18:03:52 +05:30
ansuz
24274e6c9b remove some prototyping code that was overwriting values in responses to http-workers 2022-12-20 17:10:10 +05:30
ansuz
7e4518b43d More server cleanup:
* make the websocket port configurable
* reorder some tasks at launch time to use more consistent logging
* relaunch http workers if they crash
* refuse to launch if httpUnsafeOrigin cannot be parsed as a URL
* fix a path issue reintroduced by a git merge
2022-12-20 16:29:38 +05:30
ansuz
d58096636a Merge tag '5.2.0' into test-merge 2022-12-20 14:49:47 +05:30
ansuz
6f19101f42 big server changes:
* use the nodejs cluster module to handle http traffic with multiple threads
* listen for websocket traffic on a new port because all such logic needs to share state
* proxy websocket URLs from the cluster to the new port so everything is backwards compatible
* implement logic for http workers to make requests and stay in sync with the main process
* unrelated: define the expected nodejs version in a constant
2022-12-20 14:20:59 +05:30
yflory
d39d64626d Fix deprecated cache issue 2022-12-16 15:12:19 +01:00
yflory
9a6455759f Merge branch 'staging' into deprecatedcache 2022-12-16 15:04:14 +01:00
yflory
600771682a Allow edit/delete/multiple answers without a drive and fix race condition 2022-12-08 16:53:29 +01:00
ansuz
ed981f2b63 generalize recommended version code for easier updates 2022-12-07 13:09:24 +05:30