aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--http_global.go4
-rw-r--r--http_handle_repo_contrib_index.go6
-rw-r--r--http_handle_repo_index.go40
-rw-r--r--http_handle_repo_raw.go34
-rw-r--r--http_handle_repo_upload_pack.go16
-rw-r--r--remote_url.go8
-rw-r--r--ssh_server.go32
-rw-r--r--ssh_utils.go40
-rw-r--r--url.go2
-rw-r--r--users.go6
-rw-r--r--utils.go2
11 files changed, 94 insertions, 96 deletions
diff --git a/http_global.go b/http_global.go
index 0790b3c..f793c24 100644
--- a/http_global.go
+++ b/http_global.go
@@ -5,8 +5,8 @@ package main
// globalData is passed as "global" when rendering HTML templates.
var globalData = map[string]any{
- "server_public_key_string": &server_public_key_string,
- "server_public_key_fingerprint": &server_public_key_fingerprint,
+ "server_public_key_string": &serverPubkeyString,
+ "server_public_key_fingerprint": &serverPubkeyFP,
"forge_version": VERSION,
// Some other ones are populated after config parsing
}
diff --git a/http_handle_repo_contrib_index.go b/http_handle_repo_contrib_index.go
index 152c8cd..41c4d18 100644
--- a/http_handle_repo_contrib_index.go
+++ b/http_handle_repo_contrib_index.go
@@ -9,7 +9,7 @@ import (
"github.com/jackc/pgx/v5"
)
-type id_title_status_t struct {
+type idTitleStatus struct {
ID int
Title string
Status string
@@ -17,7 +17,7 @@ type id_title_status_t struct {
func httpHandleRepoContribIndex(w http.ResponseWriter, r *http.Request, params map[string]any) {
var rows pgx.Rows
- var result []id_title_status_t
+ var result []idTitleStatus
var err error
if rows, err = database.Query(r.Context(),
@@ -36,7 +36,7 @@ func httpHandleRepoContribIndex(w http.ResponseWriter, r *http.Request, params m
http.Error(w, "Error scanning merge request: "+err.Error(), http.StatusInternalServerError)
return
}
- result = append(result, id_title_status_t{id, title, status})
+ result = append(result, idTitleStatus{id, title, status})
}
if err = rows.Err(); err != nil {
http.Error(w, "Error ranging over merge requests: "+err.Error(), http.StatusInternalServerError)
diff --git a/http_handle_repo_index.go b/http_handle_repo_index.go
index 54fcd6b..0eab027 100644
--- a/http_handle_repo_index.go
+++ b/http_handle_repo_index.go
@@ -15,20 +15,20 @@ import (
func httpHandleRepoIndex(w http.ResponseWriter, r *http.Request, params map[string]any) {
var repo *git.Repository
- var repo_name string
- var group_path []string
+ var repoName string
+ var groupPath []string
var refHash plumbing.Hash
var err error
- var recent_commits []*object.Commit
- var commit_object *object.Commit
+ var recentCommits []*object.Commit
+ var commitObj *object.Commit
var tree *object.Tree
var notes []string
var branches []string
- var branches_ storer.ReferenceIter
+ var branchesIter storer.ReferenceIter
- repo, repo_name, group_path = params["repo"].(*git.Repository), params["repo_name"].(string), params["group_path"].([]string)
+ repo, repoName, groupPath = params["repo"].(*git.Repository), params["repo_name"].(string), params["group_path"].([]string)
- if strings.Contains(repo_name, "\n") || slice_contains_newline(group_path) {
+ if strings.Contains(repoName, "\n") || sliceContainsNewlines(groupPath) {
notes = append(notes, "Path contains newlines; HTTP Git access impossible")
}
@@ -37,27 +37,25 @@ func httpHandleRepoIndex(w http.ResponseWriter, r *http.Request, params map[stri
goto no_ref
}
- branches_, err = repo.Branches()
- if err != nil {
- }
- err = branches_.ForEach(func(branch *plumbing.Reference) error {
- branches = append(branches, branch.Name().Short())
- return nil
- })
- if err != nil {
+ branchesIter, err = repo.Branches()
+ if err == nil {
+ branchesIter.ForEach(func(branch *plumbing.Reference) error {
+ branches = append(branches, branch.Name().Short())
+ return nil
+ })
}
params["branches"] = branches
- if recent_commits, err = getRecentCommits(repo, refHash, 3); err != nil {
+ if recentCommits, err = getRecentCommits(repo, refHash, 3); err != nil {
goto no_ref
}
- params["commits"] = recent_commits
+ params["commits"] = recentCommits
- if commit_object, err = repo.CommitObject(refHash); err != nil {
+ if commitObj, err = repo.CommitObject(refHash); err != nil {
goto no_ref
}
- if tree, err = commit_object.Tree(); err != nil {
+ if tree, err = commitObj.Tree(); err != nil {
goto no_ref
}
@@ -66,8 +64,8 @@ func httpHandleRepoIndex(w http.ResponseWriter, r *http.Request, params map[stri
no_ref:
- params["http_clone_url"] = genHTTPRemoteURL(group_path, repo_name)
- params["ssh_clone_url"] = genSSHRemoteURL(group_path, repo_name)
+ params["http_clone_url"] = genHTTPRemoteURL(groupPath, repoName)
+ params["ssh_clone_url"] = genSSHRemoteURL(groupPath, repoName)
params["notes"] = notes
renderTemplate(w, "repo_index", params)
diff --git a/http_handle_repo_raw.go b/http_handle_repo_raw.go
index e26f438..e398856 100644
--- a/http_handle_repo_raw.go
+++ b/http_handle_repo_raw.go
@@ -15,57 +15,57 @@ import (
)
func httpHandleRepoRaw(w http.ResponseWriter, r *http.Request, params map[string]any) {
- var raw_path_spec, path_spec string
+ var rawPathSpec, pathSpec string
var repo *git.Repository
var refHash plumbing.Hash
- var commit_object *object.Commit
+ var commitObj *object.Commit
var tree *object.Tree
var err error
- raw_path_spec = params["rest"].(string)
- repo, path_spec = params["repo"].(*git.Repository), strings.TrimSuffix(raw_path_spec, "/")
- params["path_spec"] = path_spec
+ rawPathSpec = params["rest"].(string)
+ repo, pathSpec = params["repo"].(*git.Repository), strings.TrimSuffix(rawPathSpec, "/")
+ params["path_spec"] = pathSpec
if refHash, err = getRefHash(repo, params["ref_type"].(string), params["ref_name"].(string)); err != nil {
http.Error(w, "Error getting ref hash: "+err.Error(), http.StatusInternalServerError)
return
}
- if commit_object, err = repo.CommitObject(refHash); err != nil {
+ if commitObj, err = repo.CommitObject(refHash); err != nil {
http.Error(w, "Error getting commit object: "+err.Error(), http.StatusInternalServerError)
return
}
- if tree, err = commit_object.Tree(); err != nil {
+ if tree, err = commitObj.Tree(); err != nil {
http.Error(w, "Error getting file tree: "+err.Error(), http.StatusInternalServerError)
return
}
var target *object.Tree
- if path_spec == "" {
+ if pathSpec == "" {
target = tree
} else {
- if target, err = tree.Tree(path_spec); err != nil {
+ if target, err = tree.Tree(pathSpec); err != nil {
var file *object.File
- var file_contents string
- if file, err = tree.File(path_spec); err != nil {
+ var fileContent string
+ if file, err = tree.File(pathSpec); err != nil {
http.Error(w, "Error retrieving path: "+err.Error(), http.StatusInternalServerError)
return
}
- if len(raw_path_spec) != 0 && raw_path_spec[len(raw_path_spec)-1] == '/' {
- http.Redirect(w, r, "../"+path_spec, http.StatusSeeOther)
+ if len(rawPathSpec) != 0 && rawPathSpec[len(rawPathSpec)-1] == '/' {
+ http.Redirect(w, r, "../"+pathSpec, http.StatusSeeOther)
return
}
- if file_contents, err = file.Contents(); err != nil {
+ if fileContent, err = file.Contents(); err != nil {
http.Error(w, "Error reading file: "+err.Error(), http.StatusInternalServerError)
return
}
- fmt.Fprint(w, file_contents)
+ fmt.Fprint(w, fileContent)
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)
+ if len(rawPathSpec) != 0 && rawPathSpec[len(rawPathSpec)-1] != '/' {
+ http.Redirect(w, r, path.Base(pathSpec)+"/", http.StatusSeeOther)
return
}
diff --git a/http_handle_repo_upload_pack.go b/http_handle_repo_upload_pack.go
index 86f1ab3..a88297d 100644
--- a/http_handle_repo_upload_pack.go
+++ b/http_handle_repo_upload_pack.go
@@ -13,14 +13,14 @@ import (
)
func httpHandleUploadPack(w http.ResponseWriter, r *http.Request, params map[string]any) (err error) {
- var group_path []string
- var repo_name string
- var repo_path string
+ var groupPath []string
+ var repoName string
+ var repoPath string
var stdout io.ReadCloser
var stdin io.WriteCloser
var cmd *exec.Cmd
- group_path, repo_name = params["group_path"].([]string), params["repo_name"].(string)
+ groupPath, repoName = params["group_path"].([]string), params["repo_name"].(string)
if err := database.QueryRow(r.Context(), `
WITH RECURSIVE group_path_cte AS (
@@ -53,9 +53,9 @@ func httpHandleUploadPack(w http.ResponseWriter, r *http.Request, params map[str
WHERE c.depth = cardinality($1::text[])
AND r.name = $2
`,
- pgtype.FlatArray[string](group_path),
- repo_name,
- ).Scan(&repo_path); err != nil {
+ pgtype.FlatArray[string](groupPath),
+ repoName,
+ ).Scan(&repoPath); err != nil {
return err
}
@@ -64,7 +64,7 @@ func httpHandleUploadPack(w http.ResponseWriter, r *http.Request, params map[str
w.Header().Set("Transfer-Encoding", "chunked")
w.WriteHeader(http.StatusOK)
- cmd = exec.Command("git", "upload-pack", "--stateless-rpc", repo_path)
+ cmd = exec.Command("git", "upload-pack", "--stateless-rpc", repoPath)
cmd.Env = append(os.Environ(), "LINDENII_FORGE_HOOKS_SOCKET_PATH="+config.Hooks.Socket)
if stdout, err = cmd.StdoutPipe(); err != nil {
return err
diff --git a/remote_url.go b/remote_url.go
index c0f4fc1..f5ebfcd 100644
--- a/remote_url.go
+++ b/remote_url.go
@@ -10,10 +10,10 @@ import (
// We don't use path.Join because it collapses multiple slashes into one.
-func genSSHRemoteURL(group_path []string, repo_name string) string {
- return strings.TrimSuffix(config.SSH.Root, "/") + "/" + segmentsToURL(group_path) + "/:/repos/" + url.PathEscape(repo_name)
+func genSSHRemoteURL(groupPath []string, repoName string) string {
+ return strings.TrimSuffix(config.SSH.Root, "/") + "/" + segmentsToURL(groupPath) + "/:/repos/" + url.PathEscape(repoName)
}
-func genHTTPRemoteURL(group_path []string, repo_name string) string {
- return strings.TrimSuffix(config.HTTP.Root, "/") + "/" + segmentsToURL(group_path) + "/:/repos/" + url.PathEscape(repo_name)
+func genHTTPRemoteURL(groupPath []string, repoName string) string {
+ return strings.TrimSuffix(config.HTTP.Root, "/") + "/" + segmentsToURL(groupPath) + "/:/repos/" + url.PathEscape(repoName)
}
diff --git a/ssh_server.go b/ssh_server.go
index 42188fb..24495b8 100644
--- a/ssh_server.go
+++ b/ssh_server.go
@@ -9,42 +9,42 @@ import (
"os"
"strings"
- glider_ssh "github.com/gliderlabs/ssh"
+ gliderSSH "github.com/gliderlabs/ssh"
"go.lindenii.runxiyu.org/lindenii-common/ansiec"
"go.lindenii.runxiyu.org/lindenii-common/clog"
- go_ssh "golang.org/x/crypto/ssh"
+ goSSH "golang.org/x/crypto/ssh"
)
var (
- server_public_key_string string
- server_public_key_fingerprint string
- server_public_key go_ssh.PublicKey
+ serverPubkeyString string
+ serverPubkeyFP string
+ serverPubkey goSSH.PublicKey
)
func serveSSH(listener net.Listener) error {
var host_key_bytes []byte
- var host_key go_ssh.Signer
+ var host_key goSSH.Signer
var err error
- var server *glider_ssh.Server
+ var server *gliderSSH.Server
if host_key_bytes, err = os.ReadFile(config.SSH.Key); err != nil {
return err
}
- if host_key, err = go_ssh.ParsePrivateKey(host_key_bytes); err != nil {
+ if host_key, err = goSSH.ParsePrivateKey(host_key_bytes); err != nil {
return err
}
- server_public_key = host_key.PublicKey()
- server_public_key_string = string(go_ssh.MarshalAuthorizedKey(server_public_key))
- server_public_key_fingerprint = go_ssh.FingerprintSHA256(server_public_key)
+ serverPubkey = host_key.PublicKey()
+ serverPubkeyString = string(goSSH.MarshalAuthorizedKey(serverPubkey))
+ serverPubkeyFP = goSSH.FingerprintSHA256(serverPubkey)
- server = &glider_ssh.Server{
- Handler: func(session glider_ssh.Session) {
+ server = &gliderSSH.Server{
+ Handler: func(session gliderSSH.Session) {
client_public_key := session.PublicKey()
var client_public_key_string string
if client_public_key != nil {
- client_public_key_string = strings.TrimSuffix(string(go_ssh.MarshalAuthorizedKey(client_public_key)), "\n")
+ client_public_key_string = strings.TrimSuffix(string(goSSH.MarshalAuthorizedKey(client_public_key)), "\n")
}
clog.Info("Incoming SSH: " + session.RemoteAddr().String() + " " + client_public_key_string + " " + session.RawCommand())
@@ -79,8 +79,8 @@ func serveSSH(listener net.Listener) error {
return
}
},
- 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 },
+ PublicKeyHandler: func(ctx gliderSSH.Context, key gliderSSH.PublicKey) bool { return true },
+ KeyboardInteractiveHandler: func(ctx gliderSSH.Context, challenge goSSH.KeyboardInteractiveChallenge) bool { return true },
// It is intentional that we do not check any credentials and accept all connections.
// This allows all users to connect and clone repositories. However, the public key
// is passed to handlers, so e.g. the push handler could check the key and reject the
diff --git a/ssh_utils.go b/ssh_utils.go
index 7fa6cb8..562234e 100644
--- a/ssh_utils.go
+++ b/ssh_utils.go
@@ -14,14 +14,14 @@ import (
"go.lindenii.runxiyu.org/lindenii-common/ansiec"
)
-var err_ssh_illegal_endpoint = errors.New("illegal endpoint during SSH access")
+var errIllegalSSHRepoPath = errors.New("illegal SSH repo path")
-func getRepoInfo2(ctx context.Context, ssh_path, ssh_pubkey string) (group_path []string, repo_name string, repo_id int, repo_path string, direct_access bool, contrib_requirements, user_type string, user_id int, err error) {
+func getRepoInfo2(ctx context.Context, sshPath, sshPubkey string) (groupPath []string, repoName string, repoID int, repoPath string, directAccess bool, contribReq, userType string, userID int, err error) {
var segments []string
- var separator_index int
- var module_type, module_name string
+ var sepIndex int
+ var moduleType, moduleName string
- segments = strings.Split(strings.TrimPrefix(ssh_path, "/"), "/")
+ segments = strings.Split(strings.TrimPrefix(sshPath, "/"), "/")
for i, segment := range segments {
var err error
@@ -32,13 +32,13 @@ func getRepoInfo2(ctx context.Context, ssh_path, ssh_pubkey string) (group_path
}
if segments[0] == ":" {
- return []string{}, "", 0, "", false, "", "", 0, err_ssh_illegal_endpoint
+ return []string{}, "", 0, "", false, "", "", 0, errIllegalSSHRepoPath
}
- separator_index = -1
+ sepIndex = -1
for i, part := range segments {
if part == ":" {
- separator_index = i
+ sepIndex = i
break
}
}
@@ -47,22 +47,22 @@ func getRepoInfo2(ctx context.Context, ssh_path, ssh_pubkey string) (group_path
}
switch {
- case separator_index == -1:
- return []string{}, "", 0, "", false, "", "", 0, err_ssh_illegal_endpoint
- case len(segments) <= separator_index+2:
- return []string{}, "", 0, "", false, "", "", 0, err_ssh_illegal_endpoint
+ case sepIndex == -1:
+ return []string{}, "", 0, "", false, "", "", 0, errIllegalSSHRepoPath
+ case len(segments) <= sepIndex+2:
+ return []string{}, "", 0, "", false, "", "", 0, errIllegalSSHRepoPath
}
- group_path = segments[:separator_index]
- module_type = segments[separator_index+1]
- module_name = segments[separator_index+2]
- repo_name = module_name
- switch module_type {
+ groupPath = segments[:sepIndex]
+ moduleType = segments[sepIndex+1]
+ moduleName = segments[sepIndex+2]
+ repoName = moduleName
+ switch moduleType {
case "repos":
- _1, _2, _3, _4, _5, _6, _7 := getRepoInfo(ctx, group_path, module_name, ssh_pubkey)
- return group_path, repo_name, _1, _2, _3, _4, _5, _6, _7
+ _1, _2, _3, _4, _5, _6, _7 := getRepoInfo(ctx, groupPath, moduleName, sshPubkey)
+ return groupPath, repoName, _1, _2, _3, _4, _5, _6, _7
default:
- return []string{}, "", 0, "", false, "", "", 0, err_ssh_illegal_endpoint
+ return []string{}, "", 0, "", false, "", "", 0, errIllegalSSHRepoPath
}
}
diff --git a/url.go b/url.go
index 9809068..3978c6e 100644
--- a/url.go
+++ b/url.go
@@ -12,7 +12,7 @@ import (
var (
errDupRefSpec = errors.New("duplicate ref spec")
- errNoRefSpec = errors.New("no ref spec")
+ errNoRefSpec = errors.New("no ref spec")
)
func getParamRefTypeName(r *http.Request) (retRefType, retRefName string, err error) {
diff --git a/users.go b/users.go
index 98a5efe..f8dae4b 100644
--- a/users.go
+++ b/users.go
@@ -9,7 +9,7 @@ import (
"github.com/jackc/pgx/v5"
)
-func addUserSSH(ctx context.Context, pubkey string) (user_id int, err error) {
+func addUserSSH(ctx context.Context, pubkey string) (userID int, err error) {
var tx pgx.Tx
if tx, err = database.Begin(ctx); err != nil {
@@ -19,11 +19,11 @@ func addUserSSH(ctx context.Context, pubkey string) (user_id int, err error) {
_ = tx.Rollback(ctx)
}()
- if err = tx.QueryRow(ctx, `INSERT INTO users (type) VALUES ('pubkey_only') RETURNING id`).Scan(&user_id); err != nil {
+ if err = tx.QueryRow(ctx, `INSERT INTO users (type) VALUES ('pubkey_only') RETURNING id`).Scan(&userID); err != nil {
return
}
- if _, err = tx.Exec(ctx, `INSERT INTO ssh_public_keys (key_string, user_id) VALUES ($1, $2)`, pubkey, user_id); err != nil {
+ if _, err = tx.Exec(ctx, `INSERT INTO ssh_public_keys (key_string, user_id) VALUES ($1, $2)`, pubkey, userID); err != nil {
return
}
diff --git a/utils.go b/utils.go
index f0b352d..965a839 100644
--- a/utils.go
+++ b/utils.go
@@ -5,7 +5,7 @@ package main
import "strings"
-func slice_contains_newline(s []string) bool {
+func sliceContainsNewlines(s []string) bool {
for _, v := range s {
if strings.Contains(v, "\n") {
return true
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 15:00:09 +0000