mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,208 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

32208 Commits

Author SHA1 Message Date
Joas Schilling bc1d70f08c Pass on the error message from the user manager to the UI (#24526) 2016-05-11 19:41:13 +02:00
Lukas Reschke ee0ebd192a Use proper URL generation function (#24576) 
Fixes the redirection after login, otherwise `core/files/index` is opened which fails.
 2016-05-11 19:39:57 +02:00
Joas Schilling 2a05035339 Move Provisioning api to PSR-4 (#24510) 
* Move app to PSR-4

* Fix setUp method

* Fix the tests
 2016-05-11 19:38:49 +02:00
Jörn Friedrich Dreyer e03f9e8103 allow configuration of memcached options (#23729) 
* allow configuration of memcache options

Use production values for memcached as explained in http://apprize.info/php/scaling/15.html

The current implementiation uses ascii based serialization. This PR should reduce traffic to the memcached server.

cc @MorrisJobke @FelixBoehm

* add config sample

* merge config options, throw hint on config error

* fix typo

* fix config sample
 2016-05-11 19:38:00 +02:00
Thomas Müller 3333c4c0b9 Merge pull request #24568 from owncloud/fix_24566 
Fix etag propegation test race condition
 2016-05-11 16:29:00 +02:00
Roeland Jago Douma 8bfa532075
Fix test race condition 
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
 2016-05-11 14:07:37 +02:00
Thomas Müller 8729415880 Merge pull request #24531 from owncloud/psr4-loading-for-install-and-commands 
Correctly register PSR-4 autoloading before install.php and loading commands
 2016-05-11 13:53:16 +02:00
Thomas Müller efa545f8f0 Merge pull request #24189 from owncloud/pluggable-auth 
Pluggable auth
 2016-05-11 13:52:45 +02:00
Christoph Wurst 0486d750aa
use the UID for creating the session token, not the login name 2016-05-11 13:36:46 +02:00
Christoph Wurst 5e55dfb2d6
create session token for DAV clients (sync clients) 2016-05-11 13:36:46 +02:00
Christoph Wurst 214aa6639c
fix login with email 2016-05-11 13:36:46 +02:00
Christoph Wurst 69dafd727d
delete the token in case an exception is thrown when decrypting the password 2016-05-11 13:36:46 +02:00
Christoph Wurst af707fba41
use the query builder instead of raw sql statements 2016-05-11 13:36:46 +02:00
Christoph Wurst 46bdf6ea2b
fix PHPDoc and other minor issues 2016-05-11 13:36:46 +02:00
Christoph Wurst 3ffa7d986a
show login error 2016-05-11 13:36:46 +02:00
Christoph Wurst a9b500c03b
catch possible SessionNotAvailableExceptions 2016-05-11 13:36:46 +02:00
Christoph Wurst bfed02b038
add auth integration tests 2016-05-11 13:36:46 +02:00
Christoph Wurst f0f8bdd495
PHPDoc and other minor fixes 2016-05-11 13:36:46 +02:00
Christoph Wurst dff108e97b
fix mock builder for old phpunit versions 2016-05-11 13:36:46 +02:00
Christoph Wurst fbb5768587
add unit tests for all new classes 2016-05-11 13:36:46 +02:00
Christoph Wurst 699289cd26
pass in $request on OCS api 2016-05-11 13:36:46 +02:00
Christoph Wurst 168ccf90a6
try apache auth too 2016-05-11 13:36:46 +02:00
Christoph Wurst aa85edd224
increase token column width 
add some range to time() assertions
 2016-05-11 13:36:46 +02:00
Christoph Wurst 8cc5f6036f
Fix existing tests 2016-05-11 13:36:46 +02:00
Christoph Wurst aafd660b97
fix LoginController unit tests 2016-05-11 13:36:46 +02:00
Christoph Wurst 7aa16e1559
fix setup 2016-05-11 13:36:46 +02:00
Christoph Wurst 18704a9fc8
increase version number to trigger db migration 2016-05-11 13:36:46 +02:00
Christoph Wurst 7e7d5a2ef2
Add fallback to allow user:token basic auth 2016-05-11 13:36:46 +02:00
Christoph Wurst fdc2cd7554
Add token auth for OCS APIs 2016-05-11 13:36:46 +02:00
Christoph Wurst 8d48502187
Add index on 'last_activity' 
add token type column and delete only temporary tokens in the background job

debounce token updates; fix wrong class import
 2016-05-11 13:36:46 +02:00
Christoph Wurst 53636c73d6
Add controller to generate client tokens 2016-05-11 13:36:46 +02:00
Christoph Wurst 3ab922601a
Check if session token is valid and log user out if the check fails 
* Update last_activity timestamp of the session token
* Check user backend credentials once in 5 minutes
 2016-05-11 13:36:46 +02:00
Christoph Wurst 2fa5e0a24e
invalidate (delete) session token on logout 
add 'last_activity' column to session tokens and delete old ones via a background job
 2016-05-11 13:36:46 +02:00
Christoph Wurst d8cde414bd
token based auth 
* Add InvalidTokenException
* add DefaultTokenMapper and use it to check if a auth token exists
* create new token for the browser session if none exists
hash stored token; save user agent
* encrypt login password when creating the token
 2016-05-11 13:36:46 +02:00
Joas Schilling db16dc6644
Correctly register autoloading before install.php and loading commands 2016-05-11 11:18:00 +02:00
Thomas Müller f39e163d4a Merge pull request #24493 from owncloud/command_psr4 
Move \OCP\Command to PSR-4
 2016-05-11 11:17:19 +02:00
Thomas Müller 9eea062004 Merge pull request #24433 from owncloud/user_psr4 
lib/private/user to PSR-4
 2016-05-11 11:16:56 +02:00
Thomas Müller a02c524007 Merge pull request #24550 from owncloud/kill-en@pirate 
Yo-ho-oh - Murder all band 'o pirates
 2016-05-11 11:04:36 +02:00
Thomas Müller 199b447527
Yo-ho-oh - Murder all band 'o pirates 2016-05-11 09:16:17 +02:00
Jenkins for ownCloud 7da5331782 [tx-robot] updated from transifex 2016-05-11 01:55:55 -04:00
Lukas Reschke 4a05e9ce76 Merge pull request #24379 from owncloud/remove-unneeded-code 
Remove unneeded private wrapper methods
 2016-05-10 20:19:48 +02:00
Roeland Jago Douma 73b8158519
Move \OCP\Command to PSR-4 2016-05-10 20:14:04 +02:00
Morris Jobke e2748e4cbf
fix usage of legacy class in LDAP 2016-05-10 19:53:36 +02:00
Roeland Jago Douma f6ee738ba8
Add \OC\User\Backend 
Since some apps (ldap et al) still depend on OC_User_Backend this seemed
like the cleanest approach.
 2016-05-10 19:53:36 +02:00
Roeland Jago Douma 9e1d9871a8
Move OC_User_Database to \OC\User\Database 2016-05-10 19:53:36 +02:00
Roeland Jago Douma 9504500e5f
Move \OC\User to PSR-4 2016-05-10 19:53:36 +02:00
Roeland Jago Douma c51ebb02fa
Move OC_User_XX to legacy folder 2016-05-10 19:53:36 +02:00
Morris Jobke 0543f8a839 Merge pull request #24397 from owncloud/sort-share-links 
Reordered share link settings
 2016-05-10 18:42:10 +02:00
Vincent Petry 510724716d Merge pull request #24401 from owncloud/trash-list-cache 
use the cache for trash listing
 2016-05-10 17:12:49 +02:00
Thomas Müller 67163262e4 Merge pull request #24534 from owncloud/fix_phpdoc 
Fix phpdoc
 2016-05-10 14:36:54 +02:00