Commit Graph

54934 Commits

Author SHA1 Message Date
Morris Jobke b13aa660c9
Merge pull request #22243 from nextcloud/fix/20490/no_session_duplicate_warnings
Silence duplicate session warnings
2020-08-14 09:22:24 +02:00
dependabot-preview[bot] bc19168719
Merge pull request #22198 from nextcloud/dependabot/npm_and_yarn/vue-router-3.4.3 2020-08-14 06:02:44 +00:00
Julius Härtl 00e62171d2
Test for locking state in key generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-14 07:58:41 +02:00
Julius Härtl 36cfdd320b
Harden key generation
There might be cases where multiple requests trigger the key generation
at the same time and the instance ends up with a non-fitting
public/private key pair. Therefore the whole key generation should be
locked. Other than that this makes sure that user key generation return
values are properly validated.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-14 07:58:40 +02:00
dependabot-preview[bot] 4e2c4c4ac6 Bump vue-router from 3.3.4 to 3.4.3
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.3.4 to 3.4.3.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.3.4...v3.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-08-14 05:31:29 +00:00
Roeland Jago Douma f1dd87dc50
Merge pull request #22200 from cweiske/duplicated-sql-where-line
Remove duplicated SQL addWhere line
2020-08-14 05:43:42 +02:00
Roeland Jago Douma 8daaf33e3d
Silence duplicate session warnings
Fixes #20490

Basically restroring the old behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-08-14 05:23:11 +02:00
Nextcloud bot 9bd58553db
[tx-robot] updated from transifex 2020-08-14 02:31:59 +00:00
Gary Kim 5559570faf
Merge pull request #22242 from nextcloud/techdebt/noid/remove-deprecated-methods
Remove deprecated and unused method calls
2020-08-14 10:10:53 +08:00
Morris Jobke 75c659cfbc
Merge pull request #20451 from exussum12/AllowPreviewWhenGeneratorHasBeenRemoved
Always try and show pre rendered preview
2020-08-13 23:49:56 +02:00
Morris Jobke 8e249569af
Fix existing test and add a specific one for the new case
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 23:24:21 +02:00
Scott Dutton b12a390220
Always try and show pre rendered preview
Currently if the following situation happens

Server generates preview
Server has command removed which allows a preview to be shown
Client asks for preview, gets a 404 error when preview exists
(Mime checked before preview)

This happens more often with documents, or video as the commands are not
native PHP, they require a binary on the server.

After the fix the following would happen

Server generates preview
Server has command removed which allows a preview to be shown
Client asks for preview, gets preview which has been generated
(Mime checked after preview)

This would also allow offline generation (for example a docker image
containing the extra binaries), allowing a reduction in attack surface
of the instance serving the preview data.

Signed-off-by: Scott Dutton <scott@exussum.co.uk>
2020-08-13 22:50:38 +02:00
Morris Jobke 16d83ab30a
Remove getLastJob from IJobList
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 21:50:06 +02:00
Morris Jobke afd52c6b12
Remove setCustomJs of the files_external FrontendDefinitionTrait
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 21:49:50 +02:00
Morris Jobke e9f5c7f649
Merge pull request #22128 from nextcloud/bugfix/noid/cleanup-chunks-on-failure
Delete chunks if the move on an upload failed
2020-08-13 20:47:08 +02:00
Georg Ehrke ee23906c3c
Allow writing empty content to new file
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-13 15:41:26 +02:00
Julius Härtl 6722246aca
Return proper status when file didn't exist before
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-13 15:26:42 +02:00
Morris Jobke ed46115593
Merge pull request #22235 from nextcloud/fix/22217/fix-naming-of-app-config-option
Fix name of app config option to properly reflect what it does
2020-08-13 14:49:01 +02:00
Morris Jobke 93ba8faabc
Fix name of app config option to properly reflect what it does
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 13:34:31 +02:00
Morris Jobke 89f92e3c22
Merge pull request #22229 from nextcloud/bugfix/noid/dashboard-outdated-bundles
Bump outdated dashboard bundles
2020-08-13 10:58:54 +02:00
Morris Jobke 0b856329eb
Merge pull request #22202 from nextcloud/enh/noid/cleanup-servercontainer
Use autowiring where possible in server container
2020-08-13 10:55:48 +02:00
Julius Härtl ac95e069c4
Bump outdated dashboard bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-13 10:10:40 +02:00
Roeland Jago Douma 34cd49827c
Merge pull request #21788 from nextcloud/debt/noid/unused-method
Remove unused method uploadFile
2020-08-13 09:40:38 +02:00
Morris Jobke 3c56922444
Merge pull request #22205 from nextcloud/activity-settings-cleanup
merge file activity settings into a single 'favorite changed' item
2020-08-13 08:15:06 +02:00
Daniel Kesselberg ba3a855ad8
Remove unused method uploadFile
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-13 08:02:28 +02:00
Morris Jobke df4bcd616f
Add @deprecated labels for server DI containter aliases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 07:43:37 +02:00
Morris Jobke 725fecee34
Merge pull request #21344 from nextcloud/fix/twofactor-cleanup-event
Emit an event for every disabled 2FA provider during cleanup
2020-08-13 07:25:01 +02:00
Morris Jobke 894640206e
Use registerDeprecatedAlias for non-namespaced aliases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 05:43:38 +02:00
Morris Jobke 2f2252cfba
Use autowiring where possible in server container
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 05:43:36 +02:00
Nextcloud bot 3a39f2ae91
[tx-robot] updated from transifex 2020-08-13 02:16:38 +00:00
Robin Appelman 5f58cefbd7
merge file activity settings into a single 'favorite changed' item
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-13 00:01:34 +02:00
Robin Appelman a11769e0e3
move share notifcation settings to files group
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-13 00:01:30 +02:00
Morris Jobke f49de1d775
Merge pull request #22206 from nextcloud/enh/noid/tests-recent-contact-mapper
Add some tests for RecentContactMapper
2020-08-12 21:09:18 +02:00
Morris Jobke 6ca359a745
Merge pull request #22217 from nextcloud/enh/noid/disable-admin-changed-email-appconfig
Add app config option to disable "Email was changed by admin" email
2020-08-12 16:46:00 +02:00
Arthur Schiwon 44cad1756c
provide event class to LDAP loaded event to fix deprecation message
* and also dispatch the typed event as current approach to it

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-08-12 15:38:47 +02:00
Morris Jobke 55e79b8a6a
Merge pull request #22199 from nextcloud/techdebt/noid/PHPUnit_Framework_MockObject_MockObject
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to …
2020-08-12 13:55:36 +02:00
Morris Jobke 234b510652
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-12 13:55:19 +02:00
Morris Jobke 53fab3fe5f
Add app config option to disable "Email was changed by admin" email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-12 12:27:43 +02:00
Daniel Kesselberg 1fc1376175
Add some tests for RecentContactMapper
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-12 12:16:25 +02:00
blizzz 4c1f13c569
Merge pull request #22211 from nextcloud/fix/noid/rm-useless-log
remove logging message carrying no valuable information
2020-08-12 09:15:44 +00:00
Arthur Schiwon 5257efc5f2
remove logging message carrying no valuable information
the exception caught is not an error, but due to valid configuration and
code flow is expecting this. For an admin it is confusing, and it carries
no information worth for debugging.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-08-12 09:10:23 +02:00
Morris Jobke 15d70859e6
Merge pull request #22196 from nextcloud/enh/sse/do_not_concatenate_ints
SSE enhancement of file signature
2020-08-12 09:09:04 +02:00
Julius Härtl cda5cfc01e
Adjust chunking test for non-existing target node
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-12 08:18:46 +02:00
Julius Härtl 860f6d8fcf
Delete chunks if the move on an upload failed
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-12 08:18:46 +02:00
Nextcloud bot ad6a4219a2
[tx-robot] updated from transifex 2020-08-12 02:16:50 +00:00
blizzz 88fcc05e4f
Merge pull request #21559 from nextcloud/fix/noid/ldap-group-shortcut-ad
shortcut in reading nested group members when IN_CHAIN is available
2020-08-11 22:22:37 +00:00
Morris Jobke 138f47a1b9
Merge pull request #22162 from nextcloud/enh/noid/password-generator-sharebymail
ShareByMail: Migrate to GenerateSecurePasswordEvent
2020-08-11 21:59:21 +02:00
Daniel Kesselberg 4dd507675c
Generate password by password_policy app
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-11 21:58:51 +02:00
Christian Weiske ebe7081c2b Remove duplicated SQL addWhere line 2020-08-11 21:35:48 +02:00
Jan C. Borchardt 50fdd45e9b
Merge pull request #22143 from nextcloud/design/dashboard-design
Dashboard design enhancements
2020-08-11 19:37:14 +02:00