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

8917 commits

Author SHA1 Message Date
Morris Jobke
213d43f043
Merge pull request #11568 from nextcloud/fix/11097/just_update_password_hash 
Just update password hash without validating
 2018-10-03 12:08:49 +02:00
Roeland Jago Douma
f9e201adfe
Merge pull request #11409 from nextcloud/feature/consolidated-2fa-settings 
Consolidate personal two-factor provider settings
 2018-10-03 09:56:21 +02:00
Roeland Jago Douma
0c9a3de68f
Just update password hash without validating 
Fixes #11097

If your password hash changed (becuse your are on 7.2 and we moved to
ARGON2). Then we shold not 'set a new password' but just update the
hash. As else we invoke the password policy again which might lock out
users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-03 00:37:20 +02:00
Morris Jobke
8ede3f6346
Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-dont-work 
Allow overwrite.cli.url without trailing slash
 2018-10-02 23:39:30 +02:00
Christoph Wurst
79a0ee4f4a
Consolidate personal two-factor provider settings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-02 22:56:33 +02:00
Daniel Kesselberg
a4eb3ee508
Validate email in occ command 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-02 22:24:30 +02:00
Daniel Kesselberg
13877c2d20
Use setUserValue instead setEMailAddress because latter omits an changeUser events. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-02 22:24:30 +02:00
Daniel Kesselberg
6c805ec9ba
Add --admin-email to cli installer 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-02 22:24:30 +02:00
Morris Jobke
6b730b4c47
Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3 
Apptoken v3: imrpove token handling on external password change
 2018-10-02 21:45:10 +02:00
Morris Jobke
19d552e00b
Merge pull request #11336 from nextcloud/bugfix/3342/database-name-prefix-sqlite 
Allow --database-name and --database-table-prefix for sqlite from occ
 2018-10-02 21:44:03 +02:00
Roeland Jago Douma
19f84f7b54
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:54 +02:00
Roeland Jago Douma
d9febae5b2
Update all the publickey tokens if needed on web login 
* On weblogin check if we have invalid public key tokens
* If so update them all with the new token

This ensures that your marked as invalid tokens work again if you once
login on the web.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:54 +02:00
Roeland Jago Douma
00e99af586
Mark token as invalid if the password doesn't match 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:44 +02:00
Roland Tapken
d17856a1e9
Make logfile's mode configurable. 
The file logger currently resets the mode of the logfile to 0640.

When the webserver is running as a different user than the cron job
(but both are in the same group) the files mode has to be 0660. The
current implementation breaks logging for the user that is not the
owner of the logfile.

This patch introduces a new config option 'logfilemode' that expects
an octal value (defaults to 0640). Unless the value is lower or equal
than 0 the logfiles mode will be resetted to this value.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-10-02 18:27:06 +02:00
Christoph Wurst
d01905200a
Merge pull request #11433 from nextcloud/feature/all_lax_cookies2 
Make authenticated cookies lax
 2018-10-02 10:28:05 +02:00
Roeland Jago Douma
a95154642d
Emit event on enablign or disabling of 2FA provider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-01 15:35:24 +02:00
Morris Jobke
1034efd640
Merge pull request #11461 from nextcloud/feature/noid/drop-find-and-pass-additional-paths 
Dont use find to lookup binaries
 2018-10-01 11:47:07 +02:00
Christoph Wurst
259c0ce11d
Add mandatory 2FA service/class 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-30 11:47:29 +02:00
Daniel Kesselberg
d4dec43f8f
Dont use find to lookup binaries 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-29 20:25:19 +02:00
Daniel Kesselberg
c275beeceb
Allow url without / for overwrite.cli.url 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-28 22:32:19 +02:00
Roeland Jago Douma
9a7265babf
Make authenticated cookies lax 
This protects our cookies a bit more. It makes sure that when a 3rdparty
websites embededs a public alendar for example. That all the users see
this in anonymous mode there.

It adds a small helper function.

In the future we can think about protecting other cookies like this as
well. But for now this is sufficient to not have the user logged in at
all when doing 3rdparty requests.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-28 16:44:37 +02:00
Roeland Jago Douma
c9e93b8084
Compile contactmenu handlebars templates 
Fixes #11029
For https://github.com/orgs/nextcloud/projects/18

Ship the compiled handlebars templates. This makes it possible to have a
scricter CSP.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 20:33:58 +02:00
Christoph Wurst
f71ffc73db
Remove unused constructor argument 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:44:21 +02:00
Christoph Wurst
0259792614
Reduce settings manager complexity by loading sections via DI 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:44:21 +02:00
blizzz
ff55bcdad5
Merge pull request #11150 from nextcloud/feature/noid/unit-test-find-webroot 
Extract logic for webroot into method and add test
 2018-09-26 15:22:30 +02:00
Morris Jobke
ee73f6c416
Merge pull request #11240 from nextcloud/feature/noid/consider-openssl-settings-from-config.php 
Consider openssl settings from config.php
 2018-09-25 18:04:20 +02:00
Roeland Jago Douma
b8418b502d
Merge pull request #11316 from nextcloud/container-queryexception-only 
only catch QueryException when trying to build class
 2018-09-25 16:21:55 +02:00
Christoph Wurst
7586b19e52
Only allow 2FA state changs if providers support the operation 
Ref https://github.com/nextcloud/server/issues/11019.

Add `twofactorauth:cleanup` command

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-25 09:54:20 +02:00
Roeland Jago Douma
92fa373314
Merge pull request #11297 from nextcloud/bugfix/noid/this-database-dude 
Copy the expiration from 480864b3e3 to …
 2018-09-25 09:04:44 +02:00
blizzz
67da97c362
Merge pull request #11222 from nextcloud/gs-and-saml 
make the server ready to use global scale with SAML as auth back-end
 2018-09-24 12:00:13 +02:00
Daniel Kesselberg
9d7e51fd56
Use empty instead ?? because dbname is '' sometimes 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-23 18:25:48 +02:00
Daniel Kesselberg
0ee191bf44
Use const for dbname and dbtableprefix defaults 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-23 18:15:57 +02:00
Daniel Kesselberg
a5f0cc6539
--database-name or --database-table-prefix are ignored for sqlite 
The default implementation of initialize in AbstractDatabase writes
database information to config.php. The method is overwritten in
Sqlite but parent is never called. Database-Name and Database-Table-Prefix
are never written to config.php. But from this point setup use values
from config.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-23 15:52:28 +02:00
Robin Appelman
dccbdc8c01
only catch QueryException when trying to build class 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-09-21 18:32:15 +02:00
Joas Schilling
f258e65f13
Also adjust the expiration of PublicKeyTokenProvider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-20 09:54:27 +02:00
Joas Schilling
5e6187926f
Copy the expiration from 480864b3e3 to getTokenById 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-19 17:55:48 +02:00
Joas Schilling
b026b5deb0
Merge pull request #11134 from nextcloud/locale-template-fix 
Use user locale as default in the template
 2018-09-19 16:06:35 +02:00
John Molakvoæ (skjnldsv)
3095ec4125 Fix icons cacher regex for compressed output 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-19 13:06:04 +02:00
Daniel Kesselberg
90a9a1ecc6
Consider openssl settings from config.php 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-16 11:51:15 +02:00
Bjoern Schiessle
bb86a8ca36
add back-end as parameter to the pre-login hook 
This is needed for the Global Scale setup to allow the master
node to perform different operations during login, depending
on the user management. Because in case of SAML, the authentication
at the idp happens at the master node.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-09-14 17:23:06 +02:00
Daniel Kesselberg
3b7ac0c94d
Change visibility to private 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-13 12:24:06 +02:00
John Molakvoæ (skjnldsv)
92fbb6d795
Fallback to $lang if no $locale match 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-13 11:37:40 +02:00
Daniel Kesselberg
603a578a1c
Change return false to throw new 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-10 22:45:40 +02:00
Daniel Kesselberg
62c03beb1d
Extract logic for webroot into method and add test 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-10 22:33:35 +02:00
John Molakvoæ (skjnldsv)
7d158c62ce
Typehint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-10 11:17:03 +02:00
John Molakvoæ (skjnldsv)
df143cb72a
Use user locale as default in the template 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-10 10:42:08 +02:00
Roeland Jago Douma
c44368b9a3
Merge pull request #11096 from nextcloud/bugfix/11080/set-cookie-null-argument 
replace setcookie value with '' instead of null.
 2018-09-07 19:31:30 +02:00
Roeland Jago Douma
47b46fa69d
Expire tokens hardening 
Just to be sure that the field is also not 0

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-07 10:01:31 +02:00
MartB
fe21b10de5 replace setcookie value with '' instead of null. 
The php documentation states that an empty string should be used for a cookie when it has no real value.
null leads to the following error: expects parameter 2 to be string, null given

Signed-off-by: Martin Böh <mart.b@outlook.de>
 2018-09-06 20:34:16 +02:00
Christoph Wurst
b4b095ca91
Fix @since version on new API 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-05 20:58:39 +02:00