Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various OIDC related fixes. #1191

Merged
merged 1 commit into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ services:
interval: 10s
timeout: 5s
retries: 3
labels:
traefik.enable: true
traefik.http.routers.traefik.rule: Host(`127.0.0.1`)
traefik.http.routers.traefik.entrypoints: websecure
traefik.http.routers.traefik.tls: true

jimm:
image: cosmtrek/air:latest
Expand Down
2 changes: 1 addition & 1 deletion internal/auth/oauth2.go
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ func VerifySessionToken(token string, secretKey string) (jwt.Token, error) {
parsedToken, err := jwt.Parse(decodedToken, jwt.WithKey(jwa.HS256, []byte(secretKey)))
if err != nil {
if stderrors.Is(err, jwt.ErrTokenExpired()) {
return nil, errors.E(op, "JIMM session token expired")
return nil, errors.E(op, errors.CodeUnauthorized, "JIMM session token expired")
}
return nil, errors.E(op, err)
}
Expand Down
3 changes: 0 additions & 3 deletions local/traefik/traefik.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ tls:
certificates:
- certFile: /certs/server.crt
keyFile: /certs/server.key
default:
keyFile: /certs/server.key
certFile: /certs/server.crt
# when troubleshooting certs, enable this so traefik doesn't use
# its own self-signed. By default if it can't find a matching
# cert, it'll just create its own which will cause cert warnings
Expand Down
Loading