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
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
c919b41395
Adding a custom webdav property which holds the list of contacts groups
2016-02-10 17:06:13 +01:00
edbe5d7b6d
handle forbidden exceptions in smb backend
2016-02-10 16:52:13 +01:00
bef70e9448
also fix lock order for chunked dav uploads
2016-02-10 16:31:32 +01:00
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
65554ec333
scan the file in the write lock when uploading over dav
2016-02-10 16:21:13 +01:00
5dc63e34b4
Add translations of unshare activities
2016-02-10 15:42:48 +01:00
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
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
c4d2f6bb25
Merge pull request #22270 from owncloud/use-cache-directly
...
Use cache directly instead of QueryBuilder
2016-02-10 14:23:04 +01:00
c1d21cf873
Merge pull request #22263 from owncloud/fix-group-principals
...
Fix group principal
2016-02-10 14:22:18 +01:00
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
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
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
0ebb205010
Chunk the queries to make sure they don't time out
2016-02-10 13:04:37 +01:00
762636efcd
Use cache directly instead of QB
...
In case somebody does not use oc_filecache
2016-02-10 12:30:39 +01:00
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
2e94d34dfd
Fix group principal
2016-02-10 10:43:32 +01:00
fa893762a2
Fix oracle by using less quotes
2016-02-10 08:40:45 +01:00
75d552b29e
Listen to the notification event to reload the file list
2016-02-10 08:40:45 +01:00
65e1e4a202
Mark the accept button as primary
2016-02-10 08:40:45 +01:00
c769f5775d
Create the actions with the correct ID
2016-02-10 08:40:45 +01:00
31cf3b8288
Make sure the share ID is an integer
2016-02-10 08:40:45 +01:00
cb8024ca14
Fix action paths
2016-02-10 08:40:45 +01:00
49dd693d8f
Bring the messages inline
2016-02-10 08:40:45 +01:00
a4a7cf40a1
Fix the notification API usage
2016-02-10 08:40:45 +01:00
3ff88c8c84
Revert "Disable the remote sharing notifications until they work properly"
...
This reverts commit 6bc93c7401
2016-02-10 08:40:44 +01:00
9ebcc4ce31
[tx-robot] updated from transifex
2016-02-10 01:56:05 -05:00
ca350294a6
Add tests for setVersion
2016-02-09 23:43:28 +01:00
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
6724f76573
Use cache and add tests
2016-02-09 23:43:27 +01:00
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
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
5ccb9dfa7e
Use database for keeping track of the version
2016-02-09 23:43:27 +01:00
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
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
d5c1596887
Clarify documentation
2016-02-09 23:43:26 +01:00
3b62459c41
Use hash with appended "a" of the original password for the authentication
2016-02-09 23:43:26 +01:00
9bb97c714b
fixing unit tests
2016-02-09 23:43:26 +01:00
b9ff16498b
Use random_bytes instead OpenSSL
2016-02-09 23:43:26 +01:00
61dd191253
meta data are at the end of the file
2016-02-09 23:43:25 +01:00
e7ff84df5c
always use default cipher for write operations, no matter how the file was encrypted before
2016-02-09 23:43:25 +01:00
cf3a8f274f
make it backward compatible to work with signed and un-signed files
2016-02-09 23:43:25 +01:00
40a5ba72fc
sign all encrypted blocks and check signature on decrypt
2016-02-09 23:43:25 +01:00
db8f267647
Add note about the addPadding function
2016-02-09 23:43:25 +01:00
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
d25b8dacb3
Use AES-256-CTR as default
...
CTR is recommended over CFB mode.
2016-02-09 23:43:24 +01:00
4cfb7ca7dd
Merge pull request #22255 from owncloud/add-sso-for-updatechecker
...
Add SSO for updater application
2016-02-09 23:37:32 +01:00
57ef23dadf
Merge pull request #22251 from owncloud/smb-105
...
update icewind/smb to 1.0.5
2016-02-09 23:37:09 +01:00
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
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
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
d19c47a381
More fixed tests :)
2016-02-09 18:11:30 +01:00
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
3a796d1e15
Consolidate getQuota and setQuota methods in User instance
2016-02-09 17:16:43 +01:00
3982c8f87a
update icewind/smb to 1.0.5
2016-02-09 17:09:30 +01:00
2982017682
Merge pull request #22228 from owncloud/comments-limit-message
...
Limit comment message to 1k chars
2016-02-09 16:35:23 +01:00
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
81d4042af4
Adjust command description
2016-02-09 15:42:41 +01:00
10b9bf15f4
Set share owner and share initiator on upate as well
2016-02-09 15:41:06 +01:00
cbb7934fb3
Introduce console command to transfer ownerships of files - refs #19154
2016-02-09 15:41:06 +01:00
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
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
232bb75329
Merge pull request #21893 from owncloud/migrate-calendars
...
Migrate calendars
2016-02-09 15:14:33 +01:00
acd8c72d3d
add tests
2016-02-09 15:03:00 +01:00
359c62d90e
Fix unit tests
2016-02-09 15:03:00 +01:00
f9f2800016
check share permissions in share controller
2016-02-09 15:03:00 +01:00
fd9166488b
Check that the owner of a link share still has share permissions on access
2016-02-09 15:02:34 +01:00
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
bbc86e0756
on DAV throw Bad Request if provided message is too long
2016-02-09 13:59:13 +01:00
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
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
6474866aff
Merge pull request #22225 from owncloud/sharing-moar-hooks
...
More sharing hooks for extended auditing
2016-02-09 13:30:22 +01:00
e8d9c288bc
Stop when a mid result is empty
2016-02-09 12:07:30 +01:00
178914104c
Add a test for empty mid-result
2016-02-09 12:07:17 +01:00
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
847a2426b8
Fix unit tests for system tag filter section
2016-02-09 11:22:05 +01:00
bf3a843e89
Migration of calendars
2016-02-09 11:20:31 +01:00
e378a757ff
Add system tags filter section for files app
2016-02-09 10:59:29 +01:00
623a0e4637
Example hook check
2016-02-09 10:36:44 +01:00
38cbfed476
Fix unit test
2016-02-09 10:20:25 +01:00
98497aa423
Merge pull request #22199 from owncloud/multiple_checksums
...
Make checksum propfind future proof
2016-02-09 09:10:32 +01:00
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
e749a02e6b
[tx-robot] updated from transifex
2016-02-09 01:55:36 -05:00
cd68500731
throw hooks when accessing a link share
2016-02-09 00:34:10 +01:00
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
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
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
2f1a60a64d
Add REPORT on files endpoint for filtering
...
For now only supports filtering by system tags
2016-02-08 21:04:53 +01:00
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
d2d6644702
use int values and constants instead of strings
2016-02-08 18:16:27 +01:00
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
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
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
b6e03fe261
versions provide more information when throwing hooks
2016-02-08 16:33:49 +01:00
87179eaae2
Add tests
2016-02-08 15:53:46 +01:00
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
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
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
cf1f92cc12
Merge pull request #22080 from owncloud/fed_share_provider
...
implementation of the federated share provider
2016-02-08 14:12:20 +01:00
b95e388526
Add occ command to verify storage configurations
2016-02-08 14:07:58 +01:00
678a3abf6d
handle no user set for personal global auth
2016-02-08 13:45:52 +01:00
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
7199ea2f5e
Fix PHPDoc
2016-02-08 11:36:58 +01:00
c1ae8b0d81
Adding common name to sharee
2016-02-08 11:36:57 +01:00
5b86148d3a
Original resources should not be overwritten by shared resources
2016-02-08 11:36:57 +01:00
2f6ffdbce5
Added tests for used parts
2016-02-08 11:30:48 +01:00
a506f9ca3f
Respect not allowing outgoing shares
2016-02-08 11:30:48 +01:00
bec1de8a38
Update OCS Share API to use federated share provider
2016-02-08 11:30:48 +01:00
9079388e02
implementation of the federated share provider
2016-02-08 11:30:48 +01:00
6a550d44e9
Fix path
2016-02-08 10:52:30 +01:00
0c9a469f74
Adding pre oc 9.0 CalDAV endpoint for migration of old clients
2016-02-08 10:52:30 +01:00
a67f7ad1f3
Remove calendar-proxy support - did this ever work?
2016-02-08 10:52:30 +01:00
cca2ade199
Adding pre oc 9.0 CardDAV endpoint for migration of old clients
2016-02-08 10:52:30 +01:00
9eef38c593
Merge pull request #22190 from owncloud/fix_22189
...
Even single shares are returned as array
2016-02-08 10:47:55 +01:00
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
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
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
4130639a7e
[tx-robot] updated from transifex
2016-02-08 01:54:46 -05:00
feb0522cd0
[tx-robot] updated from transifex
2016-02-07 01:55:33 -05:00
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
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
7297408150
Merge pull request #22163 from owncloud/comments-sizelimit
...
Limit comment size to 1000 in UI
2016-02-06 13:25:38 +01:00
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
079ebe2be6
Merge pull request #22165 from owncloud/comments-markowncommentasread
...
Mark own comments as read after posting
2016-02-06 13:22:20 +01:00
9fa09b67e6
[tx-robot] updated from transifex
2016-02-06 01:55:36 -05:00
065141f6f4
Move casting to IExpressionBuilder
2016-02-05 21:26:30 +01:00
7568c40275
Merge pull request #22159 from owncloud/fix_21678
...
Gracefull handle link shares rename hook
2016-02-05 16:36:04 +01:00
d2a495f190
Mark own comments as read after posting
2016-02-05 16:30:37 +01:00
96b592b45b
output mount id on create
2016-02-05 15:54:19 +01:00
16ad612c83
verify that the auth backend is valid for the storage backend
2016-02-05 15:51:38 +01:00
239cdd099a
list supported auth backends for storage backends
2016-02-05 15:48:10 +01:00
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
9d2c433b24
fix pgsql
2016-02-05 15:36:21 +01:00
d537cae063
cleanup jobs for comments and comment read marks
2016-02-05 15:36:21 +01:00
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
54d2175bf5
Add occ files_external:create command to add new mounts
2016-02-05 14:20:22 +01:00
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
e15a120f83
Merge pull request #22152 from owncloud/activities-for-comments
...
Activities for comments
2016-02-05 13:50:38 +01:00
35e4acbc1f
Use HTTPS instead of HTTP
...
This is now supported by github.io
2016-02-05 13:05:04 +01:00
733db5c14a
Add a filter for comment activities
2016-02-05 11:30:53 +01:00
070ff71a2d
Add activities for comments
2016-02-05 11:30:53 +01:00
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
96ccbca2e3
Merge pull request #22135 from owncloud/global-auth-warning
...
fix warning caused by global auth
2016-02-05 10:04:22 +01:00
0ed2108b7f
[tx-robot] updated from transifex
2016-02-05 01:56:20 -05:00
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
b7d27ab141
fix warning caused by global auth
2016-02-04 16:53:13 +01:00
d83b1f3b8b
fix error code for unconfigured user provided auth
2016-02-04 16:47:41 +01:00
b12d449ec7
set read permissions on failed mount root
2016-02-04 16:41:27 +01:00
Thomas Müller
Robin Appelman
Lukas Reschke
Joas Schilling
Vincent Petry
Bjoern Schiessle
Jenkins for ownCloud
Björn Schießle
C. Montero Luque
Arthur Schiwon
Roeland Jago Douma