aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acl.go2
-rw-r--r--config.go8
-rw-r--r--database.go2
-rw-r--r--fedauth.go2
-rw-r--r--git2d_deploy.go2
-rw-r--r--git_hooks_deploy.go6
-rw-r--r--git_hooks_handle_linux.go10
-rw-r--r--git_init.go2
-rw-r--r--git_misc.go2
-rw-r--r--http_auth.go2
-rw-r--r--http_handle_group_index.go14
-rw-r--r--http_handle_login.go6
-rw-r--r--http_handle_repo_contrib_index.go2
-rw-r--r--http_handle_repo_contrib_one.go2
-rw-r--r--http_handle_repo_index.go2
-rw-r--r--http_handle_repo_info.go2
-rw-r--r--http_handle_repo_raw.go2
-rw-r--r--http_handle_repo_tree.go2
-rw-r--r--http_handle_repo_upload_pack.go4
-rw-r--r--http_server.go10
-rw-r--r--irc.go24
-rw-r--r--lmtp_server.go16
-rw-r--r--remote_url.go4
-rw-r--r--server.go98
-rw-r--r--ssh_handle_receive_pack.go8
-rw-r--r--ssh_handle_upload_pack.go2
-rw-r--r--ssh_server.go10
-rw-r--r--users.go2
28 files changed, 124 insertions, 124 deletions
diff --git a/acl.go b/acl.go
index c4bf29f..aaf190b 100644
--- a/acl.go
+++ b/acl.go
@@ -14,7 +14,7 @@ import (
//
// TODO: Revamp.
func (s *Server) getRepoInfo(ctx context.Context, groupPath []string, repoName, sshPubkey string) (repoID int, fsPath string, access bool, contribReq, userType string, userID int, err error) {
- err = s.Database.QueryRow(ctx, `
+ err = s.database.QueryRow(ctx, `
WITH RECURSIVE group_path_cte AS (
-- Start: match the first name in the path where parent_group IS NULL
SELECT
diff --git a/config.go b/config.go
index 84633ea..3548478 100644
--- a/config.go
+++ b/config.go
@@ -84,19 +84,19 @@ func (s *Server) LoadConfig(path string) (err error) {
defer configFile.Close()
decoder := scfg.NewDecoder(bufio.NewReader(configFile))
- if err = decoder.Decode(&s.Config); err != nil {
+ if err = decoder.Decode(&s.config); err != nil {
return err
}
- if s.Config.DB.Type != "postgres" {
+ if s.config.DB.Type != "postgres" {
return errors.New("unsupported database type")
}
- if s.Database, err = pgxpool.New(context.Background(), s.Config.DB.Conn); err != nil {
+ if s.database, err = pgxpool.New(context.Background(), s.config.DB.Conn); err != nil {
return err
}
- s.GlobalData["forge_title"] = s.Config.General.Title
+ s.globalData["forge_title"] = s.config.General.Title
return nil
}
diff --git a/database.go b/database.go
index a627f2d..edfadbf 100644
--- a/database.go
+++ b/database.go
@@ -21,7 +21,7 @@ import (
func (s *Server) QueryNameDesc(ctx context.Context, query string, args ...any) (result []NameDesc, err error) {
var rows pgx.Rows
- if rows, err = s.Database.Query(ctx, query, args...); err != nil {
+ if rows, err = s.database.Query(ctx, query, args...); err != nil {
return nil, err
}
defer rows.Close()
diff --git a/fedauth.go b/fedauth.go
index fd84047..7866e58 100644
--- a/fedauth.go
+++ b/fedauth.go
@@ -77,7 +77,7 @@ func (s *Server) fedauth(ctx context.Context, userID int, service, remoteUsernam
}
var txn pgx.Tx
- if txn, err = s.Database.Begin(ctx); err != nil {
+ if txn, err = s.database.Begin(ctx); err != nil {
return false, err
}
defer func() {
diff --git a/git2d_deploy.go b/git2d_deploy.go
index 5a5f336..b75b63a 100644
--- a/git2d_deploy.go
+++ b/git2d_deploy.go
@@ -18,7 +18,7 @@ func (s *Server) deployGit2D() (err error) {
}
defer srcFD.Close()
- if dstFD, err = os.OpenFile(s.Config.Git.DaemonPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755); err != nil {
+ if dstFD, err = os.OpenFile(s.config.Git.DaemonPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755); err != nil {
return err
}
defer dstFD.Close()
diff --git a/git_hooks_deploy.go b/git_hooks_deploy.go
index eeda995..afab7f0 100644
--- a/git_hooks_deploy.go
+++ b/git_hooks_deploy.go
@@ -24,7 +24,7 @@ func (s *Server) deployHooks() (err error) {
}
defer srcFD.Close()
- if dstFD, err = os.OpenFile(filepath.Join(s.Config.Hooks.Execs, "hookc"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755); err != nil {
+ if dstFD, err = os.OpenFile(filepath.Join(s.config.Hooks.Execs, "hookc"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755); err != nil {
return err
}
defer dstFD.Close()
@@ -41,14 +41,14 @@ func (s *Server) deployHooks() (err error) {
// Go's embed filesystems do not store permissions; but in any case,
// they would need to be 0o755:
- if err = os.Chmod(filepath.Join(s.Config.Hooks.Execs, "hookc"), 0o755); err != nil {
+ if err = os.Chmod(filepath.Join(s.config.Hooks.Execs, "hookc"), 0o755); err != nil {
return err
}
for _, hookName := range []string{
"pre-receive",
} {
- if err = os.Symlink(filepath.Join(s.Config.Hooks.Execs, "hookc"), filepath.Join(s.Config.Hooks.Execs, hookName)); err != nil {
+ if err = os.Symlink(filepath.Join(s.config.Hooks.Execs, "hookc"), filepath.Join(s.config.Hooks.Execs, hookName)); err != nil {
if !errors.Is(err, fs.ErrExist) {
return err
}
diff --git a/git_hooks_handle_linux.go b/git_hooks_handle_linux.go
index 3d8c011..aba47d3 100644
--- a/git_hooks_handle_linux.go
+++ b/git_hooks_handle_linux.go
@@ -77,7 +77,7 @@ func (s *Server) hooksHandler(conn net.Conn) {
{
var ok bool
- packPass, ok = s.PackPasses.Load(misc.BytesToString(cookie))
+ packPass, ok = s.packPasses.Load(misc.BytesToString(cookie))
if !ok {
if _, err = conn.Write([]byte{1}); err != nil {
return
@@ -233,12 +233,12 @@ func (s *Server) hooksHandler(conn net.Conn) {
var newMRLocalID int
if packPass.userID != 0 {
- err = s.Database.QueryRow(ctx,
+ err = s.database.QueryRow(ctx,
"INSERT INTO merge_requests (repo_id, creator, source_ref, status) VALUES ($1, $2, $3, 'open') RETURNING repo_local_id",
packPass.repoID, packPass.userID, strings.TrimPrefix(refName, "refs/heads/"),
).Scan(&newMRLocalID)
} else {
- err = s.Database.QueryRow(ctx,
+ err = s.database.QueryRow(ctx,
"INSERT INTO merge_requests (repo_id, source_ref, status) VALUES ($1, $2, 'open') RETURNING repo_local_id",
packPass.repoID, strings.TrimPrefix(refName, "refs/heads/"),
).Scan(&newMRLocalID)
@@ -251,7 +251,7 @@ func (s *Server) hooksHandler(conn net.Conn) {
fmt.Fprintln(sshStderr, ansiec.Blue+"Created merge request at", mergeRequestWebURL+ansiec.Reset)
select {
- case s.IrcSendBuffered <- "PRIVMSG #chat :New merge request at " + mergeRequestWebURL:
+ case s.ircSendBuffered <- "PRIVMSG #chat :New merge request at " + mergeRequestWebURL:
default:
slog.Error("IRC SendQ exceeded")
}
@@ -259,7 +259,7 @@ func (s *Server) hooksHandler(conn net.Conn) {
var existingMRUser int
var isAncestor bool
- err = s.Database.QueryRow(ctx,
+ err = s.database.QueryRow(ctx,
"SELECT COALESCE(creator, 0) FROM merge_requests WHERE source_ref = $1 AND repo_id = $2",
strings.TrimPrefix(refName, "refs/heads/"), packPass.repoID,
).Scan(&existingMRUser)
diff --git a/git_init.go b/git_init.go
index b448451..d1922ee 100644
--- a/git_init.go
+++ b/git_init.go
@@ -23,7 +23,7 @@ func (s *Server) gitInit(repoPath string) (err error) {
return err
}
- gitConf.Raw.SetOption("core", gitFmtConfig.NoSubsection, "hooksPath", s.Config.Hooks.Execs)
+ gitConf.Raw.SetOption("core", gitFmtConfig.NoSubsection, "hooksPath", s.config.Hooks.Execs)
gitConf.Raw.SetOption("receive", gitFmtConfig.NoSubsection, "advertisePushOptions", "true")
if err = repo.SetConfig(gitConf); err != nil {
diff --git a/git_misc.go b/git_misc.go
index 8ba10e1..37f427b 100644
--- a/git_misc.go
+++ b/git_misc.go
@@ -23,7 +23,7 @@ import (
// request/router context in the future, as it cannot cover the nuance of
// fields needed.
func (s *Server) openRepo(ctx context.Context, groupPath []string, repoName string) (repo *git.Repository, description string, repoID int, fsPath string, err error) {
- err = s.Database.QueryRow(ctx, `
+ err = s.database.QueryRow(ctx, `
WITH RECURSIVE group_path_cte AS (
-- Start: match the first name in the path where parent_group IS NULL
SELECT
diff --git a/http_auth.go b/http_auth.go
index 5ba278b..44e087d 100644
--- a/http_auth.go
+++ b/http_auth.go
@@ -16,7 +16,7 @@ func (s *Server) getUserFromRequest(request *http.Request) (id int, username str
return
}
- err = s.Database.QueryRow(
+ err = s.database.QueryRow(
request.Context(),
"SELECT user_id, COALESCE(username, '') FROM users u JOIN sessions s ON u.id = s.user_id WHERE s.session_id = $1;",
sessionCookie.Value,
diff --git a/http_handle_group_index.go b/http_handle_group_index.go
index 3f6ed68..bb9c94f 100644
--- a/http_handle_group_index.go
+++ b/http_handle_group_index.go
@@ -28,7 +28,7 @@ func (s *Server) httpHandleGroupIndex(writer http.ResponseWriter, request *http.
groupPath = params["group_path"].([]string)
// The group itself
- err = s.Database.QueryRow(request.Context(), `
+ err = s.database.QueryRow(request.Context(), `
WITH RECURSIVE group_path_cte AS (
SELECT
id,
@@ -69,7 +69,7 @@ func (s *Server) httpHandleGroupIndex(writer http.ResponseWriter, request *http.
// ACL
var count int
- err = s.Database.QueryRow(request.Context(), `
+ err = s.database.QueryRow(request.Context(), `
SELECT COUNT(*)
FROM user_group_roles
WHERE user_id = $1
@@ -96,7 +96,7 @@ func (s *Server) httpHandleGroupIndex(writer http.ResponseWriter, request *http.
}
var newRepoID int
- err := s.Database.QueryRow(
+ err := s.database.QueryRow(
request.Context(),
`INSERT INTO repos (name, description, group_id, contrib_requirements)
VALUES ($1, $2, $3, $4)
@@ -111,9 +111,9 @@ func (s *Server) httpHandleGroupIndex(writer http.ResponseWriter, request *http.
return
}
- filePath := filepath.Join(s.Config.Git.RepoDir, strconv.Itoa(newRepoID)+".git")
+ filePath := filepath.Join(s.config.Git.RepoDir, strconv.Itoa(newRepoID)+".git")
- _, err = s.Database.Exec(
+ _, err = s.database.Exec(
request.Context(),
`UPDATE repos
SET filesystem_path = $1
@@ -137,7 +137,7 @@ func (s *Server) httpHandleGroupIndex(writer http.ResponseWriter, request *http.
// Repos
var rows pgx.Rows
- rows, err = s.Database.Query(request.Context(), `
+ rows, err = s.database.Query(request.Context(), `
SELECT name, COALESCE(description, '')
FROM repos
WHERE group_id = $1
@@ -162,7 +162,7 @@ func (s *Server) httpHandleGroupIndex(writer http.ResponseWriter, request *http.
}
// Subgroups
- rows, err = s.Database.Query(request.Context(), `
+ rows, err = s.database.Query(request.Context(), `
SELECT name, COALESCE(description, '')
FROM groups
WHERE parent_group = $1
diff --git a/http_handle_login.go b/http_handle_login.go
index e02ba10..e626719 100644
--- a/http_handle_login.go
+++ b/http_handle_login.go
@@ -35,7 +35,7 @@ func (s *Server) httpHandleLogin(writer http.ResponseWriter, request *http.Reque
username = request.PostFormValue("username")
password = request.PostFormValue("password")
- err = s.Database.QueryRow(request.Context(),
+ err = s.database.QueryRow(request.Context(),
"SELECT id, COALESCE(password, '') FROM users WHERE username = $1",
username,
).Scan(&userID, &passwordHash)
@@ -71,7 +71,7 @@ func (s *Server) httpHandleLogin(writer http.ResponseWriter, request *http.Reque
}
now = time.Now()
- expiry = now.Add(time.Duration(s.Config.HTTP.CookieExpiry) * time.Second)
+ expiry = now.Add(time.Duration(s.config.HTTP.CookieExpiry) * time.Second)
cookie = http.Cookie{
Name: "session",
@@ -85,7 +85,7 @@ func (s *Server) httpHandleLogin(writer http.ResponseWriter, request *http.Reque
http.SetCookie(writer, &cookie)
- _, err = s.Database.Exec(request.Context(), "INSERT INTO sessions (user_id, session_id) VALUES ($1, $2)", userID, cookieValue)
+ _, err = s.database.Exec(request.Context(), "INSERT INTO sessions (user_id, session_id) VALUES ($1, $2)", userID, cookieValue)
if err != nil {
errorPage500(writer, params, "Error inserting session: "+err.Error())
return
diff --git a/http_handle_repo_contrib_index.go b/http_handle_repo_contrib_index.go
index f729cbe..a4b1eac 100644
--- a/http_handle_repo_contrib_index.go
+++ b/http_handle_repo_contrib_index.go
@@ -23,7 +23,7 @@ func (s *Server) httpHandleRepoContribIndex(writer http.ResponseWriter, request
var result []idTitleStatus
var err error
- if rows, err = s.Database.Query(request.Context(),
+ if rows, err = s.database.Query(request.Context(),
"SELECT repo_local_id, COALESCE(title, 'Untitled'), status FROM merge_requests WHERE repo_id = $1",
params["repo_id"],
); err != nil {
diff --git a/http_handle_repo_contrib_one.go b/http_handle_repo_contrib_one.go
index 9a261a4..55af74c 100644
--- a/http_handle_repo_contrib_one.go
+++ b/http_handle_repo_contrib_one.go
@@ -33,7 +33,7 @@ func (s *Server) httpHandleRepoContribOne(writer http.ResponseWriter, request *h
}
mrIDInt = int(mrIDInt64)
- if err = s.Database.QueryRow(request.Context(),
+ if err = s.database.QueryRow(request.Context(),
"SELECT COALESCE(title, ''), status, source_ref, COALESCE(destination_branch, '') FROM merge_requests WHERE repo_id = $1 AND repo_local_id = $2",
params["repo_id"], mrIDInt,
).Scan(&title, &status, &srcRefStr, &dstBranchStr); err != nil {
diff --git a/http_handle_repo_index.go b/http_handle_repo_index.go
index 40fd9b0..d28311b 100644
--- a/http_handle_repo_index.go
+++ b/http_handle_repo_index.go
@@ -25,7 +25,7 @@ func (s *Server) httpHandleRepoIndex(w http.ResponseWriter, req *http.Request, p
_, repoPath, _, _, _, _, _ := s.getRepoInfo(req.Context(), groupPath, repoName, "") // TODO: Don't use getRepoInfo
- client, err := git2c.NewClient(s.Config.Git.Socket)
+ client, err := git2c.NewClient(s.config.Git.Socket)
if err != nil {
errorPage500(w, params, err.Error())
return
diff --git a/http_handle_repo_info.go b/http_handle_repo_info.go
index e2080ac..303fad7 100644
--- a/http_handle_repo_info.go
+++ b/http_handle_repo_info.go
@@ -21,7 +21,7 @@ func (s *Server) httpHandleRepoInfo(writer http.ResponseWriter, request *http.Re
repoName := params["repo_name"].(string)
var repoPath string
- if err := s.Database.QueryRow(request.Context(), `
+ if err := s.database.QueryRow(request.Context(), `
WITH RECURSIVE group_path_cte AS (
-- Start: match the first name in the path where parent_group IS NULL
SELECT
diff --git a/http_handle_repo_raw.go b/http_handle_repo_raw.go
index b714397..0407574 100644
--- a/http_handle_repo_raw.go
+++ b/http_handle_repo_raw.go
@@ -24,7 +24,7 @@ func (s *Server) httpHandleRepoRaw(writer http.ResponseWriter, request *http.Req
_, repoPath, _, _, _, _, _ := s.getRepoInfo(request.Context(), groupPath, repoName, "")
- client, err := git2c.NewClient(s.Config.Git.Socket)
+ client, err := git2c.NewClient(s.config.Git.Socket)
if err != nil {
errorPage500(writer, params, err.Error())
return
diff --git a/http_handle_repo_tree.go b/http_handle_repo_tree.go
index 00c6821..7667435 100644
--- a/http_handle_repo_tree.go
+++ b/http_handle_repo_tree.go
@@ -25,7 +25,7 @@ func (s *Server) httpHandleRepoTree(writer http.ResponseWriter, request *http.Re
_, repoPath, _, _, _, _, _ := s.getRepoInfo(request.Context(), groupPath, repoName, "")
- client, err := git2c.NewClient(s.Config.Git.Socket)
+ client, err := git2c.NewClient(s.config.Git.Socket)
if err != nil {
errorPage500(writer, params, err.Error())
return
diff --git a/http_handle_repo_upload_pack.go b/http_handle_repo_upload_pack.go
index 4c7291b..475c0a2 100644
--- a/http_handle_repo_upload_pack.go
+++ b/http_handle_repo_upload_pack.go
@@ -24,7 +24,7 @@ func (s *Server) httpHandleUploadPack(writer http.ResponseWriter, request *http.
groupPath, repoName = params["group_path"].([]string), params["repo_name"].(string)
- if err := s.Database.QueryRow(request.Context(), `
+ if err := s.database.QueryRow(request.Context(), `
WITH RECURSIVE group_path_cte AS (
-- Start: match the first name in the path where parent_group IS NULL
SELECT
@@ -67,7 +67,7 @@ func (s *Server) httpHandleUploadPack(writer http.ResponseWriter, request *http.
writer.WriteHeader(http.StatusOK)
cmd = exec.Command("git", "upload-pack", "--stateless-rpc", repoPath)
- cmd.Env = append(os.Environ(), "LINDENII_FORGE_HOOKS_SOCKET_PATH="+s.Config.Hooks.Socket)
+ cmd.Env = append(os.Environ(), "LINDENII_FORGE_HOOKS_SOCKET_PATH="+s.config.Hooks.Socket)
if stdout, err = cmd.StdoutPipe(); err != nil {
return err
}
diff --git a/http_server.go b/http_server.go
index cad3a3d..f5f6328 100644
--- a/http_server.go
+++ b/http_server.go
@@ -21,7 +21,7 @@ import (
// TODO: This function is way too large.
func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
var remoteAddr string
- if s.Config.HTTP.ReverseProxy {
+ if s.config.HTTP.ReverseProxy {
remoteAddrs, ok := request.Header["X-Forwarded-For"]
if ok && len(remoteAddrs) == 1 {
remoteAddr = remoteAddrs[0]
@@ -50,7 +50,7 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
params["url_segments"] = segments
params["dir_mode"] = dirMode
- params["global"] = s.GlobalData
+ params["global"] = s.globalData
var userID int // 0 for none
userID, params["username"], err = s.getUserFromRequest(request)
params["user_id"] = userID
@@ -87,10 +87,10 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
switch segments[1] {
case "static":
- s.StaticHandler.ServeHTTP(writer, request)
+ s.staticHandler.ServeHTTP(writer, request)
return
case "source":
- s.SourceHandler.ServeHTTP(writer, request)
+ s.sourceHandler.ServeHTTP(writer, request)
return
}
}
@@ -183,7 +183,7 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
repoURLRoot = repoURLRoot + url.PathEscape(part) + "/"
}
params["repo_url_root"] = repoURLRoot
- params["repo_patch_mailing_list"] = repoURLRoot[1:len(repoURLRoot)-1] + "@" + s.Config.LMTP.Domain
+ params["repo_patch_mailing_list"] = repoURLRoot[1:len(repoURLRoot)-1] + "@" + s.config.LMTP.Domain
params["http_clone_url"] = s.genHTTPRemoteURL(groupPath, moduleName)
params["ssh_clone_url"] = s.genSSHRemoteURL(groupPath, moduleName)
diff --git a/irc.go b/irc.go
index 298930f..4f4c5c9 100644
--- a/irc.go
+++ b/irc.go
@@ -19,10 +19,10 @@ type errorBack[T any] struct {
func (s *Server) ircBotSession() error {
var err error
var underlyingConn net.Conn
- if s.Config.IRC.TLS {
- underlyingConn, err = tls.Dial(s.Config.IRC.Net, s.Config.IRC.Addr, nil)
+ if s.config.IRC.TLS {
+ underlyingConn, err = tls.Dial(s.config.IRC.Net, s.config.IRC.Addr, nil)
} else {
- underlyingConn, err = net.Dial(s.Config.IRC.Net, s.Config.IRC.Addr)
+ underlyingConn, err = net.Dial(s.config.IRC.Net, s.config.IRC.Addr)
}
if err != nil {
return err
@@ -36,11 +36,11 @@ func (s *Server) ircBotSession() error {
return conn.WriteString(s + "\r\n")
}
- _, err = logAndWriteLn("NICK " + s.Config.IRC.Nick)
+ _, err = logAndWriteLn("NICK " + s.config.IRC.Nick)
if err != nil {
return err
}
- _, err = logAndWriteLn("USER " + s.Config.IRC.User + " 0 * :" + s.Config.IRC.Gecos)
+ _, err = logAndWriteLn("USER " + s.config.IRC.User + " 0 * :" + s.config.IRC.Gecos)
if err != nil {
return err
}
@@ -81,7 +81,7 @@ func (s *Server) ircBotSession() error {
if !ok {
slog.Error("unable to convert source of JOIN to client")
}
- if c.Nick != s.Config.IRC.Nick {
+ if c.Nick != s.config.IRC.Nick {
continue
}
default:
@@ -93,18 +93,18 @@ func (s *Server) ircBotSession() error {
select {
case err = <-readLoopError:
return err
- case line := <-s.IrcSendBuffered:
+ case line := <-s.ircSendBuffered:
_, err = logAndWriteLn(line)
if err != nil {
select {
- case s.IrcSendBuffered <- line:
+ case s.ircSendBuffered <- line:
default:
slog.Error("unable to requeue message", "line", line)
}
writeLoopAbort <- struct{}{}
return err
}
- case lineErrorBack := <-s.IrcSendDirectChan:
+ case lineErrorBack := <-s.ircSendDirectChan:
_, err = logAndWriteLn(lineErrorBack.content)
lineErrorBack.errorBack <- err
if err != nil {
@@ -120,7 +120,7 @@ func (s *Server) ircBotSession() error {
func (s *Server) ircSendDirect(line string) error {
ech := make(chan error, 1)
- s.IrcSendDirectChan <- errorBack[string]{
+ s.ircSendDirectChan <- errorBack[string]{
content: line,
errorBack: ech,
}
@@ -130,8 +130,8 @@ func (s *Server) ircSendDirect(line string) error {
// TODO: Delay and warnings?
func (s *Server) ircBotLoop() {
- s.IrcSendBuffered = make(chan string, s.Config.IRC.SendQ)
- s.IrcSendDirectChan = make(chan errorBack[string])
+ s.ircSendBuffered = make(chan string, s.config.IRC.SendQ)
+ s.ircSendDirectChan = make(chan errorBack[string])
for {
err := s.ircBotSession()
diff --git a/lmtp_server.go b/lmtp_server.go
index ae912c5..3abfdb6 100644
--- a/lmtp_server.go
+++ b/lmtp_server.go
@@ -66,10 +66,10 @@ func (*lmtpHandler) NewSession(_ *smtp.Conn) (smtp.Session, error) {
func (s *Server) serveLMTP(listener net.Listener) error {
smtpServer := smtp.NewServer(&lmtpHandler{})
smtpServer.LMTP = true
- smtpServer.Domain = s.Config.LMTP.Domain
- smtpServer.Addr = s.Config.LMTP.Socket
- smtpServer.WriteTimeout = time.Duration(s.Config.LMTP.WriteTimeout) * time.Second
- smtpServer.ReadTimeout = time.Duration(s.Config.LMTP.ReadTimeout) * time.Second
+ smtpServer.Domain = s.config.LMTP.Domain
+ smtpServer.Addr = s.config.LMTP.Socket
+ smtpServer.WriteTimeout = time.Duration(s.config.LMTP.WriteTimeout) * time.Second
+ smtpServer.ReadTimeout = time.Duration(s.config.LMTP.ReadTimeout) * time.Second
smtpServer.EnableSMTPUTF8 = true
return smtpServer.Serve(listener)
}
@@ -85,9 +85,9 @@ func (session *lmtpSession) Data(r io.Reader) error {
n int64
)
- n, err = io.CopyN(&buf, r, session.s.Config.LMTP.MaxSize)
+ n, err = io.CopyN(&buf, r, session.s.config.LMTP.MaxSize)
switch {
- case n == session.s.Config.LMTP.MaxSize:
+ case n == session.s.config.LMTP.MaxSize:
err = errors.New("Message too big.")
// drain whatever is left in the pipe
_, _ = io.Copy(io.Discard, r)
@@ -133,10 +133,10 @@ func (session *lmtpSession) Data(r io.Reader) error {
_ = from
for _, to := range to {
- if !strings.HasSuffix(to, "@"+session.s.Config.LMTP.Domain) {
+ if !strings.HasSuffix(to, "@"+session.s.config.LMTP.Domain) {
continue
}
- localPart := to[:len(to)-len("@"+session.s.Config.LMTP.Domain)]
+ localPart := to[:len(to)-len("@"+session.s.config.LMTP.Domain)]
var segments []string
segments, err = misc.PathToSegments(localPart)
if err != nil {
diff --git a/remote_url.go b/remote_url.go
index 8fc5528..a9d8bf2 100644
--- a/remote_url.go
+++ b/remote_url.go
@@ -15,11 +15,11 @@ import (
// genSSHRemoteURL generates SSH remote URLs from a given group path and repo
// name.
func (s *Server) genSSHRemoteURL(groupPath []string, repoName string) string {
- return strings.TrimSuffix(s.Config.SSH.Root, "/") + "/" + misc.SegmentsToURL(groupPath) + "/-/repos/" + url.PathEscape(repoName)
+ return strings.TrimSuffix(s.config.SSH.Root, "/") + "/" + misc.SegmentsToURL(groupPath) + "/-/repos/" + url.PathEscape(repoName)
}
// genHTTPRemoteURL generates HTTP remote URLs from a given group path and repo
// name.
func (s *Server) genHTTPRemoteURL(groupPath []string, repoName string) string {
- return strings.TrimSuffix(s.Config.HTTP.Root, "/") + "/" + misc.SegmentsToURL(groupPath) + "/-/repos/" + url.PathEscape(repoName)
+ return strings.TrimSuffix(s.config.HTTP.Root, "/") + "/" + misc.SegmentsToURL(groupPath) + "/-/repos/" + url.PathEscape(repoName)
}
diff --git a/server.go b/server.go
index c025f45..75226d4 100644
--- a/server.go
+++ b/server.go
@@ -21,32 +21,32 @@ import (
)
type Server struct {
- Config Config
+ config Config
- // Database serves as the primary Database handle for this entire application.
+ // database serves as the primary database handle for this entire application.
// Transactions or single reads may be used from it. A [pgxpool.Pool] is
// necessary to safely use pgx concurrently; pgx.Conn, etc. are insufficient.
- Database *pgxpool.Pool
+ database *pgxpool.Pool
- SourceHandler http.Handler
- StaticHandler http.Handler
+ sourceHandler http.Handler
+ staticHandler http.Handler
- IrcSendBuffered chan string
- IrcSendDirectChan chan errorBack[string]
+ ircSendBuffered chan string
+ ircSendDirectChan chan errorBack[string]
- // GlobalData is passed as "global" when rendering HTML templates.
- GlobalData map[string]any
+ // globalData is passed as "global" when rendering HTML templates.
+ globalData map[string]any
- ServerPubkeyString string
- ServerPubkeyFP string
- ServerPubkey goSSH.PublicKey
+ serverPubkeyString string
+ serverPubkeyFP string
+ serverPubkey goSSH.PublicKey
- // PackPasses contains hook cookies mapped to their packPass.
- PackPasses cmap.Map[string, packPass]
+ // packPasses contains hook cookies mapped to their packPass.
+ packPasses cmap.Map[string, packPass]
}
func (s *Server) Setup() {
- s.SourceHandler = http.StripPrefix(
+ s.sourceHandler = http.StripPrefix(
"/-/source/",
http.FileServer(http.FS(embeddedSourceFS)),
)
@@ -54,10 +54,10 @@ func (s *Server) Setup() {
if err != nil {
panic(err)
}
- s.StaticHandler = http.StripPrefix("/-/static/", http.FileServer(http.FS(staticFS)))
- s.GlobalData = map[string]any{
- "server_public_key_string": &s.ServerPubkeyString,
- "server_public_key_fingerprint": &s.ServerPubkeyFP,
+ s.staticHandler = http.StripPrefix("/-/static/", http.FileServer(http.FS(staticFS)))
+ s.globalData = map[string]any{
+ "server_public_key_string": &s.serverPubkeyString,
+ "server_public_key_fingerprint": &s.serverPubkeyFP,
"forge_version": VERSION,
// Some other ones are populated after config parsing
}
@@ -79,7 +79,7 @@ func (s *Server) Run() {
// Launch Git2D
go func() {
- cmd := exec.Command(s.Config.Git.DaemonPath, s.Config.Git.Socket) //#nosec G204
+ cmd := exec.Command(s.config.Git.DaemonPath, s.config.Git.Socket) //#nosec G204
cmd.Stderr = log.Writer()
cmd.Stdout = log.Writer()
if err := cmd.Run(); err != nil {
@@ -89,14 +89,14 @@ func (s *Server) Run() {
// UNIX socket listener for hooks
{
- hooksListener, err := net.Listen("unix", s.Config.Hooks.Socket)
+ hooksListener, err := net.Listen("unix", s.config.Hooks.Socket)
if errors.Is(err, syscall.EADDRINUSE) {
- slog.Warn("removing existing socket", "path", s.Config.Hooks.Socket)
- if err = syscall.Unlink(s.Config.Hooks.Socket); err != nil {
- slog.Error("removing existing socket", "path", s.Config.Hooks.Socket, "error", err)
+ slog.Warn("removing existing socket", "path", s.config.Hooks.Socket)
+ if err = syscall.Unlink(s.config.Hooks.Socket); err != nil {
+ slog.Error("removing existing socket", "path", s.config.Hooks.Socket, "error", err)
os.Exit(1)
}
- if hooksListener, err = net.Listen("unix", s.Config.Hooks.Socket); err != nil {
+ if hooksListener, err = net.Listen("unix", s.config.Hooks.Socket); err != nil {
slog.Error("listening hooks", "error", err)
os.Exit(1)
}
@@ -104,7 +104,7 @@ func (s *Server) Run() {
slog.Error("listening hooks", "error", err)
os.Exit(1)
}
- slog.Info("listening hooks on unix", "path", s.Config.Hooks.Socket)
+ slog.Info("listening hooks on unix", "path", s.config.Hooks.Socket)
go func() {
if err = s.serveGitHooks(hooksListener); err != nil {
slog.Error("serving hooks", "error", err)
@@ -115,14 +115,14 @@ func (s *Server) Run() {
// UNIX socket listener for LMTP
{
- lmtpListener, err := net.Listen("unix", s.Config.LMTP.Socket)
+ lmtpListener, err := net.Listen("unix", s.config.LMTP.Socket)
if errors.Is(err, syscall.EADDRINUSE) {
- slog.Warn("removing existing socket", "path", s.Config.LMTP.Socket)
- if err = syscall.Unlink(s.Config.LMTP.Socket); err != nil {
- slog.Error("removing existing socket", "path", s.Config.LMTP.Socket, "error", err)
+ slog.Warn("removing existing socket", "path", s.config.LMTP.Socket)
+ if err = syscall.Unlink(s.config.LMTP.Socket); err != nil {
+ slog.Error("removing existing socket", "path", s.config.LMTP.Socket, "error", err)
os.Exit(1)
}
- if lmtpListener, err = net.Listen("unix", s.Config.LMTP.Socket); err != nil {
+ if lmtpListener, err = net.Listen("unix", s.config.LMTP.Socket); err != nil {
slog.Error("listening LMTP", "error", err)
os.Exit(1)
}
@@ -130,7 +130,7 @@ func (s *Server) Run() {
slog.Error("listening LMTP", "error", err)
os.Exit(1)
}
- slog.Info("listening LMTP on unix", "path", s.Config.LMTP.Socket)
+ slog.Info("listening LMTP on unix", "path", s.config.LMTP.Socket)
go func() {
if err = s.serveLMTP(lmtpListener); err != nil {
slog.Error("serving LMTP", "error", err)
@@ -141,14 +141,14 @@ func (s *Server) Run() {
// SSH listener
{
- sshListener, err := net.Listen(s.Config.SSH.Net, s.Config.SSH.Addr)
- if errors.Is(err, syscall.EADDRINUSE) && s.Config.SSH.Net == "unix" {
- slog.Warn("removing existing socket", "path", s.Config.SSH.Addr)
- if err = syscall.Unlink(s.Config.SSH.Addr); err != nil {
- slog.Error("removing existing socket", "path", s.Config.SSH.Addr, "error", err)
+ sshListener, err := net.Listen(s.config.SSH.Net, s.config.SSH.Addr)
+ if errors.Is(err, syscall.EADDRINUSE) && s.config.SSH.Net == "unix" {
+ slog.Warn("removing existing socket", "path", s.config.SSH.Addr)
+ if err = syscall.Unlink(s.config.SSH.Addr); err != nil {
+ slog.Error("removing existing socket", "path", s.config.SSH.Addr, "error", err)
os.Exit(1)
}
- if sshListener, err = net.Listen(s.Config.SSH.Net, s.Config.SSH.Addr); err != nil {
+ if sshListener, err = net.Listen(s.config.SSH.Net, s.config.SSH.Addr); err != nil {
slog.Error("listening SSH", "error", err)
os.Exit(1)
}
@@ -156,7 +156,7 @@ func (s *Server) Run() {
slog.Error("listening SSH", "error", err)
os.Exit(1)
}
- slog.Info("listening SSH on", "net", s.Config.SSH.Net, "addr", s.Config.SSH.Addr)
+ slog.Info("listening SSH on", "net", s.config.SSH.Net, "addr", s.config.SSH.Addr)
go func() {
if err = s.serveSSH(sshListener); err != nil {
slog.Error("serving SSH", "error", err)
@@ -167,14 +167,14 @@ func (s *Server) Run() {
// HTTP listener
{
- httpListener, err := net.Listen(s.Config.HTTP.Net, s.Config.HTTP.Addr)
- if errors.Is(err, syscall.EADDRINUSE) && s.Config.HTTP.Net == "unix" {
- slog.Warn("removing existing socket", "path", s.Config.HTTP.Addr)
- if err = syscall.Unlink(s.Config.HTTP.Addr); err != nil {
- slog.Error("removing existing socket", "path", s.Config.HTTP.Addr, "error", err)
+ httpListener, err := net.Listen(s.config.HTTP.Net, s.config.HTTP.Addr)
+ if errors.Is(err, syscall.EADDRINUSE) && s.config.HTTP.Net == "unix" {
+ slog.Warn("removing existing socket", "path", s.config.HTTP.Addr)
+ if err = syscall.Unlink(s.config.HTTP.Addr); err != nil {
+ slog.Error("removing existing socket", "path", s.config.HTTP.Addr, "error", err)
os.Exit(1)
}
- if httpListener, err = net.Listen(s.Config.HTTP.Net, s.Config.HTTP.Addr); err != nil {
+ if httpListener, err = net.Listen(s.config.HTTP.Net, s.config.HTTP.Addr); err != nil {
slog.Error("listening HTTP", "error", err)
os.Exit(1)
}
@@ -184,11 +184,11 @@ func (s *Server) Run() {
}
server := http.Server{
Handler: s,
- ReadTimeout: time.Duration(s.Config.HTTP.ReadTimeout) * time.Second,
- WriteTimeout: time.Duration(s.Config.HTTP.ReadTimeout) * time.Second,
- IdleTimeout: time.Duration(s.Config.HTTP.ReadTimeout) * time.Second,
+ ReadTimeout: time.Duration(s.config.HTTP.ReadTimeout) * time.Second,
+ WriteTimeout: time.Duration(s.config.HTTP.ReadTimeout) * time.Second,
+ IdleTimeout: time.Duration(s.config.HTTP.ReadTimeout) * time.Second,
} //exhaustruct:ignore
- slog.Info("listening HTTP on", "net", s.Config.HTTP.Net, "addr", s.Config.HTTP.Addr)
+ slog.Info("listening HTTP on", "net", s.config.HTTP.Net, "addr", s.config.HTTP.Addr)
go func() {
if err = server.Serve(httpListener); err != nil && !errors.Is(err, http.ErrServerClosed) {
slog.Error("serving HTTP", "error", err)
diff --git a/ssh_handle_receive_pack.go b/ssh_handle_receive_pack.go
index 724c3fd..de6843a 100644
--- a/ssh_handle_receive_pack.go
+++ b/ssh_handle_receive_pack.go
@@ -51,7 +51,7 @@ func (s *Server) sshHandleRecvPack(session gliderSSH.Session, pubkey, repoIdenti
}
hooksPath := repoConfCore.OptionAll("hooksPath")
- if len(hooksPath) != 1 || hooksPath[0] != s.Config.Hooks.Execs {
+ if len(hooksPath) != 1 || hooksPath[0] != s.config.Hooks.Execs {
return errors.New("repository has hooksPath set to an unexpected value")
}
@@ -91,7 +91,7 @@ func (s *Server) sshHandleRecvPack(session gliderSSH.Session, pubkey, repoIdenti
fmt.Fprintln(session.Stderr(), "Error while generating cookie:", err)
}
- s.PackPasses.Store(cookie, packPass{
+ s.packPasses.Store(cookie, packPass{
session: session,
pubkey: pubkey,
directAccess: directAccess,
@@ -104,13 +104,13 @@ func (s *Server) sshHandleRecvPack(session gliderSSH.Session, pubkey, repoIdenti
contribReq: contribReq,
userType: userType,
})
- defer s.PackPasses.Delete(cookie)
+ defer s.packPasses.Delete(cookie)
// The Delete won't execute until proc.Wait returns unless something
// horribly wrong such as a panic occurs.
proc := exec.CommandContext(session.Context(), "git-receive-pack", repoPath)
proc.Env = append(os.Environ(),
- "LINDENII_FORGE_HOOKS_SOCKET_PATH="+s.Config.Hooks.Socket,
+ "LINDENII_FORGE_HOOKS_SOCKET_PATH="+s.config.Hooks.Socket,
"LINDENII_FORGE_HOOKS_COOKIE="+cookie,
)
proc.Stdin = session
diff --git a/ssh_handle_upload_pack.go b/ssh_handle_upload_pack.go
index 45ecfd8..34a1d9e 100644
--- a/ssh_handle_upload_pack.go
+++ b/ssh_handle_upload_pack.go
@@ -20,7 +20,7 @@ func (s *Server) sshHandleUploadPack(session glider_ssh.Session, pubkey, repoIde
}
proc := exec.CommandContext(session.Context(), "git-upload-pack", repoPath)
- proc.Env = append(os.Environ(), "LINDENII_FORGE_HOOKS_SOCKET_PATH="+s.Config.Hooks.Socket)
+ proc.Env = append(os.Environ(), "LINDENII_FORGE_HOOKS_SOCKET_PATH="+s.config.Hooks.Socket)
proc.Stdin = session
proc.Stdout = session
proc.Stderr = session.Stderr()
diff --git a/ssh_server.go b/ssh_server.go
index 07a1f34..bac7d53 100644
--- a/ssh_server.go
+++ b/ssh_server.go
@@ -25,7 +25,7 @@ func (s *Server) serveSSH(listener net.Listener) error {
var err error
var server *gliderSSH.Server
- if hostKeyBytes, err = os.ReadFile(s.Config.SSH.Key); err != nil {
+ if hostKeyBytes, err = os.ReadFile(s.config.SSH.Key); err != nil {
return err
}
@@ -33,9 +33,9 @@ func (s *Server) serveSSH(listener net.Listener) error {
return err
}
- s.ServerPubkey = hostKey.PublicKey()
- s.ServerPubkeyString = misc.BytesToString(goSSH.MarshalAuthorizedKey(s.ServerPubkey))
- s.ServerPubkeyFP = goSSH.FingerprintSHA256(s.ServerPubkey)
+ s.serverPubkey = hostKey.PublicKey()
+ s.serverPubkeyString = misc.BytesToString(goSSH.MarshalAuthorizedKey(s.serverPubkey))
+ s.serverPubkeyFP = goSSH.FingerprintSHA256(s.serverPubkey)
server = &gliderSSH.Server{
Handler: func(session gliderSSH.Session) {
@@ -46,7 +46,7 @@ func (s *Server) serveSSH(listener net.Listener) error {
}
slog.Info("incoming ssh", "addr", session.RemoteAddr().String(), "key", clientPubkeyStr, "command", session.RawCommand())
- fmt.Fprintln(session.Stderr(), ansiec.Blue+"Lindenii Forge "+VERSION+", source at "+strings.TrimSuffix(s.Config.HTTP.Root, "/")+"/-/source/"+ansiec.Reset+"\r")
+ fmt.Fprintln(session.Stderr(), ansiec.Blue+"Lindenii Forge "+VERSION+", source at "+strings.TrimSuffix(s.config.HTTP.Root, "/")+"/-/source/"+ansiec.Reset+"\r")
cmd := session.Command()
diff --git a/users.go b/users.go
index 3f57a35..2b529f3 100644
--- a/users.go
+++ b/users.go
@@ -15,7 +15,7 @@ import (
func (s *Server) addUserSSH(ctx context.Context, pubkey string) (userID int, err error) {
var txn pgx.Tx
- if txn, err = s.Database.Begin(ctx); err != nil {
+ if txn, err = s.database.Begin(ctx); err != nil {
return
}
defer func() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 10:21:00 +0000