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
Björn Schießle
331d73c3a3
Merge pull request #13182 from owncloud/download_versions
...
make versions of shared files downloadable
2015-01-12 12:03:21 +01:00
Bjoern Schiessle
0500d3a506
unit tests
2015-01-09 15:49:44 +01:00
Bjoern Schiessle
6cc40552b1
don't move encryption keys if a mount point was renamed
2015-01-09 15:39:36 +01:00
Bjoern Schiessle
d699d31518
make versions of shared files downloadable
2015-01-09 12:46:24 +01:00
Jenkins for ownCloud
d4fc2f555b
[tx-robot] updated from transifex
2015-01-09 01:55:22 -05:00
Jenkins for ownCloud
8776271103
[tx-robot] updated from transifex
2015-01-05 01:54:36 -05:00
Jenkins for ownCloud
84ed1034b4
[tx-robot] updated from transifex
2015-01-04 01:54:53 -05:00
Jenkins for ownCloud
4b357274bb
[tx-robot] updated from transifex
2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a
[tx-robot] updated from transifex
2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d
[tx-robot] updated from transifex
2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
d2e53d1022
[tx-robot] updated from transifex
2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8
[tx-robot] updated from transifex
2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
d8f04f5a97
[tx-robot] updated from transifex
2014-12-23 01:55:23 -05:00
Morris Jobke
eab4c029c2
Merge pull request #12961 from owncloud/try_to_cache_keys
...
cache keys to read them only once from the hard disc
2014-12-22 09:50:29 +01:00
Jenkins for ownCloud
92c8cd3933
[tx-robot] updated from transifex
2014-12-22 01:54:49 -05:00
Jenkins for ownCloud
312891c603
[tx-robot] updated from transifex
2014-12-21 01:54:36 -05:00
Bjoern Schiessle
aea991c22e
cache keys to read them only once from the hard disc
2014-12-19 16:04:13 +01:00
Bjoern Schiessle
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Jörn Friedrich Dreyer
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Morris Jobke
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
Jenkins for ownCloud
6d80524e67
[tx-robot] updated from transifex
2014-12-17 01:56:41 -05:00
Jenkins for ownCloud
ea95bb0189
[tx-robot] updated from transifex
2014-12-10 01:55:34 -05:00
Joas Schilling
26861a98c5
Merge pull request #12568 from owncloud/autoload-encryption-classes
...
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Lukas Reschke
3566edbcec
Merge pull request #12715 from owncloud/fix-broken-personal-page
...
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
Joas Schilling
b85e34c1da
Correctly namespace encryption tests
2014-12-09 09:47:27 +01:00
Joas Schilling
e67fe0336b
Use self:: instead of the class name in encryption tests
2014-12-09 09:47:27 +01:00
Joas Schilling
efac8ced90
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f
Fix namespace of files_encryption classes and autoload them
2014-12-09 09:47:26 +01:00
Morris Jobke
b9fab7441c
remove duplicate loaded personal.js - fixes #12674
2014-12-09 09:27:10 +01:00
Morris Jobke
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Jenkins for ownCloud
2784d580bd
[tx-robot] updated from transifex
2014-12-08 01:54:57 -05:00
Jenkins for ownCloud
8ee9ee29ea
[tx-robot] updated from transifex
2014-12-07 01:54:32 -05:00
Jenkins for ownCloud
94eb2e782f
[tx-robot] updated from transifex
2014-12-06 01:54:56 -05:00
Jenkins for ownCloud
4d53f163fd
[tx-robot] updated from transifex
2014-12-05 01:55:52 -05:00
Bjoern Schiessle
1509dd1358
update error message
2014-12-04 12:01:11 +01:00
Bjoern Schiessle
0dd44eaf27
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
2014-12-04 11:17:44 +01:00
Bjoern Schiessle
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
Bjoern Schiessle
9ca9acf3f8
small fixes
2014-12-02 16:08:06 +01:00
Bjoern Schiessle
2e78217f17
delete old keys if file was moved to a different mount point
2014-12-02 16:03:54 +01:00
Bjoern Schiessle
49cfc30359
upgrade to new folder structure
2014-12-02 16:03:54 +01:00
Bjoern Schiessle
a90606fb14
change private/public key names for consistency reasons
2014-11-26 10:57:47 +01:00
Bjoern Schiessle
266f1a2afa
harmonize copyright notice
2014-11-26 10:57:47 +01:00
Bjoern Schiessle
fd86d76f98
new folder structure for keys
...
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
Morris Jobke
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Joas Schilling
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
Bjoern Schiessle
4643a5d238
replace \OC:: with \OC::->getSession()
2014-11-25 16:15:32 +01:00
Bjoern Schiessle
917bef39b7
don't store private public-share-key in session
2014-11-25 12:32:25 +01:00
Bjoern Schiessle
f274833403
remove unused variable
2014-11-25 10:12:10 +01:00
Bjoern Schiessle
1645c8f819
use login name to verify password
2014-11-24 15:44:43 +01:00
Jenkins for ownCloud
fa3f7ad9e9
[tx-robot] updated from transifex
2014-11-22 01:55:21 -05:00
Jenkins for ownCloud
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
Vincent Petry
391ece46e3
Fix file upload to ext storage when recovery key is enabled
...
Fixes an issue when uploading files to external storage when recovery
keys are enabled
The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
Lukas Reschke
713c8e0dac
Merge pull request #12325 from owncloud/removeunneccessarylang
...
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Volkan Gezer
995fe4a176
cleanup languages. closes #11274
2014-11-20 14:46:17 +01:00
Joas Schilling
76ebd3a050
Make apps/ extend the \Test\TestCase and fix overwritten methods
2014-11-19 14:52:09 +01:00
Lukas Reschke
1c8f9564a4
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
...
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Jenkins for ownCloud
91f7c0af6e
[tx-robot] updated from transifex
2014-11-18 01:54:31 -05:00
Bjoern Schiessle
f6efbfcf0b
listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user
2014-11-17 17:50:20 +01:00
Morris Jobke
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
