From 2911b6e0a248bedf564641d867336747fcac2f5f Mon Sep 17 00:00:00 2001 From: pomidorry Date: Sat, 16 May 2026 23:12:10 +0300 Subject: [PATCH] adapt to single-return util.CryptoRandomString --- modules/ssh/agent.go | 6 +----- modules/ssh/agent_windows.go | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/ssh/agent.go b/modules/ssh/agent.go index de118f8942..ed696fcc99 100644 --- a/modules/ssh/agent.go +++ b/modules/ssh/agent.go @@ -166,11 +166,7 @@ func CreateTemporaryAgent(privateKey ed25519.PrivateKey) (string, func(), error) return "", nil, err } - agentID, err := util.CryptoRandomString(16) - if err != nil { - agent.Close() - return "", nil, fmt.Errorf("failed to generate agent ID: %w", err) - } + agentID := util.CryptoRandomString(16) globalAgentManager.mu.Lock() globalAgentManager.agents[agentID] = agent diff --git a/modules/ssh/agent_windows.go b/modules/ssh/agent_windows.go index ae88bb6140..653e9e4acd 100644 --- a/modules/ssh/agent_windows.go +++ b/modules/ssh/agent_windows.go @@ -17,10 +17,7 @@ import ( // createAgentListener creates a Windows named pipe listener for the SSH agent. // Returns the listener, pipe path, and a cleanup function for early-return error paths. func createAgentListener() (net.Listener, string, func(), error) { - agentID, err := util.CryptoRandomString(16) - if err != nil { - return nil, "", nil, fmt.Errorf("failed to generate agent ID: %w", err) - } + agentID := util.CryptoRandomString(16) pipePath := `\\.\pipe\gitea-ssh-agent-` + agentID listener, err := winio.ListenPipe(pipePath, nil)