Commit Graph

12749 Commits

Author SHA1 Message Date
Roeland Jago Douma 670557ffbb Add unit tests for formatShare 2016-02-17 13:55:39 +01:00
Roeland Jago Douma 2aa0b885f6 OCS Share API should not return invalid shares
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908

This add checks for the get methods to handle the NotFound exception.
2016-02-17 13:55:39 +01:00
Robin Appelman c2c6caee93 remove global credentials 2016-02-17 13:55:27 +01:00
Vincent Petry 53eff9792f Check the quota on the actual file's storage in dav quota plugin
Fix quota plugin to use the correct file name when chunking

When chunking, the file name is the compound name, so need to convert it
to the correct final file name before doing the free space check.
This ensures that in the case of shared files, the correct storage is
used for the quota check.
2016-02-17 11:52:49 +01:00
Thomas Müller 9e415a956a Merge pull request #22451 from owncloud/use-proper-user-folder
Handles null as return code and uses proper UserFolder in trashbin
2016-02-17 10:58:31 +01:00
Thomas Müller ff4e040971 Merge pull request #22435 from owncloud/trashbin-hook-nouser
Don't resize trash when no user
2016-02-17 10:57:50 +01:00
Jenkins for ownCloud fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Morris Jobke de58364eb8 Handles null as return code and uses proper UserFolder in trashbin 2016-02-16 18:45:25 +01:00
Vincent Petry 7bed529951 Don't resize trash when no user
Happens when overwriting files on federated shares.
2016-02-16 16:29:07 +01:00
Thomas Müller c6b2457306 Merge pull request #22432 from owncloud/files_external-backends
remove login credentails and user provided backends
2016-02-16 16:08:21 +01:00
Robin Appelman 176fb191b7 remove login credentails and user provided backends 2016-02-16 15:27:55 +01:00
Jenkins for ownCloud 7942f3d7ec [tx-robot] updated from transifex 2016-02-16 08:49:12 -05:00
Thomas Müller 3503eb69f2 Adding transifex to new core apps 2016-02-16 14:40:10 +01:00
Joas Schilling 077a407285 Show the comments and tags on the share filters 2016-02-16 11:24:44 +01:00
Thomas Müller 1cb3583a9a Merge pull request #22398 from owncloud/fix-card-properties
Queries on the cards table by uri require the addressbook as well
2016-02-16 10:19:51 +01:00
Thomas Müller 3a55229915 Merge pull request #22400 from owncloud/files-select-closesidebar
Close file detail sidebar when selecting/unselecting files
2016-02-16 09:15:14 +01:00
Thomas Müller f850871415 Merge pull request #22385 from owncloud/issue-22384-invalid-content-location-on-commenting
Posting a comment replies with invalid location URL
2016-02-16 08:30:11 +01:00
Thomas Müller 9942263409 Merge pull request #22392 from owncloud/create-default-calendar-and-addressbook
On login we create a default calendar and a default addressbook for t…
2016-02-16 08:29:54 +01:00
Thomas Müller e5641247a3 Merge pull request #22403 from owncloud/improved-error-handling
Remove background job if the server accepted to ask for the shared secret
2016-02-16 08:29:38 +01:00
Jenkins for ownCloud 3dd1961f92 [tx-robot] updated from transifex 2016-02-16 01:55:39 -05:00
Bjoern Schiessle 9d1d08bf9b forbidden (403) is a valid return status, don't log the whole exception in this case 2016-02-15 18:03:10 +01:00
Bjoern Schiessle 835e70dbe2 throw exception if we don't find a token for a given server 2016-02-15 18:03:10 +01:00
Bjoern Schiessle cc397da1be Remove background job if the server accepted to ask for the shared secret
If we don't remove it the server will later ask the remote server to ask for
the shared secret which will result in a error log message on the remote server
and in some circumstances maybe even to a failure
2016-02-15 18:03:10 +01:00
Vincent Petry d38b71f206 Fix GDrive mime type detection with encryption
When encryption is enabled, GDrive would think that all files are text
files. This fix falls back to the extension based detection when a
non-special mime type is returned
2016-02-15 17:09:08 +01:00
Vincent Petry 075dd54f6c Fix GDrive handling of office files
1) Properly detect empty file extension, can be null.

2) When renaming part file to final file, use the correct file name
without extension, if it exists

3) When renaming a file, do not delete the original file if it had the
same id, which can happen with part files
2016-02-15 16:49:12 +01:00
Vincent Petry d565290d16 Close file detail sidebar when selecting/unselecting files
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
2016-02-15 14:58:44 +01:00
Joas Schilling 7e4c3b577c Add index names so Doctrine does not use a too long random string 2016-02-15 14:52:41 +01:00
Thomas Müller 722809c2bd On login we create a default calendar and a default addressbook for the user - fixes #22360 2016-02-15 14:41:54 +01:00
Thomas Müller df7280a3c7 Queries on the cards table by uri require the addressbook as well - fixes #22284 2016-02-15 14:29:24 +01:00
Vincent Petry b8b77709c0 Add handler for global ajax errors 2016-02-15 12:48:47 +01:00
Thomas Müller 46b39c3465 Merge pull request #22337 from owncloud/new_reshare_no_initiator
On backend hickups don't crash OCS output
2016-02-15 12:02:52 +01:00
Thomas Müller fd21bfd9e8 Merge pull request #22358 from owncloud/fix-22278
Fix race condition when switching filter mode. Fixes #22278
2016-02-15 12:02:35 +01:00
Joas Schilling cb836158f0 Deduplicate slashes 2016-02-15 10:54:56 +01:00
Jenkins for ownCloud be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Jenkins for ownCloud 7061416016 [tx-robot] updated from transifex 2016-02-14 01:55:37 -05:00
Thomas Müller 11707dffce Merge pull request #22351 from owncloud/fix_22277
show remote server on federated share auto-complete
2016-02-13 18:25:04 +01:00
Thomas Müller 248c571c56 Merge pull request #22331 from owncloud/dav-nonexisting-part
fix getNodeForPath for non existing part files
2016-02-13 18:24:00 +01:00
Jenkins for ownCloud 2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Arthur Schiwon 62aac81c45 Fix race condition when switching filter mode. Fixes #22278 2016-02-12 21:51:06 +01:00
Lukas Reschke ab5768f7dd Only register admin page when update is available
Fixes https://github.com/owncloud/core/issues/22353
2016-02-12 18:45:42 +01:00
Thomas Müller ad9dea8edf Merge pull request #22292 from owncloud/smb-handle-forbidden
handle forbidden exceptions in smb backend
2016-02-12 16:09:05 +01:00
Bjoern Schiessle 11abf2487c add remote server to the result 2016-02-12 15:52:51 +01:00
Thomas Müller b3323a51c9 Merge pull request #22294 from owncloud/carddav-report-list-groups-2
Adding a custom webdav property which holds the list of contacts groups
2016-02-12 13:22:05 +01:00
Thomas Müller cb1051dae4 Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298
Calculate the share statuses in js from the OCS Response
2016-02-12 11:12:14 +01:00
Thomas Müller e99c4d83dc Merge pull request #22317 from owncloud/fix_invisible_linkshares
Do not allow invisible link shares
2016-02-12 11:10:58 +01:00
Roeland Jago Douma 479c458428 The owner and recipient can also be null
If we have backend hickups it can be that we are unable to retrive the
owner and recipient user as well. In such cases just return the UID.
2016-02-12 10:45:33 +01:00
Roeland Jago Douma 0a33cdee0c If the initiator no longer exists return UID
It can happen that the share initiator is deleted. Because of the new
resharing behaviour this share then still exists. We just can fetch the
displayname properly.
2016-02-12 10:45:33 +01:00
Jenkins for ownCloud f8607ac132 [tx-robot] updated from transifex 2016-02-12 01:56:04 -05:00
Robin Appelman c3e4ced64a fix getNodeForPath for non existing part files 2016-02-11 17:22:40 +01:00
Thomas Müller e3a67d0505 Merge pull request #22320 from owncloud/files_external-crypt
encrypt passwords for files_external
2016-02-11 17:19:29 +01:00
Thomas Müller 4d24929e05 Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors
Remove notification on unshare and on errors
2016-02-11 14:02:44 +01:00
Thomas Müller 26939a2873 Merge pull request #22290 from owncloud/dav-upload-scan-in-lock
scan the file in the write lock when uploading over dav
2016-02-11 14:02:08 +01:00
Robin Appelman 80eb1aada5 encrypt passwords for files_external 2016-02-11 14:00:08 +01:00
Roeland Jago Douma 745bfda41f Fix migration step to avoind invisible shares 2016-02-11 13:29:23 +01:00
Roeland Jago Douma 0284c60c3a Add tests 2016-02-11 13:29:23 +01:00
Roeland Jago Douma a823485638 Reload list of shares on directory change 2016-02-11 11:06:26 +01:00
Thomas Müller 06af9b817e Merge pull request #22281 from owncloud/activity-100-unshare-activities
Add translations of unshare activities
2016-02-11 11:01:47 +01:00
Joas Schilling 31c9e047a8 Delete the notification when the owner unshares the remote before the user did anything 2016-02-11 10:41:55 +01:00
Joas Schilling 2263b8b693 Remove the notification if accepting/declining failed because of 404 2016-02-11 10:41:55 +01:00
Jenkins for ownCloud 5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
Vincent Petry f79fafcf06 Revert back to non-webdav download link for public URLs
Fixes issues with browsers not happy with the token.
Fixes activities which were not sent.
2016-02-10 19:09:52 +01:00
Thomas Müller 6b836325cf Merge pull request #22276 from owncloud/harden-updater-auth
Harden updater authentication
2016-02-10 17:31:38 +01:00
Thomas Müller 6ffb83ae19 Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup
Chunk the cleanup queries to make sure they don't time out
2016-02-10 17:26:11 +01:00
Thomas Müller 10613f7265 Merge pull request #22273 from owncloud/versions-fixpathasrecipient
Fix versions path as share recipient when different than owner path
2016-02-10 17:25:14 +01:00
Thomas Müller c919b41395 Adding a custom webdav property which holds the list of contacts groups 2016-02-10 17:06:13 +01:00
Robin Appelman edbe5d7b6d handle forbidden exceptions in smb backend 2016-02-10 16:52:13 +01:00
Robin Appelman bef70e9448 also fix lock order for chunked dav uploads 2016-02-10 16:31:32 +01:00
Lukas Reschke 5680743c2b Harden updater authentication
- Reset tokens after 2 hours as discussed at https://github.com/owncloud/updater/issues/220#issuecomment-182033453
- Used BCrypt for storing the password in the config.php. This makes it substantially harder in case of a leakage of the token to bruteforce it. In the future we can evaluate also an HMAC including the IP. That's a bit tricker though at the moment considering that we support reverse proxies. Didn't feel brave enough to touch that dragon now as well ;)
2016-02-10 16:31:11 +01:00
Robin Appelman 65554ec333 scan the file in the write lock when uploading over dav 2016-02-10 16:21:13 +01:00
Joas Schilling 5dc63e34b4 Add translations of unshare activities 2016-02-10 15:42:48 +01:00
Thomas Müller 5c89cf9565 Merge pull request #22267 from owncloud/fix_encryption2
calculate and update the version of the encryption signature correctly
2016-02-10 15:14:52 +01:00
Thomas Müller 159a0eb597 Merge pull request #20073 from owncloud/files-should-add-download-disposition
Serve files with an attachment disposition for new DAV endpoint
2016-02-10 14:35:50 +01:00
Thomas Müller c4d2f6bb25 Merge pull request #22270 from owncloud/use-cache-directly
Use cache directly instead of QueryBuilder
2016-02-10 14:23:04 +01:00
Thomas Müller c1d21cf873 Merge pull request #22263 from owncloud/fix-group-principals
Fix group principal
2016-02-10 14:22:18 +01:00
Vincent Petry 1b9e291913 Use full path of known file when handling versions
Instead of relying on the versions API response, use the known file path
when populating version models.
2016-02-10 13:39:25 +01:00
Vincent Petry a6f997ddae Remove path from versions response
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.

The requested already has access to the full path of the file, so no
need to add it to the response.
2016-02-10 13:38:38 +01:00
Bjoern Schiessle 9dc759b4dc remember signature version and only set it on update to make sure that other
apps like files_versions still get the old signature version
2016-02-10 13:27:32 +01:00
Joas Schilling 0ebb205010 Chunk the queries to make sure they don't time out 2016-02-10 13:04:37 +01:00
Lukas Reschke 762636efcd Use cache directly instead of QB
In case somebody does not use oc_filecache
2016-02-10 12:30:39 +01:00
Bjoern Schiessle 43ed86313c use the version of the original file if we write the part file to have a proper version if we move the file over to the original location 2016-02-10 11:08:03 +01:00
Thomas Müller 2e94d34dfd Fix group principal 2016-02-10 10:43:32 +01:00
Joas Schilling fa893762a2 Fix oracle by using less quotes 2016-02-10 08:40:45 +01:00
Joas Schilling 75d552b29e Listen to the notification event to reload the file list 2016-02-10 08:40:45 +01:00
Joas Schilling 65e1e4a202 Mark the accept button as primary 2016-02-10 08:40:45 +01:00
Joas Schilling c769f5775d Create the actions with the correct ID 2016-02-10 08:40:45 +01:00
Joas Schilling 31cf3b8288 Make sure the share ID is an integer 2016-02-10 08:40:45 +01:00
Joas Schilling cb8024ca14 Fix action paths 2016-02-10 08:40:45 +01:00
Joas Schilling 49dd693d8f Bring the messages inline 2016-02-10 08:40:45 +01:00
Joas Schilling a4a7cf40a1 Fix the notification API usage 2016-02-10 08:40:45 +01:00
Joas Schilling 3ff88c8c84 Revert "Disable the remote sharing notifications until they work properly"
This reverts commit 6bc93c7401.

Conflicts:
	apps/files_sharing/lib/external/manager.php
2016-02-10 08:40:44 +01:00
Jenkins for ownCloud 9ebcc4ce31 [tx-robot] updated from transifex 2016-02-10 01:56:05 -05:00
Lukas Reschke ca350294a6 Add tests for setVersion 2016-02-09 23:43:28 +01:00
Vincent Petry 45c78476f5 Use cache update instead of put for encryption version
Saves a call to fetch the file id which didn't even work for a reason.

This fix properly sets the version in the database.
2016-02-09 23:43:28 +01:00
Lukas Reschke 6724f76573 Use cache and add tests 2016-02-09 23:43:27 +01:00
Bjoern Schiessle 377d7fb8a8 don't decrease ->version for part files but only a local variable, otherwise it can happen that we decrease it twice and end up with the wrong value 2016-02-09 23:43:27 +01:00
Bjoern Schiessle 966eb4b084 realPath should contain the path to the file we want to read, e.g. the version and not the original file 2016-02-09 23:43:27 +01:00
Lukas Reschke 5ccb9dfa7e Use database for keeping track of the version 2016-02-09 23:43:27 +01:00
Lukas Reschke 3badf5caf5 Use number of chunk for HMAC as well
Prevents switching single blocks within the encrypted file.
2016-02-09 23:43:26 +01:00
Lukas Reschke b5824f024a Keep track of file version
This way it is not possible anymore for an external storage admin to put up old versions of the file.
2016-02-09 23:43:26 +01:00
Lukas Reschke d5c1596887 Clarify documentation 2016-02-09 23:43:26 +01:00