diff options
| -rw-r--r-- | git_hooks_handle.go | 7 | ||||
| -rw-r--r-- | http_handle_repo_index.go | 2 | ||||
| -rw-r--r-- | ssh_handle_receive_pack.go | 6 | ||||
| -rw-r--r-- | ssh_server.go | 26 |
4 files changed, 20 insertions, 21 deletions
diff --git a/git_hooks_handle.go b/git_hooks_handle.go index a244a84..0bf7b88 100644 --- a/git_hooks_handle.go +++ b/git_hooks_handle.go @@ -303,10 +303,9 @@ func hooksHandler(conn net.Conn) { if allOK { fmt.Fprintln(sshStderr, "Overall "+ansiec.Green+"ACK"+ansiec.Reset+" (all checks passed)") return 0 - } else { - fmt.Fprintln(sshStderr, "Overall "+ansiec.Red+"NAK"+ansiec.Reset+" (one or more branches failed checks)") - return 1 } + fmt.Fprintln(sshStderr, "Overall "+ansiec.Red+"NAK"+ansiec.Reset+" (one or more branches failed checks)") + return 1 default: fmt.Fprintln(sshStderr, ansiec.Red+"Invalid hook:", args[0]+ansiec.Reset) return 1 @@ -329,7 +328,7 @@ func serveGitHooks(listener net.Listener) error { } func getUcred(conn net.Conn) (ucred *syscall.Ucred, err error) { - var unixConn *net.UnixConn = conn.(*net.UnixConn) + var unixConn = conn.(*net.UnixConn) var fd *os.File if fd, err = unixConn.File(); err != nil { diff --git a/http_handle_repo_index.go b/http_handle_repo_index.go index 0eab027..cb3fcdc 100644 --- a/http_handle_repo_index.go +++ b/http_handle_repo_index.go @@ -39,7 +39,7 @@ func httpHandleRepoIndex(w http.ResponseWriter, r *http.Request, params map[stri branchesIter, err = repo.Branches() if err == nil { - branchesIter.ForEach(func(branch *plumbing.Reference) error { + _ = branchesIter.ForEach(func(branch *plumbing.Reference) error { branches = append(branches, branch.Name().Short()) return nil }) diff --git a/ssh_handle_receive_pack.go b/ssh_handle_receive_pack.go index 81e94bc..ed1f765 100644 --- a/ssh_handle_receive_pack.go +++ b/ssh_handle_receive_pack.go @@ -60,17 +60,17 @@ func sshHandleRecvPack(session gliderSSH.Session, pubkey, repoIdentifier string) switch contribReq { case "closed": if !directAccess { - return errors.New("you need direct access to push to this repo.") + return errors.New("you need direct access to push to this repo") } case "registered_user": if userType != "registered" { - return errors.New("you need to be a registered user to push to this repo.") + return errors.New("you need to be a registered user to push to this repo") } case "ssh_pubkey": fallthrough case "federated": if pubkey == "" { - return errors.New("you need to have an SSH public key to push to this repo.") + return errors.New("you need to have an SSH public key to push to this repo") } if userType == "" { userID, err = addUserSSH(session.Context(), pubkey) diff --git a/ssh_server.go b/ssh_server.go index 24495b8..58a5acd 100644 --- a/ssh_server.go +++ b/ssh_server.go @@ -22,32 +22,32 @@ var ( ) func serveSSH(listener net.Listener) error { - var host_key_bytes []byte - var host_key goSSH.Signer + var hostKeyBytes []byte + var hostKey goSSH.Signer var err error var server *gliderSSH.Server - if host_key_bytes, err = os.ReadFile(config.SSH.Key); err != nil { + if hostKeyBytes, err = os.ReadFile(config.SSH.Key); err != nil { return err } - if host_key, err = goSSH.ParsePrivateKey(host_key_bytes); err != nil { + if hostKey, err = goSSH.ParsePrivateKey(hostKeyBytes); err != nil { return err } - serverPubkey = host_key.PublicKey() + serverPubkey = hostKey.PublicKey() serverPubkeyString = string(goSSH.MarshalAuthorizedKey(serverPubkey)) serverPubkeyFP = goSSH.FingerprintSHA256(serverPubkey) 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(goSSH.MarshalAuthorizedKey(client_public_key)), "\n") + clientPubkey := session.PublicKey() + var clientPubkeyStr string + if clientPubkey != nil { + clientPubkeyStr = strings.TrimSuffix(string(goSSH.MarshalAuthorizedKey(clientPubkey)), "\n") } - clog.Info("Incoming SSH: " + session.RemoteAddr().String() + " " + client_public_key_string + " " + session.RawCommand()) + clog.Info("Incoming SSH: " + session.RemoteAddr().String() + " " + clientPubkeyStr + " " + session.RawCommand()) fmt.Fprintln(session.Stderr(), ansiec.Blue+"Lindenii Forge "+VERSION+", source at "+strings.TrimSuffix(config.HTTP.Root, "/")+"/:/source/"+ansiec.Reset+"\r") cmd := session.Command() @@ -63,13 +63,13 @@ func serveSSH(listener net.Listener) error { fmt.Fprintln(session.Stderr(), "Too many arguments\r") return } - err = sshHandleUploadPack(session, client_public_key_string, cmd[1]) + err = sshHandleUploadPack(session, clientPubkeyStr, cmd[1]) case "git-receive-pack": if len(cmd) > 2 { fmt.Fprintln(session.Stderr(), "Too many arguments\r") return } - err = sshHandleRecvPack(session, client_public_key_string, cmd[1]) + err = sshHandleRecvPack(session, clientPubkeyStr, cmd[1]) default: fmt.Fprintln(session.Stderr(), "Unsupported command: "+cmd[0]+"\r") return @@ -87,7 +87,7 @@ func serveSSH(listener net.Listener) error { // push if it needs to. } - server.AddHostKey(host_key) + server.AddHostKey(hostKey) if err = server.Serve(listener); err != nil { clog.Fatal(1, "Serving SSH: "+err.Error()) |