Thomas Müller
1f6d8f2fdb
tearDown the file system before reinitializing - fixes #14775
2015-03-25 10:55:54 +01:00
Clark Tomlinson
0e4ba618cf
Merge pull request #14383 from jknockaert/newbranch
...
make encryption stream wrapper seekable
2015-03-23 09:22:36 -04:00
Vincent Petry
22bc622f9b
Move keys instead of copy during encryption key migration
2015-02-27 17:14:17 +01:00
Robin Appelman
6f000ffc7b
Disable the cache updater when doing the encryption migration
2015-02-27 17:14:16 +01:00
Morris Jobke
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
.
2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
jknockaert
261b5eb90f
again
2015-02-19 16:36:54 +01:00
jknockaert
9ff9f27f8a
try again
2015-02-19 16:12:01 +01:00
jknockaert
a490e21d0d
new try
2015-02-19 16:10:41 +01:00
jknockaert
417e40d218
Merge remote-tracking branch 'origin/master'
...
Conflicts:
apps/files_encryption/lib/stream.php
2015-02-19 16:08:33 +01:00
jknockaert
d5ba6af259
back
2015-02-19 16:08:08 +01:00
jknockaert
470994ba1e
OC8 version
2015-02-19 15:43:22 +01:00
Thomas Müller
b4b45a1a52
Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval
...
Fix enc mig user retrieval
2015-02-06 21:26:32 +01:00
Arthur Schiwon
15b2d33599
always specify limit, except you do like questionable surprises
...
always specify limit, except you do like questionable surprises, part 2
2015-02-06 17:51:40 +01:00
Bjoern Schiessle
b2e13229fa
don't check if we have a valid user
2015-02-06 17:31:15 +01: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
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
Bjoern Schiessle
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01: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
Robin Appelman
750cff0e3e
Bypass the view when storing encryption keys
2015-01-20 16:20:49 +01:00
Morris Jobke
2229290cca
fix typo of blog -> changed to block
...
* fixes #13460
2015-01-19 15:57:53 +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
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
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
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
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
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
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
jknockaert
e426375114
update enc stream
2014-12-17 15:48:05 +01:00
Morris Jobke
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +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
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
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
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
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
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
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