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

5441 commits

Author SHA1 Message Date
Roeland Jago Douma
669302e570
Merge pull request #18064 from nextcloud/feature/php74 
Add php7.4 support
 2019-11-28 08:36:10 +01:00
Julius Härtl
e18397284b
Use person icon for personal settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 21:06:14 +01:00
Julius Härtl
329e8c2604
Add mimetype to creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:44 +01:00
Julius Härtl
9a2694fcb0
Code style fixes and cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:40 +01:00
Roeland Jago Douma
0e14bdc0d0
remove test case 
Because we test very naively we matched also on def in default...

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:28 +01:00
Roeland Jago Douma
469c06be15
TO REVERT LATER: disable decimaltest from LegacyDBTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:28 +01:00
Roeland Jago Douma
b656693db2
TO REVERT LATER: disable tests in LargeFileHelperGetFileSizeTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:28 +01:00
Roeland Jago Douma
3a7cf40aaa
Mode to modern phpunit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:18 +01:00
Roeland Jago Douma
078f4efb20
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 14:51:14 +01:00
Julius Härtl
c8d3e32190
Direct editing token tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 14:36:20 +01:00
Roeland Jago Douma
ec14d95292
Fix lockprivider test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
8d4346d656
Fix more tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
bc16b05243
Fix signCoretests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
305481688b
SignApp fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
ef4b59d341
More fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
799f58391e
More fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
3aa5f105fa
Fix more tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
385ec2947d
Skip redis if not configured 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
c007ca624f
Make phpunit8 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
0532f8116d
Merge pull request #18019 from nextcloud/enhancement/password-policy-events 
Add typed events for password_policy
 2019-11-27 11:11:17 +01:00
blizzz
d2f9deba51
Merge pull request #17834 from nextcloud/enh/noid/generic-event-replacement-tk2 
Public API's GenericEvent replacement (take 2)
 2019-11-27 10:50:07 +01:00
Christoph Wurst
1a886b1472
Add typed events for password_policy 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-27 09:56:12 +01:00
Roeland Jago Douma
d09f8c7423
Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handling 
Handle token insert conflicts
 2019-11-26 19:47:59 +01:00
Arthur Schiwon
fc16b09a2c
Files first to use own GenericEvent 
* those are added to 18 only anyway :)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-26 14:48:59 +01:00
Roeland Jago Douma
b607e3e6f4
Merge pull request #17948 from nextcloud/enh/check-if-property-is-bool 
Make isXXX available for bool properties only
 2019-11-26 12:25:36 +01:00
Christoph Wurst
0299ea0a96
Handle token insert conflicts 
Env-based SAML uses the "Apache auth" mechanism to log users in. In this
code path, we first delete all existin auth tokens from the database,
before a new one is inserted. This is problematic for concurrent
requests as they might reach the same code at the same time, hence both
trying to insert a new row wit the same token (the session ID). This
also bubbles up and disables user_saml.

As the token might still be OK (both request will insert the same data),
we can actually just check if the UIDs of the conflict row is the same
as the one we want to insert right now. In that case let's just use the
existing entry and carry on.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-26 12:07:12 +01:00
Robin Appelman
74c6beb603
dont set folder size to negative values during propagation 
normally this shouldn't be a problem, but cache/storage desync might cause this
so this adds some failsafe to ensure we dont corrupt the cache further

the minimum value is set to -1 instead of 0 in order to triger a background scan
on the folder and figure out the size properly

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-26 12:05:30 +01:00
Robin Appelman
9e450d727a
add LEAST and GREATER to db function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-26 12:05:30 +01:00
blizzz
b1dffc5c2d
Merge pull request #17896 from nextcloud/fix/noid/consider-create-group-result 
take group creation result into consideration
 2019-11-25 17:16:40 +01:00
Arthur Schiwon
7b1eedb11e
take group creation result into consideration 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-25 14:01:20 +01:00
Roeland Jago Douma
68748d4f85
Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Roeland Jago Douma
3c1bcd551d
Fix the tests after #18029 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-21 22:31:45 +01:00
Roeland Jago Douma
5c4b2a2436
Merge pull request #18029 from nextcloud/feature/public-post-login-event 
Make the post login event public
 2019-11-21 12:39:42 +01:00
Daniel Calviño Sánchez
f402e23448 Accept incoming shares in acceptance tests 
Incoming shares are no longer automatically added to the file list of
the sharee. Instead, the user now needs to explictly accept the share.

Currently shares can be accepted only from the Notifications app, so it
must be explicitly cloned before installing Nextcloud if it is not found
in the "apps" directory. Note that the development branches are already
built, so there is no need to explicitly build the app.

With the new sharing behaviour the "share a skeleton file with another
user before first login" scenario is no longer valid (as the user will
need to log in to accept the share, so at that point the skeleton is
already created), so it was removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-11-20 21:15:46 +01:00
Daniel Calviño Sánchez
0abff19aa9 Rename "Notification" to "Toast" 
Since Nextcloud 17 the proper name for the old built-in notifications is
"Toast". Moreover, this will reduce ambiguity when using the
"notification" term to refer to elements in the Notifications app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-11-20 21:15:46 +01:00
Roeland Jago Douma
da25ed997e
Do not check for updates if we have no internet 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 19:30:59 +01:00
Christoph Wurst
535000aac6
Make the post login event public 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-20 18:43:09 +01:00
Roeland Jago Douma
b367027798
Do pagination on the dummy group backend 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 08:08:01 +01:00
Roeland Jago Douma
1bd688a9d1
Use dummy backend in test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 11:54:26 +01:00
Roeland Jago Douma
a184e350d7
Merge remote-tracking branch 'origin/master' into filecache-extension 2019-11-18 11:06:17 +01:00
Daniel Kesselberg
a27c10daa6
Make isXXX available for bool properties only 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-16 00:39:48 +01:00
Roeland Jago Douma
54eb27dab2
Update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-13 20:43:20 +01:00
RussellAult
19791b2460
Check getRedirectUri() for queries 
Resolves Issue #17885

Check getRedirectUri() for queries, and add a '&' instead of a '?' to $redirectUri if it already has them; otherwise, $redirectUri might end up with two '?'.

Signed-off-by: RussellAult <russellault@users.noreply.github.com>
 2019-11-13 14:05:03 +01:00
Robin Appelman
066faaec05
fix folder delete 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 12:39:46 +01:00
Robin Appelman
43fa746ad9
dont create empty filecache extended rows 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 12:39:43 +01:00
Robin Appelman
1b6e647b63
expose filecache extension data in FileInfo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 12:39:32 +01:00
Robin Appelman
842da3f183
store filecache extension fields 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 11:30:44 +01:00
Daniel Calviño Sánchez
2f49806c20 Add unit tests for "getAllShares()" 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-30 14:27:41 +01:00
John Molakvoæ (skjnldsv)
12eba18bdf Adjust acceptance tests to new OCA.Sidebar 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-29 13:20:08 +01:00
John Molakvoæ (skjnldsv)
ea6f423e2c Extend data returned when searching remote shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-29 12:55:59 +01:00
Roeland Jago Douma
2cf068463f
Harden middleware check 
These annotations will allow for extra checks. And thus make it harder
to break things.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-25 15:44:37 +02:00
Daniel Calviño Sánchez
81d0b70791 Run acceptance tests on PHP 7.3 
There is no difference (as far as I know) between running the acceptance
tests on PHP 7.1 or on PHP 7.3; this is simply a preparatory step to be
ready when PHP 7.1 support is dropped in Nextcloud server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-22 16:48:55 +02:00
Roeland Jago Douma
5122629bb0
Make renewSessionToken return the new token 
Avoids directly getting the token again. We just inserted it so it and
have all the info. So that query is just a waste.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-09 10:10:37 +02:00
Roeland Jago Douma
075a0b24d5
Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive 
make TrustedDomainHelper case insensitive
 2019-10-08 08:51:11 +02:00
Roeland Jago Douma
a02a626606
Merge pull request #17411 from kinolaev/fix-oauth2-redirect 
Fix oauth client redirect
 2019-10-07 12:03:52 +02:00
Johannes Koenig
2df8d646c1 make TrustedDomainHelper case insensitive 
Signed-off-by: Johannes Koenig <mail@jokoenig.de>
 2019-10-06 20:43:55 +02:00
Sergej Nikolaev
1b5d85a4ca fix oauth client redirect 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-04 21:09:13 +03:00
John Molakvoæ
6d819e2820
Fix master testing and update eslint-config (#17367) 
Fix master testing and update eslint-config
 2019-10-04 08:18:13 +02:00
John Molakvoæ (skjnldsv)
4293ede565
Fix tag acceptance tests after #16682 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 07:48:45 +02:00
Tim Terhorst
2ad33bc06e Add Fatal logging option 
Signed-off-by: Tim Terhorst <mynamewastaken+gitlab@gmail.com>
 2019-10-02 21:18:29 -05:00
blizzz
47ab961aa7
Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatar 
reduce adressbook change events and handling
 2019-10-01 12:17:35 +02:00
Christoph Wurst
de6940352a Move settings to an app 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-28 09:39:28 +00:00
John Molakvoæ (skjnldsv)
f737dc9a86 Remove input id on login form 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-28 08:15:03 +00:00
Roeland Jago Douma
cc6874df19
Merge pull request #17264 from nextcloud/move-from-storage-wrappers 
handle moveFromStorage within the same storage even when storage wrap…
 2019-09-26 15:48:59 +02:00
Roeland Jago Douma
6ac67011f4
Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-delete 
dont delete cache entries if deleting an object from object store failed
 2019-09-26 11:24:02 +02:00
Robin Appelman
35f317df7b
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage 
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 19:17:06 +02:00
Robin Appelman
733d4b6cca
dont delete cache entries if deleting an object from object store failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 18:09:45 +02:00
Roeland Jago Douma
210a0554a2
Use the actual password to update the tokens 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-18 19:50:58 +02:00
Greta Doci
68ef242a0a
Fixed the SecurityTest error 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-15 12:04:28 +02:00
Greta Doci
4ff7551574
Fixed the test 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-09-15 12:04:28 +02:00
Roeland Jago Douma
2b98eea129
Harden identifyproof openssl code 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-14 13:52:10 +02:00
Christoph Wurst
a1ef939c06
Use Symfony's new contract Event class instead of the deprecated one 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-09-12 14:44:55 +02:00
Roeland Jago Douma
2187f856ce
Merge pull request #16682 from nextcloud/enh/12790/workflow-backend 
workflow overhaul
 2019-09-11 13:14:06 +02:00
Roeland Jago Douma
41cbb05aea
Split personal security settings in code 
Instead of one big monolitic sections this is the first step in breaking
down the settings. This should make is easiet to see what does what. As
well as nicely splitting up the sections.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-10 16:22:41 +02:00
Arthur Schiwon
1cc6f34d88
adapt file hooks test to eventdispatcher utilization 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-09-09 23:28:51 +02:00
Roeland Jago Douma
bf6082e119
Merge pull request #16836 from nextcloud/fix/16724/smb-availability 
Fix SMB availability status + higher delay on auth issues
 2019-09-09 16:50:42 +02:00
Roeland Jago Douma
1cfb851300
Merge pull request #17006 from nextcloud/querybuilder-max-min 
add MAX and MIN to functionbuilder
 2019-09-07 11:09:11 +02:00
Robin Appelman
8ef5a366ec
add MAX and MIN to functionbuilder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-06 12:28:17 +02:00
Roeland Jago Douma
0ff08810d9
Log/FileTest does not require the DB 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-04 20:41:12 +02:00
Arthur Schiwon
d33e0be2f1
adjust test expectations 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-09-04 13:46:56 +02:00
Roeland Jago Douma
2fdf946dae
Merge pull request #16454 from nextcloud/bugfix/noid/sharelink-shouldnt-open-menu-automatically 
Dont show menu automatically when share link is clicked
 2019-09-04 10:36:04 +02:00
Daniel Kesselberg
773778dd8c
Add default timeout to expected request options 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-03 14:59:09 +02:00
Greta Doci
1993984769 Adjust acceptance tests to changes in link share menu behaviour 
Now the link share menu is not automatically opened after a link share
is created, so waiting until it was opened failed in iShareTheLinkFor.

Note that the steps that interact with the link share menu take care
themselves of showing the menu if needed, so there is no need to
explicitly show it despite the change. Also, the waiting in
iShareTheLinkFor was introduced when the link share menu was changed
to automatically open after creating a link share, as that caused some
issues with the steps that opened the menu by themselves (fec8d12fc5).
Due to all this, now that the link share menu is again not automatically
opened the wait can be simply removed.

Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-08-29 10:19:03 +02:00
Roeland Jago Douma
3f12ec95f0
SessionMiddleware: declare session property 
* Remove request since we don't useit
* Update tests as well

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-08-28 13:02:29 +02:00
John Molakvoæ
caf32d25f8
Merge pull request #16879 from only-run-integration-tests-on-php-changes 
Only run integration tests when PHP was modified
 2019-08-27 18:12:40 +02:00
Roeland Jago Douma
495f94e558
Merge pull request #16875 from nextcloud/bugfix/16874/welcome-mail-client-url 
Use custom client URL in welcome emails
 2019-08-27 13:48:11 +02:00
Joas Schilling
23a0cbe6ef
Only run integration tests when PHP was modified 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-08-27 11:31:15 +02:00
Julius Härtl
52dc36fb88
Mock client URL in new user mail tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-08-27 10:22:54 +02:00
Roeland Jago Douma
505f10044a
Merge pull request #16865 from nextcloud/bugfix/noid/5-min-cron 
Cron should run every 5 mins
 2019-08-26 19:29:57 +02:00
Arthur Schiwon
4bd83c9a28
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-26 13:47:35 +02:00
Joas Schilling
db968cb1d4
Cleanup the Settings class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-08-26 11:50:26 +02:00
John Molakvoæ
40edabaf61
Merge pull request #16795 from nextcloud/enh/phpstan/limiter 
Fix report of phpstan in Limiter
 2019-08-26 11:42:03 +02:00
blizzz
6d20876eb2
Merge pull request #16782 from nextcloud/fix/16729/stop-if-encrypted-token-null 
Stop if there is no encrypted token
 2019-08-21 12:31:12 +02:00
Roeland Jago Douma
7927aebdeb
Fix report of phpstan in Limiter 
* unneeded arguments to constructor
* added return types
* let automatic DI do its work

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-08-19 19:38:43 +02:00
Daniel Kesselberg
9c4c5ee818
Add test case for existing user with token null 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-08-18 23:27:03 +02:00
Daniel Kesselberg
7f7c6e49b6
Return the disabled user mock instead of the existing 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-08-18 23:18:39 +02:00
Daniel Calviño Sánchez
e5a305b9d8 Allow Context subclasses in acceptance tests to access parent actor 
Although uncommon, in some cases a Context may need to be extended (for
example, to override a step defined in the server with a specific
behaviour in the acceptance tests of an app); in those cases the
subclass should be able to access the actor attribute defined in the
Context it is extending.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-08-16 08:20:41 +02:00
Roeland Jago Douma
fced73aa37
Merge pull request #16711 from nextcloud/fix/csp/form_actions/loginflow 
Fix login flow form actions
 2019-08-12 08:24:53 +02:00
Roeland Jago Douma
f465f9d4b9
Merge pull request #16721 from nextcloud/fix/16644 
Correctly handle emtpy string in proxyuserpwd config
 2019-08-11 22:46:01 +02:00
Scott Shambarger
edf946dfc7
Correctly handle emtpy string in proxyuserpwd config 
As documented, the default value for config value proxyuserpwd is ''.
However, that value results in the error:
 "cURL error 5: Unsupported proxy syntax in '@'".
This patch handles the values of '' and null (the default in the code)
the same for config values proxyuserpwd and proxy.

Signed-off-by: Scott Shambarger <devel@shambarger.net>
 2019-08-11 21:07:30 +02:00