1b613c84e9
Merge pull request #24007 from nextcloud/select-distinct-multiple
...
allow selecting multiple columns with SELECT DISTINCT
2020-11-19 22:39:01 +01:00
66013f906d
Merge pull request #24189 from nextcloud/enh/csp/frame-ancestors
...
Set frame-ancestors to none if none are filled
2020-11-18 11:29:28 +01:00
9163790b7c
Set frame-ancestors to none if none are filled
...
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-18 10:13:36 +01:00
72a9c35be3
Remove some IRouter methods
...
This is not the end. IRouter needs to burn.
But it is a start.
🎵 we didn't start the fire 🎵
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 14:08:20 +01:00
a61a757b85
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-16 15:45:17 +01:00
4d3cb1533e
Add unit tests for "validateExpirationDateInternal"
...
They were copied and adjusted as needed from the tests for
"validateExpirationDate".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 08:54:19 +01:00
baaaacd650
Add explicit time to test date for clarity
...
This shows in a clearer way that the expected expiration date is the
original one, but without time.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:34 +01:00
578b57837a
Add unit test for expiration date with date and with default
...
This adds back what was being actually tested in the unit test fixed in
the previous commit.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:34 +01:00
70018ddabf
Fix unit test for expiration date without date but with default
...
The expiration date was explicitly given, so it was not testing what it
should. Moreover, "link_defaultExpDays" needs to be mapped when testing
the default value (even if it will just fallback to the value of
"shareapi_expire_after_n_days").
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:32 +01:00
3a53c2b6e5
Fix unit test method name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:31 +01:00
e997f0fa46
Fix unit test for verifying enforced valid expiration date.
...
The enforced expiration date was not actually enabled, as for that
"shareapi_default_expire_date" needs to be explicitly set to "yes".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:31 +01:00
8f1fff40e8
Fix unit test for verifying enforced expire date too far in the future
...
The test should fail if no exception was thrown, and no exception was
thrown due to a missing configuration parameter. However, the use of
"addToAssertionCount(1)" made the test pass even if no exception was
thrown and, therefore, to silently fail.
Now the missing configuration parameter was added and the test will fail
if the expected exception is not thrown.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:29 +01:00
ec92e82571
Add unit tests to enforce a relaxed default share expiration date
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:28 +01:00
4dbeab5cff
Remove wrong and misleading comment
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:26 +01:00
72f51422ec
Remove extra spaces
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:25 +01:00
7cfa2701b9
Fix typo in variable name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:23 +01:00
c8dc51f0ba
Fix typos in method names
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:22 +01:00
42a033bbc4
Change to full class names for the encryption app DI in preparation of auto-wiring
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 21:30:45 +01:00
0c695d97ec
Fix unique key in test table
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 21:39:19 +01:00
61c767128c
Skip the insertIfNotExists() tests on Oracle because it doesn't work with clob
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:34:35 +01:00
74c0143001
Easier debugging and spell fix
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:34:35 +01:00
e313777cd6
Use a different column for the primary key as we can not insert it on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:34:35 +01:00
2050517d44
Add github action for oci8
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-10 15:34:35 +01:00
8027dcbc6f
Don't leave cursors open when tests fail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 12:28:17 +01:00
c07720de77
Use query builder instead of OC_DB in OC\Files\*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 09:05:15 +01:00
d25e5366b8
Merge pull request #23934 from nextcloud/enh/avoid_scss_compile
2020-11-07 10:11:50 +01:00
3e6e9186d8
Fix tests to return config default values
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-07 10:11:20 +01:00
659ea6ad79
Merge pull request #23851 from nextcloud/enh/read_env_only_once
...
Read the env variables only once
2020-11-06 22:35:00 +01:00
da1c2bdfe6
Fix repair mimetype step to not leave stray cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 10:33:59 +01:00
f7a2b71627
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 09:37:45 +01:00
ede7510854
Add a function to get the unread count for multiple objects in one go
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-04 11:01:21 +01:00
8d02ee9ac7
Merge pull request #21693 from nextcloud/fix/noid/import-certificates-only-by-system
...
Improve CertificateManager to not be user context dependent
2020-11-03 21:48:37 +01:00
f03bb4716b
Remove OCSResponse type hint - see #23827
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-03 10:43:32 +01:00
dc479aae2d
Improve CertificateManager to not be user context dependent
...
* removes the ability for users to import their own certificates (for external storage)
* reliably returns the same certificate bundles system wide (and not depending on the user context and available sessions)
The user specific certificates were broken in some cases anyways, as they are only loaded if the specific user is logged in and thus causing unexpected behavior for background jobs and other non-user triggered code paths.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-03 00:13:01 +01:00
fa6a790859
Remove deprecated OCSResponse
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-01 14:12:27 +01:00
de7026f6e4
use file name instead of path in 'not allowed to share' message
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-10-29 16:43:21 +01:00
7ed11b6dfa
Merge pull request #23765 from nextcloud/techdebt/noid/sudadmin-events-into-typed-events
...
Add typed events for adding and removing a subadmin
2020-10-29 11:18:01 +01:00
765ee60eea
Change tests to typed event listener
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 23:10:23 +01:00
6e35457fcc
Remove unused private ForwardEmitter and LegacyEmitter
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 22:23:39 +01:00
e4f53ff91b
Add typed events for adding and removing a subadmin
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 21:55:08 +01:00
cf1af5b83b
Merge pull request #23496 from lynn-stephenson/fix/related-key-issue
...
Fixes related key issue.
2020-10-27 20:23:07 +01:00
1f1244fdcc
Fix PHP CS
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-22 11:00:54 +02:00
8600e51df5
Fix manager creation and testing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-22 10:54:03 +02:00
766590d204
Merge pull request #23173 from nextcloud/feat/comments-sidebar-vue
2020-10-20 20:46:21 +02:00
6cd7549509
Bump @nextcloud/vue to 3.0.0
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-20 18:02:45 +02:00
4bc821edd9
PSR logger for accounts
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-20 17:41:47 +02:00
3e1916080a
Add ICommentsManager::load method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-20 14:39:28 +02:00
ffd76d05c9
Merge pull request #23374 from nextcloud/bugfix/noid/app-fetch-retry
...
Only retry fetching app store data once every 5 minutes in case it fails
2020-10-20 09:21:51 +02:00
2d175586b4
fix php-cs check fail(tests/lib/IntegrityCheck/CheckerTest.php)
...
Signed-off-by: ACTom <i@actom.me>
2020-10-18 00:38:57 +08:00
47ebcdff9e
fix Test\IntegrityCheck\CheckerTest tests fail
...
Signed-off-by: ACTom <i@actom.me>
2020-10-18 00:38:48 +08:00
4512c73293
Only retry fetching app store data once every 5 minutes in case it fails
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-16 14:32:58 +02:00
cce716f9f3
Clear cached app config while waiting for the SCSSCache to finish processing the file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 13:28:00 +02:00
a3bdb0c4cb
Implement unit tests for versions 1 and 2.
...
Signed-off-by: lynn-stephenson <lynn.stephenson@protonmail.com>
2020-10-15 21:23:24 -08:00
0ad4ad31e1
Fix more tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-13 08:16:17 +02:00
49ff48fcd3
Use PSR logger in authentication
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-12 22:07:04 +02:00
f5a52e941c
Overwrite also the new command bus name to execute them in sync in the tests
...
Followup to #23245
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-12 21:04:00 +02:00
91d445909a
Fix code style
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-12 14:54:51 +02:00
6a1f8fb3be
Fix typo 'shared'
2020-10-12 14:19:41 +02:00
3b82c6cc84
Merge pull request #23184 from nextcloud/bugfix/noid/make-sure-getUsersFavoritingObject-can-be-run-without-a-user
...
Make sure getUsersFavoritingObject can be run without a user
2020-10-07 13:08:02 +02:00
9f99f859a1
Make sure getUsersFavoritingObject can be run without a user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 16:49:23 +02:00
d9015a8c94
Format code to a single space around binary operators
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-05 20:25:24 +02:00
b976cd5535
Merge pull request #21821 from nextcloud/enh/bootstrap/initial_state
...
Bootstrap: add initial state registration
2020-10-04 11:09:18 +02:00
1896f37465
Merge pull request #22937 from nextcloud/enh/allow_configuring_token_auth_activity_interval
...
Allow configuring the activity update interval of token
2020-10-04 10:37:41 +02:00
f865a3a1c2
Move initial state provider to boostrap
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-04 09:35:33 +02:00
76a7600e2e
Allow configuring the activity update interval of token
...
On some systems with a lot of users this creates a lot of extra DB
writes.
Being able to increase this interval helps there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-04 09:31:41 +02:00
95a301ea57
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 10:37:18 +02:00
c25063dc07
Don't break when the IP is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-10 14:20:27 +02:00
cd563023db
Merge pull request #22657 from nextcloud/bugfix/noid/quota-trash-creation
...
Check if quota should be applied to path when creating directories
2020-09-09 17:37:28 +02:00
e6fca0a519
Fix code style
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-09 17:36:58 +02:00
74747163d6
Make sure tests cover the new mkdir behaviour on 0 quota
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-08 11:35:32 +02:00
adf100a42f
Fix undefined class property access after upgrade from 19 to 20
...
The serialized data in 19 has one property less and this was not
considered in the code. Hence adding a fallback. Moreover I'm changing
the deserialization into an array instead of object, as that is the
safer option.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-07 13:31:24 +02:00
e0ae37745a
Do not expose direct editing if no master key is available
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-01 11:40:27 +02:00
7b8364e001
Merge pull request #21288 from lmamane/master
...
Return correct loginname in credentials
2020-08-28 16:11:46 +02:00
a0cbf16d9b
In case the group backend returns $limit or more results it is expected to contain more results
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-21 13:14:32 +02:00
987f621173
Merge pull request #22331 from nextcloud/bugfix/noid/dont-use-deprecated-inigetwrapper
...
Don't use deprecated getIniWrapper() anymore
2020-08-20 19:45:47 +02:00
65b5e65185
Merge pull request #21529 from nextcloud/enh/encryption/improve_key_format
...
New SSE key format
2020-08-20 17:41:18 +02:00
590d461210
Remove unneeded import
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-20 16:53:34 +02:00
9e483ea949
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-20 16:35:38 +02:00
b09620651c
Don't use deprecated getIniWrapper() anymore
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-20 16:35:38 +02:00
2c8e7912f3
adapt testGetLoginCredentialsInvalidTokenLoginCredentials() unit test to uid != loginname
...
Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
2020-08-20 16:02:23 +02:00
5340ab3a75
New SSE key format
...
* Encrypt the keys with the instance secret
* Store them as json (so we can add other things if needed)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-08-20 15:42:43 +02:00
387cac4c5f
Properly inject IRouter into URLGenerator to properly encapsulate tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-19 22:00:47 +02:00
053ee7b386
Only load routes of the app which is requested
...
* Add fallback to load all routes if needed
* Move partial loaded routes test to proper place
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-19 21:58:20 +02:00
a9f22ac7b1
More test fixing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-19 12:40:25 +02:00
41d8a7e05f
Fix unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-19 11:20:36 +02:00
3a71155fc5
Fix activity tests again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-18 18:21:03 +02:00
5b26487f14
Expose status via Collaborators API
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-14 17:04:52 +02:00
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
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
16d83ab30a
Remove getLastJob from IJobList
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-13 21:50:06 +02:00
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
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
8fc877ff7d
Merge pull request #22117 from nextcloud/activity-settings-grouping
...
allow grouping of activity settings
2020-08-11 11:24:23 +02:00
45428e4948
Add config option to enable multibucket preview distribution
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-06 22:31:39 +02:00
159f28cd52
Mount the old previews in a separate folder for the multi bucket setup and check in them before using the actual locations
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-06 22:19:21 +02:00
519cd678ee
Merge pull request #22008 from elijahnyp/OCImage_Leak_Fix
...
Ensured large image is unloaded from memory when generating previews
2020-08-05 22:39:09 +02:00
227e362842
allow grouping of activity settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-05 16:13:03 +02:00
0fad921840
Add user-status app
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-07-31 16:45:27 +02:00
bab4fb98eb
Fix overwriteService() for apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-28 09:38:43 +02:00
56ed563b0c
fix memory leak caused by not destroying image in Preview/Generate.php
...
Signed-off-by: Elijah Martin-Merrill <elijah@nyp-itsours.com>
2020-07-27 10:52:44 -04:00
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
Robin Appelman
Daniel Calviño Sánchez
Joas Schilling
Julius Härtl
John Molakvoæ
John Molakvoæ (skjnldsv)
ACTom
lynn-stephenson
Robin Windey
Christoph Wurst
Lionel Elie Mamane
Georg Ehrke
Gary Kim
Elijah Martin-Merrill