hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-06-29 04:47:45 +02:00
Code Issues Projects Releases Wiki Activity

userpage: time-pad pwr request for ambiguity

Browse Source 
the user shouldn't know if the reset has actually been sent (i.e. if an
account with the given contact address exists), so the backend response
is always sent after 1 second.
This commit is contained in:
Harvey Tindall 2023-06-22 12:25:00 +01:00
parent 86daa70ccb
commit 3ec3e9672e
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api-userpage.go
View File

@ -487,9 +487,15 @@ func (app *appContext) UnlinkMyMatrix(gc *gin.Context) {
// @Router /my/password/reset/{address} [post] // @Router /my/password/reset/{address} [post]
// @tags Users // @tags Users
func (app *appContext) ResetMyPassword(gc *gin.Context) { func (app *appContext) ResetMyPassword(gc *gin.Context) {
// All requests should take 1 second, to make it harder to tell if a success occured or not.
timerWait := make(chan bool)
cancel := time.AfterFunc(1*time.Second, func() {
timerWait <- true
})
address := gc.Param("address") address := gc.Param("address")
if address == "" { if address == "" {
app.debug.Println("Ignoring empty request for PWR") app.debug.Println("Ignoring empty request for PWR")
cancel.Stop()
respondBool(400, false, gc) respondBool(400, false, gc)
return return
} }
@ -499,13 +505,20 @@ func (app *appContext) ResetMyPassword(gc *gin.Context) {
jfID := app.reverseUserSearch(address) jfID := app.reverseUserSearch(address)
if jfID == "" { if jfID == "" {
app.debug.Printf("Ignoring PWR request: User not found") app.debug.Printf("Ignoring PWR request: User not found")
respondBool(204, true, gc)
for range timerWait {
respondBool(204, true, gc)
return
}
return return
} }
pwr, err = app.GenInternalReset(jfID) pwr, err = app.GenInternalReset(jfID)
if err != nil { if err != nil {
app.err.Printf("Failed to get user from Jellyfin: %v", err) app.err.Printf("Failed to get user from Jellyfin: %v", err)
respondBool(500, false, gc) for range timerWait {
respondBool(204, true, gc)
return
}
return return
} }
if app.internalPWRs == nil { if app.internalPWRs == nil {
@ -523,12 +536,18 @@ func (app *appContext) ResetMyPassword(gc *gin.Context) {
) )
if err != nil { if err != nil {
app.err.Printf("Failed to construct password reset message for \"%s\": %v", pwr.Username, err) app.err.Printf("Failed to construct password reset message for \"%s\": %v", pwr.Username, err)
respondBool(500, false, gc) for range timerWait {
respondBool(204, true, gc)
return
}
return return
} else if err := app.sendByID(msg, jfID); err != nil { } else if err := app.sendByID(msg, jfID); err != nil {
app.err.Printf("Failed to send password reset message to \"%s\": %v", address, err) app.err.Printf("Failed to send password reset message to \"%s\": %v", address, err)
} else { } else {
app.info.Printf("Sent password reset message to \"%s\"", address) app.info.Printf("Sent password reset message to \"%s\"", address)
} }
respondBool(204, true, gc) for range timerWait {
respondBool(204, true, gc)
return
}
} }

28
ts/user.ts
View File

@ -63,18 +63,22 @@ window.notifications = new notificationBox(document.getElementById('notification
if (window.pwrEnabled && window.linkResetEnabled) { if (window.pwrEnabled && window.linkResetEnabled) {
const submitButton = document.getElementById("pwr-submit"); const submitButton = document.getElementById("pwr-submit");
const input = document.getElementById("pwr-address") as HTMLInputElement; const input = document.getElementById("pwr-address") as HTMLInputElement;
submitButton.onclick = () => _post("/my/password/reset/" + input.value, null, (req: XMLHttpRequest) => { submitButton.onclick = () => {
if (req.readyState != 4) return; toggleLoader(submitButton);
if (req.status != 204) { _post("/my/password/reset/" + input.value, null, (req: XMLHttpRequest) => {
window.notifications.customError("unkownError", window.lang.notif("errorUnknown"));; if (req.readyState != 4) return;
window.modals.pwr.close(); toggleLoader(submitButton);
return; if (req.status != 204) {
} window.notifications.customError("unkownError", window.lang.notif("errorUnknown"));;
window.modals.pwr.modal.querySelector(".heading").textContent = window.lang.strings("resetSent"); window.modals.pwr.close();
window.modals.pwr.modal.querySelector(".content").textContent = window.lang.strings("resetSentDescription"); return;
submitButton.classList.add("unfocused"); }
input.classList.add("unfocused"); window.modals.pwr.modal.querySelector(".heading").textContent = window.lang.strings("resetSent");
}); window.modals.pwr.modal.querySelector(".content").textContent = window.lang.strings("resetSentDescription");
submitButton.classList.add("unfocused");
input.classList.add("unfocused");
});
};
} }
const grid = document.querySelector(".grid"); const grid = document.querySelector(".grid");