Skip to content

Commit

Permalink
Merge pull request #168 from ivanilves/issues-167
Browse files Browse the repository at this point in the history 
feat(auth): Failback to "none" auth if "basic" auth fails
  • Loading branch information
@vonrabbe
vonrabbe committed Aug 6, 2018
2 parents d49c45f + 5498160 commit d3eb4b9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 138 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ script:
- make lint
- make vet
- if [[ "${TRAVIS_PULL_REQUEST}" == "true" ]]; then make semantic RANGE=$(scripts/travis_range.sh); fi
- make stress-test-async CONCURRENT_REQUESTS=128
- make stress-test-async CONCURRENT_REQUESTS=256
- make coverage
- make blackbox-integration-test
- make docker-image DOCKER_TAG=release
- make stress-test-wait TIME=120 MODE=silent
- make stress-test-wait TIME=60 MODE=silent

after_script:
- sudo killall -v dockerd
Expand Down
134 changes: 0 additions & 134 deletions fixtures/config/config-stress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,6 @@ lstags:
- busybox:latest
- alpine:2
- alpine:3.7
- nginx:1.7.1
- nginx:1.7.5
- nginx:1.7.6
- nginx:1.7.7
- nginx:1.7.8
- nginx:1.7.9
- nginx:1.7.10
- nginx:1.7.11
- nginx:1.7
- nginx:1.7.12
- nginx:1.9.0
- nginx:1.9.1
- nginx:1.9.2
- nginx:1.9.3
- nginx:1.9.4
- nginx:1.9.5
- nginx:1.9.6
- nginx:1.9.7
- nginx:1.9.8
- nginx:1.9.9
- nginx:1.9.10
- nginx:1.9.11
- nginx:1.9.12
- nginx:1.9.14
- nginx:1.8
- nginx:1.8.1
- nginx:1.9.14-alpine
- nginx:1.8-alpine
- nginx:1.8.1-alpine
- nginx:1.10.0-alpine
- nginx:1.9-alpine
- nginx:1.9.15-alpine
- nginx:1.9
- nginx:1.9.15
- nginx:1.10.0
- nginx:1.11.0
- nginx:1.11.0-alpine
- nginx:1.11.1
- nginx:1.11.1-alpine
- nginx:1.11.3
- nginx:1.11.3-alpine
- nginx:1.11.4-alpine
- nginx:1.11.4
- nginx:1.10.1
- nginx:1.11.5-alpine
- nginx:1.10.1-alpine
- nginx:1.11.5
- nginx:1.11.6
- nginx:1.11.6-alpine
- nginx:1.11.7
- nginx:1.11.7-alpine
- nginx:1.11.8-alpine
- nginx:1.10.2-alpine
Expand Down Expand Up @@ -348,12 +298,6 @@ lstags:
- gcr.io/google_containers/hyperkube:v1.9.7
- gcr.io/google_containers/hyperkube:v1.9.7-beta.0
- gcr.io/google_containers/hyperkube:v1.9.8-beta.0
- debian:7.3
- debian:6.0.8
- debian:7.4
- debian:7.5
- debian:6.0.9
- debian:7.6
- debian:7.7
- debian:8.0
- debian:8.1
Expand Down Expand Up @@ -455,26 +399,6 @@ lstags:
- debian:9.3
- debian:stretch-20180213
- debian:9.3-slim
- debian:testing-20180213
- debian:unstable-20180213
- debian:wheezy-20180213
- debian:experimental-20180213
- debian:rc-buggy-20180213
- debian:buster-20180312
- debian:jessie-20180312
- debian:oldoldstable-20180312
- debian:oldstable-20180312
- debian:sid-20180312
- debian:stable-20180312
- debian:stretch-20180312
- debian:testing-20180312
- debian:unstable-20180312
- debian:wheezy-20180312
- debian:experimental-20180312
- debian:rc-buggy-20180312
- debian:buster
- debian:buster-20180426
- debian:buster-slim
- debian:8
- debian:8.10
- debian:jessie
Expand Down Expand Up @@ -795,22 +719,6 @@ lstags:
- quay.io/calico/node:bg-logging
- quay.io/calico/node:bg-logging-2
- quay.io/calico/node:djosborne-patch-releasingmd
- quay.io/calico/node:69c3089
- quay.io/calico/node:383a737
- quay.io/calico/node:da2c666
- quay.io/calico/node:b2f4c91
- quay.io/calico/node:06d8348
- quay.io/calico/node:4d0d1ec
- quay.io/calico/node:e3f76ad
- quay.io/calico/node:6889069
- quay.io/calico/node:a0d5d2b
- quay.io/calico/node:c4c5af8
- quay.io/calico/node:53afe8a
- quay.io/calico/node:cf57bf0
- quay.io/calico/node:f61eef2
- quay.io/calico/node:e191979
- quay.io/calico/node:9512289
- quay.io/calico/node:6ce4f0a
- quay.io/calico/node:header_update
- quay.io/calico/node:d304ed2
- quay.io/calico/node:43b069c
Expand Down Expand Up @@ -892,45 +800,3 @@ lstags:
- quay.io/calico/node:golang
- quay.io/calico/node:develop
- quay.io/calico/node:go-libnetwork-plugin
- quay.io/calico/node:golang-felix
- quay.io/calico/node:bg-logging
- quay.io/calico/node:bg-logging-2
- quay.io/calico/node:djosborne-patch-releasingmd
- quay.io/calico/node:69c3089
- quay.io/calico/node:383a737
- quay.io/calico/node:da2c666
- quay.io/calico/node:b2f4c91
- quay.io/calico/node:06d8348
- quay.io/calico/node:4d0d1ec
- quay.io/calico/node:e3f76ad
- quay.io/calico/node:6889069
- quay.io/calico/node:a0d5d2b
- quay.io/calico/node:c4c5af8
- quay.io/calico/node:53afe8a
- quay.io/calico/node:cf57bf0
- quay.io/calico/node:f61eef2
- quay.io/calico/node:e191979
- quay.io/calico/node:9512289
- quay.io/calico/node:6ce4f0a
- quay.io/calico/node:header_update
- quay.io/calico/node:d304ed2
- quay.io/calico/node:43b069c
- quay.io/calico/node:765dc25
- quay.io/calico/node:aec5c5c
- quay.io/calico/node:a3677a8
- quay.io/calico/node:91d54c3
- quay.io/calico/node:542c040
- quay.io/calico/node:c261f5f
- quay.io/calico/node:eaeebf4
- quay.io/calico/node:96b8c57
- quay.io/calico/node:684ef2b
- quay.io/calico/node:96b2e86
- quay.io/calico/node:clarify-doc-contribution
- quay.io/calico/node:add-style-guide
- quay.io/calico/node:ignore-edit-this-page
- quay.io/calico/node:Felix_IpInIpEnabled_note
- quay.io/calico/node:calico-upgrade
- quay.io/calico/node:v2.6.5
- quay.io/calico/node:feature-policy-api
- quay.io/calico/node:caseydavenport-patch-1
- quay.io/calico/node:automated-libcalico-update
9 changes: 8 additions & 1 deletion tag/remote/auth/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,14 @@ func NewToken(repo *repository.Repository, username, password string) (TokenResp
case "None":
return none.RequestToken()
case "Basic":
return basic.RequestToken(url, username, password)
t, err := basic.RequestToken(url, username, password)
if err != nil {
println(err.Error())

return none.RequestToken()
}

return t, nil
case "Bearer":
return bearer.RequestToken(params["realm"], params["service"], repo.Path(), username, password)
default:
Expand Down
2 changes: 1 addition & 1 deletion tag/remote/remote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ type detailResponse struct {

func validateConcurrentRequests() (int, error) {
const min = 1
const max = 128
const max = 256

if ConcurrentRequests < min {
return 0, errors.New("Concurrent requests limit could not be lower than " + strconv.Itoa(min))
Expand Down

0 comments on commit d3eb4b9

Please sign in to comment.