Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-27 05:50:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
146 Commits 23 Branches 187 Tags 36 MiB
028f6ea824
Commit Graph

146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
028f6ea824 WebDavMounter warmUp in background thread. 2015-02-22 13:52:28 +01:00
Sebastian Stenzel
30dc8eecb1 - Refactored WebDavMounter (using Guice) 
- implemented warm start for windows mounts
 2015-02-22 13:21:08 +01:00
Sebastian Stenzel
4d979c26f6 (hopefully) fixed NPE in FXMLLoader. 
see http://stackoverflow.com/questions/26434758/npe-in-fxmlloader/26436265#26436265
 2015-02-22 12:36:17 +01:00
Sebastian Stenzel
4776dbf603 Renamed volume icon 2015-02-22 12:18:42 +01:00
Sebastian Stenzel
0b5e4469b4 Update .travis.yml 2015-02-20 22:11:00 +01:00
Sebastian Stenzel
8ba89a3bf5 Injecting Cryptor using Guice 2015-02-20 21:30:33 +01:00
Sebastian Stenzel
b68cf71494 - always check HMAC before decryption 
- separating AES and CMAC key during SIV mode
 2015-02-20 19:47:45 +01:00
Sebastian Stenzel
5569ecbfc7 fixes #23 2015-02-19 19:50:03 +01:00
Sebastian Stenzel
19bc1ed569 using beginning of long filename instead of checksum 2015-02-19 18:54:31 +01:00
Sebastian Stenzel
5aaee7bbf6 - fixed xorend function 
- SIV implementation now satisfies all official test vectors
 2015-02-15 15:55:49 +01:00
Sebastian Stenzel
3187520797 - fixed special chars in folder names 
- fixed IndexOutOfBoundsException
- removal of no longer existing vault directories (at runtime)
 2015-02-15 00:48:03 +01:00
Sebastian Stenzel
bcee1e0d12 Filename padding no longer needed: This was done in order to prevent AES-CTR to switch to a stream mode on the last block, which would be highly exploitable. Now we're using SIV mode, which operates on whole blocks. 2015-02-14 19:21:08 +01:00
Sebastian Stenzel
9fdd2f339c - changed file name encryption to SIV mode 
- vastly improved exception handling, if decryption of a path name fails
 2015-02-14 18:55:33 +01:00
Sebastian Stenzel
ebdf37ed63 RFC 5297 AEAD_AES_SIV_CMAC_256 2015-02-14 18:20:17 +01:00
Sebastian Stenzel
09c26f5e86 Merge pull request #32 from Tillerino/injection 
Dependency injection instead of static instances
 2015-02-14 16:34:19 +01:00
Tillmann Gaida
def70c5891 Removed static resources in WebDavServer, FXThreads and Settings with 
dependency injection. Replaced static references to MainApplication in
the context of closing resources with an injected DeferredCloser. Using
controller factory for dependency injection into FX controllers.
 2015-02-14 14:11:55 +01:00
Sebastian Stenzel
11396b71e6 Merge pull request #31 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2015-02-14 12:45:10 +01:00
The Gitter Badger
05ec9b574e Added Gitter badge 2015-02-14 11:44:48 +00:00
Sebastian Stenzel
efac770915 allow adding *.cryptomator files to vault list 2015-02-13 21:22:26 +01:00
Sebastian Stenzel
f29bcc447c - fixed automount on windows 2015-02-13 21:05:16 +01:00
Sebastian Stenzel
5e0ebab587 refactored "add vault" functionality, which fixes #14 
removed some dependencies
refactored Main/MainApplication, which fixes #16
 2015-02-13 19:46:07 +01:00
Sebastian Stenzel
751dbe6b7e Merge pull request #30 from Tillerino/osxNames 
Named mounting (only affects OSX atm)
 2015-01-25 13:44:44 +01:00
Tillmann Gaida
a72f8ba8ab Added the new mount name to the web dav mounter interface. Under OSX, we 
can now use the name, which fixes #5
 2015-01-25 12:42:16 +01:00
Sebastian Stenzel
999285617d Merge pull request #28 from Tillerino/windowsNames 
Pretty network drive names on Windows
 2015-01-25 12:05:04 +01:00
Sebastian Stenzel
addf488b26 Merge pull request #29 from Tillerino/master 
Merged. But we should investigate alternatives to axet's openFileHandler
 2015-01-25 12:04:12 +01:00
Tillmann Gaida
cd5e878a26 Bugfix (magic file open handler broke context class loader for event 
thread)
 2015-01-23 16:25:54 +01:00
Tillmann Gaida
0a671aa9bc Addition of a name to the context path of the WebDAV servlet. The name 
will then appear as the name of the network drive on Windows.
The name is "normalized" down to characters, which are certain to be
accepted. I added a field to the unlock controller, which normalizes the
name as you type.
 2015-01-23 14:28:22 +01:00
Sebastian Stenzel
8cc445a12a New application icon by Thomas Pähler 2015-01-23 00:20:40 +01:00
Sebastian Stenzel
432beb2a17 - fixed #19 (again): vault-specific prefix is now handled by the servlet context instead of jackrabbit. 
- simplified webdav locator, as workspaces and pathPrefixes are not relevant to jackrabbit any longer
 2015-01-22 21:48:52 +01:00
Sebastian Stenzel
9fd271ad7b fixed NPE 2015-01-22 21:42:45 +01:00
Sebastian Stenzel
72b1ff78c3 Merge pull request #27 from Tillerino/master 
Single Running Instance + Double-clicking folders/files shows in GUI
 2015-01-21 20:07:51 +01:00
Tillmann Gaida
edfd264e47 Changes proposed by @totalvoidness in code review 2015-01-21 19:54:10 +01:00
Tillmann Gaida
0cfc3fb7f7 Prevents starting a second instance of the GUI and forwards 
main-method-arguments to the running instance. Command line arguments
are treated by showing the corresponding folder in the GUI.

If an argument is a folder, it is shown directly. If an argument is a
.masterkey.json file, the parent directory is shown. If an argument does
not exist, but the folder can be created, the newly created folder is
shown.

It was necessary to move the main function away from the MainApplication
class because running the main method of a class, which extends the
javafx Application class, will start a non-daemon thread. This prevents
the VM from exiting naturally.

OSX needs its own mechanism, which is implemented in OS-specific code.
It is vital that the required handler is added in the main thread of the
application, not the Java FX thread, which is a bit awkward to
implement. Since it is possible to open .cryptomator packages on OSX,
this extension is now hidden in the folder list.
 2015-01-21 17:35:25 +01:00
Sebastian Stenzel
ecf29a91b8 Update README.md 2015-01-18 15:35:35 +01:00
Sebastian Stenzel
38884c6dfd - added custom info.plist template for OS X native packages (references #14) kudos to @tillerino 2015-01-17 19:57:15 +01:00
Sebastian Stenzel
7813a11381 - pad filenames with NULL bytes (fixes #24) 2015-01-16 19:55:33 +01:00
Sebastian Stenzel
d774546bf8 - pad file contents to reach a multiple of 16 bytes (so AES/CTR always works on complete blocks) - references #24 
- calculate MAC over complete ciphertext (including file length obfuscation trash data)
 2015-01-16 19:50:57 +01:00
Sebastian Stenzel
0b64c7ce25 - Updated exception 2015-01-15 12:29:10 +01:00
Sebastian Stenzel
0aef60efc4 - Single Jetty instnace (fixes #19) 2015-01-15 12:27:10 +01:00
Sebastian Stenzel
f0fa4fcf3d Merge branch 'master' of https://github.com/totalvoidness/open-cloud-encryptor 2015-01-14 19:35:04 +01:00
Sebastian Stenzel
8bfdad38b9 - fixed timing attack on MAC (see http://codahale.com/a-lesson-in-timing-attacks/) 2015-01-14 19:34:36 +01:00
Sebastian Stenzel
19ea81f0e5 Update README.md 2015-01-13 13:57:38 +01:00
Sebastian Stenzel
5e6f343e68 - Updated version to 0.5.0-SNAPSHOT 2015-01-13 11:04:58 +01:00
Sebastian Stenzel
b49eb82f38 - Beta Version 0.4.0 2015-01-13 11:01:42 +01:00
Sebastian Stenzel
523f38c69e - Updated L&F for Mac OS X: Greyed out controls, if window is inactive. 2015-01-10 19:40:20 +01:00
Sebastian Stenzel
3cd3012a05 - fixes #13 2015-01-10 17:01:34 +01:00
Sebastian Stenzel
3ff8d6bc19 - fixed error during exception handling, if trying to decrypt vault with unsupported key length 2015-01-10 15:51:46 +01:00
Sebastian Stenzel
7ce6ed6abb - shows application icon in notification center 2015-01-10 15:23:49 +01:00
Sebastian Stenzel
be0b4859e3 - Adjusted win L&F of checkbox 2015-01-09 15:45:45 +01:00
Sebastian Stenzel
760b2c028f - Some minor improvements, renamed some classes 2015-01-09 15:25:44 +01:00