mirrors/redoctober
1
0
Fork 0
mirror of https://github.com/cloudflare/redoctober.git synced 2026-01-07 14:05:47 +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:15:57 -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

4
core/core.go
View File

@@ -191,7 +191,7 @@ func Summary(jsonIn []byte) ([]byte, error) {
return jsonStatusError(errors.New("Vault is not created yet")) 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) log.Printf("Error validating admin status of %s: %s", s.Name, err)
return jsonStatusError(err) return jsonStatusError(err)
} }
@@ -267,7 +267,7 @@ func Encrypt(jsonIn []byte) ([]byte, error) {
return jsonStatusError(err) 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) log.Println("Error validating admin status", err)
return jsonStatusError(err) return jsonStatusError(err)
} }

4
core/core_test.go
View File

@@ -352,7 +352,7 @@ func TestEncryptDecrypt(t *testing.T) {
t.Fatalf("Error in summary, %v", sum.Status) t.Fatalf("Error in summary, %v", sum.Status)
} }
// Encrypt with non-admin (fail) // Encrypt with non-admin
respJson, err = Encrypt(encryptJson) respJson, err = Encrypt(encryptJson)
if err != nil { if err != nil {
t.Fatalf("Error in encrypt, %v", err) t.Fatalf("Error in encrypt, %v", err)
@@ -361,7 +361,7 @@ func TestEncryptDecrypt(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Error in encrypt, %v", err) t.Fatalf("Error in encrypt, %v", err)
} }
if s.Status == "ok" { if s.Status != "ok" {
t.Fatalf("Error in encrypt, %v", s.Status) t.Fatalf("Error in encrypt, %v", s.Status)
} }

9
redoctober.go
View File

@@ -308,6 +308,7 @@ var indexHtml = []byte(`<!DOCTYPE html>
<button type="submit" class="btn btn-primary">Delegate</button> <button type="submit" class="btn btn-primary">Delegate</button>
</form> </form>
</div> </div>
</section> </section>
<hr /> <hr />
@@ -456,11 +457,11 @@ var indexHtml = []byte(`<!DOCTYPE html>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-6"> <div class="col-md-6">
<label for="encrypt-user-admin">Admin User</label> <label for="encrypt-user-admin">User name</label>
<input type="text" name="Name" class="form-control" id="encrypt-user-admin" placeholder="User name" required /> <input type="text" name="Name" class="form-control" id="encrypt-user-admin" placeholder="User name" required />
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="encrypt-user-pass">Admin Password</label> <label for="encrypt-user-pass">Password</label>
<input type="password" name="Password" class="form-control" id="encrypt-user-pass" placeholder="Password" required /> <input type="password" name="Password" class="form-control" id="encrypt-user-pass" placeholder="Password" required />
</div> </div>
</div> </div>
@@ -495,11 +496,11 @@ var indexHtml = []byte(`<!DOCTYPE html>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-6"> <div class="col-md-6">
<label for="decrypt-user-admin">Admin User</label> <label for="decrypt-user-admin">User name</label>
<input type="text" name="Name" class="form-control" id="decrypt-user-admin" placeholder="User name" required /> <input type="text" name="Name" class="form-control" id="decrypt-user-admin" placeholder="User name" required />
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="decrypt-user-pass">Admin Password</label> <label for="decrypt-user-pass">Password</label>
<input type="password" name="Password" class="form-control" id="decrypt-user-pass" placeholder="Password" required /> <input type="password" name="Password" class="form-control" id="decrypt-user-pass" placeholder="Password" required />
</div> </div>
</div> </div>