mirrors/redoctober
1
0
Fork 0
mirror of https://github.com/cloudflare/redoctober.git synced 2026-09-19 14:14:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let encrypt and decrypt be called by non-admins.

Browse Source
This commit is contained in:
Nick Sullivan
2015-04-13 12:51:02 -07:00
parent 2f4e7fed67
commit 5deefb26c5
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/core.go
+2 -2
View File
@@ -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)
}
core/core_test.go
+2 -2
View File
@@ -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)
}