Hi… I am well aware that this diff view is very suboptimal. It will be fixed when the refactored server comes along!
*.go: Use the database for repo info, and fix ssh cloning repo
package main import (
"context"
"errors" "io"
"path/filepath"
"strings"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object"
"go.lindenii.runxiyu.org/lindenii-common/misc"
)
var (
err_unsafe_path = errors.New("Unsafe path")
err_getting_commit_tree = errors.New("Error getting commit tree")
err_getting_patch_of_commit = errors.New("Error getting patch of commit")
err_getting_parent_commit_object = errors.New("Error getting parent commit object")
)
func open_git_repo(group_name, repo_name string) (*git.Repository, error) {
group_name, group_name_ok := misc.Sanitize_path(group_name)
if !group_name_ok {
return nil, err_unsafe_path
func open_git_repo(ctx context.Context, group_name, repo_name string) (*git.Repository, error) {
var fs_path string
err := database.QueryRow(ctx, "SELECT r.filesystem_path FROM repos r JOIN groups g ON r.group_id = g.id WHERE g.name = $1 AND r.name = $2;", group_name, repo_name).Scan(&fs_path)
if err != nil {
return nil, err
}
repo_name, repo_name_ok := misc.Sanitize_path(repo_name)
if !repo_name_ok {
return nil, err_unsafe_path
}
return git.PlainOpen(filepath.Join(config.Git.Root, group_name, repo_name+".git"))
return git.PlainOpen(fs_path)
}
type display_git_tree_entry_t struct {
Name string
Mode string
Size int64
Is_file bool
Is_subtree bool
}
func build_display_git_tree(tree *object.Tree) []display_git_tree_entry_t {
display_git_tree := make([]display_git_tree_entry_t, 0)
for _, entry := range tree.Entries {
display_git_tree_entry := display_git_tree_entry_t{}
os_mode, err := entry.Mode.ToOSFileMode()
if err != nil {
display_git_tree_entry.Mode = "x---"
} else {
display_git_tree_entry.Mode = os_mode.String()[:4]
}
display_git_tree_entry.Is_file = entry.Mode.IsFile()
display_git_tree_entry.Size, err = tree.Size(entry.Name)
if err != nil {
display_git_tree_entry.Size = 0
}
display_git_tree_entry.Name = strings.TrimPrefix(entry.Name, "/")
display_git_tree = append(display_git_tree, display_git_tree_entry)
}
return display_git_tree
}
var err_get_recent_commits = errors.New("Error getting recent commits")
func get_recent_commits(repo *git.Repository, head_hash plumbing.Hash, number_of_commits int) (recent_commits []*object.Commit, err error) {
commit_iter, err := repo.Log(&git.LogOptions{From: head_hash})
if err != nil {
err = misc.Wrap_one_error(err_get_recent_commits, err)
return nil, err
}
recent_commits = make([]*object.Commit, 0)
defer commit_iter.Close()
if number_of_commits < 0 {
for {
this_recent_commit, err := commit_iter.Next()
if errors.Is(err, io.EOF) {
return recent_commits, nil
} else if err != nil {
err = misc.Wrap_one_error(err_get_recent_commits, err)
return nil, err
}
recent_commits = append(recent_commits, this_recent_commit)
}
} else {
for range number_of_commits {
this_recent_commit, err := commit_iter.Next()
if errors.Is(err, io.EOF) {
return recent_commits, nil
} else if err != nil {
err = misc.Wrap_one_error(err_get_recent_commits, err)
return nil, err
}
recent_commits = append(recent_commits, this_recent_commit)
}
}
return recent_commits, err
}
func get_patch_from_commit(commit_object *object.Commit) (parent_commit_hash plumbing.Hash, patch *object.Patch, ret_err error) {
parent_commit_object, err := commit_object.Parent(0)
if errors.Is(err, object.ErrParentNotFound) {
commit_tree, err := commit_object.Tree()
if err != nil {
ret_err = misc.Wrap_one_error(err_getting_commit_tree, err)
return
}
patch, err = (&object.Tree{}).Patch(commit_tree)
if err != nil {
ret_err = misc.Wrap_one_error(err_getting_patch_of_commit, err)
return
}
} else if err != nil {
ret_err = misc.Wrap_one_error(err_getting_parent_commit_object, err)
return
} else {
parent_commit_hash = parent_commit_object.Hash
patch, err = parent_commit_object.Patch(commit_object)
if err != nil {
ret_err = misc.Wrap_one_error(err_getting_patch_of_commit, err)
return
}
}
return
}
package main import ( "net/http"
"os" "path/filepath" "strings"
)
func handle_group_repos(w http.ResponseWriter, r *http.Request, params map[string]string) {
data := make(map[string]any)
group_name := params["group_name"]
data["group_name"] = group_name
entries, err := os.ReadDir(filepath.Join(config.Git.Root, group_name))
var names []string rows, err := database.Query(r.Context(), "SELECT r.name FROM repos r JOIN groups g ON r.group_id = g.id WHERE g.name = $1;", group_name)
if err != nil {
_, _ = w.Write([]byte("Error listing repos: " + err.Error()))
_, _ = w.Write([]byte("Error getting groups: " + err.Error()))
return }
defer rows.Close()
repos := []string{}
for _, entry := range entries {
this_name := entry.Name()
if strings.HasSuffix(this_name, ".git") {
repos = append(repos, strings.TrimSuffix(this_name, ".git"))
for rows.Next() {
var name string
if err := rows.Scan(&name); err != nil {
_, _ = w.Write([]byte("Error scanning row: " + err.Error()))
return
}
names = append(names, name)
}
data["repos"] = repos
if err := rows.Err(); err != nil {
_, _ = w.Write([]byte("Error iterating over rows: " + err.Error()))
return
}
data["repos"] = names
err = templates.ExecuteTemplate(w, "group_repos", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
package main
import (
"net/http"
"strings"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/filemode"
"github.com/go-git/go-git/v5/plumbing/format/diff"
"go.lindenii.runxiyu.org/lindenii-common/misc"
)
type usable_file_patch struct {
From diff.File
To diff.File
Chunks []diff.Chunk
}
func handle_repo_commit(w http.ResponseWriter, r *http.Request, params map[string]string) {
data := make(map[string]any)
group_name, repo_name, commit_id_specified_string := params["group_name"], params["repo_name"], params["commit_id"]
data["group_name"], data["repo_name"] = group_name, repo_name
repo, err := open_git_repo(group_name, repo_name)
repo, err := open_git_repo(r.Context(), group_name, repo_name)
if err != nil {
_, _ = w.Write([]byte("Error opening repo: " + err.Error()))
return
}
commit_id_specified_string_without_suffix := strings.TrimSuffix(commit_id_specified_string, ".patch")
commit_id := plumbing.NewHash(commit_id_specified_string_without_suffix)
commit_object, err := repo.CommitObject(commit_id)
if err != nil {
_, _ = w.Write([]byte("Error getting commit object: " + err.Error()))
return
}
if commit_id_specified_string_without_suffix != commit_id_specified_string {
patch, err := format_patch_from_commit(commit_object)
if err != nil {
_, _ = w.Write([]byte("Error formatting patch: " + err.Error()))
return
}
_, _ = w.Write([]byte(patch))
return
}
commit_id_string := commit_object.Hash.String()
if commit_id_string != commit_id_specified_string {
http.Redirect(w, r, commit_id_string, http.StatusSeeOther)
return
}
data["commit_object"] = commit_object
data["commit_id"] = commit_id_string
parent_commit_hash, patch, err := get_patch_from_commit(commit_object)
if err != nil {
_, _ = w.Write([]byte("Error getting patch from commit: " + err.Error()))
return
}
data["parent_commit_hash"] = parent_commit_hash.String()
data["patch"] = patch
// TODO: Remove unnecessary context
// TODO: Prepend "+"/"-"/" " instead of solely distinguishing based on color
usable_file_patches := make([]usable_file_patch, 0)
for _, file_patch := range patch.FilePatches() {
from, to := file_patch.Files()
if from == nil {
from = fake_diff_file_null
}
if to == nil {
to = fake_diff_file_null
}
usable_file_patch := usable_file_patch{
Chunks: file_patch.Chunks(),
From: from,
To: to,
}
usable_file_patches = append(usable_file_patches, usable_file_patch)
}
data["file_patches"] = usable_file_patches
err = templates.ExecuteTemplate(w, "repo_commit", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
type fake_diff_file struct {
hash plumbing.Hash
mode filemode.FileMode
path string
}
func (f fake_diff_file) Hash() plumbing.Hash {
return f.hash
}
func (f fake_diff_file) Mode() filemode.FileMode {
return f.mode
}
func (f fake_diff_file) Path() string {
return f.path
}
var fake_diff_file_null = fake_diff_file{
hash: plumbing.NewHash("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"),
mode: misc.First_or_panic(filemode.New("100644")),
path: "",
}
package main
import (
"net/http"
)
func handle_repo_index(w http.ResponseWriter, r *http.Request, params map[string]string) {
data := make(map[string]any)
group_name, repo_name := params["group_name"], params["repo_name"]
data["group_name"], data["repo_name"] = group_name, repo_name
repo, err := open_git_repo(group_name, repo_name)
repo, err := open_git_repo(r.Context(), group_name, repo_name)
if err != nil {
_, _ = w.Write([]byte("Error opening repo: " + err.Error()))
return
}
head, err := repo.Head()
if err != nil {
_, _ = w.Write([]byte("Error getting repo HEAD: " + err.Error()))
return
}
data["ref"] = head.Name().Short()
head_hash := head.Hash()
recent_commits, err := get_recent_commits(repo, head_hash, 3)
if err != nil {
_, _ = w.Write([]byte("Error getting recent commits: " + err.Error()))
return
}
data["commits"] = recent_commits
commit_object, err := repo.CommitObject(head_hash)
if err != nil {
_, _ = w.Write([]byte("Error getting commit object: " + err.Error()))
return
}
tree, err := commit_object.Tree()
if err != nil {
_, _ = w.Write([]byte("Error getting file tree: " + err.Error()))
return
}
data["readme_filename"], data["readme"] = render_readme_at_tree(tree)
data["files"] = build_display_git_tree(tree)
err = templates.ExecuteTemplate(w, "repo_index", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
package main
import (
"net/http"
"github.com/go-git/go-git/v5/plumbing"
)
// TODO: I probably shouldn't include *all* commits here...
func handle_repo_log(w http.ResponseWriter, r *http.Request, params map[string]string) {
data := make(map[string]any)
group_name, repo_name, ref_name := params["group_name"], params["repo_name"], params["ref"]
data["group_name"], data["repo_name"], data["ref"] = group_name, repo_name, ref_name
repo, err := open_git_repo(group_name, repo_name)
repo, err := open_git_repo(r.Context(), group_name, repo_name)
if err != nil {
_, _ = w.Write([]byte("Error opening repo: " + err.Error()))
return
}
ref, err := repo.Reference(plumbing.NewBranchReferenceName(ref_name), true)
if err != nil {
_, _ = w.Write([]byte("Error getting repo reference: " + err.Error()))
return
}
ref_hash := ref.Hash()
commits, err := get_recent_commits(repo, ref_hash, -1)
if err != nil {
_, _ = w.Write([]byte("Error getting recent commits: " + err.Error()))
return
}
data["commits"] = commits
err = templates.ExecuteTemplate(w, "repo_log", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
package main
import (
"errors"
"net/http"
"path"
"strings"
"github.com/go-git/go-git/v5/plumbing/object"
)
func handle_repo_raw(w http.ResponseWriter, r *http.Request, params map[string]string) {
data := make(map[string]any)
raw_path_spec := params["rest"]
group_name, repo_name, path_spec := params["group_name"], params["repo_name"], strings.TrimSuffix(raw_path_spec, "/")
ref_type, ref_name, err := get_param_ref_and_type(r)
if err != nil {
if errors.Is(err, err_no_ref_spec) {
ref_type = "head"
} else {
_, _ = w.Write([]byte("Error querying ref type: " + err.Error()))
return
}
}
data["ref_type"], data["ref"], data["group_name"], data["repo_name"], data["path_spec"] = ref_type, ref_name, group_name, repo_name, path_spec
repo, err := open_git_repo(group_name, repo_name)
repo, err := open_git_repo(r.Context(), group_name, repo_name)
if err != nil {
_, _ = w.Write([]byte("Error opening repo: " + err.Error()))
return
}
ref_hash, err := get_ref_hash_from_type_and_name(repo, ref_type, ref_name)
if err != nil {
_, _ = w.Write([]byte("Error getting ref hash: " + err.Error()))
return
}
commit_object, err := repo.CommitObject(ref_hash)
if err != nil {
_, _ = w.Write([]byte("Error getting commit object: " + err.Error()))
return
}
tree, err := commit_object.Tree()
if err != nil {
_, _ = w.Write([]byte("Error getting file tree: " + err.Error()))
return
}
var target *object.Tree
if path_spec == "" {
target = tree
} else {
target, err = tree.Tree(path_spec)
if err != nil {
file, err := tree.File(path_spec)
if err != nil {
_, _ = w.Write([]byte("Error retrieving path: " + err.Error()))
return
}
if len(raw_path_spec) != 0 && raw_path_spec[len(raw_path_spec)-1] == '/' {
http.Redirect(w, r, "../"+path_spec, http.StatusSeeOther)
return
}
file_contents, err := file.Contents()
if err != nil {
_, _ = w.Write([]byte("Error reading file: " + err.Error()))
return
}
_, _ = w.Write([]byte(file_contents))
return
}
}
if len(raw_path_spec) != 0 && raw_path_spec[len(raw_path_spec)-1] != '/' {
http.Redirect(w, r, path.Base(path_spec)+"/", http.StatusSeeOther)
return
}
data["files"] = build_display_git_tree(target)
err = templates.ExecuteTemplate(w, "repo_raw_dir", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
package main
import (
"bytes"
"errors"
"html/template"
"net/http"
"path"
"strings"
chroma_formatters_html "github.com/alecthomas/chroma/v2/formatters/html"
chroma_lexers "github.com/alecthomas/chroma/v2/lexers"
chroma_styles "github.com/alecthomas/chroma/v2/styles"
"github.com/go-git/go-git/v5/plumbing/object"
)
func handle_repo_tree(w http.ResponseWriter, r *http.Request, params map[string]string) {
data := make(map[string]any)
raw_path_spec := params["rest"]
group_name, repo_name, path_spec := params["group_name"], params["repo_name"], strings.TrimSuffix(raw_path_spec, "/")
ref_type, ref_name, err := get_param_ref_and_type(r)
if err != nil {
if errors.Is(err, err_no_ref_spec) {
ref_type = "head"
} else {
_, _ = w.Write([]byte("Error querying ref type: " + err.Error()))
return
}
}
data["ref_type"], data["ref"], data["group_name"], data["repo_name"], data["path_spec"] = ref_type, ref_name, group_name, repo_name, path_spec
repo, err := open_git_repo(group_name, repo_name)
repo, err := open_git_repo(r.Context(), group_name, repo_name)
if err != nil {
_, _ = w.Write([]byte("Error opening repo: " + err.Error()))
return
}
ref_hash, err := get_ref_hash_from_type_and_name(repo, ref_type, ref_name)
if err != nil {
_, _ = w.Write([]byte("Error getting ref hash: " + err.Error()))
return
}
commit_object, err := repo.CommitObject(ref_hash)
if err != nil {
_, _ = w.Write([]byte("Error getting commit object: " + err.Error()))
return
}
tree, err := commit_object.Tree()
if err != nil {
_, _ = w.Write([]byte("Error getting file tree: " + err.Error()))
return
}
var target *object.Tree
if path_spec == "" {
target = tree
} else {
target, err = tree.Tree(path_spec)
if err != nil {
file, err := tree.File(path_spec)
if err != nil {
_, _ = w.Write([]byte("Error retrieving path: " + err.Error()))
return
}
if len(raw_path_spec) != 0 && raw_path_spec[len(raw_path_spec)-1] == '/' {
http.Redirect(w, r, "../"+path_spec, http.StatusSeeOther)
return
}
file_contents, err := file.Contents()
if err != nil {
_, _ = w.Write([]byte("Error reading file: " + err.Error()))
return
}
lexer := chroma_lexers.Match(path_spec)
if lexer == nil {
lexer = chroma_lexers.Fallback
}
iterator, err := lexer.Tokenise(nil, file_contents)
if err != nil {
_, _ = w.Write([]byte("Error tokenizing code: " + err.Error()))
return
}
var formatted_unencapsulated bytes.Buffer
style := chroma_styles.Get("autumn")
formatter := chroma_formatters_html.New(chroma_formatters_html.WithClasses(true), chroma_formatters_html.TabWidth(8))
err = formatter.Format(&formatted_unencapsulated, style, iterator)
if err != nil {
_, _ = w.Write([]byte("Error formatting code: " + err.Error()))
return
}
formatted_encapsulated := template.HTML(formatted_unencapsulated.Bytes())
data["file_contents"] = formatted_encapsulated
err = templates.ExecuteTemplate(w, "repo_tree_file", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
return
}
}
if len(raw_path_spec) != 0 && raw_path_spec[len(raw_path_spec)-1] != '/' {
http.Redirect(w, r, path.Base(path_spec)+"/", http.StatusSeeOther)
return
}
data["readme_filename"], data["readme"] = render_readme_at_tree(target)
data["files"] = build_display_git_tree(target)
err = templates.ExecuteTemplate(w, "repo_tree_dir", data)
if err != nil {
_, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
package main
import (
"context"
"errors"
"net/url"
"strings"
)
var err_ssh_illegal_endpoint = errors.New("Illegal endpoint during SSH access")
func get_repo_path_from_ssh_path(ctx context.Context, ssh_path string) (repo_path string, err error) {
segments := strings.Split(strings.TrimPrefix(ssh_path, "/"), "/")
for i, segment := range segments {
var err error
segments[i], err = url.QueryUnescape(segment)
if err != nil {
return "", err
}
}
if segments[0] == ":" {
return "", err_ssh_illegal_endpoint
}
separator_index := -1
for i, part := range segments {
if part == ":" {
separator_index = i
break
}
}
if segments[len(segments)-1] == "" {
segments = segments[:len(segments)-1]
}
switch {
case separator_index == -1:
return "", err_ssh_illegal_endpoint
case len(segments) <= separator_index+2:
return "", err_ssh_illegal_endpoint
}
group_name := segments[0]
module_type := segments[separator_index+1]
module_name := segments[separator_index+2]
switch module_type {
case "repos":
var fs_path string
err := database.QueryRow(ctx, "SELECT r.filesystem_path FROM repos r JOIN groups g ON r.group_id = g.id WHERE g.name = $1 AND r.name = $2;", group_name, module_name).Scan(&fs_path)
return fs_path, err
default:
return "", err_ssh_illegal_endpoint
}
}
package main
import (
"fmt"
"net"
"os"
"os/exec"
glider_ssh "github.com/gliderlabs/ssh"
"go.lindenii.runxiyu.org/lindenii-common/clog"
go_ssh "golang.org/x/crypto/ssh"
)
func serve_ssh() error {
hostKeyBytes, err := os.ReadFile(config.SSH.Key)
if err != nil {
return err
}
hostKey, err := go_ssh.ParsePrivateKey(hostKeyBytes)
if err != nil {
return err
}
server := &glider_ssh.Server{
Handler: func(session glider_ssh.Session) {
client_public_key := session.PublicKey()
var client_public_key_string string
if client_public_key != nil {
client_public_key_string = string(go_ssh.MarshalAuthorizedKey(client_public_key))
}
_ = client_public_key_string
cmd := session.Command()
if len(cmd) < 2 {
fmt.Fprintln(session.Stderr(), "Insufficient arguments")
return
}
if cmd[0] != "git-upload-pack" {
fmt.Fprintln(session.Stderr(), "Unsupported command")
return
}
proc := exec.CommandContext(session.Context(), cmd[0], "/home/runxiyu/git/forge.git")
fs_path, err := get_repo_path_from_ssh_path(session.Context(), cmd[1])
if err != nil {
fmt.Fprintln(session.Stderr(), "Error while getting repo path:", err)
return
}
proc := exec.CommandContext(session.Context(), cmd[0], fs_path)
proc.Stdin = session proc.Stdout = session proc.Stderr = session.Stderr()
err := proc.Start()
err = proc.Start()
if err != nil {
fmt.Fprintln(session.Stderr(), "Error while starting process:", err)
return
}
err = proc.Wait()
if exitError, ok := err.(*exec.ExitError); ok {
fmt.Fprintln(session.Stderr(), "Process exited with error", exitError.ExitCode())
} else if err != nil {
fmt.Fprintln(session.Stderr(), "Error while waiting for process:", err)
}
},
PublicKeyHandler: func(ctx glider_ssh.Context, key glider_ssh.PublicKey) bool { return true },
KeyboardInteractiveHandler: func(ctx glider_ssh.Context, challenge go_ssh.KeyboardInteractiveChallenge) bool { return true },
}
server.AddHostKey(hostKey)
listener, err := net.Listen("tcp", ":2222")
if err != nil {
return err
}
go func() {
err = server.Serve(listener)
if err != nil {
clog.Fatal(1, "Serving SSH: "+err.Error())
}
}()
return nil
}
package main
import (
"errors"
"net/http"
"net/url"
"strings"
"go.lindenii.runxiyu.org/lindenii-common/misc"
)
var (
err_duplicate_ref_spec = errors.New("Duplicate ref spec")
err_no_ref_spec = errors.New("No ref spec")
)
func get_param_ref_and_type(r *http.Request) (ref_type, ref string, err error) {
qr := r.URL.RawQuery
q, err := url.ParseQuery(qr)
if err != nil {
return
}
done := false
for _, _ref_type := range []string{"commit", "branch", "tag"} {
_ref, ok := q[_ref_type]
if ok {
if done {
err = err_duplicate_ref_spec
return
} else {
done = true
if len(_ref) != 1 {
err = err_duplicate_ref_spec
return
}
ref = _ref[0]
ref_type = _ref_type
}
}
}
if !done {
err = err_no_ref_spec
}
return
}
func parse_request_uri(request_uri string) (segments []string, params url.Values, err error) {
path, params_string, _ := strings.Cut(request_uri, "?")
segments = strings.Split(strings.TrimPrefix(path, "/"), "/")
for i, segment := range segments {
segments[i], _ = url.QueryUnescape(segment)
segments[i], err = url.QueryUnescape(segment)
if err != nil {
return nil, nil, misc.Wrap_one_error(err_bad_request, err)
}
}
params, err = url.ParseQuery(params_string)
if err != nil {
return nil, nil, misc.Wrap_one_error(err_bad_request, err)
}
return
}