mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
30,353 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

30353 Commits

Author SHA1 Message Date
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 53d57bffed Merge pull request #21557 from owncloud/use-hmac-over-encryption 
Add integrity protection using Encrypt-Then-MAC to default encryption module
 2016-02-09 23:45:27 +01: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
Vincent Petry 3736f13826 Check if partial cache entry or not in encryption wrapper 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 29f6f451a9 Merge pull request #22192 from owncloud/fix_19685 
Only set the default expiration date on share creation
 2016-02-09 23:38:00 +01:00
Thomas Müller febe5359aa Merge pull request #22246 from owncloud/register-process-control-signal-handler-later 
Register process control signel handlers only on execution of the com…
 2016-02-09 23:37:49 +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
Thomas Müller 22c8501ce9 Merge pull request #22249 from owncloud/fix-22245 
Save display name and email address on paste operations
 2016-02-09 23:36:10 +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 03d0fb4e3f revolutionar: change updates might even sent the new value (optional) 2016-02-09 18:37:41 +01:00
Lukas Reschke a39c7591d6 Merge pull request #22238 from owncloud/add-link-to-updater 
Move update notification code into app
 2016-02-09 18:22:20 +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 096115870c Avatar should also claim its change 2016-02-09 17:44:49 +01:00
Arthur Schiwon 82a37d41d0 Doc improvements 2016-02-09 17:41:04 +01:00
Arthur Schiwon ef7846f7bd fix tests 2016-02-09 17:37:13 +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 a3eaefa530 Save display name and email address on paste operations - fixes #22245 2016-02-09 16:20:04 +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