Commit Graph

375 Commits

Author SHA1 Message Date
Jakob Unterwurzacher
553f65a014 benchmark.pl: Improve help text, add Makefile target
Performing a benchmark on /var/tmp now is as easy as
"make benchmark".
2014-12-27 15:00:58 +01:00
Jakob Unterwurzacher
f8a563bdcd encfsctl: define a default PATH_MAX
Unless it is already defined. Fixes build errors with musl libc.
2014-12-27 15:00:58 +01:00
Jakob Unterwurzacher
517c7bc948 benchmark.pl: Skip ecryptfs if mount.ecryptfs is not available
Allows the benchmark to work on OS X or when ecryptfs is not
installed.
Also, introduce stopwatch_start/stop helpers to cut down copy-paste
code.
2014-12-27 15:00:58 +01:00
Led
d9a3759cfd encfssh: use mktemp(1) for create unique unenc_dir 2014-12-25 01:24:17 +02:00
Valient Gough
3643924ba3 Merge pull request #39 from rfjakob/next
Update yes/no prompts. Fixes issue #20
2014-12-13 19:22:15 -08:00
Jakob Unterwurzacher
0a920fa733 Use standard "[y]/n" / "y/[n]" prompt
This removes the need for a translated prompt. Fixes issue #20.

Also,
* merge boolDefaultNo() and boolDefaultYes() into boolDefault()
* do not accept arbitrary answers, but prompt again
2014-12-13 13:01:03 +01:00
Jakob Unterwurzacher
80844b89da Update translation URL
"rosetta" now lives at translations.launchpad.net
2014-12-13 13:00:18 +01:00
Valient Gough
11c4b70a70 Merge pull request #38 from rfjakob/next
Add benchmark.pl
2014-12-08 19:17:39 -08:00
Jakob Unterwurzacher
0a274fe77f Mention PERFORMANCE.md in README.md 2014-12-08 19:47:56 +01:00
Jakob Unterwurzacher
9a64ff97c5 benchmark.pl: Align numbers right in Markdown output 2014-12-08 19:34:50 +01:00
Jakob Unterwurzacher
b9c8b5cb47 Put benchmark results into PERFORMANCE.md 2014-12-08 19:21:33 +01:00
Jakob Unterwurzacher
ca6c46e2dc DESIGN.md: Add markdown headings 2014-12-08 18:20:15 +01:00
Jakob Unterwurzacher
f4d100648f Rename README to DESIGN.md and link to it in README.md
This document provides a nice overview and should be presented
prominently.
2014-12-08 18:14:35 +01:00
Jakob Unterwurzacher
9feb263dea tests: Add benchmark.pl - benchmark EncFS against eCryptfs
Example Results
* Seagate Barracuda 7200.9, model ST3250824AS
* Linux 3.16.3
* EncFS 1c5c75c44f

Test            | EncFS        | eCryptfs     | EncFS advantage
----------------|--------------|--------------|----------------
stream_write    |     32 MiB/s |     38 MiB/s | 0.84
extract         |  28744 ms    |  30027 ms    | 1.04
du              |    495 MB    |    784 MB    | 1.58
rsync           |   3319 ms    |  62486 ms    | 18.83
delete          |   6462 ms    |  74652 ms    | 11.55

(eCryptfs is very slow for stat() on a classical HDD)
2014-12-08 18:09:20 +01:00
Jakob Unterwurzacher
1c5c75c44f tests: Name all tests ".t.pl"
This way, everything (for example, common.inc) can have its proper
".pl" ending and syntax highlighting works properly in every editor.
2014-12-08 17:39:10 +01:00
Valient Gough
40531024c8 Merge pull request #36 from rfjakob/master
Reverse mode improvements
2014-12-02 12:43:11 -08:00
Jakob Unterwurzacher
8c7cf98af6 Clarify read-only handling of reverse mounts without uniqueIV
Also, delete unused define

Both issues spottet by Valient Gough's review
2014-12-01 20:13:40 +01:00
Jakob Unterwurzacher
8b8130782d tests: Unset ENCFS6_CONFIG before testing
This prevents unexpected failures when you have set that variable.

Also, give Test::More the number of tests that will be run for
more informative output.
2014-11-30 23:13:10 +01:00
Jakob Unterwurzacher
73b2f7c850 Replace ternary operators in cipherPathWithoutRoot with if clause
Adds a few lines but makes clear what is happening.
2014-11-30 23:13:02 +01:00
Jakob Unterwurzacher
8eea3be2db Add comments to path-handling functions in DirNode.cpp 2014-11-30 22:42:51 +01:00
Jakob Unterwurzacher
34d15bbeaa Remove buggy prefix check from plainPath
In reverse mode, this caused symlinks pointing to the absolute
plaintext directory to be stripped. This is what the test in
commit

	tests: reverse: symlink absolute path inside the plaintext dir

checks for.

Ignoring encfsctl, plainPath() is only called from encfs.cpp, in
_do_readlink() and _do_getattr(). Both functions get the path passed in from
FUSE. Paths from FUSE are always anchored at the mountpoint (they start with
"/", and "/" means the root of the mount). This suggests that the check can
never trigger - I have verified that it does not trigger when running the
test suite.

With this patch, the full test suite passes.
2014-11-30 22:28:12 +01:00
Jakob Unterwurzacher
91919929dd tests: reverse: symlink absolute path inside the plaintext dir
This test currently fails because of a bug in EncFS
2014-11-30 22:22:20 +01:00
Jakob Unterwurzacher
52f189b232 encfs_symlink: Fix argument naming (was reversed)
It is symlink(target, link_name), see man 3 symlink
2014-11-30 20:55:18 +01:00
Jakob Unterwurzacher
32102447e0 reverse: Filesystem is read-only of uniqueIV is enabled
Writing to the ciphertext files can rewrite the header. This
would mean we had to re-encrypt the whole file with the new IV.

This could be made more fine-grained, for example allowing
writes to everywhere but the header. However, this is
something that needs a lot of testing to ensure correctness.
Writing to the ciphertext is a niche use case of the niche
use case of using reverse mode, so it is unlikely it would
get the test coverage it needs.

To be safe, we deny all modifications of the ciphertext with
read-only filesystem error (EROFS) if uniqueIV is enabled.

Reverse mode with uniqueIV disabled still supports writing,
if somebody really needs it. This use case is not covered
by the test suite at the moment.
2014-11-30 14:23:35 +01:00
Jakob Unterwurzacher
d1363578fc reverse: Make uniqueIV configurable in expert mode 2014-11-29 20:04:31 +01:00
Jakob Unterwurzacher
7732466277 tests: Replace calls to dd with native writeZeroes 2014-11-29 13:35:02 +01:00
Jakob Unterwurzacher
8620b46d56 Update changelog 2014-11-26 23:57:32 +01:00
Valient Gough
89513f273a Merge pull request #34 from rfjakob/reverse-iv
reverse: Implement unique IV derived from the inode number
2014-11-24 21:00:50 -08:00
Jakob Unterwurzacher
73a5accb8e reverse: Derive IV from inode number
The truncated SHA1 hash of the inode number is used as the IV
for files encrypted in reverse mode.
Passes the test suite.

Closes #24.
2014-11-23 21:21:51 +01:00
Jakob Unterwurzacher
3fce933f65 Document SSL_Cipher::setIVec 2014-11-23 21:19:25 +01:00
Jakob Unterwurzacher
43a1cd3344 tests: Get rid of df warnings
Like "Transport endpoint is not connected" when there is
a stale FUSE mount lying around
2014-11-23 21:17:27 +01:00
Jakob Unterwurzacher
1b5cde2273 tests: Also verify file contents in grow test 2014-11-23 18:24:55 +01:00
Jakob Unterwurzacher
76424a58cb Implement uniqueIV for reverse mode
For now, the IVs are constant. This is fixed in a later commit.
They are enabled by default to make testing easier.
The whole thing passes the test suite on x86 and x86_64.
2014-11-23 18:24:22 +01:00
Jakob Unterwurzacher
dee3f628e3 Implement --nocache
Disable block cache (in EncFS) and stat cache (in kernel).
This is needed if the backing files may be modified
behind the back of EncFS (for example, when you mount
an encrypted filesystem exported by encfs --reverse).

The reverse grow tests fail when this option is not passed to the
decrypting mount.
2014-11-17 21:57:06 +01:00
Jakob Unterwurzacher
9f9e30a73f Check the assertions in cacheReadOneBlock explicitely
...to make the code more robust w.r.t. refactoring.

Also add comments about the last block handling.
2014-11-17 20:21:44 +01:00
Valient Gough
4608c1704b Merge pull request #29 from doughdemon/master
Make it compile with musl libc
2014-11-16 20:55:25 -08:00
Jakob Unterwurzacher
6d895fdc72 tests: Add --reverse file grow test
This test uncovered issues caused by unsafe kernel-side and BlockFileIO caching.
2014-11-17 00:39:14 +01:00
Jakob Unterwurzacher
84dae17d4e Disable unsafe kernel caching for --reverse
By default, the kernel caches file metadata for one second.
This is fine for EncFS' normal mode, but for --reverse, this
means that the encrypted view will be up to one second out of
date.
This causes the reverse grow tests to fail because stale stat()
data is returned.
2014-11-17 00:32:54 +01:00
Jakob Unterwurzacher
a00a3beb8e tests: explicitely verify that the reverse mount worked 2014-11-17 00:32:54 +01:00
Jakob Unterwurzacher
68485500fd Log offending filename "too small" errors 2014-11-17 00:32:54 +01:00
Jakob Unterwurzacher
5e834968b2 Handle ENCFS6_CONFIG set to non-existing file
This used to give the confusing error

	Found config file %s, but failed to load - exiting
2014-11-17 00:32:54 +01:00
Jakob Unterwurzacher
b2943eeed1 tests: Move helper funtion to common.inc
Also fixes md5fh's fd leak.
2014-11-17 00:32:54 +01:00
Jakob Unterwurzacher
1227df72e2 Add function descriptions to BlockFileIO 2014-11-10 23:15:29 +01:00
Jakob Unterwurzacher
7565fb149a Add comments documenting the filesystem config options 2014-11-09 13:59:35 +01:00
Jakob Unterwurzacher
00811625cf Add comments describing the config load functions 2014-11-09 13:58:33 +01:00
Jakob Unterwurzacher
5d3b246a0d V6SubVersion: Add comment explaining that the effective version is 20
..for boost 1.42+.

Note that RHEL 6 uses boost 1.41, so there may still be a few users
that are not running 1.42+.
2014-11-09 13:08:39 +01:00
Jakob Unterwurzacher
0053cd7a70 Actually print error message in withCipherPath and withFileNode 2014-11-09 12:40:39 +01:00
Jakob Unterwurzacher
cc274dca63 Exit on corrupt config file instead of overwriting it
This is something that should really not happen, it makes
sense to have the user examine the situation himself.

Behavoir was:

	23:00:42 (FileUtils.cpp:379) Archive exception: XML start/end tag mismatch - uniqueIV
	23:00:42 (FileUtils.cpp:337) Found config file /tmp/a/ciphertext/.encfs6.xml, but failed to load
	Creating new encrypted volume.
	Please choose from one of the following options:
	...

Now it exits with:

	23:13:04 (FileUtils.cpp:337) Found config file /tmp/a/ciphertext/.encfs6.xml, but failed to load - exiting
2014-11-05 21:34:30 +01:00
Jakob Unterwurzacher
8efda5b700 tests: Check that absolute symlinks work in reverse mode 2014-11-04 23:08:33 +01:00
Felix Janda
4a2c53a4f9 encfs/encfsctl.cpp: add missing #include <limits.h> 2014-11-01 08:22:45 +01:00