rename auth redirect login name
This commit is contained in:
parent
da6b6011fc
commit
47cc8feefa
|
@ -50,7 +50,7 @@ func StartSessionContinuation(context *RequestContext, req *http.Request, resp h
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func InterceptCodeContinuation(context *RequestContext, req *http.Request, resp http.ResponseWriter) ContinuationChain {
|
func InterceptOauthCodeContinuation(context *RequestContext, req *http.Request, resp http.ResponseWriter) ContinuationChain {
|
||||||
return func(success Continuation, failure Continuation) ContinuationChain {
|
return func(success Continuation, failure Continuation) ContinuationChain {
|
||||||
state := req.URL.Query().Get("state")
|
state := req.URL.Query().Get("state")
|
||||||
code := req.URL.Query().Get("code")
|
code := req.URL.Query().Get("code")
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -43,16 +41,11 @@ func SignGuestbookContinuation(context *RequestContext, req *http.Request, resp
|
||||||
return func(success Continuation, failure Continuation) ContinuationChain {
|
return func(success Continuation, failure Continuation) ContinuationChain {
|
||||||
name := req.FormValue("name")
|
name := req.FormValue("name")
|
||||||
message := req.FormValue("message")
|
message := req.FormValue("message")
|
||||||
hCaptchaResponse := req.FormValue("h-captcha-response")
|
|
||||||
|
|
||||||
formErrors := FormError{
|
formErrors := FormError{
|
||||||
Errors: []string{},
|
Errors: []string{},
|
||||||
}
|
}
|
||||||
|
|
||||||
if hCaptchaResponse == "" {
|
|
||||||
formErrors.Errors = append(formErrors.Errors, "hCaptcha is required")
|
|
||||||
}
|
|
||||||
|
|
||||||
entry := &database.GuestbookEntry{
|
entry := &database.GuestbookEntry{
|
||||||
ID: utils.RandomId(),
|
ID: utils.RandomId(),
|
||||||
Name: name,
|
Name: name,
|
||||||
|
@ -60,22 +53,19 @@ func SignGuestbookContinuation(context *RequestContext, req *http.Request, resp
|
||||||
}
|
}
|
||||||
formErrors.Errors = append(formErrors.Errors, validateGuestbookEntry(entry)...)
|
formErrors.Errors = append(formErrors.Errors, validateGuestbookEntry(entry)...)
|
||||||
|
|
||||||
err := verifyHCaptcha(context.Args.HcaptchaSecret, hCaptchaResponse)
|
if len(formErrors.Errors) == 0 {
|
||||||
|
_, err := database.SaveGuestbookEntry(context.DBConn, entry)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
|
formErrors.Errors = append(formErrors.Errors, "failed to save entry")
|
||||||
formErrors.Errors = append(formErrors.Errors, "hCaptcha verification failed")
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(formErrors.Errors) > 0 {
|
if len(formErrors.Errors) > 0 {
|
||||||
(*context.TemplateData)["FormError"] = formErrors
|
(*context.TemplateData)["FormError"] = formErrors
|
||||||
(*context.TemplateData)["EntryForm"] = entry
|
(*context.TemplateData)["EntryForm"] = entry
|
||||||
return failure(context, req, resp)
|
resp.WriteHeader(http.StatusBadRequest)
|
||||||
}
|
|
||||||
|
|
||||||
_, err = database.SaveGuestbookEntry(context.DBConn, entry)
|
|
||||||
if err != nil {
|
|
||||||
log.Println(err)
|
|
||||||
resp.WriteHeader(http.StatusInternalServerError)
|
|
||||||
return failure(context, req, resp)
|
return failure(context, req, resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,46 +86,3 @@ func ListGuestbookContinuation(context *RequestContext, req *http.Request, resp
|
||||||
return success(context, req, resp)
|
return success(context, req, resp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func HcaptchaArgsContinuation(context *RequestContext, req *http.Request, resp http.ResponseWriter) ContinuationChain {
|
|
||||||
return func(success Continuation, failure Continuation) ContinuationChain {
|
|
||||||
(*context.TemplateData)["HcaptchaArgs"] = HcaptchaArgs{
|
|
||||||
SiteKey: context.Args.HcaptchaSiteKey,
|
|
||||||
}
|
|
||||||
log.Println(context.Args.HcaptchaSiteKey)
|
|
||||||
return success(context, req, resp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func verifyHCaptcha(secret, response string) error {
|
|
||||||
verifyURL := "https://hcaptcha.com/siteverify"
|
|
||||||
body := strings.NewReader("secret=" + secret + "&response=" + response)
|
|
||||||
|
|
||||||
req, err := http.NewRequest("POST", verifyURL, body)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
|
||||||
|
|
||||||
client := &http.Client{}
|
|
||||||
resp, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
jsonResponse := struct {
|
|
||||||
Success bool `json:"success"`
|
|
||||||
}{}
|
|
||||||
err = json.NewDecoder(resp.Body).Decode(&jsonResponse)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !jsonResponse.Success {
|
|
||||||
return fmt.Errorf("hcaptcha verification failed")
|
|
||||||
}
|
|
||||||
|
|
||||||
defer resp.Body.Close()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func verifyCaptcha(secret, response string) error {
|
||||||
|
verifyURL := "https://hcaptcha.com/siteverify"
|
||||||
|
body := strings.NewReader("secret=" + secret + "&response=" + response)
|
||||||
|
|
||||||
|
req, err := http.NewRequest("POST", verifyURL, body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
|
||||||
|
client := &http.Client{}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
jsonResponse := struct {
|
||||||
|
Success bool `json:"success"`
|
||||||
|
}{}
|
||||||
|
err = json.NewDecoder(resp.Body).Decode(&jsonResponse)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !jsonResponse.Success {
|
||||||
|
return fmt.Errorf("hcaptcha verification failed")
|
||||||
|
}
|
||||||
|
|
||||||
|
defer resp.Body.Close()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func CaptchaArgsContinuation(context *RequestContext, req *http.Request, resp http.ResponseWriter) ContinuationChain {
|
||||||
|
return func(success Continuation, failure Continuation) ContinuationChain {
|
||||||
|
(*context.TemplateData)["HcaptchaArgs"] = HcaptchaArgs{
|
||||||
|
SiteKey: context.Args.HcaptchaSiteKey,
|
||||||
|
}
|
||||||
|
return success(context, req, resp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func CaptchaVerificationContinuation(context *RequestContext, req *http.Request, resp http.ResponseWriter) ContinuationChain {
|
||||||
|
return func(success Continuation, failure Continuation) ContinuationChain {
|
||||||
|
hCaptchaResponse := req.FormValue("h-captcha-response")
|
||||||
|
secretKey := context.Args.HcaptchaSecret
|
||||||
|
|
||||||
|
err := verifyCaptcha(secretKey, hCaptchaResponse)
|
||||||
|
if err != nil {
|
||||||
|
(*context.TemplateData)["FormError"] = FormError{
|
||||||
|
Errors: []string{"hCaptcha verification failed"},
|
||||||
|
}
|
||||||
|
resp.WriteHeader(http.StatusBadRequest)
|
||||||
|
|
||||||
|
return failure(context, req, resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
return success(context, req, resp)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue