a27ba09872
BREAKING CHANGE: The OpenID Provider package is now able to handle multiple issuers with a single storage implementation. The issuer will be selected from the host of the request and passed into the context, where every function can read it from if necessary. This results in some fundamental changes:
- `Configuration` interface:
- `Issuer() string` has been changed to `IssuerFromRequest(r *http.Request) string`
- `Insecure() bool` has been added
- OpenIDProvider interface and dependants:
- `Issuer` has been removed from Config struct
- `NewOpenIDProvider` now takes an additional parameter `issuer` and returns a pointer to the public/default implementation and not an OpenIDProvider interface:
`NewOpenIDProvider(ctx context.Context, config *Config, storage Storage, opOpts ...Option) (OpenIDProvider, error)` changed to `NewOpenIDProvider(ctx context.Context, issuer string, config *Config, storage Storage, opOpts ...Option) (*Provider, error)`
- therefore the parameter type Option changed to the public type as well: `Option func(o *Provider) error`
- `AuthCallbackURL(o OpenIDProvider) func(string) string` has been changed to `AuthCallbackURL(o OpenIDProvider) func(context.Context, string) string`
- `IDTokenHintVerifier() IDTokenHintVerifier` (Authorizer, OpenIDProvider, SessionEnder interfaces), `AccessTokenVerifier() AccessTokenVerifier` (Introspector, OpenIDProvider, Revoker, UserinfoProvider interfaces) and `JWTProfileVerifier() JWTProfileVerifier` (IntrospectorJWTProfile, JWTAuthorizationGrantExchanger, OpenIDProvider, RevokerJWTProfile interfaces) now take a context.Context parameter `IDTokenHintVerifier(context.Context) IDTokenHintVerifier`, `AccessTokenVerifier(context.Context) AccessTokenVerifier` and `JWTProfileVerifier(context.Context) JWTProfileVerifier`
- `OidcDevMode` (CAOS_OIDC_DEV) environment variable check has been removed, use `WithAllowInsecure()` Option
- Signing: the signer is not kept in memory anymore, but created on request from the loaded key:
- `Signer` interface and func `NewSigner` have been removed
- `ReadySigner(s Signer) ProbesFn` has been removed
- `CreateDiscoveryConfig(c Configuration, s Signer) *oidc.DiscoveryConfiguration` has been changed to `CreateDiscoveryConfig(r *http.Request, config Configuration, storage DiscoverStorage) *oidc.DiscoveryConfiguration`
- `Storage` interface:
- `GetSigningKey(context.Context, chan<- jose.SigningKey)` has been changed to `SigningKey(context.Context) (SigningKey, error)`
- `KeySet(context.Context) ([]Key, error)` has been added
- `GetKeySet(context.Context) (*jose.JSONWebKeySet, error)` has been changed to `KeySet(context.Context) ([]Key, error)`
- `SigAlgorithms(s Signer) []string` has been changed to `SigAlgorithms(ctx context.Context, storage DiscoverStorage) []string`
- KeyProvider interface: `GetKeySet(context.Context) (*jose.JSONWebKeySet, error)` has been changed to `KeySet(context.Context) ([]Key, error)`
- `CreateIDToken`: the Signer parameter has been removed
118 lines
2.9 KiB
Go
118 lines
2.9 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"html/template"
|
|
"net/http"
|
|
|
|
"github.com/gorilla/mux"
|
|
|
|
"github.com/caos/oidc/pkg/op"
|
|
)
|
|
|
|
const (
|
|
queryAuthRequestID = "authRequestID"
|
|
)
|
|
|
|
var (
|
|
loginTmpl, _ = template.New("login").Parse(`
|
|
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<meta charset="UTF-8">
|
|
<title>Login</title>
|
|
</head>
|
|
<body style="display: flex; align-items: center; justify-content: center; height: 100vh;">
|
|
<form method="POST" action="/login/username" style="height: 200px; width: 200px;">
|
|
|
|
<input type="hidden" name="id" value="{{.ID}}">
|
|
|
|
<div>
|
|
<label for="username">Username:</label>
|
|
<input id="username" name="username" style="width: 100%">
|
|
</div>
|
|
|
|
<div>
|
|
<label for="password">Password:</label>
|
|
<input id="password" name="password" style="width: 100%">
|
|
</div>
|
|
|
|
<p style="color:red; min-height: 1rem;">{{.Error}}</p>
|
|
|
|
<button type="submit">Login</button>
|
|
</form>
|
|
</body>
|
|
</html>`)
|
|
)
|
|
|
|
type login struct {
|
|
authenticate authenticate
|
|
router *mux.Router
|
|
callback func(context.Context, string) string
|
|
}
|
|
|
|
func NewLogin(authenticate authenticate, callback func(context.Context, string) string, issuerInterceptor *op.IssuerInterceptor) *login {
|
|
l := &login{
|
|
authenticate: authenticate,
|
|
callback: callback,
|
|
}
|
|
l.createRouter(issuerInterceptor)
|
|
return l
|
|
}
|
|
|
|
func (l *login) createRouter(issuerInterceptor *op.IssuerInterceptor) {
|
|
l.router = mux.NewRouter()
|
|
l.router.Path("/username").Methods("GET").HandlerFunc(l.loginHandler)
|
|
l.router.Path("/username").Methods("POST").HandlerFunc(issuerInterceptor.HandlerFunc(l.checkLoginHandler))
|
|
}
|
|
|
|
type authenticate interface {
|
|
CheckUsernamePassword(username, password, id string) error
|
|
}
|
|
|
|
func (l *login) loginHandler(w http.ResponseWriter, r *http.Request) {
|
|
err := r.ParseForm()
|
|
if err != nil {
|
|
http.Error(w, fmt.Sprintf("cannot parse form:%s", err), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
//the oidc package will pass the id of the auth request as query parameter
|
|
//we will use this id through the login process and therefore pass it to the login page
|
|
renderLogin(w, r.FormValue(queryAuthRequestID), nil)
|
|
}
|
|
|
|
func renderLogin(w http.ResponseWriter, id string, err error) {
|
|
var errMsg string
|
|
if err != nil {
|
|
errMsg = err.Error()
|
|
}
|
|
data := &struct {
|
|
ID string
|
|
Error string
|
|
}{
|
|
ID: id,
|
|
Error: errMsg,
|
|
}
|
|
err = loginTmpl.Execute(w, data)
|
|
if err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
}
|
|
}
|
|
|
|
func (l *login) checkLoginHandler(w http.ResponseWriter, r *http.Request) {
|
|
err := r.ParseForm()
|
|
if err != nil {
|
|
http.Error(w, fmt.Sprintf("cannot parse form:%s", err), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
username := r.FormValue("username")
|
|
password := r.FormValue("password")
|
|
id := r.FormValue("id")
|
|
err = l.authenticate.CheckUsernamePassword(username, password, id)
|
|
if err != nil {
|
|
renderLogin(w, id, err)
|
|
return
|
|
}
|
|
http.Redirect(w, r, l.callback(r.Context(), id), http.StatusFound)
|
|
}
|