Fix template repository expansion for non-regular files

Author: lunny

models/asymkey/ssh_key_authorized_keys.go

@@ -17,21 +17,9 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
+	"golang.org/x/crypto/ssh"
 )
 
-//  _____          __  .__                 .__                  .___
-// /  _  \  __ ___/  |_|  |__   ___________|__|_______ ____   __| _/
-// /  /_\  \|  |  \   __\  |  \ /  _ \_  __ \  \___   // __ \ / __ |
-// /    |    \  |  /|  | |   Y  (  <_> )  | \/  |/    /\  ___// /_/ |
-// \____|__  /____/ |__| |___|  /\____/|__|  |__/_____ \\___  >____ |
-//         \/                 \/                      \/    \/     \/
-// ____  __.
-// |    |/ _|____ ___.__. ______
-// |      <_/ __ <   |  |/  ___/
-// |    |  \  ___/\___  |\___ \
-// |____|__ \___  > ____/____  >
-//         \/   \/\/         \/
-//
 // This file contains functions for creating authorized_keys files
 //
 // There is a dependence on the database within RegeneratePublicKeys however most of these functions probably belong in a module
@@ -49,6 +37,23 @@ func WithSSHOpLocker(f func() error) error {
 	return f()
 }
 
+// removeSSHKeyComment removes the trailing comment from an SSH public key line.
+func removeSSHKeyComment(pubKeyLine string) (string, error) {
+	pubKeyLine = strings.TrimSpace(pubKeyLine)
+	if pubKeyLine == "" || strings.HasPrefix(pubKeyLine, "#") {
+		return pubKeyLine, nil
+	}
+
+	pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(pubKeyLine))
+	if err != nil {
+		return "", fmt.Errorf("invalid public key: %w", err)
+	}
+
+	// MarshalAuthorizedKey returns "<type> <base64>\n"
+	key := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(pubKey)))
+	return key, nil
+}
+
 // AuthorizedStringForKey creates the authorized keys string appropriate for the provided key
 func AuthorizedStringForKey(key *PublicKey) string {
 	sb := &strings.Builder{}
@@ -60,7 +65,13 @@ func AuthorizedStringForKey(key *PublicKey) string {
 		"Key":         key,
 	})
 
-	return fmt.Sprintf(tplPublicKey, util.ShellEscape(sb.String()), key.Content)
+	content, err := removeSSHKeyComment(key.Content)
+	if err != nil {
+		log.Error("Failed to remove comment from SSH key ID %d: %v", key.ID, err)
+		content = key.Content
+	}
+
+	return fmt.Sprintf(tplPublicKey, util.ShellEscape(sb.String()), content)
 }
 
 // appendAuthorizedKeysToFile appends new SSH keys' content to authorized_keys file.

models/asymkey/ssh_key_authorized_keys_test.go

@@ -0,0 +1,16 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package asymkey
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_removeSSHKeyComment(t *testing.T) {
+	content, err := removeSSHKeyComment("ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINna5Jd6FTG4d87pUHnd/uLBr/6zGOVVFEQmdTs6k21L user@hostname")
+	assert.NoError(t, err)
+	assert.Equal(t, "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINna5Jd6FTG4d87pUHnd/uLBr/6zGOVVFEQmdTs6k21L", content)
+}

services/repository/generate.go

@@ -153,33 +153,43 @@ func processGiteaTemplateFile(ctx context.Context, tmpDir string, templateRepo,
 		if d.IsDir() {
 			return nil
 		}
+		fInfo, err := d.Info()
+		if err != nil {
+			return err
+		}
+		mode := fInfo.Mode()
+		if !mode.IsRegular() { // for symlinks and other special files, just skip
+			return nil
+		}
 
 		base := strings.TrimPrefix(filepath.ToSlash(path), tmpDirSlash)
 		for _, g := range giteaTemplateFile.Globs() {
-			if g.Match(base) {
-				content, err := os.ReadFile(path)
-				if err != nil {
-					return err
-				}
-
-				generatedContent := []byte(generateExpansion(ctx, string(content), templateRepo, generateRepo, false))
-				if err := os.WriteFile(path, generatedContent, 0o644); err != nil {
-					return err
-				}
-
-				substPath := filepath.FromSlash(filepath.Join(tmpDirSlash, generateExpansion(ctx, base, templateRepo, generateRepo, true)))
-
-				// Create parent subdirectories if needed or continue silently if it exists
-				if err = os.MkdirAll(filepath.Dir(substPath), 0o755); err != nil {
-					return err
-				}
-
-				// Substitute filename variables
-				if err = os.Rename(path, substPath); err != nil {
-					return err
-				}
-				break
+			if !g.Match(base) {
+				continue
+			}
+
+			content, err := os.ReadFile(path)
+			if err != nil {
+				return err
+			}
+
+			generatedContent := []byte(generateExpansion(ctx, string(content), templateRepo, generateRepo, false))
+			if err := os.WriteFile(path, generatedContent, 0o644); err != nil {
+				return err
+			}
+
+			substPath := filepath.FromSlash(filepath.Join(tmpDirSlash, generateExpansion(ctx, base, templateRepo, generateRepo, true)))
+
+			// Create parent subdirectories if needed or continue silently if it exists
+			if err = os.MkdirAll(filepath.Dir(substPath), 0o755); err != nil {
+				return err
+			}
+
+			// Substitute filename variables
+			if err = os.Rename(path, substPath); err != nil {
+				return err
 			}
+			break
 		}
 		return nil
 	}) // end: WalkDir