From e7d626d0293a6750d943f99816aeac929d597232 Mon Sep 17 00:00:00 2001 From: ia Date: Sun, 17 Jun 2018 00:48:26 +0200 Subject: [PATCH] all: gofmt Run standard gofmt command on project root. - go version go1.10.3 darwin/amd64 Signed-off-by: ia --- cmd/ro/roagent/roagent.go | 8 ++-- core/core.go | 14 +++--- core/core_test.go | 96 +++++++++++++++++++-------------------- cryptor/cryptor.go | 22 ++++----- 4 files changed, 69 insertions(+), 71 deletions(-) diff --git a/cmd/ro/roagent/roagent.go b/cmd/ro/roagent/roagent.go index 98fcd9a..3d5c442 100644 --- a/cmd/ro/roagent/roagent.go +++ b/cmd/ro/roagent/roagent.go @@ -9,8 +9,8 @@ import ( "crypto/subtle" "encoding/json" "errors" - "log" "io" + "log" roclient "github.com/cloudflare/redoctober/client" "github.com/cloudflare/redoctober/core" @@ -18,8 +18,8 @@ import ( ) type ROAgent struct { - locked bool - keyring []*ROSigner + locked bool + keyring []*ROSigner server *roclient.RemoteServer username string @@ -102,7 +102,7 @@ func (roagent *ROAgent) Remove(key ssh.PublicKey) error { for i, rosigner := range roagent.keyring { if bytes.Equal(rosigner.PublicKey().Marshal(), wanted) { // Order is not preserved - roagent.keyring[i] = roagent.keyring[0] + roagent.keyring[i] = roagent.keyring[0] roagent.keyring = roagent.keyring[1:] log.Println("ro-ssh-agent: signer removed") return nil diff --git a/core/core.go b/core/core.go index 8882be8..0b8ee1b 100644 --- a/core/core.go +++ b/core/core.go @@ -63,7 +63,7 @@ type DelegateRequest struct { } type CreateUserRequest struct { - Name string + Name string Password string UserType string HipchatName string @@ -113,7 +113,7 @@ type SSHSignWithRequest struct { type SSHSignatureWithDelegates struct { SignatureFormat string Signature []byte - Secure bool + Secure bool Delegates []string } @@ -135,13 +135,13 @@ type ExportRequest struct { } type OrderRequest struct { - Name string + Name string Password string Duration string - Uses int - Users []string + Uses int + Users []string EncryptedData []byte - Labels []string + Labels []string } type OrderInfoRequest struct { @@ -723,7 +723,6 @@ func Decrypt(jsonIn []byte) ([]byte, error) { } } - resp := &DecryptWithDelegates{ Data: data, Secure: secure, @@ -819,7 +818,6 @@ func SSHSignWith(jsonIn []byte) ([]byte, error) { return jsonResponse(out) } - // Modify processes a modify request. func Modify(jsonIn []byte) ([]byte, error) { var s ModifyRequest diff --git a/core/core_test.go b/core/core_test.go index 5203740..19396c5 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -677,87 +677,87 @@ func TestEncryptDecrypt(t *testing.T) { // Encrypt with "decrypt" usage respJson, err = Encrypt(encryptJson4) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in encrypt, %v", s.Status) + t.Fatalf("Error in encrypt, %v", s.Status) } respJson, err = Delegate(delegateJson6) if err != nil { - t.Fatalf("Error in delegating account, %v", err) + t.Fatalf("Error in delegating account, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in delegating account, %v", err) + t.Fatalf("Error in delegating account, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in delegating account, %v", s.Status) + t.Fatalf("Error in delegating account, %v", s.Status) } // decrypt file decryptJson3, err := json.Marshal(DecryptRequest{Name: "Alice", Password: "Hello", Data: s.Response}) if err != nil { - t.Fatalf("Error in marshalling decryption, %v", err) + t.Fatalf("Error in marshalling decryption, %v", err) } respJson2, err = Decrypt(decryptJson3) if err != nil { - t.Fatalf("Error in decrypt, %v", err) + t.Fatalf("Error in decrypt, %v", err) } err = json.Unmarshal(respJson2, &s) if err != nil { - t.Fatalf("Error in decrypt, %v", err) + t.Fatalf("Error in decrypt, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in decrypt, %v", s.Status) + t.Fatalf("Error in decrypt, %v", s.Status) } // Encrypt with "unused" usage respJson, err = Encrypt(encryptJson5) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in encrypt, %v", s.Status) + t.Fatalf("Error in encrypt, %v", s.Status) } respJson, err = Delegate(delegateJson6) if err != nil { - t.Fatalf("Error in delegating account, %v", err) + t.Fatalf("Error in delegating account, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in delegating account, %v", err) + t.Fatalf("Error in delegating account, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in delegating account, %v", s.Status) + t.Fatalf("Error in delegating account, %v", s.Status) } // decrypt file decryptJson4, err := json.Marshal(DecryptRequest{Name: "Alice", Password: "Hello", Data: s.Response}) if err != nil { - t.Fatalf("Error in marshalling decryption, %v", err) + t.Fatalf("Error in marshalling decryption, %v", err) } respJson2, err = Decrypt(decryptJson4) if err != nil { - t.Fatalf("Error in decrypt, %v", err) + t.Fatalf("Error in decrypt, %v", err) } err = json.Unmarshal(respJson2, &s) if err != nil { - t.Fatalf("Error in decrypt, %v", err) + t.Fatalf("Error in decrypt, %v", err) } if s.Status == "ok" { - t.Fatalf("Expected error decrypting blob without \"decrypt\" usage") + t.Fatalf("Expected error decrypting blob without \"decrypt\" usage") } } @@ -1293,121 +1293,121 @@ func TestSSHSignWith(t *testing.T) { var s ResponseData respJson, err := Create(delegateJson) if err != nil { - t.Fatalf("Error in creating account, %v", err) + t.Fatalf("Error in creating account, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in creating account, %v", err) + t.Fatalf("Error in creating account, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in creating account, %v", s.Status) + t.Fatalf("Error in creating account, %v", s.Status) } respJson, err = Delegate(delegateJson) if err != nil { - t.Fatalf("Error in delegating account, %v", err) + t.Fatalf("Error in delegating account, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in delegating account, %v", err) + t.Fatalf("Error in delegating account, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in delegating account, %v", s.Status) + t.Fatalf("Error in delegating account, %v", s.Status) } sshKey, err := ioutil.ReadFile("../testdata/ssh_key") if err != nil { - t.Fatalf("Error loading test SSH key, %v", err) + t.Fatalf("Error loading test SSH key, %v", err) } sshPubKeyBytes, err := ioutil.ReadFile("../testdata/ssh_key.pub") if err != nil { - t.Fatalf("Error loading test SSH pubkey, %v", err) + t.Fatalf("Error loading test SSH pubkey, %v", err) } sshPubKey, _, _, _, err := ssh.ParseAuthorizedKey(sshPubKeyBytes) if err != nil { - t.Fatalf("Error loading test SSH pubkey, %v", err) + t.Fatalf("Error loading test SSH pubkey, %v", err) } e := EncryptRequest{Name: "Alice", Password: "Hello", - Owners: []string{"Alice"}, Minimum: 1, Data: sshKey} + Owners: []string{"Alice"}, Minimum: 1, Data: sshKey} encryptJson, err := json.Marshal(e) if err != nil { - t.Fatalf("Error marshalling encrypt request, %v", err) + t.Fatalf("Error marshalling encrypt request, %v", err) } // Encrypt SSH key respJson, err = Encrypt(encryptJson) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in encrypt, %v", s.Status) + t.Fatalf("Error in encrypt, %v", s.Status) } // try to generate a signature sshSignWithJson, err := json.Marshal(SSHSignWithRequest{Name: "Alice", Password: "Hello", Data: s.Response, TBSData: []byte("signme")}) if err != nil { - t.Fatalf("Error marshalling ssh-sign-with request, %v", err) + t.Fatalf("Error marshalling ssh-sign-with request, %v", err) } respJson, err = SSHSignWith(sshSignWithJson) if err != nil { - t.Fatalf("Error in ssh-sign-with, %v", err) + t.Fatalf("Error in ssh-sign-with, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in ssh-sign-with, %v", err) + t.Fatalf("Error in ssh-sign-with, %v", err) } if s.Status != "cannot sign with this file" { - t.Fatalf("Expected error using ssh-sign-with without 'ssh-sign-with' usage, got %v", s.Status) + t.Fatalf("Expected error using ssh-sign-with without 'ssh-sign-with' usage, got %v", s.Status) } e.Usages = []string{"ssh-sign-with"} encryptJson, err = json.Marshal(e) if err != nil { - t.Fatalf("Error marshalling encrypt request, %v", err) + t.Fatalf("Error marshalling encrypt request, %v", err) } respJson, err = Encrypt(encryptJson) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in encrypt, %v", err) + t.Fatalf("Error in encrypt, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in encrypt, %v", s.Status) + t.Fatalf("Error in encrypt, %v", s.Status) } sshSignWithJson, err = json.Marshal(SSHSignWithRequest{Name: "Alice", Password: "Hello", Data: s.Response, TBSData: []byte("signme")}) if err != nil { - t.Fatalf("Error marshalling ssh-sign-with request, %v", err) + t.Fatalf("Error marshalling ssh-sign-with request, %v", err) } respJson, err = SSHSignWith(sshSignWithJson) if err != nil { - t.Fatalf("Error in ssh-sign-with, %v", err) + t.Fatalf("Error in ssh-sign-with, %v", err) } err = json.Unmarshal(respJson, &s) if err != nil { - t.Fatalf("Error in ssh-sign-with, %v", err) + t.Fatalf("Error in ssh-sign-with, %v", err) } if s.Status != "ok" { - t.Fatalf("Error in ssh-sign-with, %v", s.Status) + t.Fatalf("Error in ssh-sign-with, %v", s.Status) } var sshSignWithResponse SSHSignatureWithDelegates err = json.Unmarshal(s.Response, &sshSignWithResponse) if err != nil { - t.Fatalf("Error unmarshalling ssh-sign-with response, %v", err) + t.Fatalf("Error unmarshalling ssh-sign-with response, %v", err) } sshSignature := ssh.Signature{ @@ -1416,7 +1416,7 @@ func TestSSHSignWith(t *testing.T) { } err = sshPubKey.Verify([]byte("signme"), &sshSignature) if err != nil { - t.Fatalf("Error verifying ssh-sign-with signature, %v", err) + t.Fatalf("Error verifying ssh-sign-with signature, %v", err) } } diff --git a/cryptor/cryptor.go b/cryptor/cryptor.go index 7223801..b7215c1 100644 --- a/cryptor/cryptor.go +++ b/cryptor/cryptor.go @@ -61,21 +61,21 @@ func New(records *passvault.Records, cache *keycache.Cache, config *config.Confi // both, then he can decrypt it alone). If a predicate is present, it must be // satisfied to decrypt. type AccessStructure struct { - Minimum int - Names []string + Minimum int + Names []string LeftNames []string RightNames []string - Predicate string + Predicate string } // Implements msp.UserDatabase type UserDatabase struct { - names *[]string + names *[]string - records *passvault.Records - cache *keycache.Cache + records *passvault.Records + cache *keycache.Cache user string labels []string @@ -126,9 +126,9 @@ type SingleWrappedKey struct { // EncryptedData is the format for encrypted data containing all the // keys necessary to decrypt it when delegated. type EncryptedData struct { - Version int - VaultId int `json:",omitempty"` - Labels []string `json:",omitempty"` + Version int + VaultId int `json:",omitempty"` + Labels []string `json:",omitempty"` // Usages list the endpoints which may use this data // If empty, only decryption in permitted Usages []string `json:",omitempty"` @@ -149,8 +149,8 @@ type pair struct { type mwkSlice []MultiWrappedKey type swkSlice []pair -func (s mwkSlice) Len() int { return len(s) } -func (s mwkSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s mwkSlice) Len() int { return len(s) } +func (s mwkSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] } func (s mwkSlice) Less(i, j int) bool { // Alphabetic order var shorter = i if len(s[i].Name) > len(s[j].Name) {