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

121 commits

Author SHA1 Message Date
Roeland Jago Douma
674930da7f
Move ExpiredTokenException to the correct namespace 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +01:00
Roeland Jago Douma
34f5f4091e
Catch more occurences where ExpiredTokenException can be thrown 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 14:37:08 +02:00
Roeland Jago Douma
b3a92a4e39
Expired PK tokens should not fall back to legacy tokens 
Fixes #11919

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 14:34:29 +02:00
Christoph Wurst
83e994c11f
Make it possible to enforce mandatory 2FA for groups 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-15 08:22:52 +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
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
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
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
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
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
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
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
Christoph Wurst
fb98db7da7
Fix handlng of concurrent inserts of the 2FA provider registry DAO 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-31 11:46:27 +02:00
Christoph Wurst
1124b87bc0
Fix 2FA being enforced if only backup codes provider is active 
Fixes https://github.com/nextcloud/server/issues/10634.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-10 09:26:40 +02:00
Christoph Wurst
8db66d5dfb
Fix double-inserts of the same provider state 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 13:56:04 +02:00
Christoph Wurst
d8197f2b97
Rename providerset method to get primary providers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 20:28:21 +02:00
Christoph Wurst
c6e47e8a51
Fix login redirection if only one 2FA provider is active 
Fixes https://github.com/nextcloud/server/issues/10500.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 15:25:59 +02:00
Christoph Wurst
d248a0bd1e
Fix 2FA provider registry population on login 
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 06:57:52 +02:00
Christoph Wurst
fc149bab3c
Fix duplicate inserts in the 2fa provider registry DAO 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-07-31 06:43:44 +02:00
Christoph Wurst
7be465febe
Make new classes strict and fix license header 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-25 07:38:52 +02:00
Christoph Wurst
13d93f5b25
Make 2FA providers stateful 
This adds persistence to the Nextcloud server 2FA logic so that the server
knows which 2FA providers are enabled for a specific user at any time, even
when the provider is not available.

The `IStatefulProvider` interface was added as tagging interface for providers
that are compatible with this new API.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-20 08:30:26 +02:00
Roeland Jago Douma
82959ca93e
Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 07:46:43 +02:00
Roeland Jago Douma
970dea9264
Add getProvider helper function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
df34571d1d
Use constant for token version 
And don't set the version in the constructor. That would possible cause
to many updates.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
9e7a95fe58
Add more tests 
* Add a lot of tests
* Fixes related to those tests
* Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
1999f7ce7b
Generate the new publicKey tokens by default! 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
f168ecfa7a
Actually convert the token 
* When getting the token
* When rotating the token

* Also store the encrypted password as base64 to avoid weird binary
stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
d03d16a936
Add publickey provider to manager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
4bbc21cb21
SetPassword on PublicKeyTokens 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
4c0d710479
Just pass uid to the Token stuff 
We don't have user objects in the code everywhere

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma
1f17010e0b
Add first tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma
02e0af1287
Initial PKT implementation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma
3dd5f3d5f6
Abstract the Provider via a manager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:53 +02:00
Roeland Jago Douma
480864b3e3
Make the token expiration also work for autocasting 0 
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-08 16:20:43 +02:00
Roeland Jago Douma
6b7cf46727
Certain tokens can expire 
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 16:10:19 +02:00
Roeland Jago Douma
aba255997a
Allow the rotation of tokens 
This for example will allow rotating the apptoken for oauth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-16 19:27:19 +02:00
Roeland Jago Douma
4ea2daf04d
Refix scope 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-15 11:41:27 +02:00
Roeland Jago Douma
466297829e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-15 10:56:40 +02:00
Roeland Jago Douma
47388e1cfe
Make the Token Auth code strict 
In preparation for #9441

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-15 10:32:30 +02:00
Roeland Jago Douma
610c66520b
Move over TokenMapper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-10 19:47:43 +02:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Roeland Jago Douma
eddd135f14
Dispatch event on twofactor failure and success 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Flávio Gomes da Silva Lisboa
5ca9a7d6bc
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12 + LDAP #6732 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:22:44 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Christoph Wurst
38bb6e1477
Fix duplicate session token after remembered login 
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-09-20 21:39:31 +02:00
Roeland Jago Douma
9163cf9241
Fix AppPassword 2FA auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-12 22:28:43 +02:00
Roeland Jago Douma
b96485b6bd
Fix login with basic auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-05 12:24:41 +02:00