Merge pull request #232 from ivanilves/issue-231

fix(issue-231): "nil *Token pointer" panic
ivanilves · Jul 21, 2021 · 1275cee · 1275cee
2 parents a7d5143 + 97a7299
commit 1275cee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
  command: |
  SSH_HOST=$(echo ${DOCKER_HOST} | sed 's|.*://||;s|:.*||;')
  ssh-keyscan ${SSH_HOST} >>~/.ssh/known_hosts
- ssh -C2TnN -4 -D 9050 -i ~/.ssh/id_rsa_circleci_remote_docker_engine ${SSH_HOST}
+ ssh -C2TnN -4 -D 9050 -i ~/.ssh/id_rsa* ${SSH_HOST}
  - run:
  name: Wait for SSH tunnel to become available
  environment:

diff --git a/api/v1/registry/client/client.go b/api/v1/registry/client/client.go
@@ -6,6 +6,7 @@ import (
  "fmt"
  "io"
  "net/http"
+ "reflect"
  "time"
 
  log "github.com/sirupsen/logrus"
@@ -176,7 +177,7 @@ func decodeAllTagData(body io.ReadCloser) ([]string, map[string]manifest.Manifes
 }
 
 func (cli *RegistryClient) repoToken(repoPath string) (auth.Token, error) {
- if cli.Token != nil && cli.Token.Method() != "Bearer" {
+ if cli.Token != nil && !reflect.ValueOf(cli.Token).IsNil() && cli.Token.Method() != "Bearer" {
  return cli.Token, nil
  }