mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 21:11:12 +00:00
fa37a211fb
- In Go 1.21 the crypto/sha256 [got a massive improvement](https://go.dev/doc/go1.21#crypto/sha256) by utilizing the SHA instructions for AMD64 CPUs, which sha256-simd already was doing. The performance is now on par and I think it's preferable to use the standard library rather than a package when possible. ``` cpu: AMD Ryzen 5 3600X 6-Core Processor │ simd.txt │ go.txt │ │ sec/op │ sec/op vs base │ Hash/8Bytes-12 63.25n ± 1% 73.38n ± 1% +16.02% (p=0.002 n=6) Hash/64Bytes-12 98.73n ± 1% 105.30n ± 1% +6.65% (p=0.002 n=6) Hash/1K-12 567.2n ± 1% 572.8n ± 1% +0.99% (p=0.002 n=6) Hash/8K-12 4.062µ ± 1% 4.062µ ± 1% ~ (p=0.396 n=6) Hash/1M-12 512.1µ ± 0% 510.6µ ± 1% ~ (p=0.485 n=6) Hash/5M-12 2.556m ± 1% 2.564m ± 0% ~ (p=0.093 n=6) Hash/10M-12 5.112m ± 0% 5.127m ± 0% ~ (p=0.093 n=6) geomean 13.82µ 14.27µ +3.28% │ simd.txt │ go.txt │ │ B/s │ B/s vs base │ Hash/8Bytes-12 120.6Mi ± 1% 104.0Mi ± 1% -13.81% (p=0.002 n=6) Hash/64Bytes-12 618.2Mi ± 1% 579.8Mi ± 1% -6.22% (p=0.002 n=6) Hash/1K-12 1.682Gi ± 1% 1.665Gi ± 1% -0.98% (p=0.002 n=6) Hash/8K-12 1.878Gi ± 1% 1.878Gi ± 1% ~ (p=0.310 n=6) Hash/1M-12 1.907Gi ± 0% 1.913Gi ± 1% ~ (p=0.485 n=6) Hash/5M-12 1.911Gi ± 1% 1.904Gi ± 0% ~ (p=0.093 n=6) Hash/10M-12 1.910Gi ± 0% 1.905Gi ± 0% ~ (p=0.093 n=6) geomean 1.066Gi 1.032Gi -3.18% ``` (cherry picked from commitabd94ff5b5
) (cherry picked from commit15e81637ab
) Conflicts: go.mod https://codeberg.org/forgejo/forgejo/pulls/1581 (cherry picked from commit325d92917f
) Conflicts: modules/context/context_cookie.go https://codeberg.org/forgejo/forgejo/pulls/1617 (cherry picked from commit358819e895
) (cherry picked from commit362fd7aae1
) (cherry picked from commit4f64ee294e
) (cherry picked from commit4bde77f7b1
) (cherry picked from commit1311e30a81
) (cherry picked from commit57b69e334c
) (cherry picked from commit52dc892fad
) (cherry picked from commit77f54f4187
) (cherry picked from commit0d0392f3a5
) Conflicts: go.mod https://codeberg.org/forgejo/forgejo/pulls/2034 (cherry picked from commit92798364e8
) (cherry picked from commit43d2181277
) (cherry picked from commit45c88b86a3
) (cherry picked from commita1cd6f4e3a
) (cherry picked from commit01191dc2ad
) (cherry picked from commit151e07f37e
)
275 lines
6.2 KiB
Go
275 lines
6.2 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package chef
|
|
|
|
import (
|
|
"context"
|
|
"crypto"
|
|
"crypto/rsa"
|
|
"crypto/sha1"
|
|
"crypto/sha256"
|
|
"crypto/x509"
|
|
"encoding/base64"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"hash"
|
|
"math/big"
|
|
"net/http"
|
|
"path"
|
|
"regexp"
|
|
"slices"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
chef_module "code.gitea.io/gitea/modules/packages/chef"
|
|
"code.gitea.io/gitea/modules/util"
|
|
"code.gitea.io/gitea/services/auth"
|
|
)
|
|
|
|
const (
|
|
maxTimeDifference = 10 * time.Minute
|
|
)
|
|
|
|
var (
|
|
algorithmPattern = regexp.MustCompile(`algorithm=(\w+)`)
|
|
versionPattern = regexp.MustCompile(`version=(\d+\.\d+)`)
|
|
authorizationPattern = regexp.MustCompile(`\AX-Ops-Authorization-(\d+)`)
|
|
|
|
_ auth.Method = &Auth{}
|
|
)
|
|
|
|
// Documentation:
|
|
// https://docs.chef.io/server/api_chef_server/#required-headers
|
|
// https://github.com/chef-boneyard/chef-rfc/blob/master/rfc065-sign-v1.3.md
|
|
// https://github.com/chef/mixlib-authentication/blob/bc8adbef833d4be23dc78cb23e6fe44b51ebc34f/lib/mixlib/authentication/signedheaderauth.rb
|
|
|
|
type Auth struct{}
|
|
|
|
func (a *Auth) Name() string {
|
|
return "chef"
|
|
}
|
|
|
|
// Verify extracts the user from the signed request
|
|
// If the request is signed with the user private key the user is verified.
|
|
func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataStore, sess auth.SessionStore) (*user_model.User, error) {
|
|
u, err := getUserFromRequest(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if u == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
pub, err := getUserPublicKey(req.Context(), u)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := verifyTimestamp(req); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
version, err := getSignVersion(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := verifySignedHeaders(req, version, pub.(*rsa.PublicKey)); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return u, nil
|
|
}
|
|
|
|
func getUserFromRequest(req *http.Request) (*user_model.User, error) {
|
|
username := req.Header.Get("X-Ops-Userid")
|
|
if username == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
return user_model.GetUserByName(req.Context(), username)
|
|
}
|
|
|
|
func getUserPublicKey(ctx context.Context, u *user_model.User) (crypto.PublicKey, error) {
|
|
pubKey, err := user_model.GetSetting(ctx, u.ID, chef_module.SettingPublicPem)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
pubPem, _ := pem.Decode([]byte(pubKey))
|
|
|
|
return x509.ParsePKIXPublicKey(pubPem.Bytes)
|
|
}
|
|
|
|
func verifyTimestamp(req *http.Request) error {
|
|
hdr := req.Header.Get("X-Ops-Timestamp")
|
|
if hdr == "" {
|
|
return util.NewInvalidArgumentErrorf("X-Ops-Timestamp header missing")
|
|
}
|
|
|
|
ts, err := time.Parse(time.RFC3339, hdr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
diff := time.Now().UTC().Sub(ts)
|
|
if diff < 0 {
|
|
diff = -diff
|
|
}
|
|
|
|
if diff > maxTimeDifference {
|
|
return fmt.Errorf("time difference")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func getSignVersion(req *http.Request) (string, error) {
|
|
hdr := req.Header.Get("X-Ops-Sign")
|
|
if hdr == "" {
|
|
return "", util.NewInvalidArgumentErrorf("X-Ops-Sign header missing")
|
|
}
|
|
|
|
m := versionPattern.FindStringSubmatch(hdr)
|
|
if len(m) != 2 {
|
|
return "", util.NewInvalidArgumentErrorf("invalid X-Ops-Sign header")
|
|
}
|
|
|
|
switch m[1] {
|
|
case "1.0", "1.1", "1.2", "1.3":
|
|
default:
|
|
return "", util.NewInvalidArgumentErrorf("unsupported version")
|
|
}
|
|
|
|
version := m[1]
|
|
|
|
m = algorithmPattern.FindStringSubmatch(hdr)
|
|
if len(m) == 2 && m[1] != "sha1" && !(m[1] == "sha256" && version == "1.3") {
|
|
return "", util.NewInvalidArgumentErrorf("unsupported algorithm")
|
|
}
|
|
|
|
return version, nil
|
|
}
|
|
|
|
func verifySignedHeaders(req *http.Request, version string, pub *rsa.PublicKey) error {
|
|
authorizationData, err := getAuthorizationData(req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
checkData := buildCheckData(req, version)
|
|
|
|
switch version {
|
|
case "1.3":
|
|
return verifyDataNew(authorizationData, checkData, pub, crypto.SHA256)
|
|
case "1.2":
|
|
return verifyDataNew(authorizationData, checkData, pub, crypto.SHA1)
|
|
default:
|
|
return verifyDataOld(authorizationData, checkData, pub)
|
|
}
|
|
}
|
|
|
|
func getAuthorizationData(req *http.Request) ([]byte, error) {
|
|
valueList := make(map[int]string)
|
|
for k, vs := range req.Header {
|
|
if m := authorizationPattern.FindStringSubmatch(k); m != nil {
|
|
index, _ := strconv.Atoi(m[1])
|
|
var v string
|
|
if len(vs) == 0 {
|
|
v = ""
|
|
} else {
|
|
v = vs[0]
|
|
}
|
|
valueList[index] = v
|
|
}
|
|
}
|
|
|
|
tmp := make([]string, len(valueList))
|
|
for k, v := range valueList {
|
|
if k > len(tmp) {
|
|
return nil, fmt.Errorf("invalid X-Ops-Authorization headers")
|
|
}
|
|
tmp[k-1] = v
|
|
}
|
|
|
|
return base64.StdEncoding.DecodeString(strings.Join(tmp, ""))
|
|
}
|
|
|
|
func buildCheckData(req *http.Request, version string) []byte {
|
|
username := req.Header.Get("X-Ops-Userid")
|
|
if version != "1.0" && version != "1.3" {
|
|
sum := sha1.Sum([]byte(username))
|
|
username = base64.StdEncoding.EncodeToString(sum[:])
|
|
}
|
|
|
|
var data string
|
|
if version == "1.3" {
|
|
data = fmt.Sprintf(
|
|
"Method:%s\nPath:%s\nX-Ops-Content-Hash:%s\nX-Ops-Sign:version=%s\nX-Ops-Timestamp:%s\nX-Ops-UserId:%s\nX-Ops-Server-API-Version:%s",
|
|
req.Method,
|
|
path.Clean(req.URL.Path),
|
|
req.Header.Get("X-Ops-Content-Hash"),
|
|
version,
|
|
req.Header.Get("X-Ops-Timestamp"),
|
|
username,
|
|
req.Header.Get("X-Ops-Server-Api-Version"),
|
|
)
|
|
} else {
|
|
sum := sha1.Sum([]byte(path.Clean(req.URL.Path)))
|
|
data = fmt.Sprintf(
|
|
"Method:%s\nHashed Path:%s\nX-Ops-Content-Hash:%s\nX-Ops-Timestamp:%s\nX-Ops-UserId:%s",
|
|
req.Method,
|
|
base64.StdEncoding.EncodeToString(sum[:]),
|
|
req.Header.Get("X-Ops-Content-Hash"),
|
|
req.Header.Get("X-Ops-Timestamp"),
|
|
username,
|
|
)
|
|
}
|
|
|
|
return []byte(data)
|
|
}
|
|
|
|
func verifyDataNew(signature, data []byte, pub *rsa.PublicKey, algo crypto.Hash) error {
|
|
var h hash.Hash
|
|
if algo == crypto.SHA256 {
|
|
h = sha256.New()
|
|
} else {
|
|
h = sha1.New()
|
|
}
|
|
if _, err := h.Write(data); err != nil {
|
|
return err
|
|
}
|
|
|
|
return rsa.VerifyPKCS1v15(pub, algo, h.Sum(nil), signature)
|
|
}
|
|
|
|
func verifyDataOld(signature, data []byte, pub *rsa.PublicKey) error {
|
|
c := new(big.Int)
|
|
m := new(big.Int)
|
|
m.SetBytes(signature)
|
|
e := big.NewInt(int64(pub.E))
|
|
c.Exp(m, e, pub.N)
|
|
|
|
out := c.Bytes()
|
|
|
|
skip := 0
|
|
for i := 2; i < len(out); i++ {
|
|
if i+1 >= len(out) {
|
|
break
|
|
}
|
|
if out[i] == 0xFF && out[i+1] == 0 {
|
|
skip = i + 2
|
|
break
|
|
}
|
|
}
|
|
|
|
if !slices.Equal(out[skip:], data) {
|
|
return fmt.Errorf("could not verify signature")
|
|
}
|
|
|
|
return nil
|
|
}
|