Ailur
/
datatracker
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made it not assume the oauth server was at "/"

This commit is contained in:
Tracker-Friendly 2024-10-15 19:28:54 +01:00
parent 27ebb03156
commit bf842ab498
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main.go
View File

@ -251,6 +251,36 @@ func Main(information library.ServiceInitializationInformation) *chi.Mux {
logFunc(response.Message.(error).Error(), 3, information) logFunc(response.Message.(error).Error(), 3, information)
} }
// Ask the authentication service for the OAuth host name
information.Outbox <- library.InterServiceMessage{
ServiceID: ServiceInformation.ServiceID,
ForServiceID: uuid.MustParse("00000000-0000-0000-0000-000000000004"), // Authentication service
MessageType: 0, // Request OAuth host name
SentAt: time.Now(),
Message: nil,
}
var oauthHostName string
// 3 second timeout
go func() {
time.Sleep(3 * time.Second)
if oauthHostName == "" {
logFunc("Timeout while waiting for the OAuth host name from the authentication service", 3, information)
}
}()
// Wait for the response
response = <-information.Inbox
if response.MessageType == 0 {
// This is the OAuth host name
oauthHostName = response.Message.(string)
} else {
// This is an error message
// Log the error message to the logger service
logFunc(response.Message.(error).Error(), 3, information)
}
// Ask the authentication service to create a new OAuth2 client // Ask the authentication service to create a new OAuth2 client
urlPath, err := url.JoinPath(hostName, "/oauth") urlPath, err := url.JoinPath(hostName, "/oauth")
if err != nil { if err != nil {
@ -324,7 +354,7 @@ func Main(information library.ServiceInitializationInformation) *chi.Mux {
} }
// Get the username // Get the username
sub, username, err := getUsername(commentData.JwtToken, information.Configuration["hostName"].(string), publicKey) sub, username, err := getUsername(commentData.JwtToken, oauthHostName, publicKey)
if err != nil { if err != nil {
renderJSON(400, w, map[string]interface{}{"error": "Invalid JWT token"}, information) renderJSON(400, w, map[string]interface{}{"error": "Invalid JWT token"}, information)
fmt.Println(err) fmt.Println(err)
@ -414,7 +444,7 @@ func Main(information library.ServiceInitializationInformation) *chi.Mux {
} }
// Get the username // Get the username
_, username, err := getUsername(commentData.JwtToken, information.Configuration["hostName"].(string), publicKey) _, username, err := getUsername(commentData.JwtToken, oauthHostName, publicKey)
if err != nil { if err != nil {
renderJSON(400, w, map[string]interface{}{"error": "Invalid JWT token"}, information) renderJSON(400, w, map[string]interface{}{"error": "Invalid JWT token"}, information)
return return
@ -613,6 +643,7 @@ func Main(information library.ServiceInitializationInformation) *chi.Mux {
router.Get("/oauth", func(w http.ResponseWriter, r *http.Request) { router.Get("/oauth", func(w http.ResponseWriter, r *http.Request) {
renderTemplate(200, w, map[string]interface{}{ renderTemplate(200, w, map[string]interface{}{
"ClientId": oauthResponse.AppID, "ClientId": oauthResponse.AppID,
"AuthorizationUri": oauthHostName,
}, "oauth.html", information) }, "oauth.html", information)
}) })

3
resources/templates/oauth.html
View File

@ -23,7 +23,8 @@
</style> </style>
</head> </head>
<body> <body>
<text id="clientId" style="display: none">{{ .ClientId }}</text> <span id="clientId" style="display: none">{{ .ClientId }}</span>
<span id="authorizationUri" style="display: none">{{ .AuthorizationUri }}</span>
<h2>Logging in...</h2> <h2>Logging in...</h2>
<p id="statusBox"></p> <p id="statusBox"></p>
<button id="tryAgain" style="display: none">Try again</button> <button id="tryAgain" style="display: none">Try again</button>

2
resources/wasm/oauth/main.go
View File

@ -192,7 +192,7 @@ func main() {
localStorage.Call("setItem", "OAUTH-verifier", verifier) localStorage.Call("setItem", "OAUTH-verifier", verifier)
// Redirect to the authorization page // Redirect to the authorization page
js.Global().Get("window").Get("location").Call("replace", "/authorize?response_type=code&client_id="+js.Global().Get("document").Call("getElementById", "clientId").Get("innerText").String()+"&redirect_uri="+url.QueryEscape(js.Global().Get("window").Get("location").Get("origin").String()+"/oauth")+"&code_challenge="+verifierChallenge+"&code_challenge_method=S256") js.Global().Get("window").Get("location").Call("replace", js.Global().Get("document").Call("getElementById", "authorizationUri").Get("innerText").String()+"/authorize?response_type=code&client_id="+js.Global().Get("document").Call("getElementById", "clientId").Get("innerText").String()+"&redirect_uri="+url.QueryEscape(js.Global().Get("window").Get("location").Get("origin").String()+"/oauth")+"&code_challenge="+verifierChallenge+"&code_challenge_method=S256")
} }
}() }()