upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
53652 commits 982 branches 1211 tags 8.6 GiB
Commit graph

5571 commits

Author SHA1 Message Date
John Molakvoæ
b5a30d5cd6
Merge pull request #20426 from nextcloud/techdebt/psr2 
It is done
 2020-04-11 08:21:35 +02:00
John Molakvoæ
97de425a17
Merge pull request #20419 from nextcloud/dependabot/npm_and_yarn/various 
Bump p-limit from 2.2.2 to 2.3.0, @nextcloud/auth from 1.2.2 to 1.2.3, @babel/preset-env from 7.8.7 to 7.9.5, @nextcloud/event-bus from 1.1.3 to 1.1.4, @nextcloud/password-confirmation from 1.0.0 to 1.0.1, @nextcloud/l10n from 1.2.2 to 1.2.3, @nextcloud/initial-state from 1.1.1 to 1.1.2, core-js from 3.6.4 to 3.6.5 …
 2020-04-11 08:18:14 +02:00
John Molakvoæ (skjnldsv)
0f135c7bd6
Bump acceptance tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-04-10 17:07:14 +02:00
Christoph Wurst
28f8eb5dba
Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
Christoph Wurst
1584c9ae9c
Add visibility to all methods and position of static keyword 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:51:06 +02:00
Christoph Wurst
a7c8d26d31
Add visibility to all properties and move static keyword 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:48:31 +02:00
Christoph Wurst
1762a409f9
Merge pull request #20422 from nextcloud/techdebt/format-control-structs-classes-methods 
Format control structures, classes, methods and function
 2020-04-10 16:38:23 +02:00
Roeland Jago Douma
eba3726e1e
Merge pull request #19495 from nextcloud/preview-generate-batch 
optimize batch generation of previews
 2020-04-10 15:57:06 +02:00
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Robin Appelman
8f9bac26f8
fix preview generation tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-10 13:39:45 +02:00
Christoph Wurst
14c996d982
Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
John Molakvoæ (skjnldsv)
6c49dc2d1f
Fix absolute redirect 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-04-10 08:58:54 +02:00
Christoph Wurst
3a415e4139
Remove space between switch case and colon 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:17:53 +02:00
Christoph Wurst
a8a06a82d2
Remove trailing whitespaces from comments 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:09:23 +02:00
Christoph Wurst
44577e4345
Remove trailing and in between spaces 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:07:47 +02:00
Christoph Wurst
afbd9c4e6e
Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst
2a529e453a
Use a blank line after the opening tag 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:50:14 +02:00
Christoph Wurst
41b5e5923a
Use exactly one empty line after the namespace declaration 
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:48:10 +02:00
Christoph Wurst
2fbad1ed72
Fix (array) indent style to always use one tab 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 10:16:08 +02:00
blizzz
e9795d01f1
Merge pull request #16035 from nextcloud/share-search-hide-on-match 
dont show remote and email options if we have an exact match for local user email
 2020-04-09 00:08:34 +02:00
Christoph Wurst
85e369cddb
Fix multiline comments 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-08 22:24:54 +02:00
Robin Appelman
01c147a4a5
dont show remote and email options if we have an exact match for local user email 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-08 16:11:09 +02:00
Azul
62f7e6ba81 tests: fix failing header acceptance test 
The username is listed in a div with class `fullname` now.

Signed-off-by: Azul <azul@riseup.net>
 2020-04-07 14:57:20 +02:00
Christoph Wurst
1e086064f5
Move legacy classes from PSR0 to PSR4 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-07 08:48:00 +02:00
Roeland Jago Douma
f5919d5b83
Merge pull request #20033 from nextcloud/s3-seekable-stream 
Enable fseek for files in S3 storage
 2020-04-06 21:38:49 +02:00
Roeland Jago Douma
4a292126e5
Merge pull request #20139 from nextcloud/unify-default-value-for-restricting-user-enumeration-with-settings 
Unify default value for restricting user enumeration with settings
 2020-04-04 10:33:04 +02:00
Robin Appelman
3ba46f3b50
add basic tests for s3 seeking and add some error handling if reopen return the wrong range 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-01 15:23:05 +02:00
Robin Appelman
f984512e33
fix tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-01 14:17:31 +02:00
Roeland Jago Douma
590849e4d7
Merge pull request #19858 from nextcloud/feature/webauthn 
Add WebAuthn support
 2020-03-31 22:55:13 +02:00
Roeland Jago Douma
53db05a1f6
Start with webauthn 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-03-31 22:17:07 +02:00
Roeland Jago Douma
84f3d2ddeb
[POC] Event for failed login attempts 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-31 21:41:02 +02:00
Christoph Wurst
463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports 
Remove unused imports
 2020-03-27 17:14:08 +01:00
Christoph Wurst
b80ebc9674
Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Christoph Wurst
25ab122245
Merge pull request #20172 from nextcloud/techdebt/phpunit-short-return 
Use the shorter phpunit syntax for mocked return values
 2020-03-26 09:25:19 +01:00
Christoph Wurst
2ee65f177e
Use the shorter phpunit syntax for mocked return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:21:27 +01:00
Christoph Wurst
74936c49ea
Remove unused imports 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:08:08 +01:00
Christoph Wurst
23eb0462e5
Use lowercase true, false and null constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 21:53:04 +01:00
Roeland Jago Douma
b93e1e300e
Merge pull request #14722 from tacruc/GpgMailerHooks 
Add Mailer events
 2020-03-25 08:10:04 +01:00
Arne Hamann
a16aa99586
Added Hook before Message is send 
Signed-off-by: Arne Hamann <kontakt+github@arne.email>
 2020-03-24 20:57:27 +01:00
Roeland Jago Douma
3b26bfe879
Merge pull request #20127 from nextcloud/bugfix/noid/check-user-on-remote-wipe 
Check the user on remote wipe
 2020-03-24 20:26:52 +01:00
Daniel Calviño Sánchez
4ec370016f Add acceptance test for restricting user enumeration to groups 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-24 14:42:52 +01:00
Daniel Calviño Sánchez
d4f25b01b8 Unify default value for restricting user enumeration with settings 
If the value was never enabled or disabled, the settings show "Restrict
username enumeration to groups" as disabled. However, in some components
it was enabled by default, which caused an inconsistency in the
behaviour with respect to the settings, for example in the contacts
menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-24 14:30:59 +01:00
Julius Härtl
63900d0574
Remove admin_notifications since it is obsolete since Nextcloud 14 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-24 09:18:42 +01:00
Roeland Jago Douma
6675f9b403
Merge pull request #17684 from mlatief/support-no-proxy 
Add support for GuzzleHTTP 'no' proxy
 2020-03-22 19:38:01 +01:00
Daniel Calviño Sánchez
9386f24ab0 Add acceptance test for accepting an incoming share 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 20:03:58 +01:00
Daniel Calviño Sánchez
887e740434 Fix timeout capping 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 17:43:12 +01:00
Daniel Calviño Sánchez
43e18e96e2 Revert (partially) "Accept incoming shares in acceptance tests" 
This reverts commit f402e23448.

Since eb4c42d3d1 now shares are accepted
by default, so no notification is shown to accept them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 17:39:34 +01:00
Roeland Jago Douma
a0058fe601
Merge pull request #20049 from nextcloud/force-compatible-dependency-versions-in-acceptance-tests 
Force compatible dependency versions in acceptance tests
 2020-03-20 15:48:26 +01:00
Daniel Calviño Sánchez
0896f33f86 Force compatible dependency versions in acceptance tests 
behat/mink 1.8 and behat/mink-selenium2-driver 1.4 introduced behaviour
changes that broke the acceptance tests. Until the tests are updated to
work with the newer versions the last known versions are forced.

Note that some acceptance tests still fail after enforcing the
compatible versions, although that is caused by changes in the Nextcloud
server itself.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 11:45:00 +01:00
Julius Härtl
0ef53ebc08 Add tests for ContactsStore filtering 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-20 10:43:56 +01:00
Julius Härtl
78beb9e6d4 Add tests for user group enumeration limit 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-20 10:43:56 +01:00
Joas Schilling
dc7913efcd
Fix recursive calls in logging via server methods 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-18 18:59:49 +01:00
Joas Schilling
9935c71ec3
Check the user on remote wipe 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-16 09:29:28 +01:00
Roeland Jago Douma
c1152af523
Move deprecated aliases over to new registration 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-15 15:13:12 +01:00
Julius Härtl
dbd63222c8
Add system config flag to manually set that a subscription is available 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-10 14:31:27 +01:00
Roeland Jago Douma
6ea1aef031
Merge pull request #19723 from nextcloud/bug/18603/avatar-response 
Always use status 200 for avatar response
 2020-03-03 16:15:14 +01:00
blizzz
b54069189c
Merge pull request #19742 from nextcloud/bug/19740/add-msg-for-exception 
Add message for DoesNotExistException
 2020-03-02 16:19:30 +01:00
Daniel Kesselberg
5ce9e73bad
Add message for DoesNotExistException 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-03-02 13:24:06 +01:00
Daniel Kesselberg
68148f4073
Always use status 200 for avatar response 
As discussed in #18603 caching a 201 response is hard. It's now possible to distinguish between generated and uploaded avatars by reading the X-NC-IsCustomAvatar (0 = generated, 1 = uploaded) header.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-03-01 00:42:24 +01:00
Mohammed Abdellatif
98d6415264 Add support for GuzzleHTTP 'no' proxy 
The custom config allows to setup a proxy URI that is passed to
GuzzleHTTP client as request options. Guzzle has the option to receive
an array of proxies for each URI scheme as well as 'no' key value pair
to provide a list of host names that should not be proxied to.

Guzzle would automatically populate these options with HTTPS_PROXY
and NO_PROXY environment variables. However, when providing a 'proxy'
request option, default values will be overriden and it is required to
explicitly provide the 'no' value if needed.

More info:
http://docs.guzzlephp.org/en/stable/request-options.html#proxy

This commit will add support for a new config 'proxyexclude', which
takes a list of host names to be excluded.

It will also provide 'proxy' request option as an array instead of a
string to Guzzle, and populate 'http' and 'https' URI schemes with
proxy URI, and 'no' with 'proxyexclude' list.

Also, if no 'proxy' is configured, it will leave out 'proxy' request
option, so it won't override Guzzle default values.

Sample config file includes a hint on how to explicitly sync
'proxyexclude' with NO_PROXY, and a note about default values.

Signed-off-by: Mohammed Abdellatif <m.latief@gmail.com>
 2020-02-29 19:19:23 +02:00
Robin Appelman
fed86e8382
better tests for SimpleFolder 
test behavior, not implementation

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-02-28 12:55:20 +01:00
Joas Schilling
e97d643969
Strip of users home path from share api message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-20 14:56:58 +01:00
Arthur Schiwon
b1a6f66fd9
when we receive intentional empty whats new info, do not try to show it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-13 22:03:44 +01:00
Arthur Schiwon
d06ef07a97
disable timeout on app install via cli 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-12 16:52:45 +01:00
John Molakvoæ (skjnldsv)
0687b9ed8a
[3rdparty] Bump guzzlehttp/guzzle from 6.3.3 to 6.5.2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-02-11 20:49:27 +01:00
Roeland Jago Douma
12e1c469cf
Add Argon2id support 
When available we should use argon2id for hashing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-07 07:52:33 +01:00
Joas Schilling
3a0bfbd558
Merge pull request #18926 from nextcloud/fix/18689/int-array-access 
Array access on int will fail on php7.4
 2020-02-06 21:31:03 +01:00
Roeland Jago Douma
0d651f106c
Allow selecting the hashing algorithm 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-03 21:41:17 +01:00
Roeland Jago Douma
1b33116e8f
Merge pull request #19241 from nextcloud/bug/noid/job-catch-throwable 
Make sure to catch php errors during job execution
 2020-02-03 09:54:26 +01:00
Roeland Jago Douma
bfaf3fff33
Move Admin Settings also to info.xml 
More cleanup of the Settings apps. Makes the manager cleaner and a
proper manager.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-31 16:55:17 +01:00
Daniel Kesselberg
018020108b
Make sure to catch php errors during job execution 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-01-31 16:04:04 +01:00
Roeland Jago Douma
c9253cce6c
Move personal settings to proper registration 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-30 22:06:28 +01:00
Roeland Jago Douma
dc1979903e
Move password settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-30 14:03:28 +01:00
Roeland Jago Douma
9ed106f69a
Merge pull request #19176 from nextcloud/fix/contacts-menu-mailt-encoding 
Do not encode contacts menu mailto links
 2020-01-30 09:45:13 +01:00
Christoph Wurst
87ec729f34
Do not encode contacts menu mailto links 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-28 14:57:45 +01:00
Roeland Jago Douma
03df1b4c51
Move admin sections to settings app 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-28 12:38:11 +01:00
Roeland Jago Douma
d8e9cefcfe
Move the Personal sections to the settings app 
There is no need to have weird magic in the manager. This should be
properly registered in the right way. The settings code is messy
anyways. This is a start to make it a tad more clean.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-28 08:45:07 +01:00
Sergey Shliakhov
acc0df1d13 Change avatar placeholder from single letter to 2 letters 
https://github.com/nextcloud/server/issues/18717
Signed-off-by: Sergey Shliakhov <husband.sergey@gmail.com>
 2020-01-27 09:42:45 +01:00
Arthur Schiwon
5b18f684e7
add hub bundle for easy post-installation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-26 21:23:42 +01:00
Daniel Kesselberg
7af3bcb4bc
Add test to trigger "Trying to access array offset on value of type int" 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-01-23 10:18:14 +01:00
Roeland Jago Douma
8056bbeae3
Merge pull request #19035 from nextcloud/bugfix/noid/increase-timeout-for-downloads 
Adjust unit test for #19017
 2020-01-21 10:53:08 +01:00
Joas Schilling
827f3228a3
Adjust unit test for #19017 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-01-21 08:44:35 +01:00
Daniel Kesselberg
8331d8296b
Make getServerHost more robust to faulty user input 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-01-16 11:26:29 +01:00
Robin Appelman
47fd6730e0
use nodeExists instead of catching exceptions 
makes the intent of the code more clear imo

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-01-14 11:03:14 +01:00
Roeland Jago Douma
e7b308cf0a
Merge pull request #18805 from nextcloud/bugfix/direct-edit-create 
Check if file already exists during file creation
 2020-01-14 08:34:39 +01:00
Julius Härtl
ab4b9a6df5
CHeck if file already exists during file creation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-13 18:10:12 +01:00
Georg Ehrke
2f89f5fd13
AppFetcher: Distinguish between fileName and endpointName 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-09 17:29:00 +01:00
Christoph Wurst
60d4b45e89
Clean up 2FA provider registry when a user is deleted 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-08 10:51:44 +01:00
Roeland Jago Douma
52e4ecd66e
Merge pull request #18644 from nextcloud/harden/csrf_endpoint 
Only allow requesting new CSRF tokens if it passes the SameSite Cooki…
 2020-01-07 13:43:46 +01:00
Roeland Jago Douma
a673c597ed
Fix the LoggerTests for phpunit 
Less deprecation warnings. YAY.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 09:06:52 +01:00
Kim Brose
9c5fe8fca4
Fix CI 
Signed-off-by: Kim Brose <kim.brose@rwth-aachen.de>
 2020-01-03 18:06:59 +01:00
Roeland Jago Douma
da81b71f93
Only allow requesting new CSRF tokens if it passes the SameSite Cookie test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-03 13:12:03 +01:00
Daniel Kesselberg
d393b1612b
Modify regex to match some other chromium browsers 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-27 17:24:52 +01:00
Georg Ehrke
f0bef8881d
Restore old behavior allowing to set custom appstore 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-22 15:06:31 +01:00
GretaD
455013c309
fix the folder share 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-19 16:14:47 +01:00
Julius Härtl
de5384466c
Return empty template for default creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-16 17:22:53 +01:00
Joas Schilling
faf58e4cac
Merge pull request #17018 from nextcloud/feature/noid/allow-to-force-enable-via-cli 
Allow to force enable apps via CLI
 2019-12-16 12:34:27 +01:00
Roeland Jago Douma
3b8fbf129e
Merge pull request #18384 from nextcloud/fix/18255/global_config_to_always_accept 
config.php setting to always accept internal shares
 2019-12-16 09:50:45 +01:00
Roeland Jago Douma
bb4264c565
config.php setting to always accept internal shares 
Part of #18255

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-16 09:07:25 +01:00
blizzz
f7674c592c
Merge pull request #17494 from nextcloud/fix/16340/ignore-invalid-json 
Return a default user record if json is broken
 2019-12-13 15:43:36 +01:00