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

50726 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
ebcb7b76c2
Merge pull request #18156 from nextcloud/backport/18135/stable17 
[stable17] Trim the login name
 2019-12-02 08:53:37 +01:00
Nextcloud bot
1e67be443d
[tx-robot] updated from transifex 2019-12-02 02:17:03 +00:00
Nextcloud bot
59a4349650
[tx-robot] updated from transifex 2019-12-01 02:18:24 +00:00
John Molakvoæ
c4561be550
[stable17] Fix provisioning_api getUsers types (#18157) 
[stable17] Fix provisioning_api getUsers types
 2019-11-30 11:21:50 +01:00
Nextcloud bot
c302033e5f
[tx-robot] updated from transifex 2019-11-30 02:16:58 +00:00
John Molakvoæ (skjnldsv)
f452ab09df Fix provisioning_api getUsers types 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-29 08:09:02 +00:00
Christoph Wurst
f28a23cdd8 Trim the login name 
Otherwise we keep on using it with leading or trailing whitespaces for
app tokens and other logic. The reason this doesn't throw an error
immediately with local users is that (My)SQL compares strings regardless
of their padding by default. So we look up 'uid ' and get the row for
the user 'uid'.
Other back-ends will lead to a hard error, though, and the user is
unable to log out as all request fail.

Ref https://stackoverflow.com/a/10495807/2239067

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-29 07:50:52 +00:00
Nextcloud bot
611e6a0f7d
[tx-robot] updated from transifex 2019-11-29 02:17:03 +00:00
Nextcloud bot
c75cc61226
[tx-robot] updated from transifex 2019-11-28 02:17:04 +00:00
Roeland Jago Douma
de26578025
Merge pull request #17919 from nextcloud/backport/17905/update-searchdav 
[stable17] Bump icewind/searchdav
 2019-11-27 08:37:22 +01:00
Nextcloud bot
8cb7149de8
[tx-robot] updated from transifex 2019-11-27 02:16:34 +00:00
Roeland Jago Douma
f6aa0d5f4f
Merge pull request #18100 from nextcloud/backport/18027/stable17 
[stable17] Incorrect integer value: '' for column 'password_invalid' while migra…
 2019-11-26 14:39:38 +01:00
Nextcloud bot
902c75a1a9
[tx-robot] updated from transifex 2019-11-26 02:16:05 +00:00
Łukasz Buśko
7fae44c4c7 Incorrect integer value: '' for column 'password_invalid' while migrating from pg to mysql #14920 
Signed-off-by: Łukasz Buśko <busko.lukasz@pm.me>
 2019-11-25 10:38:39 +00:00
Roeland Jago Douma
09a739de83
Merge pull request #18054 from nextcloud/backport/18016/stable17 
[stable17] make chunksize (used to check for gone LDAP users) configurable
 2019-11-25 08:40:25 +01:00
Roeland Jago Douma
a0a9f702b0
Merge pull request #18075 from nextcloud/backport/17696/stable17 
[stable17] Remove objectstore credentials
 2019-11-25 08:38:21 +01:00
John Molakvoæ
66ddb89180
[stable17] Quickfix #17515 (#18094) 
[stable17] Quickfix #17515
 2019-11-25 07:09:46 +01:00
Nextcloud bot
f715e77607
[tx-robot] updated from transifex 2019-11-25 02:16:04 +00:00
Robin Windey
ff2f7a7d1a Revert changes and add css-rule to correct file inside files-app 2019-11-24 14:58:41 +00:00
Nextcloud bot
030dd9e01e
[tx-robot] updated from transifex 2019-11-24 02:17:04 +00:00
Nextcloud bot
2d0fa72171
[tx-robot] updated from transifex 2019-11-23 02:16:17 +00: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
Nextcloud bot
99420445cc
[tx-robot] updated from transifex 2019-11-22 02:16:26 +00:00
Arthur Schiwon
5f32b62a63 make chunksize (used to check for gone LDAP users) configurable 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-21 10:06:44 +00:00
blizzz
f9aa207440
Merge pull request #18047 from nextcloud/backport/18030/stable17 
[stable17] uid can be false when the user record does not exit
 2019-11-21 11:01:26 +01:00
Roeland Jago Douma
daf65816ca
Merge pull request #18040 from nextcloud/backport/18004/stable17 
[stable17] Convert more columns to bigint
 2019-11-21 10:54:04 +01:00
Roeland Jago Douma
c84e1c45c9
Merge pull request #18050 from nextcloud/backport/18035/stable17 
[stable17] Update the CRL
 2019-11-21 07:56:51 +01:00
Roeland Jago Douma
1fb2f7fbf3 Update the CRL 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-21 06:51:52 +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
Roeland Jago Douma
1d5ce9907f
Merge pull request #18043 from nextcloud/backport/18009/stable17 
[stable17] Fix installing with MySQL 8.0.4+
 2019-11-21 07:48:03 +01:00
Arthur Schiwon
fbd2b7d7d5 uid can be false when the user record does not exit 
fixes not loading files app for users who got a share by the gone LDAP user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-21 06:09:24 +00:00
Nextcloud bot
02df65a102
[tx-robot] updated from transifex 2019-11-21 02:16:11 +00: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
1c48fbf949 Convert more columns to bigint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 20:34:10 +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
Nextcloud bot
9d5e7a4dd4
[tx-robot] updated from transifex 2019-11-20 02:16:28 +00:00
Nextcloud bot
1986315b32
[tx-robot] updated from transifex 2019-11-19 02:17:57 +00:00
Nextcloud bot
c2e3fcddb5
[tx-robot] updated from transifex 2019-11-18 02:16:06 +00:00
Roeland Jago Douma
d9d6408a7a
Merge pull request #17945 from nextcloud/backport/17926/stable17 
[stable17] re-acquired expired shared locks on large file uploads
 2019-11-17 09:09:51 +01:00
Roeland Jago Douma
3530e23a7a
Merge pull request #17952 from nextcloud/backport/17942/stable17 
[stable17] pass through ServerNotAvailableException on app init
 2019-11-17 09:09:04 +01:00
Nextcloud bot
f05e1d1749
[tx-robot] updated from transifex 2019-11-17 02:17:24 +00:00
Nextcloud bot
577e9d0cad
[tx-robot] updated from transifex 2019-11-16 02:16:07 +00:00
Nextcloud bot
1893d4512a
[tx-robot] updated from transifex 2019-11-15 02:16:13 +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
Robin Appelman
bfc9e50160 re-acquired expired shared locks on large file uploads 
during large file uploads, the shared lock that we get at the begining can expire
leading to locked errors later on, instead of erroring, try to re-get the lock

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-14 18:35:17 +00:00
Nextcloud bot
d5fc345d70
[tx-robot] updated from transifex 2019-11-14 02:16:24 +00:00
Roeland Jago Douma
a78d05a42e
Merge pull request #17925 from nextcloud/backport/17873/stable17 
[stable17] Make timeout a optional parameter
 2019-11-13 19:56:40 +01:00