veyron/tools/mgmt,veyron/security/agent/agentd: node mgr integration test.
Introduce test.sh for node manager (work in progress). Currently, it just builds
the right binaries and brings up a node manager. We need to make it work
without requiring root privileges and without requiring a password in the agent,
hence the changes to nminstall and agentd.
Change-Id: Ifa2ae322f6e5c22c36dcaed819f8d35d3cf1bdef
diff --git a/security/agent/agentd/main.go b/security/agent/agentd/main.go
index ed9fe2e..faa8c0d 100644
--- a/security/agent/agentd/main.go
+++ b/security/agent/agentd/main.go
@@ -23,7 +23,10 @@
"veyron.io/veyron/veyron2/vlog"
)
-var keypath = flag.String("additional_principals", "", "If non-empty, allow for the creation of new principals and save them in this directory.")
+var (
+ keypath = flag.String("additional_principals", "", "If non-empty, allow for the creation of new principals and save them in this directory.")
+ noPassphrase = flag.Bool("no_passphrase", false, "If true, user will not be prompted for principal encryption passphrase.")
+)
func main() {
flag.Usage = func() {
@@ -116,9 +119,13 @@
}
func handleDoesNotExist(dir string) (security.Principal, []byte, error) {
- pass, err := getPassword("Private key file does not exist. Creating new private key...\nEnter passphrase (entering nothing will store unencrypted): ")
- if err != nil {
- return nil, nil, fmt.Errorf("failed to read passphrase: %v", err)
+ fmt.Println("Private key file does not exist. Creating new private key...")
+ var pass []byte
+ if !*noPassphrase {
+ var err error
+ if pass, err = getPassword("Enter passphrase (entering nothing will store unencrypted): "); err != nil {
+ return nil, nil, fmt.Errorf("failed to read passphrase: %v", err)
+ }
}
p, err := vsecurity.CreatePersistentPrincipal(dir, pass)
if err != nil {
@@ -129,6 +136,9 @@
}
func handlePassphrase(dir string) (security.Principal, []byte, error) {
+ if *noPassphrase {
+ return nil, nil, fmt.Errorf("Passphrase required for decrypting principal.")
+ }
pass, err := getPassword("Private key file is encrypted. Please enter passphrase.\nEnter passphrase: ")
if err != nil {
return nil, nil, fmt.Errorf("failed to read passphrase: %v", err)
