`20ffd30`

M slop: drop unused-import shims, sanitizerOnce, ErrTransient, stubCmd

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 5 days ago

SHA: 20ffd308528838af2341b37ed8ccd89b084aa292
Parents: c0c9bdf
Tree: e2ad52b

5 changed files

Status	File	+	-
M	`cmd/shithubd/hook.go`	0	4
D	`cmd/shithubd/stubs.go`	0	22
M	`internal/markdown/extensions/extensions.go`	8	21
M	`internal/markdown/sanitize.go`	2	9
M	`internal/repos/protection/protection.go`	9	7

cmd/shithubd/hook.gomodified

  	"strings"
  	"time"
--	"github.com/jackc/pgx/v5"
  	"github.com/jackc/pgx/v5/pgtype"
  	"github.com/jackc/pgx/v5/pgxpool"
  	"github.com/spf13/cobra"
  	rootCmd.AddCommand(hooksParentCmd)
  }
--// silence unused import warnings during incremental builds — the pgx
--// import is used through the hookCtx pool helper above.
--var _ = pgx.ErrNoRows

cmd/shithubd/stubs.godeleted

--// SPDX-License-Identifier: AGPL-3.0-or-later
--
--package main
--
--import (
--	"fmt"
--
--	"github.com/spf13/cobra"
--)
--
--// stubCmd returns a placeholder cobra command for subcommands scheduled in
--// later sprints. The sprint identifier is surfaced in the error so an
--// operator who hits the stub knows which sprint adds the implementation.
--func stubCmd(name, short, sprint string) *cobra.Command {
--	return &cobra.Command{
--		Use:   name,
--		Short: fmt.Sprintf("%s (planned in %s)", short, sprint),
--		RunE: func(cmd *cobra.Command, args []string) error {
--			return fmt.Errorf("%s: not yet implemented (planned in sprint %s)", name, sprint)
--		},
--	}
--}

internal/markdown/extensions/extensions.gomodified

  	"context"
  	"regexp"
  	"strconv"
--	"strings"
  	"github.com/yuin/goldmark"
  	"github.com/yuin/goldmark/ast"
  //	#6               commit prefix
  //	#7               emoji name
  var reCombined = regexp.MustCompile(`` +
--	// cross-repo: alice/proj#3
++	// cross-repo: alice/proj#3 — left boundary required so we don't
--	`([A-Za-z0-9][A-Za-z0-9._-]*)/([A-Za-z0-9][A-Za-z0-9._-]*)#([0-9]{1,9})\b` +
++	// chew into a preceding word (e.g. `xfoo/bar#3` should not be a
++	// match of `foo/bar#3`). Mirrors the same-repo / mention shape;
++	// the audit caught the asymmetry (S00-S25, M).
++	`(?:^|[^\w/])([A-Za-z0-9][A-Za-z0-9._-]*)/([A-Za-z0-9][A-Za-z0-9._-]*)#([0-9]{1,9})\b` +
  	// or same-repo: #3 — must have non-word non-/ boundary on the left
  	`|(?:^|[^\w/])#([0-9]{1,9})\b` +
  	// or mention: @alice — must have non-word boundary on the left
  		var contentStart int
  		switch {
  		case isCrossRepo:
++			// m[2] is the owner-start position (after the regex's
++			// leading non-word boundary char). Same shape as same-repo
++			// — emit the boundary char as plain text, then the link.
  			contentStart = m[2]
  		case isSameRepo:
  			contentStart = m[8] - 1 // include `#`
  	return true
+ }
--// trimLeadingNonWord drops the leading boundary char(s) — used when
--// a same-repo or mention token is rendered as plain text fallback.
--func trimLeadingNonWord(b []byte) []byte {
--	for len(b) > 0 && !isWordByte(b[0]) {
--		b = b[1:]
--	}
--	return b
--}
--
--func isWordByte(c byte) bool {
--	return c == '_' || (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
--}
--
--// silence unused-import warnings in a stripped build.
--var (
--	_ = strings.Builder{}
--	_ = trimLeadingNonWord
--)

internal/markdown/sanitize.gomodified

  import (
  	"regexp"
--	"sync"
  	"github.com/microcosm-cc/bluemonday"
+ )
  var reCodeClass = regexp.MustCompile(`^(?:language-[A-Za-z0-9_+\-]+|chroma|chroma-[a-zA-Z]+|nl|ln|line|hl)(?:\s+(?:language-[A-Za-z0-9_+\-]+|chroma|chroma-[a-zA-Z]+|nl|ln|line|hl))*$`)
  // sanitizeBytes is the hot-path entry the Render pipeline uses. The
--// bluemonday Policy is itself goroutine-safe; the once.Do here keeps
++// bluemonday Policy is built at package init via the var initializer
--// the regex compilation cost off the first request path.
++// above and is itself goroutine-safe — no need for sync.Once gymnastics.
--var sanitizerOnce sync.Once
--
  func sanitizeBytes(in []byte) []byte {
--	sanitizerOnce.Do(func() {
--		// Touch the package-level sanitizer to ensure it's built.
--		_ = sanitizer
--	})
  	return sanitizer.SanitizeBytes(in)
+ }

internal/repos/protection/protection.gomodified

  import (
  	"context"
--	"errors"
  	"fmt"
  	"path/filepath"
  	"sort"
  	}
  }
--// matchRule returns the rule with the longest pattern matching branch
++// MatchLongestRule returns the rule with the longest pattern matching
--// (alphabetical tiebreaker). Returns ok=false when no rule matches.
++// branch (alphabetical tiebreaker). Returns ok=false when no rule
++// matches. Exposed as the canonical pattern-match helper so the
++// `pulls` and `pulls/review` packages don't reimplement it (the audit
++// caught two near-identical copies — S00-S25 audit, M).
  //
  // Patterns use filepath.Match semantics:
  //   - `*` matches any sequence of non-separator chars (NOT crossing `/`)
  //   - `[abc]` matches one of a/b/c
  //
  // `release/*` matches `release/v1.0` but NOT `release/v1.0/sub`.
++func MatchLongestRule(rules []reposdb.BranchProtectionRule, branch string) (reposdb.BranchProtectionRule, bool) {
++	return matchRule(rules, branch)
++}
++
  func matchRule(rules []reposdb.BranchProtectionRule, branch string) (reposdb.BranchProtectionRule, bool) {
  	type cand struct {
  		rule reposdb.BranchProtectionRule
  	return fmt.Sprintf("shithub: %s (rule pattern %q).", d.Reason, d.Pattern)
  }
--// ErrTransient is returned by Enforce when DB connectivity is the
--// failure cause. Pre-receive maps this to "transient error; try
--// again" and rejects the push (fail closed per S20 spec).
--var ErrTransient = errors.New("protection: transient error")