wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
46970 commits 157 branches 562 tags 714 MiB
Commit graph

695 commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv)
8c69d783e0
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:35:42 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
4a1cbefc90
Fix files_sharing tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Joas Schilling
bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
Roeland Jago Douma
1e7b20f615
Remove IAppConfig::setValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:57 +01:00
Morris Jobke
55532f19d9
Cleanup OC_User and OCP\User 
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 18:39:11 +01:00
Daniel Calviño Sánchez
b70b38ce31 Fix constructor spy in unit test with Sinon 4.1.3 
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-12-08 21:26:45 +01:00
Arthur Schiwon
077381c7b3
rip out obsolete recipientsDisplayName 
also needs tests adjustements, and this also brings in natural sorting

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:14 +01:00
Arthur Schiwon
9d95391ff1
adjust tests and apply sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:13 +01:00
Robin Appelman
56fd462718
Use the correct root for shared jail when the source storage is also a jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-10 17:03:27 +01:00
Morris Jobke
31c5c2a592
Change @georgehrke's email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 20:38:59 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Jan-Christoph Borchardt
4a3893b105
Merge pull request #6094 from nextcloud/sharedby-avatar 
Show avatar instead of username for shared files
 2017-11-02 14:51:17 +01:00
Arthur Schiwon
222d99fe96
adjust more js unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-02 13:51:08 +01:00
Arthur Schiwon
e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Arthur Schiwon
20e7a0c07b
fix sharerecipientssorter tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 16:03:37 +02:00
Morris Jobke
c733cdaa65
Use ::class in test mocks of encryption app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 13:56:56 +02:00
Morris Jobke
ab36980d20
Use ::class in test mocks of dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 10:16:12 +02:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Morris Jobke
f884e762bc
Use appmanager instead of OC_App for check for enabled app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:31:17 +02:00
Arthur Schiwon
8722458d2a
ensure that sorting is stable 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
fd6daf8d19
AutoCompletion backend 
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:32 +02:00
blizzz
2d62f97f1b Merge pull request #6328 from nextcloud/split-sharees-api-logic 
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
 2017-10-04 15:43:44 +02:00
Arthur Schiwon
c43685e6fc
shareeAPIController unit test clean up and last fixes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
f2c8e1ed2f
remove unused method 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
a7a651f4a4
move splitUserRemote unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
3888b3a285
adapt unit test for ensuring exception 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
a28b1d91f9
split off former searchSharee unit test 
also moves registering default plugins to Server for proper unit testing

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
4a315ede81
adjust ShareeAPIController invalid-input search unit test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
38ff7eaece
adjust ShareeAPIController search test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
3d1d03a511
split off getEmail tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
c92f7ee767
split off getRemote unit tests 
adds two small fixes → they actually work \o/

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
b35760de27
split off getGroups unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
dd9e191d37
split off getUsers unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Roeland Jago Douma
05c37526a7
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 21:44:42 +02:00
Morris Jobke
7eba0a2720
Fix comment 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-21 20:10:36 +02:00
Roeland Jago Douma
6e7865d05b
Update to new test case 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-16 21:23:32 +02:00
Morris Jobke
a55e794bfd Cleanup unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 14:29:26 +02:00
Morris Jobke
cf7c4a4439 Merge pull request #6123 from nextcloud/cleanup-shareItem 
Cleanup usage of shareItem in internal code base
 2017-08-15 13:57:00 +02:00
Morris Jobke
8366dfa50b Cleanup usage of shareItem in internal code base 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:57:18 +02:00
Morris Jobke
895b9c2309 Use proper methods for registerBackend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:29:15 +02:00
Morris Jobke
f640b56bfa Cleanup unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 10:09:47 +02:00
Roeland Jago Douma
685f272212
Add unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 16:25:58 +02:00
Roeland Jago Douma
c81e79f8b9
Fix files_sharing CacheTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 16:15:27 +02:00
Roeland Jago Douma
6d4731024a
Some app fixes of phpstorm inspections 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:42:07 +02:00
Bjoern Schiessle
c46b158e10
update sharing test to new master key default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:12 +02:00
Jan-Christoph Borchardt
fd63577089 Improve wording of various error messages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-21 14:51:59 -05:00
Joas Schilling
f28511cac6
Add unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-14 15:32:34 +02:00
Joas Schilling
643b4a4ec4
Move the file sharing app to migration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:38:48 +02:00
Vincent Petry
17a31a51c6
Fix share indicator handling 
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
 2017-04-26 13:38:12 +02:00
Roeland Jago Douma
e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems 
Fix unit test problems
 2017-04-21 09:35:01 +02:00
Morris Jobke
f5b900b654 Merge pull request #4412 from individual-it/master 
deleted forgotten code in test
 2017-04-20 18:04:32 -05:00
Artur Neumann
faf55adb90 deleted forgotten code in test 
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-20 22:27:51 +05:45
Joas Schilling
a0ada9aab4
Don't use deprecated getMock() anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:30:21 +02:00
Joas Schilling
b469882595 Merge pull request #4212 from individual-it/master 
validate file name before uploading in upload only folder
 2017-04-20 10:50:56 +02:00
Artur Neumann
bf58d24b5c remove accidently left over *f*it 
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-18 20:53:49 +05:45
Artur Neumann
88f02f27a3 JS tests for upload only function 
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-18 20:43:25 +05:45
Lukas Reschke
727688ebd9
Adjust existing bruteforce protection code 
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-14 13:42:40 +02:00
Morris Jobke
ec034757fa Merge pull request #4337 from nextcloud/fix-adblock-share-icon 
Fix AdBlock blocking share icon, ref #866
 2017-04-13 12:10:37 -05:00
Björn Schießle
b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints 
Discover federatedsharing endpoints
 2017-04-12 16:01:07 +02:00
Jan-Christoph Borchardt
37145a275f Fix AdBlock blocking share icon, ref #866 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-12 15:04:12 +02:00
Morris Jobke
4d7c7b1816
[files_sharing] Remove unneeded update steps 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 00:49:50 -05:00
Michael Jobst
81b1dc4930
share api expanded by tags (#26583) 
* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-11 11:54:13 -05:00
Roeland Jago Douma
53bca14a27
Do proper DI 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-11 15:04:01 +02:00
Bjoern Schiessle
449011dae7
remove discovery manager in favour of the OCSDiscoveryService 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:04:01 +02:00
Lukas Reschke
afb5d45705 Merge pull request #4256 from nextcloud/theming 
Move OC_Defaults to OCP\Defaults
 2017-04-11 14:39:46 +02:00
Bjoern Schiessle
cbacca4202
move capabilities to share by mail app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-10 17:18:13 +02:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Bjoern Schiessle
3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Bjoern Schiessle
676a4c781a
update capabilities 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Roeland Jago Douma
4821c00ea8 Merge pull request #4004 from nextcloud/backport-27172 
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
 2017-03-28 21:56:44 +02:00
Robin Appelman
ae3016959e
fix shared storage numeric id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-27 14:05:18 +02:00
Morris Jobke
a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027 
Ignore NoUserException for shares from ghosts
 2017-03-23 15:26:43 -06:00
Robin Appelman
a12ec5ec77
set cache to failedcache when shared storage init fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-23 15:01:23 +01:00
Vincent Petry
89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it 
The CacheWrapper will properly forward the call to the wrapped cache.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 00:02:48 -06:00
Roeland Jago Douma
7e95837097 Merge pull request #3955 from nextcloud/downstream-27113 
Can we get some faster phpunit execution?
 2017-03-21 11:27:00 +01:00
Thomas Müller
5bfce597a9
[CI] Can we get some faster phpunit execution? (#27113) 
* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 12:34:05 -06:00
Joas Schilling
35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Vincent Petry
78ee125c34
Fix public link download button 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:39:46 -06:00
Vincent Petry
a4ce440392
Ignore NoUserException for shares from ghosts 
Add unit tests for FailedStorage init from SharedStorage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 01:43:24 -06:00
Maxence Lange
69694012ab shares-circles 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-17 18:48:33 -01:00
Jörn Friedrich Dreyer
5155a5288c
Add CleanupRemoteStorages command 
cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:09:52 -06:00
Vincent Petry
377fdf3860
Skip null groups in group manager (#26871) (#26956) 
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:07:03 -06:00
Morris Jobke
a5ba1f7803
Remove legacy class OC_Group and OC_User 
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-09 17:35:09 -06:00
Robin Appelman
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
Bjoern Schiessle
0c11209d33
allow to access mail shares even if public links are disabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-04 21:23:26 +01:00
Arthur Schiwon
b4d779977a
fix tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-22 19:33:09 +01:00
Vincent Petry
14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Robin Appelman
5d0897b8d7
use unmasked permissions in shared scanner 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-14 14:37:51 +01:00
Robin Appelman
02ee4f958c
apply permissions mask for shared storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 17:59:02 +01:00
Roeland Jago Douma
08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update 
Move file sharing activities to the new API
 2016-11-22 10:19:15 +01:00
Lukas Reschke
7b3855a375
Add config switch 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Joas Schilling
bdaf334c53
Move file sharing activities to the new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 16:45:08 +01:00
Roeland Jago Douma
ff96fffe39 Merge pull request #2100 from nextcloud/do_not_increse_link_share_perms 
Fixes not allowed increasing of link share permissions
 2016-11-14 15:21:08 +01:00
Morris Jobke
16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages 
only query substorages to calculate the final mtime/size/etag when we need it
 2016-11-14 11:39:02 +01:00
Roeland Jago Douma
965981486f
Fixes not allowed increasing of link share permissions 
Fixes the following:

1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share

before this increased the permissions of the link share. Which should
not happen.

now: API reponds with an error that the permissions can't be increased.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-13 20:29:34 +01:00
Joas Schilling
cbc6118f51
Only check the sharing backends for file/folder items 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-10 16:46:01 +01:00
Robin Appelman
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-10 13:59:22 +01:00