Commit graph

13035 commits

Author SHA1 Message Date
Vincent Petry
11215f4e27 Return -3 for unlimited quota
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
2016-02-29 14:36:20 +01:00
Thomas Müller
a38e8b6436 Merge pull request #22662 from owncloud/comments-count
remove comments count because it is not that relevant to show directly
2016-02-29 13:44:56 +01:00
Joas Schilling
2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Bjoern Schiessle
eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00
Thomas Müller
e9237dd83c Merge pull request #22671 from owncloud/issue-22670
Move the tag filter at the end for now
2016-02-26 10:48:55 +01:00
Thomas Müller
66536f912e Merge pull request #22640 from owncloud/fix_22587
Remove delete permissions for read-only federated reshares
2016-02-26 10:48:07 +01:00
Thomas Müller
c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags
Rename system tags app to collaborative tags
2016-02-26 10:47:40 +01:00
Thomas Müller
96f15a12a9 Merge pull request #22461 from owncloud/fix_6773
Allow theming of actions
2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Lukas Reschke
59028cced0 Add autodiscovery support to server-to-server sharing
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00
Joas Schilling
4471f359b1 Rename system tags app to collaborative tags 2016-02-26 09:14:28 +01:00
Jenkins for ownCloud
5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Vincent Petry
867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry
b634f1e2c7 Make more action icons themable + style fixes
Action icons now appear properly in public link page.
More actions are now CSS icons.
2016-02-25 23:01:07 +01:00
Roeland Jago Douma
c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes
This makes theming of file actions possible
2016-02-25 22:49:52 +01:00
Jan-Christoph Borchardt
6e97ab1b71 remove comments count because it is not that relevant to show directly 2016-02-25 20:48:19 +01:00
Thomas Müller
3772a8acdb Merge pull request #22644 from owncloud/external-share-manager
inject the correct external share manager into the storage
2016-02-25 16:58:00 +01:00
Thomas Müller
29e3c4a60e Merge pull request #22628 from owncloud/fix-thrashbin-cronjob
Skip users with no trashbin
2016-02-25 16:55:36 +01:00
Robin Appelman
f338329ddf inject the correct external share manager into the storage 2016-02-25 14:49:25 +01:00
Thomas Müller
914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
Thomas Müller
202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption
Copy into local file
2016-02-25 14:35:39 +01:00
Thomas Müller
5ecf2d5987 Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault
Disable sharing by default for external storage mounts
2016-02-25 14:35:24 +01:00
Thomas Müller
dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
take the first result of that array, if present. Fixes 2nd display na…
2016-02-25 14:35:06 +01:00
Roeland Jago Douma
0c9c7737b4 Remove delete permissions for read-only federated reshares
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.

However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.

This PR removes the delete permissions if it is a shared storage.

Basically a quick hack.
Fixes #22587
2016-02-25 12:19:38 +01:00
Lukas Reschke
aebb900cd4 More error handling 2016-02-25 10:12:31 +01:00
Lukas Reschke
3b5ddb417c Copy into local file
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣

This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.

While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90 for the breaking change.

To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.

Fixes https://github.com/owncloud/core/issues/22590
2016-02-25 09:40:30 +01:00
Jenkins for ownCloud
32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Arthur Schiwon
b9b85e32be take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-24 21:32:03 +01:00
Lukas Reschke
db2ddb5441 Properly cast type
The current logic is checking whether:

1. The returned value is a boolen
2. The returned value is a string and then matches for "true"

Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP.

This change casts the data to a boolean if it is defined as boolean.

Fixes https://github.com/owncloud/core/issues/22605
Fixes https://github.com/owncloud/core/issues/22016
2016-02-24 19:58:41 +01:00
Victor Dubiniuk
aac6932e92 Skip users with no trashbin 2016-02-24 18:08:45 +03:00
Vincent Petry
4829a2d421 Disable sharing by default for external storage mounts
This is for newly created mount points.

Migrated mount points will have sharing enabled as before.
2016-02-24 13:58:21 +01:00
Thomas Müller
ac9de4ee95 Print docker logs to the console fro debugging 2016-02-24 13:58:13 +01:00
Thomas Müller
faf65e73b7 Merge pull request #22593 from owncloud/swift-docker-fix
Enable upstream entrypoint changes with Ceph Docker
2016-02-24 12:17:58 +01:00
Thomas Müller
473cd97a45 Merge pull request #22592 from owncloud/fix-response-header
Add header for attachment disposition only once
2016-02-24 12:15:32 +01:00
Thomas Müller
9a0950f10b Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries
Allow defining a limit and offset for getObjectIdsForTags
2016-02-23 15:02:08 +01:00
Morris Jobke
403f11633c Drop unneeded use statements 2016-02-23 14:53:12 +01:00
Robin McCorkell
1d8c1f5692 Enable upstream entrypoint changes with Ceph Docker 2016-02-23 11:52:05 +00:00
Lukas Reschke
fc2c5fe414 Add header for attachment disposition only once
Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains.

This changeset adds the header only once and adds integration tests ensuring the correct header in future.

https://github.com/owncloud/core/issues/22577
2016-02-23 12:23:41 +01:00
Thomas Müller
fae6643e6d Merge pull request #22582 from owncloud/case-insensitive-contact-search
Case insensitive contact search
2016-02-23 10:48:38 +01:00
Thomas Müller
a3d1b2637d Merge pull request #22516 from owncloud/core-cumulativenotifications
Accumulate notifications instead of blinking
2016-02-23 10:36:34 +01:00
Joas Schilling
3a65bdf4d5 Fix dav unit tests 2016-02-23 09:04:15 +01:00
Thomas Müller
4dfdb2720c Case insensitive search in contacts - fixes #22575 2016-02-22 19:47:10 +01:00
Vincent Petry
27544144ce Fix unit tests affected by side effects
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.

Since now we're restoring the clock properly, the other tests were fixed
to still work.
2016-02-22 17:25:32 +01:00
Vincent Petry
8ea80e114a Accumulate notifications instead of blinking
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
2016-02-22 17:25:32 +01:00
Joas Schilling
a0d0edc754 Make non-public-method protected 2016-02-22 15:26:59 +01:00
Thomas Müller
f3b13c7656 Merge pull request #22536 from owncloud/add-integration-tests-for-tags
Add integration tests for tags plus fix permissions
2016-02-22 14:14:51 +01:00
Thomas Müller
7f2b3dbfd2 Merge pull request #22555 from owncloud/jenkins-19978
Show username when writing "Insufficient storage" into owncloud.log
2016-02-22 14:13:59 +01:00
Vincent Petry
642190f333 Fix public page footer position in IE
The content element needs hasLayout, so triggering it with a display
attribute.

Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
2016-02-22 11:26:50 +01:00
Pierre Jochem
1a8a667863 Solution for Proposal #19974
Show username when writing into owncloud.log
2016-02-22 10:02:45 +01:00
Morris Jobke
3e59c04c7f Fixes pagination in IE
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
2016-02-22 08:55:20 +01:00
Lukas Reschke
3bd95cca6b Check if user has permission to create such a tag
Fixes https://github.com/owncloud/core/issues/22512
2016-02-19 20:45:20 +01:00
Thomas Müller
f8677628d4 Merge pull request #22503 from owncloud/issue_22500
When (re-)sharing an incomming federated share set the corrent owner
2016-02-19 16:07:43 +01:00
Thomas Müller
5b3a79a28b Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint
Add FilesPlugin
2016-02-19 14:44:02 +01:00
Thomas Müller
66f0ba837f Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url
Fix old calendar dav urls
2016-02-19 13:33:16 +01:00
Bjoern Schiessle
4ef035cc61 make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers 2016-02-19 13:15:09 +01:00
Thomas Müller
e987d8cd47 Add FilesPlugin - fixes #22507 2016-02-19 12:37:24 +01:00
Thomas Müller
1106c354ac Merge pull request #22515 from owncloud/webdav_checksum_only_for_files
Only add checksum headers for 'real' files
2016-02-19 12:36:56 +01:00
Joas Schilling
b216be8cca Add correct principals for the current user before ACL check 2016-02-19 12:35:33 +01:00
Joas Schilling
4e2f9ce05b Convert the old principal to the new principal before getting calendars 2016-02-19 12:35:33 +01:00
Thomas Müller
ffc2950393 Merge pull request #22198 from owncloud/birthday-calendar
Sync a users contacts birthday to the users birthday calendar
2016-02-19 12:33:19 +01:00
Roeland Jago Douma
751d3df469 Only add checksum headers for files
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
2016-02-19 10:56:43 +01:00
Thomas Müller
ae2304f23f Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes
Fix GDrive handling of office files
2016-02-19 09:13:35 +01:00
Thomas Müller
f6e61a296f Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav
Require CSRF token for non WebDAV authenticated requests
2016-02-19 09:13:00 +01:00
Thomas Müller
d1ef43481d Merge pull request #22444 from owncloud/fix-federated-share-delete
get the actual user instead of a federated cloud id
2016-02-18 16:44:57 +01:00
Thomas Müller
d8de7d1e73 Adding cli command to sync birthday calendar 2016-02-18 14:49:45 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile
Fix quota check for single shared files
2016-02-18 14:25:32 +01:00
Vincent Petry
e1dbae1467 Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-18 11:57:03 +01:00
Thomas Müller
981c73000c Prevent deletion of birthday calendar 2016-02-18 11:49:16 +01:00
Thomas Müller
c9187cc820 Sync a users contacts birthday to the users birthday calendar 2016-02-18 11:48:34 +01:00
Lukas Reschke
9b3c4e8dc4 Require CSRF token for non WebDAV authenticated requests 2016-02-18 11:18:36 +01:00
Thomas Müller
73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle
Add index names so Doctrine does not use a too long random string
2016-02-18 11:18:32 +01:00
Thomas Müller
bba8875fb5 Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares
OCS Share API should not return invalid shares
2016-02-18 11:17:41 +01:00
Thomas Müller
9d24de0ceb Merge pull request #22478 from owncloud/external-missing-auth
dont die when missing an auth backend
2016-02-18 11:17:19 +01:00
Bjoern Schiessle
8985181305 get the actual user instead of a federated cloud id
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:17:00 +01:00
Bjoern Schiessle
ac1c3d27b7 get the actual user instead of a federated cloud id
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:16:59 +01:00
Thomas Müller
3a97a0ad7f Merge pull request #22475 from owncloud/fix-js-issues
Fixes code analysis issues
2016-02-18 10:14:31 +01:00
Thomas Müller
8798f85e88 Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-other-views
Show the comments and tags on the share filters
2016-02-18 10:14:20 +01:00
Thomas Müller
bfd4a9548b Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection
Fix GDrive mime type detection with encryption
2016-02-18 10:14:01 +01:00
Robin Appelman
65a283f967 dont die when missing an auth backend 2016-02-17 16:51:40 +01:00
Vincent Petry
ceaefc2c54 Defer quota check in web UI when overwriting shared file
When receiving a shared file, the quota for that file counts in the
owner's storage, not the current user's storage.

To make it possible to overwrite the file even when the current user
doesn't have enough space, the quota check is deferred for such files.
2016-02-17 15:38:21 +01:00
Morris Jobke
d55cfb4f89 Fixes code analysis issues 2016-02-17 15:19:42 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global
Adding global error handler for ajax calls which run into redirection…
2016-02-17 14:49:04 +01:00
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
Lukas Reschke
3b62459c41 Use hash with appended "a" of the original password for the authentication 2016-02-09 23:43:26 +01:00
Björn Schießle
9bb97c714b fixing unit tests 2016-02-09 23:43:26 +01:00
Lukas Reschke
b9ff16498b Use random_bytes instead OpenSSL 2016-02-09 23:43:26 +01:00
Björn Schießle
61dd191253 meta data are at the end of the file 2016-02-09 23:43:25 +01:00
Björn Schießle
e7ff84df5c always use default cipher for write operations, no matter how the file was encrypted before 2016-02-09 23:43:25 +01:00
Björn Schießle
cf3a8f274f make it backward compatible to work with signed and un-signed files 2016-02-09 23:43:25 +01:00
Björn Schießle
40a5ba72fc sign all encrypted blocks and check signature on decrypt 2016-02-09 23:43:25 +01:00
Lukas Reschke
db8f267647 Add note about the addPadding function 2016-02-09 23:43:25 +01:00
Lukas Reschke
59ebad0b53 Use an actual 16 byte long IV
The previous IV was actually 12 byte extended to 16 byte using base64. As the encrypted file should be fine with containing binary data as well we can simply remove the encoding like that here.
2016-02-09 23:43:24 +01:00
Lukas Reschke
d25b8dacb3 Use AES-256-CTR as default
CTR is recommended over CFB mode.
2016-02-09 23:43:24 +01:00
Thomas Müller
4cfb7ca7dd Merge pull request #22255 from owncloud/add-sso-for-updatechecker
Add SSO for updater application
2016-02-09 23:37:32 +01:00
Thomas Müller
57ef23dadf Merge pull request #22251 from owncloud/smb-105
update icewind/smb to 1.0.5
2016-02-09 23:37:09 +01:00
C. Montero Luque
f64dbc67c6 Merge pull request #20928 from owncloud/publicdav-check-permissions
Check that the owner of a link share still has share permissions on access
2016-02-09 22:01:08 +01:00
C. Montero Luque
962d0c3290 Merge pull request #22252 from owncloud/consolidate-user-set-quota
Consolidate getQuota and setQuota methods in User instance
2016-02-09 22:00:24 +01:00
Lukas Reschke
b9e3ed1468 Add SSO for updater application
Allows logging-in into the updater application by visiting the admin panel and pressing "Open updater".
2016-02-09 20:28:30 +01:00
Arthur Schiwon
d19c47a381 More fixed tests :) 2016-02-09 18:11:30 +01:00
Lukas Reschke
abc675d87e Move update notification code into app
Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small.

Furthermore also makes some more code unit-testable...
2016-02-09 18:05:51 +01:00
Arthur Schiwon
3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Robin Appelman
3982c8f87a update icewind/smb to 1.0.5 2016-02-09 17:09:30 +01:00
Thomas Müller
2982017682 Merge pull request #22228 from owncloud/comments-limit-message
Limit comment message to 1k chars
2016-02-09 16:35:23 +01:00
Thomas Müller
d89ddba3a2 Merge pull request #22241 from owncloud/more-info-in-case-of-trusted-server-add
Forward exception message to the admin in case of errors and in case …
2016-02-09 16:11:18 +01:00
Thomas Müller
81d4042af4 Adjust command description 2016-02-09 15:42:41 +01:00
Thomas Müller
10b9bf15f4 Set share owner and share initiator on upate as well 2016-02-09 15:41:06 +01:00
Thomas Müller
cbb7934fb3 Introduce console command to transfer ownerships of files - refs #19154 2016-02-09 15:41:06 +01:00
Thomas Müller
4659bf9b4a Merge pull request #22234 from owncloud/systemtags-filter-intersect-empty
Fix system tag filter AND condition
2016-02-09 15:34:06 +01:00
Thomas Müller
1199b539f2 Merge pull request #21773 from owncloud/files_external-list-authtype
Show the proper auth identifier when listing mounts as json
2016-02-09 15:33:47 +01:00
Thomas Müller
232bb75329 Merge pull request #21893 from owncloud/migrate-calendars
Migrate calendars
2016-02-09 15:14:33 +01:00
Robin Appelman
acd8c72d3d add tests 2016-02-09 15:03:00 +01:00
Roeland Jago Douma
359c62d90e Fix unit tests 2016-02-09 15:03:00 +01:00
Robin Appelman
f9f2800016 check share permissions in share controller 2016-02-09 15:03:00 +01:00
Robin Appelman
fd9166488b Check that the owner of a link share still has share permissions on access 2016-02-09 15:02:34 +01:00
Thomas Müller
bc8632856a Forward exception message to the admin in case of errors and in case the remote server version is to low and appropriate message is displayed as well 2016-02-09 14:41:26 +01:00
Arthur Schiwon
bbc86e0756 on DAV throw Bad Request if provided message is too long 2016-02-09 13:59:13 +01:00
Thomas Müller
a6ade67dfb Merge pull request #22197 from owncloud/files-filterbysystemtags
Add file list filter to filter by system tags
2016-02-09 13:31:00 +01:00
Thomas Müller
9639981041 Merge pull request #22202 from owncloud/global-auth-no-user
handle no user set for personal global auth
2016-02-09 13:30:41 +01:00
Thomas Müller
6474866aff Merge pull request #22225 from owncloud/sharing-moar-hooks
More sharing hooks for extended auditing
2016-02-09 13:30:22 +01:00
Joas Schilling
e8d9c288bc Stop when a mid result is empty 2016-02-09 12:07:30 +01:00
Joas Schilling
178914104c Add a test for empty mid-result 2016-02-09 12:07:17 +01:00
Vincent Petry
3028684d89 Fix system tag filter AND condition
If one of the results is empty, no need to do array_intersect and return
an empty result directly.
2016-02-09 11:39:22 +01:00
Vincent Petry
847a2426b8 Fix unit tests for system tag filter section 2016-02-09 11:22:05 +01:00
Thomas Müller
bf3a843e89 Migration of calendars 2016-02-09 11:20:31 +01:00
Vincent Petry
e378a757ff Add system tags filter section for files app 2016-02-09 10:59:29 +01:00
Roeland Jago Douma
623a0e4637 Example hook check 2016-02-09 10:36:44 +01:00
Roeland Jago Douma
38cbfed476 Fix unit test 2016-02-09 10:20:25 +01:00
Thomas Müller
98497aa423 Merge pull request #22199 from owncloud/multiple_checksums
Make checksum propfind future proof
2016-02-09 09:10:32 +01:00
Thomas Müller
bfa404b441 Merge pull request #22217 from owncloud/fix_22215
Federates shares have to set a file_target
2016-02-09 09:10:17 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Arthur Schiwon
cd68500731 throw hooks when accessing a link share 2016-02-09 00:34:10 +01:00
Vincent Petry
ae367c7e97 Fix elementToFile to also return path when defined
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
2016-02-08 22:33:39 +01:00
Thomas Müller
b77a4b0c6a Merge pull request #22112 from owncloud/dav-filesreport
Provide REPORT method on files DAV to filter/search files
2016-02-08 21:41:40 +01:00
Thomas Müller
75bbd4f8b6 Merge pull request #22211 from owncloud/versions-hook-info
versions provide more information when throwing hooks
2016-02-08 21:06:03 +01:00
Vincent Petry
2f1a60a64d Add REPORT on files endpoint for filtering
For now only supports filtering by system tags
2016-02-08 21:04:53 +01:00
Roeland Jago Douma
7f2cb6ab60 Federates shares have to set a file_target
The old code path is still used to get the sharing info in the webui.
This requires the file_target to be set. This does not mean anything
for federated shares.

Fixes #22215
2016-02-08 18:30:51 +01:00
Arthur Schiwon
d2d6644702 use int values and constants instead of strings 2016-02-08 18:16:27 +01:00
Thomas Müller
698a6b07a8 Merge pull request #22206 from owncloud/share2_migration_with_federated
Update the migration step to include federated shares
2016-02-08 17:58:26 +01:00
Thomas Müller
703f3551dc Only set the header if the node exists and in case the request is a GET 2016-02-08 17:49:25 +01:00
Lukas Reschke
2cad9d2b8c Serve files with an attachment disposition for new DAV endpoint
This adds a `Content-Disposition: attachment` header to all files served via the DAV endpoint.
2016-02-08 17:08:34 +01:00
Arthur Schiwon
b6e03fe261 versions provide more information when throwing hooks 2016-02-08 16:33:49 +01:00
Robin Appelman
87179eaae2 Add tests 2016-02-08 15:53:46 +01:00
Thomas Müller
33eed35ae4 Merge pull request #21817 from owncloud/support-old-carddav-endpoint
Adding pre oc 9.0 CardDAV endpoint for migration of old clients
2016-02-08 15:46:38 +01:00
Thomas Müller
acc7d63a69 Merge pull request #22164 from owncloud/files_external-verify
Add occ command to verify storage configurations
2016-02-08 15:21:07 +01:00
Roeland Jago Douma
3c4e511792 Update the migration step to include federated shares
Now federated shares will also be updated to the flat
reshare model.
2016-02-08 15:11:48 +01:00
Thomas Müller
cf1f92cc12 Merge pull request #22080 from owncloud/fed_share_provider
implementation of the federated share provider
2016-02-08 14:12:20 +01:00
Robin Appelman
b95e388526 Add occ command to verify storage configurations 2016-02-08 14:07:58 +01:00
Robin Appelman
678a3abf6d handle no user set for personal global auth 2016-02-08 13:45:52 +01:00
Roeland Jago Douma
5486a2b149 For possible future usage allow multiple checksums
Instead of returning

<oc:checksum>TYPE:CHECKSUM</oc:checksum>

Return

<oc:checksums>
  <oc:checksum>TYPE:CHECKSUM</oc:checksum>
</oc:checksums>

This will allow us to expand in the future to multiple checksums.
Without doing just string concatenation.

And even for a single checksum it is now correct.
2016-02-08 11:55:07 +01:00
Lukas Reschke
7199ea2f5e Fix PHPDoc 2016-02-08 11:36:58 +01:00
Thomas Müller
c1ae8b0d81 Adding common name to sharee 2016-02-08 11:36:57 +01:00
Thomas Müller
5b86148d3a Original resources should not be overwritten by shared resources 2016-02-08 11:36:57 +01:00
Roeland Jago Douma
2f6ffdbce5 Added tests for used parts 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
a506f9ca3f Respect not allowing outgoing shares 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
bec1de8a38 Update OCS Share API to use federated share provider 2016-02-08 11:30:48 +01:00
Bjoern Schiessle
9079388e02 implementation of the federated share provider 2016-02-08 11:30:48 +01:00
Thomas Müller
6a550d44e9 Fix path 2016-02-08 10:52:30 +01:00
Thomas Müller
0c9a469f74 Adding pre oc 9.0 CalDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller
a67f7ad1f3 Remove calendar-proxy support - did this ever work? 2016-02-08 10:52:30 +01:00
Thomas Müller
cca2ade199 Adding pre oc 9.0 CardDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller
9eef38c593 Merge pull request #22190 from owncloud/fix_22189
Even single shares are returned as array
2016-02-08 10:47:55 +01:00
Roeland Jago Douma
ca32778975 Even single shares are returned as array
When fetching a single share using ../shares/<ID> we should still return
an array of shares.

Fixes #22189
2016-02-08 10:11:22 +01:00
Vincent Petry
78864dc6fa Collapse long comments
Very crude a naive implementation that relies on length and number of
newlines. Should be good enough for most cases.

Clicking on such comments will expand them.
2016-02-08 10:05:03 +01:00
Thomas Müller
83b4e2c8d1 Merge pull request #22160 from owncloud/files_external-create
Add occ files_external:create command to add new mounts
2016-02-08 09:58:43 +01:00
Jenkins for ownCloud
4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Thomas Müller
69a4cd2898 Merge pull request #22102 from owncloud/ldap_2nddispname-master
[LDAP] add second field for additional/optional display name attribute
2016-02-06 13:27:01 +01:00
Thomas Müller
5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup
cleanup jobs for comments and comment read marks
2016-02-06 13:26:00 +01:00
Thomas Müller
7297408150 Merge pull request #22163 from owncloud/comments-sizelimit
Limit comment size to 1000 in UI
2016-02-06 13:25:38 +01:00
Thomas Müller
7141c70cd0 Merge pull request #20618 from owncloud/action-icon-size
Fix image sizing for action icons in Edge
2016-02-06 13:25:10 +01:00
Thomas Müller
079ebe2be6 Merge pull request #22165 from owncloud/comments-markowncommentasread
Mark own comments as read after posting
2016-02-06 13:22:20 +01:00
Jenkins for ownCloud
9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Joas Schilling
065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Thomas Müller
7568c40275 Merge pull request #22159 from owncloud/fix_21678
Gracefull handle link shares rename hook
2016-02-05 16:36:04 +01:00
Vincent Petry
d2a495f190 Mark own comments as read after posting 2016-02-05 16:30:37 +01:00
Robin Appelman
96b592b45b output mount id on create 2016-02-05 15:54:19 +01:00
Robin Appelman
16ad612c83 verify that the auth backend is valid for the storage backend 2016-02-05 15:51:38 +01:00
Robin Appelman
239cdd099a list supported auth backends for storage backends 2016-02-05 15:48:10 +01:00
Vincent Petry
142a2dd2eb Limit comment size to 1000 in UI
Whenever the limit is almost reached (90% of the length), a tooltip will
appear.

Once the limit is exceeded, the "Post" button will be disabled and the
field will become red.
2016-02-05 15:45:30 +01:00
Arthur Schiwon
9d2c433b24 fix pgsql 2016-02-05 15:36:21 +01:00
Arthur Schiwon
d537cae063 cleanup jobs for comments and comment read marks 2016-02-05 15:36:21 +01:00
Thomas Müller
0196f0e546 Merge pull request #22157 from owncloud/use-https-instead-of-http
Use HTTPS instead of HTTP
2016-02-05 14:31:40 +01:00
Robin Appelman
54d2175bf5 Add occ files_external:create command to add new mounts 2016-02-05 14:20:22 +01:00
Roeland Jago Douma
f4edfb6dfb Gracefull handle link shares rename hook
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
2016-02-05 13:57:57 +01:00
Thomas Müller
e15a120f83 Merge pull request #22152 from owncloud/activities-for-comments
Activities for comments
2016-02-05 13:50:38 +01:00
Lukas Reschke
35e4acbc1f Use HTTPS instead of HTTP
This is now supported by github.io
2016-02-05 13:05:04 +01:00
Joas Schilling
733db5c14a Add a filter for comment activities 2016-02-05 11:30:53 +01:00
Joas Schilling
070ff71a2d Add activities for comments 2016-02-05 11:30:53 +01:00
Thomas Müller
342c2aac98 Merge pull request #20920 from owncloud/issue_20888
Add dialog to enter credentials on errored mount point
2016-02-05 10:05:23 +01:00
Thomas Müller
96ccbca2e3 Merge pull request #22135 from owncloud/global-auth-warning
fix warning caused by global auth
2016-02-05 10:04:22 +01:00
Jenkins for ownCloud
0ed2108b7f [tx-robot] updated from transifex 2016-02-05 01:56:20 -05:00
Vincent Petry
d4da2f0ac7 Improve credentials dialog usability a bit
Automatically focus on the first field.
Pressing enter submits the form.
2016-02-04 17:18:21 +01:00
Robin Appelman
b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
Robin Appelman
d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman
b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman
e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman
53fbaf70c0 fix input type 2016-02-04 16:33:08 +01:00