From 2590b0df1fa155c0d97be1fb536f1c2e7cb5ba73 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Tue, 1 Apr 2025 22:08:58 +0800 Subject: Change the main separator from : to - Implements: https://todo.sr.ht/~runxiyu/forge/28 --- http_server.go | 6 +++--- lmtp_server.go | 2 +- ssh_utils.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/http_server.go b/http_server.go index 6520037..df8f362 100644 --- a/http_server.go +++ b/http_server.go @@ -70,7 +70,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht return } - if segments[0] == ":" { + if segments[0] == "-" { if len(segments) < 2 { errorPage404(writer, params) return @@ -91,7 +91,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht } } - if segments[0] == ":" { + if segments[0] == "-" { switch segments[1] { case "login": httpHandleLogin(writer, request, params) @@ -110,7 +110,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht sepIndex = -1 for i, part := range segments { - if part == ":" { + if part == "-" { sepIndex = i break } diff --git a/lmtp_server.go b/lmtp_server.go index 10ce836..f16149d 100644 --- a/lmtp_server.go +++ b/lmtp_server.go @@ -136,7 +136,7 @@ func (session *lmtpSession) Data(r io.Reader) error { } sepIndex := -1 for i, part := range segments { - if part == ":" { + if part == "-" { sepIndex = i break } diff --git a/ssh_utils.go b/ssh_utils.go index 6a9a480..54e9cb0 100644 --- a/ssh_utils.go +++ b/ssh_utils.go @@ -35,13 +35,13 @@ func getRepoInfo2(ctx context.Context, sshPath, sshPubkey string) (groupPath []s } } - if segments[0] == ":" { + if segments[0] == "-" { return []string{}, "", 0, "", false, "", "", 0, errIllegalSSHRepoPath } sepIndex = -1 for i, part := range segments { - if part == ":" { + if part == "-" { sepIndex = i break } -- cgit v1.2.3