diff --git a/core/core.go b/core/core.go index d19734e..d19e149 100644 --- a/core/core.go +++ b/core/core.go @@ -191,7 +191,7 @@ func Summary(jsonIn []byte) ([]byte, error) { return jsonStatusError(errors.New("Vault is not created yet")) } - if err := validateAdmin(s.Name, s.Password); err != nil { + if err := validateUser(s.Name, s.Password); err != nil { log.Printf("Error validating admin status of %s: %s", s.Name, err) return jsonStatusError(err) } @@ -267,7 +267,7 @@ func Encrypt(jsonIn []byte) ([]byte, error) { return jsonStatusError(err) } - if err := validateAdmin(s.Name, s.Password); err != nil { + if err := validateUser(s.Name, s.Password); err != nil { log.Println("Error validating admin status", err) return jsonStatusError(err) } diff --git a/core/core_test.go b/core/core_test.go index a6f9341..66c65fb 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -352,7 +352,7 @@ func TestEncryptDecrypt(t *testing.T) { t.Fatalf("Error in summary, %v", sum.Status) } - // Encrypt with non-admin (fail) + // Encrypt with non-admin respJson, err = Encrypt(encryptJson) if err != nil { t.Fatalf("Error in encrypt, %v", err) @@ -361,7 +361,7 @@ func TestEncryptDecrypt(t *testing.T) { if err != nil { t.Fatalf("Error in encrypt, %v", err) } - if s.Status == "ok" { + if s.Status != "ok" { t.Fatalf("Error in encrypt, %v", s.Status) } diff --git a/redoctober.go b/redoctober.go index 55ac4b2..3fc9ce3 100644 --- a/redoctober.go +++ b/redoctober.go @@ -308,6 +308,7 @@ var indexHtml = []byte(` +
@@ -456,11 +457,11 @@ var indexHtml = []byte(`
- +
- +
@@ -495,11 +496,11 @@ var indexHtml = []byte(`
- +
- +