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

main: suppress master key display if not running on a terminal

Browse Source 
Mounting through fstab or pam_mount may get the output logged
into syslog. We don't want the master key to end up in syslog.
This commit is contained in:
Jakob Unterwurzacher 2016-10-11 09:13:51 +02:00
parent c8e5dc9844
commit 72efd3b6c3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
masterkey.go
View File

@ -5,6 +5,8 @@ import (
"os" "os"
"strings" "strings"
"golang.org/x/crypto/ssh/terminal"
"github.com/rfjakob/gocryptfs/internal/cryptocore" "github.com/rfjakob/gocryptfs/internal/cryptocore"
"github.com/rfjakob/gocryptfs/internal/tlog" "github.com/rfjakob/gocryptfs/internal/tlog"
) )
@ -12,9 +14,13 @@ import (
// printMasterKey - remind the user that he should store the master key in // printMasterKey - remind the user that he should store the master key in
// a safe place // a safe place
func printMasterKey(key []byte) { func printMasterKey(key []byte) {
if !terminal.IsTerminal(int(os.Stdout.Fd())) {
// We don't want the master key to end up in a log file
tlog.Info.Printf("Not running on a terminal, suppressing master key display\n")
return
}
h := hex.EncodeToString(key) h := hex.EncodeToString(key)
var hChunked string var hChunked string
// Try to make it less scary by splitting it up in chunks // Try to make it less scary by splitting it up in chunks
for i := 0; i < len(h); i += 8 { for i := 0; i < len(h); i += 8 {
hChunked += h[i : i+8] hChunked += h[i : i+8]
@ -25,7 +31,6 @@ func printMasterKey(key []byte) {
hChunked += "\n " hChunked += "\n "
} }
} }
tlog.Info.Printf(` tlog.Info.Printf(`
Your master key is: Your master key is: