1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

Fix order by parameter (#19849)

Upgrade builder to v0.3.11
Upgrade xorm to v1.3.1 and fixed some hidden bugs.

Replace #19821
Replace #19834
Included #19850

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Lunny Xiao
2022-06-05 03:18:50 +08:00
committed by GitHub
parent 449ea6005f
commit 12c742f8dc
19 changed files with 175 additions and 72 deletions

View File

@@ -77,7 +77,7 @@ func (key *PublicKey) AuthorizedString() string {
func addKey(ctx context.Context, key *PublicKey) (err error) {
if len(key.Fingerprint) == 0 {
key.Fingerprint, err = calcFingerprint(key.Content)
key.Fingerprint, err = CalcFingerprint(key.Content)
if err != nil {
return err
}
@@ -95,7 +95,7 @@ func addKey(ctx context.Context, key *PublicKey) (err error) {
func AddPublicKey(ownerID int64, name, content string, authSourceID int64) (*PublicKey, error) {
log.Trace(content)
fingerprint, err := calcFingerprint(content)
fingerprint, err := CalcFingerprint(content)
if err != nil {
return nil, err
}

View File

@@ -116,7 +116,7 @@ func HasDeployKey(keyID, repoID int64) bool {
// AddDeployKey add new deploy key to database and authorized_keys file.
func AddDeployKey(repoID int64, name, content string, readOnly bool) (*DeployKey, error) {
fingerprint, err := calcFingerprint(content)
fingerprint, err := CalcFingerprint(content)
if err != nil {
return nil, err
}

View File

@@ -76,7 +76,8 @@ func calcFingerprintNative(publicKeyContent string) (string, error) {
return ssh.FingerprintSHA256(pk), nil
}
func calcFingerprint(publicKeyContent string) (string, error) {
// CalcFingerprint calculate public key's fingerprint
func CalcFingerprint(publicKeyContent string) (string, error) {
// Call the method based on configuration
var (
fnName, fp string