convert to httppb

This commit is contained in:
Jeff Carr 2025-09-09 18:01:41 -05:00
parent 82b232f47a
commit 6722b019ec
1 changed files with 10 additions and 8 deletions

18
http.go
View File

@ -21,7 +21,7 @@ func logReqPB(pb *httppb.HttpRequest) {
func okHandler(w http.ResponseWriter, r *http.Request) {
reqPB, err := httppb.ReqToPB(r)
reqPB.Log("START: Got %d bytes from the client", len(reqPB.ClientData))
reqPB.Logf("START: Got %d bytes from the client", len(reqPB.ClientData))
if err != nil {
reqPB.Logf("httppb err %v", err)
}
@ -38,7 +38,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(route, "/repos/") {
pb := gitpb.NewRepos()
if err := pb.Unmarshal(reqPB.ClientData); err == nil {
reqPB.Log("Repos Unmarshal() len=%d", pb.Len())
reqPB.Logf("Repos Unmarshal() len=%d", pb.Len())
} else {
reqPB.Logf("Repos Unmarshal() err=%v", err)
}
@ -76,9 +76,9 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
result = addNewPatches(pb, reqPB)
reqPB.Logf("addNewPatches() pb.Len()=%d result.Len()=%d\n", pb.Len(), result.Len())
case "/patches/applied":
reqPB.Logf("not really anything needs to be done on applied patches?")
reqPB.Log("not really anything needs to be done on applied patches?")
case "/patches/merged":
reqPB.Logf("a maintainer has merged these patches")
reqPB.Log("a maintainer has merged these patches")
result = handleMergedPatches(pb, reqPB)
// result = handleAppliedPatches(pb, reqPB)
case "/patches/get":
@ -120,27 +120,28 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
// used for uptime monitor checking
if route == "/uptime" {
writeFile(w, "uptime.html")
httppb.WriteFile(w, resources, "uptime.html")
return
}
if route == "/goReference.svg" {
w.Header().Set("Content-Type", "image/svg+xml")
writeFile(w, "goReference.svg")
httppb.WriteFile(w, resources, "goReference.svg")
return
}
if route == "/skeleton.v2.css" {
writeFile(w, "skeleton.v2.css")
httppb.WriteFile(w, resources, "skeleton.v2.css")
return
}
if route == "/favicon.ico" {
writeFile(w, "ipv6.png")
httppb.WriteFile(w, resources, "ipv6.png")
return
}
log.Warn("BAD URL =", reqPB.URL, "from", reqPB.IP, "author", reqPB.Hostname)
badurl(w, r.URL.String())
}
/*
func writeFile(w http.ResponseWriter, filename string) {
// fmt.Fprintln(w, "GOT TEST?")
fullname := "resources/" + filename
@ -155,6 +156,7 @@ func writeFile(w http.ResponseWriter, filename string) {
repohtml = string(pfile)
fmt.Fprintln(w, repohtml)
}
*/
func badurl(w http.ResponseWriter, badurl string) {
fmt.Fprintln(w, "<!DOCTYPE html>")