Skip to content

Commit

Permalink
Merge pull request #120 from thomasmckay/update-imports
Browse files Browse the repository at this point in the history
change git repo coreos to quay
  • Loading branch information
thomasmckay committed Nov 25, 2019
2 parents cdc620d + b4167c1 commit c0ce9c9
Show file tree
Hide file tree
Showing 25 changed files with 70 additions and 70 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ VOLUME /config
ENTRYPOINT ["jwtproxy"]
CMD ["-config", "/config/config.yaml"]

ADD . /go/src/github.com/coreos/jwtproxy/
WORKDIR /go/src/github.com/coreos/jwtproxy/
ADD . /go/src/github.com/quay/jwtproxy/
WORKDIR /go/src/github.com/quay/jwtproxy/

RUN go install -v github.com/coreos/jwtproxy/cmd/jwtproxy
RUN go install -v github.com/quay/jwtproxy/cmd/jwtproxy
RUN rm -r /usr/local/go
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# JWT Proxy

[![Docker Repository on Quay](https://quay.io/repository/coreos/jwtproxy/status "Docker Repository on Quay")](https://quay.io/repository/coreos/jwtproxy)
[![Docker Repository on Quay](https://quay.io/repository/quay/jwtproxy/status "Docker Repository on Quay")](https://quay.io/repository/quay/jwtproxy)

The JWT proxy is intended to be used as a complementary service for authenticating, and possibly authorizing requests made between services.
There is a forward proxy component, which can be configured to sign outgoing requests to another service, and a reverse proxy component, which can be used to authenticate incoming requests from another service.
Expand Down Expand Up @@ -292,5 +292,5 @@ Also, because the key pair is self-signed, the certificate must be trusted by th

```
docker build -t jwtproxy .
docker run -it --rm -v "$PWD/bin":/go/bin -w /go --entrypoint /bin/bash jwtproxy -c "go install -v github.com/coreos/jwtproxy/cmd/jwtproxy"
docker run -it --rm -v "$PWD/bin":/go/bin -w /go --entrypoint /bin/bash jwtproxy -c "go install -v github.com/quay/jwtproxy/cmd/jwtproxy"
```
2 changes: 1 addition & 1 deletion bill-of-materials.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"project": "github.com/coreos/jwtproxy",
"project": "github.com/quay/jwtproxy",
"license": "Apache License 2.0",
"confidence": 1
},
Expand Down
20 changes: 10 additions & 10 deletions cmd/jwtproxy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ import (

log "github.com/sirupsen/logrus"

"github.com/coreos/jwtproxy"
"github.com/coreos/jwtproxy/config"

_ "github.com/coreos/jwtproxy/jwt/claims/static"
_ "github.com/coreos/jwtproxy/jwt/keyserver/keyregistry"
_ "github.com/coreos/jwtproxy/jwt/keyserver/keyregistry/keycache/memory"
_ "github.com/coreos/jwtproxy/jwt/keyserver/preshared"
_ "github.com/coreos/jwtproxy/jwt/noncestorage/local"
_ "github.com/coreos/jwtproxy/jwt/privatekey/autogenerated"
_ "github.com/coreos/jwtproxy/jwt/privatekey/preshared"
"github.com/quay/jwtproxy"
"github.com/quay/jwtproxy/config"

_ "github.com/quay/jwtproxy/jwt/claims/static"
_ "github.com/quay/jwtproxy/jwt/keyserver/keyregistry"
_ "github.com/quay/jwtproxy/jwt/keyserver/keyregistry/keycache/memory"
_ "github.com/quay/jwtproxy/jwt/keyserver/preshared"
_ "github.com/quay/jwtproxy/jwt/noncestorage/local"
_ "github.com/quay/jwtproxy/jwt/privatekey/autogenerated"
_ "github.com/quay/jwtproxy/jwt/privatekey/preshared"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions examples/httpserver/Procfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
web: go get github.com/rif/spark && $GOPATH/bin/spark -port 8081 "Welcome to this authenticated web service."
signer: go get github.com/coreos/jwtproxy/cmd/jwtproxy && $GOPATH/bin/jwtproxy -config $(pwd)/signer.yaml
verifier: go get github.com/coreos/jwtproxy/cmd/jwtproxy && $GOPATH/bin/jwtproxy -config $(pwd)/verifier.yaml
signer: go get github.com/quay/jwtproxy/cmd/jwtproxy && $GOPATH/bin/jwtproxy -config $(pwd)/signer.yaml
verifier: go get github.com/quay/jwtproxy/cmd/jwtproxy && $GOPATH/bin/jwtproxy -config $(pwd)/verifier.yaml
2 changes: 1 addition & 1 deletion examples/kubernetes-httpserver/nginx-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- mountPath: /etc/nginx/conf.d/
name: secret-nginx-volume
- name: jwtproxy
image: quay.io/coreos/jwtproxy
image: quay.io/quay/jwtproxy
ports:
- containerPort: 80
args:
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-httpserver/tester-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
secretName: secret-tester-config
containers:
- name: jwtproxy
image: quay.io/coreos/jwtproxy
image: quay.io/quay/jwtproxy
args:
- -config
- /etc/jwtproxy/signer.yaml
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/coreos/jwtproxy
package: github.com/quay/jwtproxy
import:
- package: github.com/sirupsen/logrus
version: ^0.10.0
Expand Down
6 changes: 3 additions & 3 deletions jwt/claims/static/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/coreos/go-oidc/jose"
log "github.com/sirupsen/logrus"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/claims"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/claims"
"github.com/quay/jwtproxy/stop"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions jwt/claims/verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/coreos/go-oidc/jose"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/stop"
)

type Constructor func(config.RegistrableComponentConfig) (Verifier, error)
Expand Down
6 changes: 3 additions & 3 deletions jwt/jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"github.com/coreos/go-oidc/oidc"
log "github.com/sirupsen/logrus"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/keyserver"
"github.com/coreos/jwtproxy/jwt/noncestorage"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/keyserver"
"github.com/quay/jwtproxy/jwt/noncestorage"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions jwt/jwt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/coreos/go-oidc/jose"
"github.com/coreos/go-oidc/key"
"github.com/coreos/go-oidc/oidc"
"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/stop"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions jwt/keyserver/keyregistry/keycache/keycache.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/gregjones/httpcache"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/stop"
)

type Constructor func(config.RegistrableComponentConfig) (Cache, error)
Expand Down
6 changes: 3 additions & 3 deletions jwt/keyserver/keyregistry/keycache/memory/memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"github.com/gregjones/httpcache"
log "github.com/sirupsen/logrus"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/keyserver/keyregistry/keycache"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/keyserver/keyregistry/keycache"
"github.com/quay/jwtproxy/stop"
)

func init() {
Expand Down
8 changes: 4 additions & 4 deletions jwt/keyserver/keyregistry/keyregistry.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt"
"github.com/coreos/jwtproxy/jwt/keyserver"
"github.com/coreos/jwtproxy/jwt/keyserver/keyregistry/keycache"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt"
"github.com/quay/jwtproxy/jwt/keyserver"
"github.com/quay/jwtproxy/jwt/keyserver/keyregistry/keycache"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions jwt/keyserver/keyserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/coreos/go-oidc/key"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/stop"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions jwt/keyserver/preshared/preshared.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"github.com/coreos/go-oidc/key"
"gopkg.in/yaml.v2"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/keyserver"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/keyserver"
"github.com/quay/jwtproxy/stop"
)

func init() {
Expand Down
6 changes: 3 additions & 3 deletions jwt/noncestorage/local/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (

"gopkg.in/yaml.v2"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/noncestorage"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/noncestorage"
"github.com/quay/jwtproxy/stop"
"github.com/patrickmn/go-cache"
)

Expand Down
4 changes: 2 additions & 2 deletions jwt/noncestorage/noncestorage.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"time"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/stop"
)

type Constructor func(config.RegistrableComponentConfig) (NonceStorage, error)
Expand Down
6 changes: 3 additions & 3 deletions jwt/privatekey/autogenerated/autogenerated.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
jose "gopkg.in/square/go-jose.v2"
"gopkg.in/yaml.v2"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/keyserver"
"github.com/coreos/jwtproxy/jwt/privatekey"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/keyserver"
"github.com/quay/jwtproxy/jwt/privatekey"
)

func init() {
Expand Down
6 changes: 3 additions & 3 deletions jwt/privatekey/preshared/preshared.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/coreos/go-oidc/key"
"gopkg.in/yaml.v2"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/privatekey"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/privatekey"
"github.com/quay/jwtproxy/stop"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions jwt/privatekey/privatekey.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/coreos/go-oidc/key"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/stop"
)

type PrivateKey interface {
Expand Down
14 changes: 7 additions & 7 deletions jwt/proxy_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"github.com/coreos/goproxy"
log "github.com/sirupsen/logrus"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt/claims"
"github.com/coreos/jwtproxy/jwt/keyserver"
"github.com/coreos/jwtproxy/jwt/noncestorage"
"github.com/coreos/jwtproxy/jwt/privatekey"
"github.com/coreos/jwtproxy/proxy"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt/claims"
"github.com/quay/jwtproxy/jwt/keyserver"
"github.com/quay/jwtproxy/jwt/noncestorage"
"github.com/quay/jwtproxy/jwt/privatekey"
"github.com/quay/jwtproxy/proxy"
"github.com/quay/jwtproxy/stop"
)

type StoppableProxyHandler struct {
Expand Down
8 changes: 4 additions & 4 deletions jwtproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

log "github.com/sirupsen/logrus"

"github.com/coreos/jwtproxy/config"
"github.com/coreos/jwtproxy/jwt"
"github.com/coreos/jwtproxy/proxy"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/config"
"github.com/quay/jwtproxy/jwt"
"github.com/quay/jwtproxy/proxy"
"github.com/quay/jwtproxy/stop"
)

// RunProxies is an utility function that starts both the JWT verifier and signer proxies
Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"

"github.com/coreos/goproxy"
"github.com/coreos/jwtproxy/stop"
"github.com/quay/jwtproxy/stop"
log "github.com/sirupsen/logrus"
"github.com/tylerb/graceful"
)
Expand Down

0 comments on commit c0ce9c9

Please sign in to comment.