wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
51123 commits 157 branches 562 tags 714 MiB
Commit graph

207 commits

Author SHA1 Message Date
Joas Schilling
16d47b5928
Fix wrongly mixed mock objects in encryption tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-15 12:04:28 +02:00
Joas Schilling
0c77cd21f9
Make sure maintenance mode is always casted to bool 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-22 08:25:41 +01:00
Bjoern Schiessle
34d4c2bc16
improve variable naming 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-30 15:24:05 +01:00
Bjoern Schiessle
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 +01:00
Bjoern Schiessle
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 +01:00
Bjoern Schiessle
87657fffd8
skip already encrypted files on encrypt all command 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-24 16:53:39 +02:00
Stefan Weiberg
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 +02:00
Bjoern Schiessle
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 +02:00
Björn Schießle
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix 
make file cache updates more robust
 2018-08-08 18:27:18 +02:00
Julius Härtl
03971d3695
Move encryption settings to security 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 09:41:09 +02:00
Bjoern Schiessle
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 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Bjoern Schiessle
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 +01:00
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Morris Jobke
e2974f1133
Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00
Morris Jobke
a661f043e1
Remove unneeded semicolon and parentheses 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 23:46:40 +01:00
Joas Schilling
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 +01:00
Morris Jobke
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 +01:00
Morris Jobke
464f024fa9
Use stripos instead of strpos(strtolower(), 'something') 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:59:50 +01:00
Morris Jobke
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 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration 
Use DI for IAppManager to encryption migration
 2017-10-24 16:33:03 +02:00
Morris Jobke
99934134dc
Use DI for IAppManager to encryption migration 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 15:52:00 +02:00
Morris Jobke
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 +02:00
Kenneth Newwood
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 +02:00
Joas Schilling
0ebdf871e0 Fix comparisons in encryption app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:54:07 +02:00
Bjoern Schiessle
473824fa06
make sure that we always have a owner 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:40:17 +02:00
Bjoern Schiessle
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 +02:00
Bjoern Schiessle
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 +02:00
Bjoern Schiessle
66debbe18e
add occ command to disable the master key again 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
5f75468aa4
improve status messages 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
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 +02:00
Bjoern Schiessle
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 +02:00
Bjoern Schiessle
9c5ba2f12c
make master key the new default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:33:03 +02:00
Arthur Schiwon
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 +02:00
Arthur Schiwon
da53162656
We're on 13 now… 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-26 11:03:41 +02:00
Arthur Schiwon
39ca06e6b9
fix setting up encryption section 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:38:33 +02:00
Arthur Schiwon
b7ce492c59
adapt encryption 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Morris Jobke
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 -05:00
Vincent Petry
6b9ef15803
Use master key for public links as well 2017-03-24 14:55:42 +01:00
Vincent Petry
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 +01:00
Matthew Setter
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 -06:00
Bjoern Schiessle
9ce32d9941
always throw a encryption exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 12:11:28 +01:00
Bjoern Schiessle
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 +01:00
Bjoern Schiessle
8a401ee156
check if session is initialized 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-23 12:20:43 +01:00
Maxence Lange
558a934842 init Session/privateKeys on Master Key 
I can't find another way to init the session ...
 2016-11-22 13:19:42 -01:00
Thomas Müller
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 +02:00
Joas Schilling
5e5e5b77d5
Fix encryption app 2016-09-12 16:48:11 +02:00
Arthur Schiwon
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00