mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-25 19:26:09 +01:00
b82293270c
* Add option to provide signed token to verify key ownership Currently we will only allow a key to be matched to a user if it matches an activated email address. This PR provides a different mechanism - if the user provides a signature for automatically generated token (based on the timestamp, user creation time, user ID, username and primary email. * Ensure verified keys can act for all active emails for the user * Add code to mark keys as verified * Slight UI adjustments * Slight UI adjustments 2 * Simplify signature verification slightly * fix postgres test * add api routes * handle swapped primary-keys * Verify the no-reply address for verified keys * Only add email addresses that are activated to keys * Fix committer shortcut properly * Restructure gpg_keys.go * Use common Verification Token code Signed-off-by: Andrew Thornton <art27@cantab.net>
114 lines
2.9 KiB
Go
114 lines
2.9 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package models
|
|
|
|
import (
|
|
"strconv"
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/modules/base"
|
|
"code.gitea.io/gitea/modules/log"
|
|
)
|
|
|
|
// __________________ ________ ____ __.
|
|
// / _____/\______ \/ _____/ | |/ _|____ ___.__.
|
|
// / \ ___ | ___/ \ ___ | <_/ __ < | |
|
|
// \ \_\ \| | \ \_\ \ | | \ ___/\___ |
|
|
// \______ /|____| \______ / |____|__ \___ > ____|
|
|
// \/ \/ \/ \/\/
|
|
// ____ ____ .__ _____
|
|
// \ \ / /___________|__|/ ____\__.__.
|
|
// \ Y // __ \_ __ \ \ __< | |
|
|
// \ /\ ___/| | \/ || | \___ |
|
|
// \___/ \___ >__| |__||__| / ____|
|
|
// \/ \/
|
|
|
|
// This file provides functions relating verifying gpg keys
|
|
|
|
// VerifyGPGKey marks a GPG key as verified
|
|
func VerifyGPGKey(ownerID int64, keyID, token, signature string) (string, error) {
|
|
sess := x.NewSession()
|
|
defer sess.Close()
|
|
if err := sess.Begin(); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
key := new(GPGKey)
|
|
|
|
has, err := sess.Where("owner_id = ? AND key_id = ?", ownerID, keyID).Get(key)
|
|
if err != nil {
|
|
return "", err
|
|
} else if !has {
|
|
return "", ErrGPGKeyNotExist{}
|
|
}
|
|
|
|
sig, err := extractSignature(signature)
|
|
if err != nil {
|
|
return "", ErrGPGInvalidTokenSignature{
|
|
ID: key.KeyID,
|
|
Wrapped: err,
|
|
}
|
|
}
|
|
|
|
signer, err := hashAndVerifyWithSubKeys(sig, token, key)
|
|
if err != nil {
|
|
return "", ErrGPGInvalidTokenSignature{
|
|
ID: key.KeyID,
|
|
Wrapped: err,
|
|
}
|
|
}
|
|
if signer == nil {
|
|
signer, err = hashAndVerifyWithSubKeys(sig, token+"\n", key)
|
|
|
|
if err != nil {
|
|
return "", ErrGPGInvalidTokenSignature{
|
|
ID: key.KeyID,
|
|
Wrapped: err,
|
|
}
|
|
}
|
|
}
|
|
if signer == nil {
|
|
signer, err = hashAndVerifyWithSubKeys(sig, token+"\n\n", key)
|
|
if err != nil {
|
|
return "", ErrGPGInvalidTokenSignature{
|
|
ID: key.KeyID,
|
|
Wrapped: err,
|
|
}
|
|
}
|
|
}
|
|
|
|
if signer == nil {
|
|
log.Error("Unable to validate token signature. Error: %v", err)
|
|
return "", ErrGPGInvalidTokenSignature{
|
|
ID: key.KeyID,
|
|
}
|
|
}
|
|
|
|
if signer.PrimaryKeyID != key.KeyID && signer.KeyID != key.KeyID {
|
|
return "", ErrGPGKeyNotExist{}
|
|
}
|
|
|
|
key.Verified = true
|
|
if _, err := sess.ID(key.ID).SetExpr("verified", true).Update(new(GPGKey)); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
if err := sess.Commit(); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return key.KeyID, nil
|
|
}
|
|
|
|
// VerificationToken returns token for the user that will be valid in minutes (time)
|
|
func VerificationToken(user *User, minutes int) string {
|
|
return base.EncodeSha256(
|
|
time.Now().Truncate(1*time.Minute).Add(time.Duration(minutes)*time.Minute).Format(time.RFC1123Z) + ":" +
|
|
user.CreatedUnix.FormatLong() + ":" +
|
|
user.Name + ":" +
|
|
user.Email + ":" +
|
|
strconv.FormatInt(user.ID, 10))
|
|
}
|