mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-23 09:30:50 +00:00
Consume hcaptcha and pwn deps (#22610)
This PR just consumes the [hcaptcha](https://gitea.com/jolheiser/hcaptcha) and [haveibeenpwned](https://gitea.com/jolheiser/pwn) modules directly into Gitea. Also let this serve as a notice that I'm fine with transferring my license (which was already MIT) from my own name to "The Gitea Authors". Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
parent
e88b529b31
commit
2052a9e2b4
10 changed files with 530 additions and 24 deletions
|
@ -5,20 +5,127 @@ package hcaptcha
|
|||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"code.gitea.io/gitea/modules/json"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
||||
"go.jolheiser.com/hcaptcha"
|
||||
)
|
||||
|
||||
const verifyURL = "https://hcaptcha.com/siteverify"
|
||||
|
||||
// Client is an hCaptcha client
|
||||
type Client struct {
|
||||
ctx context.Context
|
||||
http *http.Client
|
||||
|
||||
secret string
|
||||
}
|
||||
|
||||
// PostOptions are optional post form values
|
||||
type PostOptions struct {
|
||||
RemoteIP string
|
||||
Sitekey string
|
||||
}
|
||||
|
||||
// ClientOption is a func to modify a new Client
|
||||
type ClientOption func(*Client)
|
||||
|
||||
// WithHTTP sets the http.Client of a Client
|
||||
func WithHTTP(httpClient *http.Client) func(*Client) {
|
||||
return func(hClient *Client) {
|
||||
hClient.http = httpClient
|
||||
}
|
||||
}
|
||||
|
||||
// WithContext sets the context.Context of a Client
|
||||
func WithContext(ctx context.Context) func(*Client) {
|
||||
return func(hClient *Client) {
|
||||
hClient.ctx = ctx
|
||||
}
|
||||
}
|
||||
|
||||
// New returns a new hCaptcha Client
|
||||
func New(secret string, options ...ClientOption) (*Client, error) {
|
||||
if strings.TrimSpace(secret) == "" {
|
||||
return nil, ErrMissingInputSecret
|
||||
}
|
||||
|
||||
client := &Client{
|
||||
ctx: context.Background(),
|
||||
http: http.DefaultClient,
|
||||
secret: secret,
|
||||
}
|
||||
|
||||
for _, opt := range options {
|
||||
opt(client)
|
||||
}
|
||||
|
||||
return client, nil
|
||||
}
|
||||
|
||||
// Response is an hCaptcha response
|
||||
type Response struct {
|
||||
Success bool `json:"success"`
|
||||
ChallengeTS string `json:"challenge_ts"`
|
||||
Hostname string `json:"hostname"`
|
||||
Credit bool `json:"credit,omitempty"`
|
||||
ErrorCodes []ErrorCode `json:"error-codes"`
|
||||
}
|
||||
|
||||
// Verify checks the response against the hCaptcha API
|
||||
func (c *Client) Verify(token string, opts PostOptions) (*Response, error) {
|
||||
if strings.TrimSpace(token) == "" {
|
||||
return nil, ErrMissingInputResponse
|
||||
}
|
||||
|
||||
post := url.Values{
|
||||
"secret": []string{c.secret},
|
||||
"response": []string{token},
|
||||
}
|
||||
if strings.TrimSpace(opts.RemoteIP) != "" {
|
||||
post.Add("remoteip", opts.RemoteIP)
|
||||
}
|
||||
if strings.TrimSpace(opts.Sitekey) != "" {
|
||||
post.Add("sitekey", opts.Sitekey)
|
||||
}
|
||||
|
||||
// Basically a copy of http.PostForm, but with a context
|
||||
req, err := http.NewRequestWithContext(c.ctx, http.MethodPost, verifyURL, strings.NewReader(post.Encode()))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
resp, err := c.http.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var response *Response
|
||||
if err := json.Unmarshal(body, &response); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// Verify calls hCaptcha API to verify token
|
||||
func Verify(ctx context.Context, response string) (bool, error) {
|
||||
client, err := hcaptcha.New(setting.Service.HcaptchaSecret, hcaptcha.WithContext(ctx))
|
||||
client, err := New(setting.Service.HcaptchaSecret, WithContext(ctx))
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
resp, err := client.Verify(response, hcaptcha.PostOptions{
|
||||
resp, err := client.Verify(response, PostOptions{
|
||||
Sitekey: setting.Service.HcaptchaSitekey,
|
||||
})
|
||||
if err != nil {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue