hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

main: add -e as an alias for -exclude

Browse Source
This commit is contained in:
Jakob Unterwurzacher 2018-08-15 13:11:34 +02:00
parent 7a02f71fc2
commit 5acfbc1b2f
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/MANPAGE.md
View File

@ -76,7 +76,7 @@ prior to 1.9, which fall back to weak random data when the getrandom syscall
is blocking. Using this option can block indefinitely when the kernel cannot
harvest enough entropy.
#### -exclude PATH
#### -e PATH, -exclude PATH
Only for reverse mode: exclude relative plaintext path from the encrypted
view. Can be passed multiple times. Example:

2
README.md
View File

@ -158,7 +158,7 @@ vNEXT, in progress
* Only print master key once, on init
([#76](https://github.com/rfjakob/gocryptfs/issues/76),
[commit](https://github.com/rfjakob/gocryptfs/commit/6d64dfe8f7acd8e9ca4a659d26318e442c2db85a))
* Add `-exclude` option for reverse mode
* Add `-e` / `-exclude` option for reverse mode
([#235](https://github.com/rfjakob/gocryptfs/issues/235),
[commit](https://github.com/rfjakob/gocryptfs/commit/ec2fdc19cf9358ae7ba09c528a5807b6b0760f9b))

2
cli_args.go
View File

@ -176,6 +176,8 @@ func parseCliOpts() (args argContainer) {
flagSet.StringVar(&args.force_owner, "force_owner", "", "uid:gid pair to coerce ownership")
flagSet.StringVar(&args.trace, "trace", "", "Write execution trace to file")
// -e, --exclude
flagSet.Var(&args.exclude, "e", "Alias for -exclude")
flagSet.Var(&args.exclude, "exclude", "Exclude relative path from reverse view")
flagSet.IntVar(&args.notifypid, "notifypid", 0, "Send USR1 to the specified process after "+

9
tests/reverse/exclude_test.go
View File

@ -44,7 +44,7 @@ func ctlsockEncryptPath(t *testing.T, sock string, path string) string {
return response.Result
}
func TestExclude(t *testing.T) {
func testExclude(t *testing.T, flag string) {
pOk := []string{
"file2",
"dir1/file1",
@ -74,7 +74,7 @@ func TestExclude(t *testing.T) {
sock := mnt + ".sock"
cliArgs := []string{"-reverse", "-extpass", "echo test", "-ctlsock", sock}
for _, v := range pExclude {
cliArgs = append(cliArgs, "-exclude", v)
cliArgs = append(cliArgs, flag, v)
}
if plaintextnames {
cliArgs = append(cliArgs, "-config", "exclude_test_fs/.gocryptfs.reverse.conf.plaintextnames")
@ -102,3 +102,8 @@ func TestExclude(t *testing.T) {
}
}
}
func TestExclude(t *testing.T) {
testExclude(t, "-exclude")
testExclude(t, "-e")
}