8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
903d52d45f
Merge pull request #15809 from owncloud/view-null-root
...
dont allow using null as view root
2015-04-22 18:10:26 +02:00
bd57902d1d
typo
2015-04-22 16:24:37 +02:00
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
f391f88d7f
dont allow using null as view root
2015-04-22 14:51:02 +02:00
42d9ba0f83
Merge pull request #15787 from owncloud/trash-partfiles
...
Do not trash part files, delete directly
2015-04-22 14:10:26 +02:00
a971fa8a90
Merge pull request #15549 from owncloud/jcf-fix-cache-update
...
don't update identical values
2015-04-22 13:34:08 +02:00
0042bdd2e7
fix PHPDoc
2015-04-22 13:12:52 +02:00
225cde2183
pass KeyStorage via ctor
2015-04-22 13:09:42 +02:00
987bc138df
calling renameKeys() on directory level as well - fixes #15778
2015-04-22 12:12:27 +02:00
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
570718fb6b
Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
...
Fix encryption feof to not return too early
2015-04-22 11:32:21 +02:00
40fcc7480c
Merge pull request #15734 from owncloud/add-deprecate-tags
...
Add @deprecated to all methods with a proper method in \OCP
2015-04-21 23:57:49 +02:00
ffc796edcb
Do not trash part files, delete directly
2015-04-21 18:28:15 +02:00
19e8c4fcb1
get dirname from sharePath
2015-04-21 14:58:01 +02:00
b0fcf0fa0e
Merge pull request #15636 from owncloud/enc2_performance_improvement
...
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
2015-04-21 11:01:33 +02:00
a13088818a
Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more
...
Introduce Storage::getData() to allow storage implementations more contr...
2015-04-20 18:36:23 +02:00
76dad297ff
Fix encryption feof to not return too early
...
This is because stream_read will pre-cache the next block which causes
feof($this->source) to return true prematurely. So we cannot rely on it.
Fixed encryption stream wrapper unit tests to actually simulate 6k/8k
blocks to make sure we cover the matching logic.
Added two data files with 8192 and 8193 bytes.
2015-04-20 18:32:40 +02:00
fe2cbc3795
Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound
...
Fix wrong path generation
2015-04-20 16:55:36 +02:00
32995ace1c
move permission related code into getMetaData()
2015-04-20 16:50:12 +02:00
23f1bdc3d4
Introduce Storage::getMetaData() to allow storage implementations more control over the data array
2015-04-20 14:54:54 +02:00
92b60e36de
Introduce Storage::getData() to allow storage implementations more control over the data array
2015-04-20 14:25:39 +02:00
0a594cd3a5
Add @deprecated to all methods with a proper method in \OCP
2015-04-20 13:15:45 +02:00
7fe0e09d14
set size and unencrypted size to zero on fopen
2015-04-20 11:06:13 +02:00
80be3b0c47
Fix wrong path generation
...
* fixes #15742
2015-04-20 11:01:33 +02:00
8ebf9de3f8
Memcache\Redis Add DB Select Functionality
2015-04-15 21:24:38 +01:00
1592f25ed0
Scale up the font on larger previews
2015-04-15 14:03:40 +02:00
e33e5b425a
Merge pull request #12006 from owncloud/dav-put-storage
...
Work directly on the storage when uploading over webdav
2015-04-15 03:08:52 +02:00
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
70480423ff
Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
...
Adding a final fallback for findBinaryPath
2015-04-15 00:16:56 +02:00
1aa368effe
Merge pull request #15592 from owncloud/fix-15590-master
...
Avoid php message "Invalid argument supplied for foreach()"
2015-04-15 00:14:08 +02:00
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
eeecca04e6
Keep phpdoc updated.
2015-04-14 16:25:52 +02:00
308af8b909
pass a stream to the tests
2015-04-14 15:25:52 +02:00
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
bb0c09e994
Adding a final fallback for findBinaryPath
2015-04-14 14:06:58 +02:00
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
967e882757
return size from cache in case the cache entry is marked as encrypted
2015-04-14 13:08:59 +02:00
387984a0d5
preserve filesize on rename after upload
2015-04-14 12:27:12 +02:00
88cc52c408
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
2015-04-14 11:00:20 +02:00
5f66f867b6
Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
...
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 21:51:38 +02:00
9eff199a17
Merge pull request #15360 from owncloud/cross-storage-move-cache
...
Preserve cache data when doing a cross storage move
2015-04-13 21:48:30 +02:00
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
addfafd9da
Fix moving mount points
2015-04-13 17:10:02 +02:00
caadc8cdd9
reuse cache move logic
2015-04-13 17:10:01 +02:00
d7b3a1a35a
preserve cache data when doing a cross storage move
2015-04-13 17:10:01 +02:00
71de1d58cd
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 16:34:10 +02:00
660aa7ff1e
Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
...
cach user folder for file search results
2015-04-13 15:16:07 +02:00
c29419e6d7
fix rebase issue
2015-04-13 15:13:03 +02:00
0772e3b4c1
Properly handle copy/move failures in cross storage copy/move
2015-04-13 15:13:03 +02:00
404773940d
Detect storage full when doing cross storage copy/move
2015-04-13 15:13:03 +02:00
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
c4ec8fbeff
Make getSourcePath accessible for storage wrappers
2015-04-13 15:13:03 +02:00
31e94708f8
Improve cross storage copy between local storages
2015-04-13 15:13:02 +02:00
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
b302592a64
Small cleanup of rename code
2015-04-13 15:11:03 +02:00
2fd44dbde4
rewind and update error message
2015-04-13 14:14:48 +02:00
dcfe014103
use our own stream copy instead
2015-04-13 14:13:21 +02:00
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
b717681e3a
cach user folder for file search results
2015-04-13 11:29:10 +02:00
c3fbc2b6fd
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
...
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
906b6b7337
Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282"
2015-04-13 09:43:45 +02:00
8450b6aa2d
Properly import used classes
2015-04-13 09:26:30 +02:00
84041a4fa2
Merge pull request #15541 from owncloud/add-reply-to-support
...
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
9c95315a9e
clarify the duplication of the $params array
2015-04-12 14:49:18 +02:00
22c6216f5c
don't update identical values
...
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.
This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +02:00
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
77afef328d
Merge pull request #15458 from owncloud/web-shell-master
...
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
e512a69a59
Merge pull request #15395 from owncloud/fix-imagepath
...
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
a163243e31
Merge pull request #15510 from owncloud/cron-singleuser
...
block cron when in single user mode
2015-04-10 14:38:50 +02:00
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
a33edcd2f0
Fix singe user mode on public.php - take two
2015-04-10 11:17:33 +02:00
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
8964c5068c
do not disclose information, show generic error on login page
...
Conflicts:
core/templates/login.php
lib/base.php
2015-04-10 09:12:37 +02:00
f05e19348d
Fix single user check in case no user is logged in
2015-04-09 23:47:24 +02:00
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
de4a81f462
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
...
fixes #15326
2015-04-09 18:41:18 +02:00
f7c906902a
Throw an exception in case checkServer() returns errors
2015-04-09 16:42:34 +02:00
b60d5d3d6f
Merge pull request #14540 from owncloud/windows-setup-check
...
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
890a18e1a6
Introduce own console application class
2015-04-09 16:28:53 +02:00
8af106cc75
block webdav in single user mode
2015-04-09 15:56:41 +02:00
0abce86b31
Disallow Windows Server in Server Check
...
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
8af52e3876
fixes #15326
2015-04-09 15:37:00 +02:00
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
cbcee34eb0
update tests
2015-04-09 14:46:25 +02:00
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
332ea77865
only create a db entry for the user in case of a name conflict on group share
2015-04-09 11:16:08 +02:00
45575d0135
Check if the key exists, before trying to delete it
2015-04-09 10:28:02 +02:00
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
84ae9532c8
Merge pull request #15448 from owncloud/occ-check-server-env-master
...
Adding check command to validate server environment
2015-04-09 00:07:08 +02:00
f3ef17a963
Merge pull request #15490 from owncloud/remove-debug-logging
...
remove unessesary logging of methods instantiation
2015-04-08 21:42:47 +02:00
4e60b81264
Merge pull request #14120 from owncloud/dav-statcache
...
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
3ffb2d8abd
remove unessesary logging of methods instantiation
2015-04-08 14:46:01 -04:00
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
6a59502759
Work directly on the storage when uploading over webdav
2015-04-08 14:04:58 +02:00
59322a5037
Merge pull request #15333 from owncloud/copy-cross-device
...
fix copying folder across devices
2015-04-08 12:35:15 +02:00
f099c9883e
Adding check command to validate server environment - fixes #15429
2015-04-08 00:19:23 +02:00
6c327f8331
Merge pull request #14879 from oparoz/fix-preview-caching
...
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
74bf9806b0
Introducing the maximum size preview
...
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.
One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
161d80da5b
In case of encryption exceptions we return 503 - this will allow the client to retry
2015-04-07 14:17:42 +02:00
dd7c491bff
Fix PHPDoc
2015-04-07 13:49:16 +02:00
a2182cde90
Deduplicate code
2015-04-07 13:48:33 +02:00
4a70ca665c
respect mount option while encrypting
2015-04-07 13:30:31 +02:00
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
69e95531f8
comment change as it broke unit tests
2015-04-07 13:30:31 +02:00
ba9a797eaa
Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption
2015-04-07 13:30:31 +02:00
3d7404fe68
add unit tests to the keystorage
2015-04-07 13:30:31 +02:00
fe74a0cb4f
implement webdav copy
2015-04-07 13:30:31 +02:00
8991272269
Using stream_get_contents in file_get_contents implementation + close handle
2015-04-07 13:30:31 +02:00
ff16e3dbff
Adjusting count on read
2015-04-07 13:30:31 +02:00
02404a6a8c
Fixing encryption stream wrapper seek - thanks @jknockaert
2015-04-07 13:30:30 +02:00
104d11ec4c
Fixing encryption storage wrapper tests
2015-04-07 13:30:30 +02:00
d9c41b00ab
Introducing trait LocalTempFileTrait
2015-04-07 13:30:30 +02:00
fac7ec3fc4
fix re-shares with encryption
2015-04-07 13:30:30 +02:00
8ffa6db110
fixing unit tests for stream wrapper
2015-04-07 13:30:30 +02:00
9d8c07850d
fixing unencrypted file size
2015-04-07 13:30:30 +02:00
a74ee67476
don't wrap share storages
2015-04-07 13:30:30 +02:00
664b2bb7af
cleaning up exception mess
2015-04-07 13:30:30 +02:00
c9d6ed3d7d
in case the file exists we require the explicit module as specified in the file header - otherwise we need to fail hard to prevent data loss on client side
2015-04-07 13:30:30 +02:00
51302d5812
getUidAndFilename() always get uid from path
2015-04-07 13:30:30 +02:00
cac83642f2
Finally fixing encryption with public share
2015-04-07 13:30:30 +02:00
a57918fb10
Hook: fixing error message in exception case
2015-04-07 13:30:30 +02:00
137c135664
file_put_contents has to return the number of written bytes
2015-04-07 13:30:30 +02:00
f20844ac89
PHPDoc
2015-04-07 13:30:30 +02:00
83cb382b3f
pass file helper to encryption wrapper
2015-04-07 13:30:29 +02:00
e4895bda01
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
2015-04-07 13:30:29 +02:00
a98b7dbf6f
Fix double registration of encryption module
2015-04-07 13:30:29 +02:00
35b97ed672
Adding renameKeys to IStorage
2015-04-07 13:30:29 +02:00
4db75e3407
Setting up the encryption wrapper in a setup hook - temporarily fixes the wrapping order
2015-04-07 13:30:29 +02:00
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
6ccd3ffa23
adding function getSecureRandom(); to IServerContainer
2015-04-07 13:30:29 +02:00
0f28d538a0
add session class to handle all session operations
2015-04-07 13:30:28 +02:00
1b42b492dc
kill OC_FileProxy 💥
2015-04-07 13:30:28 +02:00
dbdd754c3f
Further cleanup of files_encryption
2015-04-07 13:30:28 +02:00
00338f9dca
Removing files_encryption left overs
2015-04-07 13:30:28 +02:00
99255ff3a9
Fix - public sharing: in case on user is available - get it from the path
2015-04-07 13:30:28 +02:00
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
d185761d31
initializing some variables + update size after writing the headers
2015-04-07 13:30:28 +02:00
4441835d18
https://github.com/owncloud/core/pull/15305#discussion_r27382305
...
Conflicts:
lib/private/files/stream/encryption.php
2015-04-07 13:30:28 +02:00
90487384f7
initializing some variables
2015-04-07 13:30:28 +02:00
Jenkins for ownCloud
Vincent Petry
Robin Appelman
Thomas Müller
Morris Jobke
Björn Schießle
Bjoern Schiessle
Lukas Reschke
Michael Telatynski
Joas Schilling
Robin Appelman
Olivier Paroz
Jörn Friedrich Dreyer
Jens-Christian Fischer
Clark Tomlinson
jknockaert