234c3c711e
Build / build (push) Successful in 10m43s
Lift the static-site deploy pipeline from internal/staticsite/manager.go into internal/workload/plugin/source/static/ so plugin-native static workloads operate directly on plugin.Workload + the containers table + workload_env. The cmd/server/static_backend.go phantom-row adapter is gone; the legacy static_sites table is no longer touched on plugin deploys. Backend - new state.go: runtimeState (last_commit_sha, last_sync_at, last_error, status) persisted in containers.extra_json under the deterministic row id <workloadID>:site - per-workload sync.Mutex serializes saveState read-modify-write so parallel deploys for the same workload can't race container_id / proxy_route_id writes - extra_json round-trips through map[string]json.RawMessage so unknown keys survive — typed runtimeStateKeys are stripped before merge so clearing a typed field actually drops the key - new env.go reads workload_env (replaces static_site_secrets for plugin-native sites); decrypt-failure logs and skips one entry rather than failing the whole deploy - new build.go ports prepareDenoBuild + prepareStaticBuild + copyDir; copyDir uses filepath.WalkDir + Lstat to refuse symlinks and non-regular files - new deploy.go is the ~300-line core; intent.Reason gates force vs skip-if-no-changes; success-path saveState failure rolls back container + proxy route and writes "failed" state (no orphans) - new teardown.go combines Remove + Stop; idempotent on never-deployed workloads - new reconcile.go refreshes container state from Docker; flips runtimeState.Status to failed when the container is missing/crashed Hardening (from go-reviewer + security-reviewer subagent passes; 1 CRITICAL + 5 HIGH + 3 MEDIUM addressed before merge) - path-traversal defense in all 3 providers (gitea_content, github_provider, gitlab_provider): reject tree entries whose resolved local path escapes destDir - verifyDownloadInsideRoot walks the build dir post-download as a second line of defense - sanitizeError redacts the access token, collapses to one line, and clamps to 240 bytes before persisting to extra_json or fanning out to the notification webhook - container/image/volume names suffixed with workload-id short prefix (workload name is not UNIQUE in schema) - primaryDomain reads settings.Domain to complete a bare subdomain face into a full FQDN (matches legacy Manager behavior) - ctx-aware health-check sleep - json.Marshal for event metadata (was fmt.Sprintf JSON template) - strings.HasPrefix for failed-status detection (was brittle slice expression) Wire-up - cmd/server/main.go: removed wireStaticBackend(...) call; existing blank import on _ ".../source/static" drives init() registration - cmd/server/static_backend.go deleted Doc - WORKLOAD_REFACTOR_TODO: static port marked DONE; next focus is the hard legacy cutover (drop /api/projects, /api/stacks, /api/sites, /api/stages + their tables, internal/stack + internal/staticsite packages, frontend /projects /stacks /sites) Behavior notes for operators - plugin-native static workloads no longer write to static_sites; legacy /api/sites/* still serves original rows unchanged - legacy tinyforge.static-site / .static-site-name container labels dropped on plugin deploys; canonical tinyforge.workload.id / .kind cover ownership - container/image/volume names gained an 8-char ID suffix (e.g. dw-site-mysite-a1b2c3d4); legacy-deployed sites keep the old shape until redeployed through the plugin path
287 lines
7.5 KiB
Go
287 lines
7.5 KiB
Go
package staticsite
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// GitHubProvider implements GitProvider for GitHub repositories.
|
|
type GitHubProvider struct {
|
|
apiBase string // "https://api.github.com" for github.com
|
|
token string
|
|
httpClient *http.Client
|
|
}
|
|
|
|
// NewGitHubProvider creates a new GitHub provider.
|
|
// baseURL should be "https://github.com" or a GitHub Enterprise URL.
|
|
func NewGitHubProvider(baseURL, token string) *GitHubProvider {
|
|
apiBase := "https://api.github.com"
|
|
base := strings.TrimRight(baseURL, "/")
|
|
if base != "https://github.com" && base != "http://github.com" {
|
|
// GitHub Enterprise: API is at {base}/api/v3
|
|
apiBase = base + "/api/v3"
|
|
}
|
|
|
|
return &GitHubProvider{
|
|
apiBase: apiBase,
|
|
token: token,
|
|
httpClient: &http.Client{
|
|
Timeout: 60 * time.Second,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (g *GitHubProvider) Name() string { return "github" }
|
|
|
|
func (g *GitHubProvider) ListRepos(ctx context.Context, query string) ([]RepoInfo, error) {
|
|
var allRepos []RepoInfo
|
|
|
|
if query != "" {
|
|
// Use search API.
|
|
url := fmt.Sprintf("%s/search/repositories?q=%s&per_page=50", g.apiBase, query)
|
|
body, err := g.doGet(ctx, url)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("search repos: %w", err)
|
|
}
|
|
|
|
var result struct {
|
|
Items []struct {
|
|
Owner struct {
|
|
Login string `json:"login"`
|
|
} `json:"owner"`
|
|
Name string `json:"name"`
|
|
FullName string `json:"full_name"`
|
|
Description string `json:"description"`
|
|
Private bool `json:"private"`
|
|
HTMLURL string `json:"html_url"`
|
|
} `json:"items"`
|
|
}
|
|
if err := json.Unmarshal(body, &result); err != nil {
|
|
return nil, fmt.Errorf("decode search: %w", err)
|
|
}
|
|
for _, r := range result.Items {
|
|
allRepos = append(allRepos, RepoInfo{
|
|
Owner: r.Owner.Login, Name: r.Name, FullName: r.FullName,
|
|
Description: r.Description, Private: r.Private, HTMLURL: r.HTMLURL,
|
|
})
|
|
}
|
|
return allRepos, nil
|
|
}
|
|
|
|
// List authenticated user's repos.
|
|
page := 1
|
|
for {
|
|
url := fmt.Sprintf("%s/user/repos?per_page=100&page=%d&sort=updated", g.apiBase, page)
|
|
body, err := g.doGet(ctx, url)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list repos: %w", err)
|
|
}
|
|
|
|
var repos []struct {
|
|
Owner struct {
|
|
Login string `json:"login"`
|
|
} `json:"owner"`
|
|
Name string `json:"name"`
|
|
FullName string `json:"full_name"`
|
|
Description string `json:"description"`
|
|
Private bool `json:"private"`
|
|
HTMLURL string `json:"html_url"`
|
|
}
|
|
if err := json.Unmarshal(body, &repos); err != nil {
|
|
return nil, fmt.Errorf("decode repos: %w", err)
|
|
}
|
|
for _, r := range repos {
|
|
allRepos = append(allRepos, RepoInfo{
|
|
Owner: r.Owner.Login, Name: r.Name, FullName: r.FullName,
|
|
Description: r.Description, Private: r.Private, HTMLURL: r.HTMLURL,
|
|
})
|
|
}
|
|
if len(repos) < 100 {
|
|
break
|
|
}
|
|
page++
|
|
}
|
|
return allRepos, nil
|
|
}
|
|
|
|
func (g *GitHubProvider) TestConnection(ctx context.Context, owner, repo string) error {
|
|
url := fmt.Sprintf("%s/repos/%s/%s", g.apiBase, owner, repo)
|
|
_, err := g.doGet(ctx, url)
|
|
return err
|
|
}
|
|
|
|
func (g *GitHubProvider) ListBranches(ctx context.Context, owner, repo string) ([]string, error) {
|
|
var allBranches []string
|
|
page := 1
|
|
|
|
for {
|
|
url := fmt.Sprintf("%s/repos/%s/%s/branches?per_page=100&page=%d",
|
|
g.apiBase, owner, repo, page)
|
|
|
|
body, err := g.doGet(ctx, url)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list branches: %w", err)
|
|
}
|
|
|
|
var branches []struct {
|
|
Name string `json:"name"`
|
|
}
|
|
if err := json.Unmarshal(body, &branches); err != nil {
|
|
return nil, fmt.Errorf("decode branches: %w", err)
|
|
}
|
|
|
|
for _, b := range branches {
|
|
allBranches = append(allBranches, b.Name)
|
|
}
|
|
|
|
if len(branches) < 100 {
|
|
break
|
|
}
|
|
page++
|
|
}
|
|
|
|
return allBranches, nil
|
|
}
|
|
|
|
func (g *GitHubProvider) GetLatestCommitSHA(ctx context.Context, owner, repo, branch string) (string, error) {
|
|
url := fmt.Sprintf("%s/repos/%s/%s/branches/%s", g.apiBase, owner, repo, branch)
|
|
|
|
body, err := g.doGet(ctx, url)
|
|
if err != nil {
|
|
return "", fmt.Errorf("get branch: %w", err)
|
|
}
|
|
|
|
var result struct {
|
|
Commit struct {
|
|
SHA string `json:"sha"`
|
|
} `json:"commit"`
|
|
}
|
|
if err := json.Unmarshal(body, &result); err != nil {
|
|
return "", fmt.Errorf("decode branch: %w", err)
|
|
}
|
|
|
|
return result.Commit.SHA, nil
|
|
}
|
|
|
|
func (g *GitHubProvider) ListTree(ctx context.Context, owner, repo, branch string) ([]FolderEntry, error) {
|
|
url := fmt.Sprintf("%s/repos/%s/%s/git/trees/%s?recursive=1",
|
|
g.apiBase, owner, repo, branch)
|
|
|
|
body, err := g.doGet(ctx, url)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list tree: %w", err)
|
|
}
|
|
|
|
var tree struct {
|
|
Tree []struct {
|
|
Path string `json:"path"`
|
|
Type string `json:"type"` // "blob" or "tree"
|
|
} `json:"tree"`
|
|
}
|
|
if err := json.Unmarshal(body, &tree); err != nil {
|
|
return nil, fmt.Errorf("decode tree: %w", err)
|
|
}
|
|
|
|
entries := make([]FolderEntry, 0, len(tree.Tree))
|
|
for _, e := range tree.Tree {
|
|
entries = append(entries, FolderEntry{
|
|
Path: e.Path,
|
|
IsDir: e.Type == "tree",
|
|
})
|
|
}
|
|
|
|
return entries, nil
|
|
}
|
|
|
|
func (g *GitHubProvider) DownloadFolder(ctx context.Context, owner, repo, branch, folderPath, destDir string) error {
|
|
// Get tree to find files in folder.
|
|
entries, err := g.ListTree(ctx, owner, repo, branch)
|
|
if err != nil {
|
|
return fmt.Errorf("list tree: %w", err)
|
|
}
|
|
|
|
folderPath = strings.TrimPrefix(folderPath, "/")
|
|
folderPath = strings.TrimSuffix(folderPath, "/")
|
|
prefix := folderPath + "/"
|
|
|
|
for _, entry := range entries {
|
|
if entry.IsDir {
|
|
continue
|
|
}
|
|
if !strings.HasPrefix(entry.Path, prefix) {
|
|
continue
|
|
}
|
|
|
|
relativePath := strings.TrimPrefix(entry.Path, prefix)
|
|
localPath := filepath.Join(destDir, filepath.FromSlash(relativePath))
|
|
|
|
// Path-traversal defense: refuse tree entries whose resolved
|
|
// path escapes destDir. A hostile/compromised GHE could
|
|
// otherwise deliver `..`-laden entries.
|
|
cleanDest := filepath.Clean(destDir)
|
|
if cleanRel := filepath.Clean(localPath); cleanRel != cleanDest &&
|
|
!strings.HasPrefix(cleanRel, cleanDest+string(os.PathSeparator)) {
|
|
return fmt.Errorf("rejecting tree entry outside dest: %s", relativePath)
|
|
}
|
|
|
|
// GitHub raw content URL.
|
|
// For github.com: https://raw.githubusercontent.com/{owner}/{repo}/{branch}/{path}
|
|
// For GHE: {baseURL}/{owner}/{repo}/raw/{branch}/{path}
|
|
var fileURL string
|
|
if g.apiBase == "https://api.github.com" {
|
|
fileURL = fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/%s/%s",
|
|
owner, repo, branch, entry.Path)
|
|
} else {
|
|
// GHE: use API contents endpoint.
|
|
fileURL = fmt.Sprintf("%s/repos/%s/%s/contents/%s?ref=%s",
|
|
g.apiBase, owner, repo, entry.Path, branch)
|
|
}
|
|
|
|
if err := downloadFileHTTP(ctx, g.httpClient, fileURL, localPath, g.setAuth); err != nil {
|
|
return fmt.Errorf("download %s: %w", relativePath, err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (g *GitHubProvider) doGet(ctx context.Context, url string) ([]byte, error) {
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("create request: %w", err)
|
|
}
|
|
|
|
g.setAuth(req)
|
|
req.Header.Set("Accept", "application/vnd.github+json")
|
|
|
|
resp, err := g.httpClient.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("execute request: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read response: %w", err)
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, fmt.Errorf("unexpected status %d: %s", resp.StatusCode, string(body))
|
|
}
|
|
|
|
return body, nil
|
|
}
|
|
|
|
func (g *GitHubProvider) setAuth(req *http.Request) {
|
|
if g.token != "" {
|
|
req.Header.Set("Authorization", "Bearer "+g.token)
|
|
}
|
|
}
|