-
diff --git a/server/flow.go b/server/flow.go
index ca7302e..c40f6b1 100644
--- a/server/flow.go
+++ b/server/flow.go
@@ -1,10 +1,13 @@
package server
import (
+ "context"
_ "embed"
"encoding/json"
+ "fmt"
"github.com/google/uuid"
"github.com/julienschmidt/httprouter"
+ "golang.org/x/oauth2"
"html/template"
"log"
"net/http"
@@ -28,6 +31,7 @@ func init() {
log.Fatal("flow.go: Failed to parse flow popup HTML:", err)
}
flowPopupTemplate = pageParse
+
pageParse, err = template.New("pages").Parse(flowCallbackHtml)
if err != nil {
log.Fatal("flow.go: Failed to parse flow callback HTML:", err)
@@ -37,7 +41,7 @@ func init() {
func (h *HttpServer) flowPopup(rw http.ResponseWriter, req *http.Request, _ httprouter.Params) {
err := flowPopupTemplate.Execute(rw, map[string]any{
- "ServiceName": flowPopupTemplate,
+ "ServiceName": h.serviceName,
"Origin": req.URL.Query().Get("origin"),
})
if err != nil {
@@ -46,7 +50,8 @@ func (h *HttpServer) flowPopup(rw http.ResponseWriter, req *http.Request, _ http
}
func (h *HttpServer) flowPopupPost(rw http.ResponseWriter, req *http.Request, _ httprouter.Params) {
- login := h.manager.FindServiceFromLogin(req.PostFormValue("username"))
+ loginName := req.PostFormValue("loginname")
+ login := h.manager.FindServiceFromLogin(loginName)
if login == nil {
http.Error(rw, "No login service defined for this username", http.StatusBadRequest)
return
@@ -68,7 +73,7 @@ func (h *HttpServer) flowPopupPost(rw http.ResponseWriter, req *http.Request, _
// generate oauth2 config and redirect to authorize URL
oa2conf := login.OAuth2Config
oa2conf.RedirectURL = h.baseUrl + "/callback"
- nextUrl := oa2conf.AuthCodeURL(state)
+ nextUrl := oa2conf.AuthCodeURL(state, oauth2.SetAuthURLParam("login_name", loginName))
http.Redirect(rw, req, nextUrl, http.StatusFound)
}
@@ -92,14 +97,18 @@ func (h *HttpServer) flowCallback(rw http.ResponseWriter, req *http.Request, _ h
return
}
- exchange, err := v.sso.OAuth2Config.Exchange(req.Context(), q.Get("code"))
+ oa2conf := v.sso.OAuth2Config
+ oa2conf.RedirectURL = h.baseUrl + "/callback"
+ exchange, err := oa2conf.Exchange(context.Background(), q.Get("code"))
if err != nil {
+ fmt.Println("Failed exchange:", err)
http.Error(rw, "Failed to exchange code", http.StatusInternalServerError)
return
}
client := v.sso.OAuth2Config.Client(req.Context(), exchange)
v2, err := client.Get(v.sso.UserInfoEndpoint)
if err != nil {
+ fmt.Println("Failed to get userinfo:", err)
http.Error(rw, "Failed to get userinfo", http.StatusInternalServerError)
return
}
@@ -110,11 +119,15 @@ func (h *HttpServer) flowCallback(rw http.ResponseWriter, req *http.Request, _ h
}
var v3 any
if json.NewDecoder(v2.Body).Decode(&v3) != nil {
+ fmt.Println("Failed to decode userinfo:", err)
http.Error(rw, "Failed to decode userinfo JSON", http.StatusInternalServerError)
return
}
+ // TODO: generate signed mjwt object
+
_ = flowCallbackTemplate.Execute(rw, map[string]any{
+ "ServiceName": h.serviceName,
"TargetOrigin": v.targetOrigin,
"TargetMessage": v3,
})
diff --git a/server/server.go b/server/server.go
index fc6b16b..f0447ad 100644
--- a/server/server.go
+++ b/server/server.go
@@ -12,12 +12,13 @@ import (
)
type HttpServer struct {
- r *httprouter.Router
- baseUrl string
- manager *issuer.Manager
- signer mjwt.Signer
- flowState *cache.Cache[string, flowStateData]
- services map[string]struct{}
+ r *httprouter.Router
+ baseUrl string
+ serviceName string
+ manager *issuer.Manager
+ signer mjwt.Signer
+ flowState *cache.Cache[string, flowStateData]
+ services map[string]struct{}
}
type flowStateData struct {
@@ -25,7 +26,7 @@ type flowStateData struct {
targetOrigin string
}
-func NewHttpServer(listen, baseUrl string, clients []utils.JsonUrl, manager *issuer.Manager, signer mjwt.Signer) *http.Server {
+func NewHttpServer(listen, baseUrl, serviceName string, clients []utils.JsonUrl, manager *issuer.Manager, signer mjwt.Signer) *http.Server {
r := httprouter.New()
// remove last slash from baseUrl
@@ -38,15 +39,17 @@ func NewHttpServer(listen, baseUrl string, clients []utils.JsonUrl, manager *iss
services := make(map[string]struct{})
for _, i := range clients {
- services[i.Host] = struct{}{}
+ services[i.String()] = struct{}{}
}
hs := &HttpServer{
- r: r,
- baseUrl: baseUrl,
- manager: manager,
- signer: signer,
- services: services,
+ r: r,
+ baseUrl: baseUrl,
+ serviceName: serviceName,
+ manager: manager,
+ signer: signer,
+ flowState: cache.New[string, flowStateData](),
+ services: services,
}
r.GET("/", func(rw http.ResponseWriter, req *http.Request, _ httprouter.Params) {
diff --git a/test-client/index.html b/test-client/index.html
new file mode 100644
index 0000000..a6ec13a
--- /dev/null
+++ b/test-client/index.html
@@ -0,0 +1,75 @@
+
+
+
+ Test Client
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test-client/run.sh b/test-client/run.sh
new file mode 100755
index 0000000..60aacf8
--- /dev/null
+++ b/test-client/run.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+python3 -m http.server 2020