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

9708 commits

Author SHA1 Message Date
Roeland Jago Douma
8c92c4aad1
Merge pull request #19327 from nextcloud/backport/19303/stable17 
[stable17] Fix occ maintenance:install database connect failure
 2020-03-05 09:01:25 +01:00
Roeland Jago Douma
53a907f7a8
Merge pull request #19095 from nextcloud/backport/19023/stable17 
[stable17] expose Argon2 options (as we did for bcrypt)
 2020-03-05 08:40:04 +01:00
Joas Schilling
a587c86a4a Strip of users home path from share api message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-22 20:27:26 +00:00
Arthur Schiwon
fb7c218ea6
ignore values that undershoot the minimum, go with default 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-21 14:51:44 +01:00
blizzz
7d1d76b2c9
use getSystemValueInt 
Co-Authored-By: kesselb <mail@danielkesselberg.de>

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-21 14:51:44 +01:00
Arthur Schiwon
d973bc7a75
expose Argon2 options (as we did for bcrypt) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-21 14:51:44 +01:00
Arthur Schiwon
c2f0ebbeed 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-14 09:09:05 +00:00
Joas Schilling
47b292b214 Don't create invalid users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-13 09:15:19 +00:00
Joas Schilling
4aeadb5e78 Split the exception handling so install errors don't log as setup errors 
More gebuging

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-06 18:39:11 +00:00
Joas Schilling
c21b00db36 Check the new connection on setup like with PostgreSQL and Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-06 18:39:09 +00:00
Joas Schilling
ecc4bb5666 Only provide the auth method for MySQL 8.0+ to not break MariaDB 
Provide the auth method for MySQL 8.0+

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-06 18:39:08 +00:00
Roeland Jago Douma
79617a2b23
Merge pull request #19229 from nextcloud/backport/19215/stable17 
[stable17] WebcalRefreshJob: Fix reading refresh rate
 2020-02-04 15:49:27 +01:00
Arthur Schiwon
4d0ef01cc0 for the DB ot pick an index specify the object_type 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-03 20:25:25 +00:00
Daniel Kesselberg
73fa8630c4 Make sure to catch php errors during job execution 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-02-03 08:56:17 +00:00
Georg Ehrke
13f31a992f JobList: Typecast last_run to integer 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-31 07:19:58 +00:00
Christoph Wurst
78cc8e2e7b Do not encode contacts menu mailto links 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-30 08:47:00 +00:00
Georg Ehrke
921e1feaef
AppFetcher: Distinguish between fileName and endpointName 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>

(cherry picked from commit 2f89f5fd13)
 2020-01-27 13:34:47 +01:00
Joas Schilling
ae675ddb99
Fix loaded controller check 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-01-22 09:48:14 +01:00
Julius Härtl
38eaa636bc Always use the latest timestamp for merged activities 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-01-20 13:42:58 +00:00
Julius Härtl
07c37df91f Fix broken upgrade caused by undefined method call 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-01-07 07:53:36 +00:00
Georg Ehrke
8bd52316dd Restore old behavior allowing to set custom appstore 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-06 14:30:41 +00:00
Arthur Schiwon
5bab0da935 when downloading from web, skip files that are not accessible 
* avoids a 403, but enables download of resources that are not restricted
* single file downloads still cause 403

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-19 16:55:54 +00:00
Arthur Schiwon
61de35c70e use Nodes API for zip streaming 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-19 16:55:54 +00:00
Julius Härtl
4d646a75f5 Use files node API for single file downloads 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-19 16:55:53 +00:00
Roeland Jago Douma
3d02121db3 Fix Office preview generation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-18 21:43:31 +00:00
Roeland Jago Douma
6955841c82
Fix detection of non extention types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-12 22:23:18 +01:00
Joas Schilling
848ca71730
Try more methods 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:18 +01:00
Joas Schilling
1dad2ddf39
Some more fixes in detecting the mimetype from the content 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:17 +01:00
Joas Schilling
5c9f503146
Allow to check for the mimetype by content only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:17 +01:00
Roeland Jago Douma
387d216214
Merge pull request #18355 from nextcloud/backport/17935/stable17 
[stable17] adding share type circles
 2019-12-12 10:49:12 +01:00
Maxence Lange
d6a276c57d using IShare:: 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-11 11:39:03 +00:00
Maxence Lange
1420cd5a7e adding share type circles 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-11 11:39:02 +00:00
Konrad Bucheli
f914b98860 handle IPv6 addresses with an explict incoming interface at the end (e.g fe80::ae2d:d1e7:fe1e:9a8d%enp2s0) 
Signed-off-by: Konrad Bucheli <konrad.bucheli@gmx.ch>
Signed-off-by: Konrad Bucheli <kb@open.ch>
 2019-12-11 10:34:21 +00:00
Roeland Jago Douma
e5772bdc3d
Merge pull request #18332 from nextcloud/backport/18312/stable17 
[stable17] Do not disable authentication apps
 2019-12-10 19:29:05 +01:00
Roeland Jago Douma
ac5f77a796
Merge pull request #18306 from nextcloud/backport/18184/stable17 
[stable17] Move overwritehost check to isTrustedDomain
 2019-12-10 14:54:11 +01:00
Roeland Jago Douma
c0becec8ad Do not disable authentication apps 
For #18249

If an app encounters an error during loading of app.php the app is
normally disabled. However. We should make sure that this doesn't happen
for authentication apps (looking at your user_saml).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 13:44:51 +00:00
Roeland Jago Douma
5623dff5ef
Merge pull request #18186 from nextcloud/backport/18149/stable17 
[stable17] delay creation of the cert bundle
 2019-12-10 13:38:58 +01:00
Julius Härtl
419df66251 Move overwritehost check to isTrustedDomain 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-09 20:39:00 +00:00
Joas Schilling
c17d86c081
Mark "Talk" active on /call/token URLs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-04 10:13:44 +01:00
Roeland Jago Douma
a7f596d241 Throw an invalid token exception is token is marked outdated 
This avoids hitting the backend with multiple requests for the same
token. And will help avoid quick LDAP lockouts.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-03 08:25:12 +00:00
Christoph Wurst
55b5e13e15
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-12-02 14:20:51 +01:00
Arthur Schiwon
ea3fc33beb
delay creation of the cert bundle 
fixes #18148

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-02 12:09:01 +01:00
Daniel Kesselberg
956c459465 Add information about credentials 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-22 13:27:16 +00:00
Daniel Kesselberg
33dc7333a6 Remove objectstore credentials 
Also remove the username for Swift v2 and add todo for unclear keys.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-22 13:27:16 +00:00
Daniel Kesselberg
d77d94b1a0 Remove objectstore credentials 
S3: key and secret
Swift v3: user.name and user.password

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-22 13:27:15 +00:00
Roeland Jago Douma
830554c1a7
Merge pull request #18036 from nextcloud/backport/18003/stable17 
[stable17] Do not check for updates if we have no internet
 2019-11-21 07:48:49 +01:00
Joas Schilling
f3ad49b866 Fix installing with MySQL 8.0.4+ 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-20 20:52:06 +00:00
Roeland Jago Douma
d95a54b359 Do not check for updates if we have no internet 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 19:55:19 +00:00
Arthur Schiwon
a9c61b4ed7 pass through ServerNotAvailableException on app init 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-14 21:01:02 +00:00
Thibault Coupin
4a09899ad8 Fix reshare with circle 
Signed-off-by: Thibault Coupin <thibault.coupin@gmail.com>
 2019-11-12 15:28:19 +00:00