d81dac24aa
Merge pull request #25025 from owncloud/clear_old_calendar_shares
...
Add repair step to clean old calendar shares
2016-06-10 10:42:04 +02:00
a636e4ff28
Downstream 2016-06-09
...
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
51fd2602a7
Revert "Downstream 2016-06-08"
2016-06-09 17:41:57 +02:00
232d735893
Do not leak the login name - fixes #25047
2016-06-09 16:44:31 +02:00
7d51fd0310
Add repair step to clean old calendar/contact shares
...
fixes #21889
2016-06-09 15:48:45 +02:00
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
7f88645eab
Allow to cancel 2FA after login
2016-06-09 14:00:02 +02:00
bee918693a
dissalow symlinks in local storages that point outside the datadir
2016-06-09 14:00:01 +02:00
4f27c2c433
Allow to decrypt user '0' files only
2016-06-09 14:00:00 +02:00
60e15e934c
do not generate device token if 2FA is enable for user
2016-06-09 14:00:00 +02:00
0041d89dc2
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-09 13:59:58 +02:00
67c2c85b05
allow deleting "ghost files" trough the View and Node api
2016-06-09 13:59:58 +02:00
826e276a79
Merge pull request #24973 from owncloud/token-password-session-token
...
When creating a session token, make sure it's the login password and …
2016-06-09 11:58:04 +02:00
aca4ea12c1
Merge pull request #24826 from owncloud/cors-client-login
...
use client login method on CORS routes
2016-06-09 10:31:14 +02:00
e49307014c
Do not log token or challenge with exception stacktrace ( #25026 )
...
* Make the filtering better readable
* Add some more methods to the sensitive list
2016-06-08 16:32:58 +02:00
9997c431c3
use client login method on CORS routes
2016-06-08 15:18:53 +02:00
ec929f07f2
When creating a session token, make sure it's the login password and not a device token
2016-06-08 13:31:55 +02:00
7dcc47dc94
Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa
...
Allow to cancel 2FA after login
2016-06-08 10:27:21 +02:00
8d0948977e
Merge pull request #24899 from owncloud/local-storage-symlinks
...
dissalow symlinks in local storages that point outside the datadir
2016-06-08 10:19:24 +02:00
ed92f4c427
Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user-config
...
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-08 10:14:08 +02:00
12683b786d
Merge pull request #24991 from owncloud/2fa-do-not-generate-token
...
do not generate device token if 2FA is enable for user
2016-06-08 10:13:04 +02:00
b7935dcebd
Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only
...
Allow to decrypt user '0' files only
2016-06-08 10:12:28 +02:00
3e3b326c85
Allow to cancel 2FA after login
2016-06-07 18:17:29 +02:00
38451c85f1
skip failing tests
2016-06-07 17:54:40 +02:00
7b1b723e5b
dissalow symlinks in local storages that point outside the datadir
2016-06-07 14:01:53 +02:00
d4ba982131
Allow to decrypt user '0' files only
2016-06-07 09:13:11 +02:00
8f7a4aaa4d
do not generate device token if 2FA is enable for user
2016-06-07 09:09:51 +02:00
911fd3ead4
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-06 12:38:20 +02:00
63408fa6ef
allow deleting "ghost files" trough the View and Node api
2016-06-03 13:30:59 +02:00
1ab7ee5e23
Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode
...
Add keepUnicode value in the cache key of normalizedPathCache
2016-06-02 15:18:13 +02:00
11900baaf3
add tests for propagator batching
2016-06-02 15:09:15 +02:00
5e71d23ded
remember redirect_url when solving the 2FA challenge
2016-06-01 14:43:47 +02:00
5b1eb416d8
Fix TestCase::invokePrivate to work with static classes
2016-06-01 14:28:59 +02:00
5ad8fa7675
Add keepUnicode value in the cache key of normalizedPathCache
2016-06-01 14:28:59 +02:00
c58d8159d7
Create session tokens for apache auth users
2016-05-31 17:07:49 +02:00
a441220f24
Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessing
...
[decrypt_all] Check if file needs to decrypted or not for speed up large oc setups.
2016-05-31 10:12:03 +02:00
718f0757e4
Fix for #23066 ( #24689 )
2016-05-31 06:53:28 +02:00
b15babd061
fix unit tests
2016-05-30 14:49:27 +02:00
4b1e8a1184
One more PSR-4 fix ( #24852 )
2016-05-26 16:31:26 +02:00
379f8a1e45
Merge pull request #24604 from owncloud/user_ldap-psr4
...
Move user_ldap to PSR-4
2016-05-25 17:11:10 +02:00
2c0743c46b
Fix the tests again
2016-05-25 16:51:02 +02:00
2bddf71f22
Merge pull request #24842 from owncloud/files-storage-wrapper-encoding-psr4
...
Move Test\Files\Storage\Wrapper\EncodingTest to PSR-4
2016-05-25 16:32:43 +02:00
299954c03d
Merge pull request #24840 from owncloud/fix-missing-ext-str-import
...
Fix missing use statements in ext. str. tests
2016-05-25 16:31:32 +02:00
4cfefda891
Move Test\Files\Storage\Wrapper\EncodingTest to PSR-4
2016-05-25 15:26:14 +02:00
7f20203006
Merge pull request #24836 from owncloud/auth-tests-to-psr4
...
Move parallel merged auth tests to PSR-4
2016-05-25 15:15:19 +02:00
154e328e2b
Adjust the phpunit config
2016-05-25 15:14:37 +02:00
8afbd80328
Move parallel merged auth tests to PSR-4
2016-05-25 12:02:05 +02:00
25e6026fa6
Merge pull request #24735 from juliushaertl/passwordreset-invalid
...
Show error messages if a password reset link is invalid or expired
2016-05-25 11:08:46 +02:00
28ce7dd262
do not allow client password logins if token auth is enforced or 2FA is enabled
2016-05-24 17:54:02 +02:00
d3fb5d618e
Merge pull request #24748 from owncloud/login-explicitly
...
Log in explicitly, save login name when generating browser/device tokens
2016-05-24 17:51:49 +02:00
e7110c7678
Merge pull request #24760 from owncloud/objectstore_multibucket
...
Objectstore multibucket
2016-05-24 15:15:59 +02:00
ad10485cec
when generating browser/device token, save the login name for later password checks
2016-05-24 11:49:15 +02:00
abe338f433
Store user bucket in preferences
2016-05-23 21:57:41 +02:00
4f6670d759
Merge pull request #24658 from owncloud/invalidate-disabled-user-session
...
invalidate user session if the user was disabled
2016-05-23 20:50:25 +02:00
87fa86a69a
Merge pull request #24559 from owncloud/2fa
...
two factor auth
2016-05-23 20:50:03 +02:00
e03e4921a0
Fix Name
2016-05-23 20:42:08 +02:00
7ef21b0b27
Add unit tests for ObjectHomeMountProvider
2016-05-23 20:42:08 +02:00
12b63258d5
Add mapper unit tests
2016-05-23 20:42:08 +02:00
d065980814
Add more tests for OC\Core\Controller\LostController
...
- remove testResetFormUnsuccessful as it is now splitted up in different test cases
- add testResetFormInvalidToken to check if timestamp and token are present
- add testResetFormInvalidTokenMatch to check if the saved token matches the provided
- add testResetFormExpiredToken to check if expiration detection works
- add testResetFormValidToken to check if detection of valid tokens works
2016-05-23 16:48:10 +02:00
eca57be336
Only recurse into incomplete folders during background scans
2016-05-23 14:40:35 +02:00
57525a02f8
Merge pull request #24703 from owncloud/personal-settings-auth-tokens
...
Personal settings auth tokens
2016-05-23 14:17:01 +02:00
bd87f67473
Merge pull request #24349 from owncloud/nfd-storagewrapper
...
Add wrapper for NFD encoding workaround
2016-05-23 13:45:33 +02:00
dfb4d426c2
Add two factor auth to core
2016-05-23 11:21:10 +02:00
c20cdc2213
invalidate user session if the user is disabled
2016-05-23 10:32:16 +02:00
dec3f9ebcb
Merge pull request #24726 from owncloud/tests-psr-4
...
Tests outside of tests/lib/ to PSR-4
2016-05-23 09:54:29 +02:00
5ba1add03c
Merge pull request #24603 from owncloud/federated_reshare
...
flat federated re-share
2016-05-23 09:52:13 +02:00
74277c25be
add button to invalidate browser sessions/device tokens
2016-05-23 09:11:12 +02:00
6495534bcd
add button to add new device tokens
2016-05-23 09:11:12 +02:00
12431aa399
list user's auth tokens on the personal settings page
2016-05-23 09:11:12 +02:00
7a6966cdfe
Merge pull request #24732 from owncloud/autoloader_fix
...
Autoloader fix
2016-05-21 19:09:22 +02:00
8646802850
Merge pull request #24696 from owncloud/lock-jobs-while-executing
...
Lock jobs while executing them, to allow multiple executors to run in…
2016-05-21 19:08:15 +02:00
d0a2fa0506
Lock jobs while executing them, to allow multiple executors to run in parallel
2016-05-21 01:59:25 +02:00
7b25839bd5
use share initiator as fall back to access the file
...
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
88740f035d
Act on effective system tag canAssign permission
...
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.
This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
2016-05-20 17:56:02 +02:00
b5eb3d9e5a
Add system tag assignability check with groups
...
Whenever a user is not an admin, a tag is visible but not
user-assignable, check whether the user is a member of the allowed
groups.
2016-05-20 17:56:02 +02:00
3cd65fe25d
Add systemtag_group table and get/set methods
...
Added systemtag to group mapping table.
Added methods in ISystemTagManager to get/set the group mappings.
2016-05-20 17:56:02 +02:00
09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects
2016-05-20 17:56:02 +02:00
8343cfb64b
Add interface methods for permission check
...
Instead of checking for admin perm, use interface method
canUserAssignTag and canUserSeeTag to check for permissions.
Allows for more flexible implementation.
2016-05-20 17:56:02 +02:00
54b637e83c
Fix unit tests
2016-05-20 16:35:07 +02:00
94ad54ec9b
Move tests/ to PSR-4 ( #24731 )
...
* Move a-b to PSR-4
* Move c-d to PSR-4
* Move e+g to PSR-4
* Move h-l to PSR-4
* Move m-r to PSR-4
* Move s-u to PSR-4
* Move files/ to PSR-4
* Move remaining tests to PSR-4
* Remove Test\ from old autoloader
2016-05-20 15:38:20 +02:00
e8d082208d
Fixes for encoding wrapper
...
Improved label
Fixed rename/copy/moveFromStorage/copyFromStorage and added tests
Improved findPathToUse algo
2016-05-20 09:33:59 +02:00
63bbbf29f4
Add wrapper for NFD encoding workaround
2016-05-20 09:33:59 +02:00
b495895017
Merge pull request #24728 from owncloud/no-more-test_-files
...
Fix autoloader for Test* files
2016-05-20 09:29:01 +02:00
54250ed065
Add PSR-4 loading for Test\ and Tests\
2016-05-19 15:49:27 +02:00
f8180391fd
Create a Fallback in the old autoloader for PSR-4 Test\TestCase
2016-05-19 15:45:34 +02:00
ffa4633822
No more Test_* files exist, remove autoloading
2016-05-19 15:38:16 +02:00
f42cdec4c4
Merge pull request #24725 from owncloud/ocs-provider-psr4
...
Move OCS Provider to PSR-4 namespace
2016-05-19 15:36:19 +02:00
3b3940df6b
Merge pull request #24660 from owncloud/no-token-login-for-disabled-users
...
don't allow token login for disabled users
2016-05-19 15:32:09 +02:00
61b3260ebd
Merge pull request #24716 from owncloud/fix-test-namespaces-2
...
Fix test namespaces [files-]
2016-05-19 15:31:43 +02:00
c58d174616
Move tests/settings to PSR-4
2016-05-19 11:18:25 +02:00
392bc0c6b9
Move tests/core/ to PSR-4
2016-05-19 11:18:25 +02:00
20f229eed9
Move OCS Provider to PSR-4 namespace
2016-05-19 11:10:32 +02:00
bae4118b4f
Fix renamed class
2016-05-19 10:33:12 +02:00
e36a27d21c
Merge pull request #24712 from owncloud/fix-test-namespaces
...
Fix test namespaces [a-e]
2016-05-19 10:30:07 +02:00
320b1c3abf
Fix more failures
2016-05-19 10:11:42 +02:00
f24179a327
Fix deprecated private method
2016-05-19 09:44:53 +02:00
e88a9b2fed
Fix missing backtick before OC
2016-05-19 09:41:45 +02:00
e823d50044
Fix "Class 'Test\Security\DateTime' not found"
2016-05-19 09:40:34 +02:00
9a4253ef7c
Fix lib/
2016-05-19 09:38:52 +02:00
55fc6536d3
FIx lib/ a-d
2016-05-19 09:27:21 +02:00
7f3f16d155
Fix namespace in user/
2016-05-19 09:19:03 +02:00
a107e7de7b
Fix namespace in share/
2016-05-19 09:15:10 +02:00
68481c10e6
Fix namespaces in security/
2016-05-19 09:02:58 +02:00
a9f24a74a2
Fix namespace in repair/
2016-05-19 08:59:37 +02:00
d19d6533dd
Fix public/ namespace in tests
2016-05-19 08:56:47 +02:00
859d2bc0ff
Fix namespace of memcache/ and ocs/
2016-05-19 08:53:06 +02:00
71603fe348
Fix namespace in log/ and mail/
2016-05-19 08:50:14 +02:00
0ab1120a33
Fix namespaces in tests/lib/integritycheck
2016-05-19 08:48:22 +02:00
51db410e67
Fix namespaces in tests/lib/http/
2016-05-19 08:46:58 +02:00
995d4b7ecd
Fix namespaces in tests/lib/groups/
2016-05-19 08:44:41 +02:00
b1458d590d
Fix namespaces and class names in tests/lib/files/
2016-05-19 08:41:01 +02:00
f824f3e5f3
don't allow token login for disabled users
2016-05-18 21:10:37 +02:00
f57407e73e
Fix file name in tests/lib/encryption
2016-05-18 18:57:46 +02:00
ba230888c6
Fix filenames and class names in tests/lib/comments
2016-05-18 18:57:46 +02:00
bbf758b1b0
Fix file name of command test
2016-05-18 18:57:46 +02:00
1b6cd583f7
Fix namespace of tests/cache/
2016-05-18 18:57:46 +02:00
c54d79947b
Fix missing namespaces in tests/lib/db/
2016-05-18 18:57:45 +02:00
5ce5eb195a
Fix namespace for archive tests
2016-05-18 18:57:45 +02:00
9eade36ae5
Fix namespaces in AppFramework tests
2016-05-18 18:57:45 +02:00
0626578739
add method to query all user auth tokens
2016-05-18 18:25:37 +02:00
98b465a8b9
a single token provider suffices
2016-05-18 09:20:48 +02:00
5c9103287f
Group fixup ( #24621 )
...
* Move used OC_Group_xx to \OC\Group
* Add (deprecated) legacy wrapper in legacy, OC_Group_xx
* Replace deprecated use of OC_Group_xx with \OC\Group\xx
2016-05-17 16:06:44 +02:00
e383a9506d
Merge pull request #24617 from owncloud/autoloader_no_private
...
our autoloader should not load classes in \OC
2016-05-13 17:30:10 +02:00
9ac763a640
Merge pull request #24594 from owncloud/authtoken-name-column-size
...
Use CLOB for auth token names to allow long user agent strings
2016-05-13 11:56:52 +02:00
d022b6fad4
Fix unit tests
2016-05-13 11:33:21 +02:00
eb79b83831
Move functions.php to legacy
...
This file should really be properly namespaced etc!
2016-05-13 08:54:07 +02:00
c28e462583
Use CLOB for auth token names to allow long user agent strings
2016-05-12 11:19:17 +02:00
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
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
0486d750aa
use the UID for creating the session token, not the login name
2016-05-11 13:36:46 +02:00
69dafd727d
delete the token in case an exception is thrown when decrypting the password
2016-05-11 13:36:46 +02:00
af707fba41
use the query builder instead of raw sql statements
2016-05-11 13:36:46 +02:00
46bdf6ea2b
fix PHPDoc and other minor issues
2016-05-11 13:36:46 +02:00
f0f8bdd495
PHPDoc and other minor fixes
2016-05-11 13:36:46 +02:00
dff108e97b
fix mock builder for old phpunit versions
2016-05-11 13:36:46 +02:00
fbb5768587
add unit tests for all new classes
2016-05-11 13:36:46 +02:00
aa85edd224
increase token column width
...
add some range to time() assertions
2016-05-11 13:36:46 +02:00
8cc5f6036f
Fix existing tests
2016-05-11 13:36:46 +02:00
aafd660b97
fix LoginController unit tests
2016-05-11 13:36:46 +02:00
db16dc6644
Correctly register autoloading before install.php and loading commands
2016-05-11 11:18:00 +02:00
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
9e1d9871a8
Move OC_User_Database to \OC\User\Database
2016-05-10 19:53:36 +02:00
e8e72aa910
Merge pull request #24434 from owncloud/permalinks
...
Permalinks
2016-05-10 09:44:50 +02:00
8b428d84c0
Make update server URL configurable
...
Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
2016-05-09 11:25:58 +02:00
108bd26856
Fix unit tests broken after #24457
...
Timeout was increased but tests were not updated.
2016-05-09 08:54:30 +02:00
caefe23bb6
Send permalink in internal share notification emails
2016-05-06 16:46:59 +02:00
873849e843
Merge pull request #24432 from owncloud/issue-24270-never-save-app-language-into-request-lang
...
Do not save the language as request lang for apps when we didn't find…
2016-05-04 13:47:08 +02:00
9fbb8ce302
Do not save the language as request lang for apps when we didn't find any
2016-05-04 08:28:13 +02:00
4b2544925f
Merge pull request #23844 from owncloud/disable-user
...
Add occ commands to enable and disable a user + a disabled user can n…
2016-05-03 15:22:41 +02:00
f8c04a4219
Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml
...
Declare cron jobs in info.xml
2016-05-03 12:03:28 +02:00
Vincent Petry
Arthur Schiwon
Thomas Müller
Roeland Jago Douma
Bjoern Schiessle
Joas Schilling
Robin Appelman
Christoph Wurst
Joas Schilling
Morris Jobke
Torben Dannhauer
Björn Schießle
Roeland Jago Douma
Julius Haertl
Roeland Douma
Lukas Reschke
Thomas Müller
Lukas Reschke