36cfdd320b
Harden key generation
...
There might be cases where multiple requests trigger the key generation
at the same time and the instance ends up with a non-fitting
public/private key pair. Therefore the whole key generation should be
locked. Other than that this makes sure that user key generation return
values are properly validated.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-14 07:58:40 +07:00
9975b80d41
SSE enhancement
...
Do not blind concatenate ints. Lets add a _ between them. So that we can
distrinquis them properly
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-08-11 19:26:41 +07:00
fc1596fada
Encryption is ready if master key is enabled
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-07-21 09:16:43 +07:00
d7c0b9cced
Also always return in app commands
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-26 15:12:11 +07:00
cb057829f7
Update license headers for 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +07:00
734c62bee0
Format code according to PSR2
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +07:00
28f8eb5dba
Add visibility to all constants
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +07:00
caff1023ea
Format control structures, classes, methods and function
...
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.
This also removes and empty lines from method/function bodies at the
beginning and end.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +07:00
14c996d982
Use elseif instead of else if
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +07:00
44577e4345
Remove trailing and in between spaces
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +07:00
42625a46be
Remove spaces after method or function call
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:05:56 +07:00
afbd9c4e6e
Unify function spacing to PSR2 recommendation
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +07:00
41b5e5923a
Use exactly one empty line after the namespace declaration
...
For PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +07:00
2fbad1ed72
Fix (array) indent style to always use one tab
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +07:00
1a9330cd69
Update the license headers for Nextcloud 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +07:00
463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
...
Remove unused imports
2020-03-27 17:14:08 +07:00
b80ebc9674
Use the short array syntax, everywhere
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +07:00
74936c49ea
Remove unused imports
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +07:00
8f403b66d1
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an instance of OCA\Encryption\KeyManager
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-12-09 14:29:22 +07:00
5bf3d1bb38
Update license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +07:00
68748d4f85
Some php-cs fixes
...
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +07:00
16d47b5928
Fix wrongly mixed mock objects in encryption tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-15 12:04:28 +07:00
0c77cd21f9
Make sure maintenance mode is always casted to bool
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-22 08:25:41 +07:00
34d4c2bc16
improve variable naming
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-30 15:24:05 +07:00
8796c6bc78
in case 'encryption_skip_signature_check' was set to true we accept if the file doesn't has a signature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-27 23:38:41 +07:00
7a61ffc3dd
Allow to disable the signature check
...
This allows you to recover encryption files even if the signature is broken
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-27 11:08:41 +07:00
87657fffd8
skip already encrypted files on encrypt all command
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-24 16:53:39 +07:00
375f167c67
Adding a check to see if keyFileContents is empty:
...
* this fixes a download error and an exception if the data content
for encryption is empty
* #3958 : for recovering encrypted files with a damaged signature
this is necessary in addition to turning the signature check off
Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
2018-08-21 15:21:26 +07:00
3adc2aca53
add occ command to recover encrypted files in case of password lost
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-16 15:51:01 +07:00
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix
...
make file cache updates more robust
2018-08-08 18:27:18 +07:00
03971d3695
Move encryption settings to security
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-01 09:41:09 +07:00
a9e22c5f1c
make file cache updates more robust
...
only update the encrypted version after the write operation is finished and the stream is closed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-31 12:24:38 +07:00
38a90130ce
move log constants to ILogger
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +07:00
8042e6b8fb
this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-03-02 10:09:52 +07:00
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import
...
Remove unused import statements
2018-02-14 22:23:07 +07:00
d3d045dd5c
Remove unused import statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +07:00
e2974f1133
Simplify return statement
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:55:24 +07:00
a661f043e1
Remove unneeded semicolon and parentheses
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +07:00
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value
...
Return value immediately instead of assigning to a one-time variable
2018-01-26 10:15:39 +07:00
0a56d2185e
Return value immediately instead of assigning to a one-time variable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +07:00
464f024fa9
Use stripos instead of strpos(strtolower(), 'something')
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:59:50 +07:00
2a38605545
Properly log the full exception instead of only the message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +07:00
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +07:00
b1f77aca4e
Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
...
Use DI for IAppManager to encryption migration
2017-10-24 16:33:03 +07:00
99934134dc
Use DI for IAppManager to encryption migration
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:52:00 +07:00
5987099d2a
Remove unneeded check if app is enabled
...
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:47:06 +07:00
7092c50e7c
print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss
...
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
2017-09-11 12:52:25 +07:00
0ebdf871e0
Fix comparisons in encryption app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:54:07 +07:00
473824fa06
make sure that we always have a owner
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +07:00
20a6b22db6
Add recovery key on public upload
...
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:14 +07:00
d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +07:00
66debbe18e
add occ command to disable the master key again
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +07:00
5f75468aa4
improve status messages
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +07:00
28a7e72868
after the master key was loaded we are ready to go, no re-login needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:10 +07:00
da51ec38f4
only collect detailed access list if it is really needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:08 +07:00
9c5ba2f12c
make master key the new default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:03 +07:00
793de6a8d0
move encryption to security (and behind two factor things)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-27 12:21:18 +07:00
da53162656
We're on 13 now…
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-26 11:03:41 +07:00
39ca06e6b9
fix setting up encryption section
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:38:33 +07:00
b7ce492c59
adapt encryption
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +07:00
1729e4471f
Update comments to Nextcloud
...
* based on PR by @Ardinis
* see #4311
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 +07:00
6b9ef15803
Use master key for public links as well
2017-03-24 14:55:42 +07:00
43c081bdc9
Fix public link for master key
...
In public link mode there is no session, so the code should use the
public key instead.
2017-03-24 14:55:12 +07:00
d7c9e2b841
Updated UI messages relating to the encryption functionality
...
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:
- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones
They were also missing full-stops to end the them.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:06:55 +07:00
9ce32d9941
always throw a encryption exception
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 12:11:28 +07:00
fcda3a20f4
create new encryption keys on password reset and backup the old one
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +07:00
8a401ee156
check if session is initialized
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 12:20:43 +07:00
558a934842
init Session/privateKeys on Master Key
...
I can't find another way to init the session ...
2016-11-22 13:19:42 +07:00
8628d57b2c
Move console command registration to info.xml for encryption as well as files_external
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:15 +07:00
5e5e5b77d5
Fix encryption app
2016-09-12 16:48:11 +07:00
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope
2016-08-11 14:48:21 +07:00
f3b15a9ab9
fixes, improvements, and another app:
...
* setupSettings now also triggered on enable
* fixes detection of present admin section or settings in the DB
* add update routine in such cases
* encryption app migrated
2016-08-11 01:41:18 +07:00
352e8b3c79
More casing
2016-08-08 16:45:40 +07:00
0215b004da
Update with robin
2016-07-21 18:13:58 +07:00
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +07:00
e7e0dc608b
fix strings
2016-06-20 13:13:37 +07:00
aba539703c
Update license headers
2016-05-26 19:57:24 +07:00
0f728b4cd1
don't fail on "bad signature" during login. Most likely this happens because
...
the login password changed at the user back-end (e.g ldap). Such failures will
be handled after login correctly by allowing the user to adjust the passwords
2016-05-25 11:39:44 +07:00
4a3311f430
Move Encryption app to PSR-4 ( #24524 )
...
* Move Encryption to PSR-4
* Move encryption tests to PSR-4
* Fix the tests
2016-05-12 09:42:19 +07:00
d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away
2016-04-26 11:06:55 +07:00
088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled
2016-04-26 11:06:55 +07:00
b50d3255fb
Merge pull request #22791 from owncloud/enc_master_key_improvements
...
Enc master key improvements
2016-04-21 11:48:26 +07:00
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786
2016-04-15 15:07:40 +07:00
89223379ad
replaceUserKeys() actually deletes the users keys -> update method name and doc-block
2016-03-18 11:06:14 +07:00
5e267589d4
only create and update user specific key if no master key is enabled
2016-03-18 11:06:14 +07:00
f3f08cf910
Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff
...
Fallback for crappy ancient distributions
2016-03-16 21:56:36 +07:00
9de4a8338e
allow group shares, even if not all public keys are available
2016-03-15 11:33:19 +07:00
3a5f58c9b0
Fallback for crappy ancient distributions
...
Fixes https://github.com/owncloud/core/issues/23181
2016-03-12 23:11:31 +07:00
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +07:00
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +07:00
95ea2ccb53
make decrypt all work with the master key
2016-02-29 14:54:32 +07: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 +07: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 +07: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 +07:00
6724f76573
Use cache and add tests
2016-02-09 23:43:27 +07: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 +07: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 +07:00
5ccb9dfa7e
Use database for keeping track of the version
2016-02-09 23:43:27 +07:00
3badf5caf5
Use number of chunk for HMAC as well
...
Prevents switching single blocks within the encrypted file.
2016-02-09 23:43:26 +07: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 +07:00
d5c1596887
Clarify documentation
2016-02-09 23:43:26 +07:00
3b62459c41
Use hash with appended "a" of the original password for the authentication
2016-02-09 23:43:26 +07:00
9bb97c714b
fixing unit tests
2016-02-09 23:43:26 +07:00
b9ff16498b
Use random_bytes instead OpenSSL
2016-02-09 23:43:26 +07:00
61dd191253
meta data are at the end of the file
2016-02-09 23:43:25 +07:00
e7ff84df5c
always use default cipher for write operations, no matter how the file was encrypted before
2016-02-09 23:43:25 +07:00
cf3a8f274f
make it backward compatible to work with signed and un-signed files
2016-02-09 23:43:25 +07:00
40a5ba72fc
sign all encrypted blocks and check signature on decrypt
2016-02-09 23:43:25 +07:00
db8f267647
Add note about the addPadding function
2016-02-09 23:43:25 +07: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 +07:00
d25b8dacb3
Use AES-256-CTR as default
...
CTR is recommended over CFB mode.
2016-02-09 23:43:24 +07:00
e0aa6e01ab
Merge pull request #21612 from owncloud/fix_21598
...
fix public link sharing if the master key is enabled
2016-01-13 10:34:48 +07:00
682821c71e
Happy new year!
2016-01-12 15:02:18 +07:00
876fb83ddc
getMediumStrengthGenerator is deprecated and does not do anything anymore
2016-01-11 20:06:30 +07:00
46f6c289ca
only use master key ID if a user is logged in. Otherwise keep the public link share key
2016-01-11 13:09:06 +07:00
0654d37da8
Remove undefined variable
2016-01-07 21:30:44 +07:00
00a01a8de2
Fix PHPDoc + Add handling for error cases
...
Makes static code analyzers happier.
2016-01-07 21:30:44 +07:00
f3360d51c6
Use PHP polyfills
2015-12-11 08:47:36 +07:00
eebe2b9c23
User IUser::getEMailAddress() all over the place
2015-12-02 21:25:05 +07:00
be4c3a8b56
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-27 15:32:44 +07:00
b025f07fb7
Make Cache\Updater per storage
2015-11-25 14:16:00 +07:00
46261b5ff1
Correct the description of function setEncryptHomeStorage
2015-11-03 22:47:55 +07:00
5fad45b230
make encryption configurable for home storage
2015-10-27 14:24:20 +07:00
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +07:00
e0a56317fa
Fix "Call to a member function getUID() on boolean" in Crypt
2015-10-22 11:46:37 +07:00
b945d71384
update licence headers via script
2015-10-05 21:15:52 +07:00
bf82015254
add some output to explain the pre-conditions for decrypt-all
2015-10-05 12:41:05 +07:00
90f1e3dc94
no need to list users if all users already had a key-pair
2015-09-24 12:47:46 +07:00
daf5d1ff2e
fix small typo
2015-09-21 16:48:15 +07:00
9bd4f2d41e
occ script to disable encryption and to decrypt all files again
2015-09-15 22:39:44 +07:00
7953cc9494
Function does return void
...
This function does return void and not a bool.
2015-09-15 14:02:10 +07:00
acfc7d7c4d
enable usage of a master key
2015-09-07 16:08:41 +07:00
166e57cf61
return false if private key is not valid
2015-08-30 15:31:19 +07:00
6e210d960c
Merge pull request #18423 from owncloud/occ_encrypt_all
...
occ command line tool to encrypt all files
2015-08-28 20:44:55 +07:00
8c08dd0ac2
occ tool to encrypt all files
2015-08-26 14:58:22 +07:00
cca35f0c3e
Merge pull request #18121 from owncloud/enc_improve_privkey_encryption
...
use password hash to encrypt private key
2015-08-24 12:03:27 +07:00
e6eb74958f
Remove unnecessary DB prefixes from existing query builder usages
2015-08-10 16:21:41 +07:00
854fd63ea9
use uid as additional information for salt
2015-08-07 15:51:43 +07:00
62bc0e5264
use password hash instead of the plain password to encrypt the private key
2015-08-07 15:21:08 +07:00
2f4bebb045
only update database on the first run (first run = we have a version number from the old encryption app)
2015-07-31 10:47:02 +07:00
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +07:00
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +07:00
570dd17d4f
fix mount point detection
2015-07-20 16:00:33 +07:00
3000f0125f
don't move keys if the key where already moved in a previous migration run
2015-07-17 15:19:10 +07:00
d6f02eb703
Merge pull request #17500 from owncloud/encryption_migration_improvements
...
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +07:00
1e284b15ff
only create new key pair if both keys are missing
2015-07-08 19:08:41 +07:00
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +07:00
876d7c160d
more secure way to update the database
2015-07-08 13:26:53 +07:00
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +07:00
ed3dc199ae
remove files_encryption from database at the end of the migration process
2015-06-19 14:15:56 +07:00
Julius Härtl
Roeland Jago Douma
Joas Schilling
Christoph Wurst
Christoph Wurst
Daniel Kesselberg
Bjoern Schiessle
Stefan Weiberg
Arthur Schiwon
Morris Jobke
Kenneth Newwood
Vincent Petry
Matthew Setter
Maxence Lange
Thomas Müller
Lukas Reschke
Björn Schießle
Joas Schilling
Roeland Jago Douma
Scrutinizer Auto-Fixer
Robin Appelman
Phil Davis
Joas Schilling