mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
revert: tea 1.0 rewrite (#1122–#1126) (#1146)
Reverts #1126, #1125, #1124, #1123 and #1122. `go.mod` keeps the Go 1.26 line with toolchain `go1.26.9` (instead of the original `go1.26.6`) so the security fix from #1131 isn't lost. reopens #69 reopens #141 reopens #162 reopens #172 reopens #197 reopens #232 reopens #240 reopens #246 reopens #323 reopens #325 reopens #326 reopens #328 reopens #344 reopens #351 reopens #373 reopens #403 reopens #406 reopens #417 reopens #430 reopens #457 reopens #480 reopens #482 reopens #489 reopens #490 reopens #498 reopens #500 reopens #504 reopens #510 reopens #516 reopens #523 reopens #556 reopens #560 reopens #569 reopens #571 reopens #602 reopens #632 reopens #633 reopens #643 reopens #666 reopens #670 reopens #672 reopens #677 reopens #683 reopens #697 reopens #726 reopens #737 reopens #770 reopens #779 reopens #804 reopens #817 reopens #831 reopens #833 reopens #834 reopens #908 reopens #966 reopens #1023 reopens #1029 reopens #1032 reopens #1050 reopens #1052 reopens #1069 reopens #1073 reopens #1087 reopens #1091 reopens #1094 reopens #1110 reopens #1115 reopens #1116 reopens #1118 Reviewed-on: https://gitea.com/gitea/tea/pulls/1146 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
This commit is contained in:
1 parent
33bb12729e
commit
c5f674111a
604 files changed
+33711
-35545
No files matched your search
@@ -0,0 +1,87 @@
|
||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package utils
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/urfave/cli/v3"
|
||||
"golang.org/x/term"
|
||||
)
|
||||
|
||||
// ReadValueOptions contains options for reading a value from various sources
|
||||
type ReadValueOptions struct {
|
||||
// ResourceName is the name of the resource (e.g., "secret", "variable")
|
||||
ResourceName string
|
||||
// PromptMsg is the message to display when prompting interactively
|
||||
PromptMsg string
|
||||
// Hidden determines if the input should be hidden (for secrets/passwords)
|
||||
Hidden bool
|
||||
// AllowEmpty determines if empty values are allowed
|
||||
AllowEmpty bool
|
||||
}
|
||||
|
||||
// ReadValue reads a value from various sources in the following priority order:
|
||||
// 1. From a file specified by --file flag
|
||||
// 2. From stdin if --stdin flag is set
|
||||
// 3. From command arguments (second argument)
|
||||
// 4. Interactive prompt
|
||||
func ReadValue(cmd *cli.Command, opts ReadValueOptions) (string, error) {
|
||||
var value string
|
||||
|
||||
// 1. Read from file
|
||||
if filePath := cmd.String("file"); filePath != "" {
|
||||
content, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to read file: %w", err)
|
||||
}
|
||||
value = strings.TrimSpace(string(content))
|
||||
} else if cmd.Bool("stdin") {
|
||||
// 2. Read from stdin
|
||||
content, err := io.ReadAll(os.Stdin)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to read from stdin: %w", err)
|
||||
}
|
||||
value = strings.TrimSpace(string(content))
|
||||
} else if cmd.Args().Len() >= 2 {
|
||||
// 3. Use provided argument
|
||||
value = cmd.Args().Get(1)
|
||||
} else {
|
||||
// 4. Interactive prompt
|
||||
if opts.PromptMsg == "" {
|
||||
opts.PromptMsg = fmt.Sprintf("Enter %s value", opts.ResourceName)
|
||||
}
|
||||
fmt.Printf("%s: ", opts.PromptMsg)
|
||||
|
||||
if opts.Hidden {
|
||||
// Hidden input for secrets/passwords
|
||||
byteValue, err := term.ReadPassword(int(syscall.Stdin))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to read %s value: %w", opts.ResourceName, err)
|
||||
}
|
||||
fmt.Println() // Add newline after hidden input
|
||||
value = string(byteValue)
|
||||
} else {
|
||||
// Regular visible input - read entire line including spaces
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
input, err := reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to read %s value: %w", opts.ResourceName, err)
|
||||
}
|
||||
value = strings.TrimSpace(input)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate non-empty if required
|
||||
if !opts.AllowEmpty && value == "" {
|
||||
return "", fmt.Errorf("%s value cannot be empty", opts.ResourceName)
|
||||
}
|
||||
|
||||
return value, nil
|
||||
}
|
||||
Reference in new issue
Block a user