sneak
3bfbb3fbe2
All checks were successful
check / check (push) Successful in 35s
- Add canonical .golangci.yml (v2 schema, default: all, project thresholds for lll/funlen/cyclop/dupl) - Bump golangci-lint pins from v2.0.2 to v2.12.2 in Makefile (go install, new /v2 module path) and Dockerfile (tagged+digest Debian image pin) - Fix all lint findings surfaced by the new linter set across cmd/mfer, internal/bork, internal/cli, internal/log, and mfer: static sentinel errors (err113), context-aware HTTP and exec (noctx), guarded integer conversions and stricter permissions (gosec), named constants (mnd, goconst), function decomposition (funlen, cyclop, gocognit, nestif), declaration ordering (funcorder), t.Parallel/t.TempDir/t.Setenv adoption in tests (paralleltest, usetesting), protobuf getters (protogetter), plus formatting and style cleanups (wsl_v5, nlreturn, lll, revive, testifylint, and others) - Serialize CLI runs in tests behind a mutex so parallel tests do not cross-wire the process-global logger's captured output The decompositions are behavior-preserving. In particular: - REPO_POLICIES.md is untouched and stays byte-identical to the authoritative copy in the prompts repo - the mfer.manifest type stays unexported; whether to export it is an open owner design question (README question 13) - directories created by fetch keep mode 0755, because fetched trees are content meant to be readable by other uids - an absent MFFilePath.Mtime is handled explicitly and identically in freshen, list, and export rather than being read as the Unix epoch, which would classify every entry as changed and rewrite the manifest on every freshen - every user-visible error message renders byte-identically to what it did before, with the err113 sentinels wrapped mid-sentence where needed; the rendered strings are now pinned by tests Also fixes an argument-injection defect the lint pass surfaced: key IDs reach gpg as bare positional arguments, so a key ID beginning with "-" was parsed by gpg as an option. All positional arguments now follow an explicit "--" end-of-options marker. The symlink-escape gap in fetch's path handling, which sanitizePath does not and cannot address, is filed separately as #86.
87 lines
2.2 KiB
Go
87 lines
2.2 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/urfave/cli/v2"
|
|
)
|
|
|
|
// manifestFetchTimeout bounds HTTP requests made to fetch a manifest.
|
|
const manifestFetchTimeout = 30 * time.Second
|
|
|
|
// errHTTPStatus indicates an HTTP response with a non-OK status code.
|
|
//
|
|
// Its text is the literal "HTTP" prefix of the rendered "HTTP <code>"
|
|
// message that mfer has always printed, so that wrapping it does not
|
|
// change any user-visible output. Match it with errors.Is; do not read
|
|
// its message.
|
|
var errHTTPStatus = errors.New("HTTP")
|
|
|
|
// isHTTPURL returns true if the string starts with http:// or https://.
|
|
func isHTTPURL(s string) bool {
|
|
return strings.HasPrefix(s, "http://") || strings.HasPrefix(s, "https://")
|
|
}
|
|
|
|
// openManifestReader opens a manifest from a path or URL and returns a ReadCloser.
|
|
// The caller must close the returned reader.
|
|
func (mfa *CLIApp) openManifestReader(pathOrURL string) (io.ReadCloser, error) {
|
|
if isHTTPURL(pathOrURL) {
|
|
client := &http.Client{Timeout: manifestFetchTimeout}
|
|
|
|
req, err := http.NewRequestWithContext(
|
|
context.Background(), http.MethodGet, pathOrURL, nil,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to fetch %s: %w", pathOrURL, err)
|
|
}
|
|
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to fetch %s: %w", pathOrURL, err)
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
_ = resp.Body.Close()
|
|
|
|
return nil, fmt.Errorf("failed to fetch %s: %w %d",
|
|
pathOrURL, errHTTPStatus, resp.StatusCode)
|
|
}
|
|
|
|
return resp.Body, nil
|
|
}
|
|
|
|
f, err := mfa.Fs.Open(pathOrURL)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return f, nil
|
|
}
|
|
|
|
// resolveManifestArg resolves the manifest path from CLI arguments.
|
|
// HTTP(S) URLs are returned as-is. Directories are searched for index.mf/.index.mf.
|
|
// If no argument is given, the current directory is searched.
|
|
func (mfa *CLIApp) resolveManifestArg(ctx *cli.Context) (string, error) {
|
|
if ctx.Args().Len() > 0 {
|
|
arg := ctx.Args().Get(0)
|
|
if isHTTPURL(arg) {
|
|
return arg, nil
|
|
}
|
|
|
|
info, statErr := mfa.Fs.Stat(arg)
|
|
if statErr == nil && info.IsDir() {
|
|
return findManifest(mfa.Fs, arg)
|
|
}
|
|
|
|
return arg, nil
|
|
}
|
|
|
|
return findManifest(mfa.Fs, ".")
|
|
}
|