Merge branch 'master' into david/automated-github-releases

Author: ddworken

.circleci/config.yml

@@ -24,6 +24,8 @@ jobs:
       - run: go get golang.org/x/tools/cmd/goimports
       - run: "! goimports ./... 2>&1 | read"
       - run: "! go mod tidy ./... 2>&1 | read"
+      - run: go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1
+      - run: "! golangci-lint 2>&1 | read" 
   publish-github-release:
     docker:
       - image: circleci/golang:1.11
@@ -35,7 +37,6 @@ jobs:
             go get github.com/tcnksm/ghr
             export VERSION=`cat VERSION`-`git rev-parse --short HEAD`
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./bin/
-
 workflows:
   version: 2
   build:

.golangci.yml

@@ -0,0 +1,16 @@
+linters-settings:
+  gocritic:
+    disabled-checks:
+      - ifElseChain
+      - elseif
+
+linters:
+  enable:
+    - gofmt
+    - gocritic
+    - unconvert
+    - goconst
+    - gocyclo
+    - misspell
+    - unparam
+    - golint

.pre-commit-config.yaml

@@ -1,10 +1,11 @@
 repos:
 -   repo: https://github.com/keybase/pre-commit-golang
-    rev: b8194ff9d85455a702480677ada13ac4dbe94146
+    rev: 314766a2c26b7f32641addbdb0e7e451320ff1f0
     hooks:
     -   id: go-fmt
     -   id: go-vet
     -   id: go-lint
+    -   id: golangci-lint
 -   repo: https://github.com/troian/pre-commit-golang
     rev: ab57c5db44bbeeae1031a2e9c2889367f8387d59
     hooks:
@@ -13,3 +14,7 @@ repos:
     rev: f16f18866390cba642e8af6073ed59504aeada5c
     hooks:
     -   id: go-mod-tidy
+-   repo: https://github.com/golangci/golangci-lint
+    rev: v1.17.1
+    hooks:
+    -   id: golangci-lint

src/cmd/keybaseca/keybaseca.go

@@ -100,7 +100,7 @@ func backupAction(c *cli.Context) error {
 		return err
 	}
 	if response != "yes" {
-		return fmt.Errorf("Did not get confirmation of key export, aborting...")
+		return fmt.Errorf("Did not get confirmation of key export, aborting")
 	}
 
 	conf, err := loadServerConfig()
@@ -120,12 +120,11 @@ func backupAction(c *cli.Context) error {
 
 // The action for the `keybaseca generate` subcommand
 func generateAction(c *cli.Context) error {
-	conf, err := loadServerConfigAndWriteClientConfig()
+	conf, err := loadServerConfig()
 	if err != nil {
 		return err
 	}
 	captureControlCToDeleteClientConfig(conf)
-	defer deleteClientConfig(conf)
 	err = sshutils.Generate(conf, c.Bool("overwrite-existing-key") || os.Getenv("FORCE_WRITE") == "true")
 	if err != nil {
 		return fmt.Errorf("Failed to generate a new key: %v", err)
@@ -140,12 +139,11 @@ func serviceAction(c *cli.Context) error {
 		return err
 	}
 	captureControlCToDeleteClientConfig(conf)
-	defer deleteClientConfig(conf)
 	err = bot.StartBot(conf)
 	if err != nil {
 		return fmt.Errorf("CA chatbot crashed: %v", err)
 	}
-	return nil
+	return deleteClientConfig(conf)
 }
 
 // The action for the `keybaseca sign` subcommand

src/cmd/kssh/kssh.go

@@ -248,13 +248,14 @@ func getConfig(botname string) (kssh.ConfigFile, error) {
 	// No specified bot and no default bot, fallback and load all the configs
 	configs, botnames, err := kssh.LoadConfigs()
 	if err != nil {
-		return empty, fmt.Errorf("Failed to load config file(s): %v\n", err)
+		return empty, fmt.Errorf("Failed to load config file(s): %v", err)
 	}
-	if len(configs) == 0 {
+	switch len(configs) {
+	case 0:
 		return empty, fmt.Errorf("Did not find any config files in KBFS (is `keybaseca service` running?)")
-	} else if len(configs) == 1 {
+	case 1:
 		return configs[0], nil
-	} else {
+	default:
 		noDefaultTeamMessage := fmt.Sprintf("Found %v config files (%s). No default bot is configured. \n"+
 			"Either specify a team via `kssh --bot cabotname` or set a default bot via `kssh --set-default-bot cabotname`", len(configs), strings.Join(botnames, ", "))
 		return empty, fmt.Errorf(noDefaultTeamMessage)

src/cmd/kssh/kssh_test.go

@@ -49,6 +49,7 @@ func BenchmarkLoadConfigs(b *testing.B) {
 	b.ResetTimer()
 
 	for n := 0; n < b.N; n++ {
-		getConfig("")
+		_, err := getConfig("")
+		require.NoError(b, err)
 	}
 }

src/keybaseca/config/config.go

@@ -101,7 +101,11 @@ func validatePath(path string) error {
 		if err != nil {
 			return fmt.Errorf("path is not writable: %v", err)
 		}
-		constants.GetDefaultKBFSOperationsStruct().KBFSDelete(path)
+
+		err = constants.GetDefaultKBFSOperationsStruct().KBFSDelete(path)
+		if err != nil {
+			return fmt.Errorf("failed to delete temp file: %v", err)
+		}
 		return nil
 	}
 	_, err := os.Stat(path)

src/keybaseca/sshutils/sshutils.go

@@ -92,6 +92,9 @@ func ProcessSignatureRequest(conf config.Config, sr shared.SignatureRequest) (re
 	log.Log(conf, fmt.Sprintf("Processing SignatureRequest from user=%s on device='%s' keyID:%s, principals:%s, expiration:%s, pubkey:%s",
 		sr.Username, sr.DeviceName, keyID, principals, conf.GetKeyExpiration(), sr.SSHPublicKey))
 	signature, err := SignKey(conf.GetCAKeyLocation(), keyID, principals, conf.GetKeyExpiration(), sr.SSHPublicKey)
+	if err != nil {
+		return
+	}
 
 	return shared.SignatureResponse{SignedKey: signature, UUID: sr.UUID}, nil
 }