ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
66a134e69e
Disallow certain malformed domain names even if they match the trusted domain expression
...
Stricter checking for valid domain names
2016-07-06 23:51:04 +00:00
2b4ceae620
Trusted domain wildcard checking made shorter, supporting multiple *
...
Added test cases
2016-07-06 23:38:30 +00:00
d769e718a5
Set content type when downloading log file to force download in some browsers ( #25382 )
2016-07-06 22:47:16 +02:00
d2d99a91a0
fix swift primary object store test ( #25281 )
...
* Wait for socket to be open
* Fix call on null
* Allow DB access for MountProviderTest
Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
6f92aef265
Merge pull request #25276 from owncloud/delete-own-session-token
...
prevent users from deleting their own session token
2016-07-01 16:15:31 +02:00
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
700a57d8b6
Set content-type to "application/octet-stream"
...
Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly.
2016-06-30 12:47:46 +02:00
3acdc1339d
Merge pull request #206 from nextcloud/ci-mysql
...
Add mysql job to CI
2016-06-30 09:06:19 +02:00
01829e8d7c
mysql only works with 3 byte UTF-8
2016-06-29 15:53:23 +02:00
b55ab6d22a
Various database migration fixes ( #25209 )
...
* String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating
* Adding schema migration tests to prevent unnecessary and non-sense migration steps
Fix Oracle autoincrement and unsigned handling
* Fix sqlite integer type for autoincrement
* Use lower case table names - fixes pg
* Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
2016-06-29 14:54:41 +02:00
c9a2790893
prevent users from deleting their own session token
2016-06-28 16:17:37 +02:00
1710de8afb
Login hooks ( #25260 )
...
* fix login hooks
* adjust user session tests
* fix login return value of successful token logins
* trigger preLogin hook earlier; extract method 'loginWithPassword'
* call postLogin hook earlier; add PHPDoc
2016-06-27 22:16:22 +02:00
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
2a990a0db5
verify user password on change
2016-06-27 14:08:11 +02:00
d4989c8037
remove old hook, no longer needed
2016-06-27 14:05:27 +02:00
630e4b1b46
check password for link shares
2016-06-27 14:05:27 +02:00
199c8e304c
Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
...
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
89198e62e8
check login name when authenticating with client token
2016-06-24 13:57:09 +02:00
0ad065cb8d
Repair step to adjust link share delete permissions
2016-06-24 09:48:48 +02:00
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
3db5de95bd
Merge pull request #25172 from owncloud/token-login-validation
...
Token login validation
2016-06-22 13:58:56 +02:00
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
b805908dca
update session token password on user password change
2016-06-21 10:24:25 +02:00
62e6de5df3
fix unit tests
2016-06-20 13:52:51 +02:00
56199eba37
fix unit test warning/errors
2016-06-20 10:41:23 +02:00
fb36fd495b
fix DefaultTokenMapperTest
2016-06-20 09:25:15 +02:00
5c68084823
fix default token provider tests
2016-06-20 09:17:19 +02:00
8ef5431e7a
fix user session tests
2016-06-20 09:10:11 +02:00
c4149c59c2
use token last_activity instead of session value
2016-06-17 15:42:28 +02:00
82b50d126c
add PasswordLoginForbiddenException
2016-06-17 11:02:07 +02:00
3521f974db
assert app is loaded in unit tests
2016-06-16 11:08:43 +02:00
a40d64ff7f
load 2FA provider apps before querying classes
2016-06-16 10:12:16 +02:00
9c328de4ab
Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_user
...
Optimize isSharingDisabledForUser
2016-06-16 09:27:48 +02:00
1251df3e17
Merge pull request #25075 from owncloud/fix_23265
...
Remove shares of the root folder
2016-06-16 09:27:06 +02:00
05967a6904
Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-users
...
Clean up tags of deleted users
2016-06-15 12:20:29 +02:00
ea4c5e6e0a
Fix unit tests
2016-06-14 13:24:48 +02:00
123bf78ca8
Clean up tags of deleted users
2016-06-14 12:38:09 +02:00
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
2016-06-14 01:06:25 +02:00
465807490d
create session token only for clients that support cookies
2016-06-13 19:44:05 +02:00
64471b5d4a
Remove shares of the root folder
...
Fixes #23265
(A possibly costly) repair job to remove cyclic shares.
2016-06-13 15:07:41 +02:00
5daa9a5417
fail hard if 2fa provider can not be loaded ( #25061 )
2016-06-13 12:46:45 +02:00
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
52a0c939ab
Merge pull request #24863 from owncloud/propagator-batching
...
Propagator batching for the file scanner
2016-06-10 17:45:52 +02:00
60225284f3
Add not-null columns for oracle
2016-06-10 12:44:49 +02:00
1b66db72d9
Repair job to fix permissions for avatars
...
Fixes #22978
On some older installations the permissions for the userRoot and the
avatars are not correct. This breaks since we now use the Node API in
the avatar code.
This repair job makes sure that the permissions are set correctly.
* Unit tests added
2016-06-10 12:44:49 +02:00
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
Morris Jobke
Johannes Ernst
Vincent Petry
Thomas Müller
Thomas Pulzer
Lukas Reschke
Christoph Wurst
Christoph Wurst
Bjoern Schiessle
VicDeo
Roeland Jago Douma
Joas Schilling
Arthur Schiwon
Lukas Reschke
Roeland Jago Douma
Thomas Müller
Robin Appelman
Joas Schilling
Torben Dannhauer
Björn Schießle