Commit Graph

1445 Commits

Author SHA1 Message Date
Jenkins for ownCloud 77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Jenkins for ownCloud 6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Morris Jobke 1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies
encryption requires openssl and user_ldap requires ldap 🙊
2015-02-02 12:49:45 +01:00
Thomas Müller c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke 012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares
make sure that we get the correct user from the path
2015-01-31 08:52:07 +01:00
Jenkins for ownCloud c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Bjoern Schiessle ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Jenkins for ownCloud f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Morris Jobke b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
Joas Schilling 333f4e7913 Fix intendation 2015-01-29 16:57:46 +01:00
Joas Schilling 4a5f626979 Fix more assertions 2015-01-29 16:54:27 +01:00
Joas Schilling 9a7dd57bc8 Fix 2 assertions 2015-01-29 16:09:35 +01:00
Bjoern Schiessle c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Thomas Müller a25063a8ed Merge pull request #13746 from owncloud/no-groups-provisioning-api
disallow provisioning api to be enabled for groups only
2015-01-29 12:47:54 +01:00
Thomas Müller 099d43b1f9 Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step
adding console command to migrate encryption keys - refs #13450
2015-01-29 10:30:12 +01:00
Thomas Müller f60406102f disallow provisioning api to be enabled for groups only 2015-01-29 10:00:54 +01:00
Jenkins for ownCloud 55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Vincent Petry acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
Call final unlink in trash wrapper's storage
2015-01-27 17:05:38 +01:00
Jenkins for ownCloud c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Jenkins for ownCloud a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Vincent Petry 67f1534e0f Call final unlink in trash wrapper's storage
In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.

This fix makes forwards that second call to the wrapped storage to make
the final delete work.

It fixes the issue with remote shares, local shares and external
storage.

Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))
2015-01-23 12:20:54 +01:00
Jenkins for ownCloud bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Arthur Schiwon 9c7cd702c3 user fs must be setup up, so that the real user folder is mounted on the username based path 2015-01-22 19:16:28 +01:00
Thomas Müller fc1865449d adding console command to migrate encryption keys - refs #13450 2015-01-22 16:10:45 +01:00
Jenkins for ownCloud 5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Morris Jobke c931eafc1f Merge pull request #13517 from owncloud/keymanager-storage
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
Lukas Reschke 762949afd9 Make naming of encryption app consistent
Fixes https://github.com/owncloud/core/issues/13580
2015-01-21 23:29:09 +01:00
Jenkins for ownCloud b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Robin Appelman 750cff0e3e Bypass the view when storing encryption keys 2015-01-20 16:20:49 +01:00
Morris Jobke 870bc429b2 Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth
Prioritise Basic Auth header over Cookie
2015-01-19 22:23:02 +01:00
Morris Jobke 2229290cca fix typo of blog -> changed to block
* fixes #13460
2015-01-19 15:57:53 +01:00
Thomas Müller 3d6f4ac24e Merge pull request #13457 from owncloud/enc-skippartfiles
Skip stray part files during initial encryption
2015-01-19 14:40:21 +01:00
Vincent Petry 7a1ab3bb5e Add class attribute types in encryption Util class 2015-01-19 13:01:52 +01:00
Vincent Petry 7c3c26ab94 Skip stray part files during initial encryption 2015-01-19 13:01:37 +01:00
Bjoern Schiessle 15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud 31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Lukas Reschke dfbc405a45 Prioritise Basic Auth header over Cookie
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.

This patch adds a workaround the following way:

1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth

Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.

This requires proper testing also considering LDAP / Shibboleth and whatever instances.
2015-01-17 13:29:07 +01:00
Jenkins for ownCloud 60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Jenkins for ownCloud a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Jenkins for ownCloud 4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Vincent Petry 87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Lukas Reschke 64ee942e7d Merge pull request #13288 from owncloud/enc_fix_public_download
[encryption] fix download of public shared files
2015-01-14 11:55:13 +01:00
Björn Schießle 5745b68fa9 Merge pull request #13311 from owncloud/fix_restore_keys
adapt decrypt all to the new folder structure
2015-01-14 11:40:22 +01:00
Jenkins for ownCloud f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Bjoern Schiessle 83574053a3 if we download a public shared file we need to retrieve the user from the path 2015-01-13 14:22:54 +01:00
Bjoern Schiessle 89f17ef6fe adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8 2015-01-13 12:45:33 +01:00
Jenkins for ownCloud 3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Joas Schilling 5c03e2207b Check array size, before using the 3rd element from it 2015-01-12 17:05:51 +01:00