mirror of
https://github.com/hanzoai/compute.git
synced 2026-10-30 14:50:41 +00:00
zeekayandHanzo Dev
2933bcae0c
Rip Beego out of visor's own source: routing, filters, auth, sessions,
logging, config and the guacamole websocket tunnel are now ZAP-native
(github.com/zap-proto/zip over fiber/fasthttp), mirroring the iam-canonical
idiom. vm's own tree is now 100% beego-free; Beego survives only as a
transitive dep of the iam-v1 identity SDK (github.com/hanzoai/iam-v1).
Also fixes the routers test panic: two Beego copies (beego + hanzoai/beego)
both registered the `graceful` flag at init, so `go test ./routers` aborted
with "flag redefined: graceful". Removing Beego removes the double init.
HTTP spine (the explicit deliverable):
- main.go: beego.Run() -> cobra root cmd -> app.Listen (HTTP edge :19000,
optional ZAP addr); a bare `/visor` still serves (container contract).
- pkg/visor/embed.go: ONE boot path Bootstrap() *zip.App; Handler() adapts to
net/http for the cloud mount.
- routers: beego.Router table -> Route(app) with app.Get/Post/Delete;
InsertFilter chain -> app.Use middleware (Recover, CORS, static, tenant,
ApiFilter authz seam, record). TransparentStatic short-circuits before the
authz seam exactly as the BeforeRouter filter did. *beego/context.Context
-> *zip.Ctx.
- util/log.go: request logger over luxfi/log.
Controllers (entailed by a green build; ApiController embedded beego.Controller):
- ApiController backed by *zip.Ctx; c.Input().Get -> c.Ctx.Query,
c.Ctx.Input.RequestBody -> c.Ctx.Body(), c.Ctx.Input.Param(":id") ->
c.Ctx.Param("id"); ServeJSON/ResponseOk/ResponseError write via zip and
stash the envelope on Locals for the record filter.
- Sessions: beego cookie/redis -> stateless Bearer-JWT Principal
(object.GetBearerUser). Signin returns claims+token; the client carries the
token thereafter.
- pagination.SetPaginator -> util.Paginate.
Object/glue:
- tenant_context: beego ctx Input.Data -> zip Locals.
- record.NewRecord(*zip.Ctx, respJSON).
- config: Beego AppConfig -> conf (ini.v1 + ${VAR||default} env expansion,
lazy-loaded). logging: beego/logs -> visor/logs over luxfi/log.
Websocket tunnel (the one Beego-adjacent API with no drop-in ZAP equivalent):
- gorilla/websocket hijack can't work on the fasthttp edge; ported guacamole +
tunnel handlers to github.com/fasthttp/websocket (gorilla-compatible fork,
already a dep). Query params are read before the hijack (fiber recycles the
ctx) and the post-upgrade callback isolates panics (it runs outside zip's
recover).
Build + tests green (host darwin/arm64 + linux/arm64 CI target); go vet clean.
Co-authored-by: Hanzo Dev <[email protected]>
97 lines
2.4 KiB
Go
97 lines
2.4 KiB
Go
// Copyright 2023 Hanzo Industries Inc. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package util
|
|
|
|
import (
|
|
"embed"
|
|
"fmt"
|
|
"io/fs"
|
|
"net/http"
|
|
"strings"
|
|
)
|
|
|
|
//go:embed 17monipdb.dat
|
|
var ipDbData embed.FS
|
|
|
|
func InitIpDb() {
|
|
data, err := fs.ReadFile(ipDbData, "17monipdb.dat")
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
InitWithData(data)
|
|
}
|
|
|
|
func GetDescFromIP(ip string) string {
|
|
info, err := Find(ip)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
res := info.Country + ", " + info.Region + ", " + info.City
|
|
if info.Isp != Null {
|
|
res += ", " + info.Isp
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
func GetIPInfo(clientIP string) string {
|
|
if clientIP == "" {
|
|
return ""
|
|
}
|
|
|
|
ips := strings.Split(clientIP, ",")
|
|
res := ""
|
|
for i := range ips {
|
|
ip := strings.TrimSpace(ips[i])
|
|
// desc := GetDescFromIP(ip)
|
|
ipstr := fmt.Sprintf("%s: %s", ip, "")
|
|
if i != len(ips)-1 {
|
|
res += ipstr + " -> "
|
|
} else {
|
|
res += ipstr
|
|
}
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
func GetIPFromRequest(req *http.Request) string {
|
|
return GetClientIP(req.Header.Get("x-forwarded-for"), req.RemoteAddr)
|
|
}
|
|
|
|
// GetClientIP formats the client IP description from the raw x-forwarded-for
|
|
// header and the transport remote address — the transport-agnostic core shared
|
|
// by the net/http path (GetIPFromRequest) and the ZAP path (a zip.Ctx hands the
|
|
// header plus its fasthttp RemoteAddr). x-forwarded-for wins; otherwise the
|
|
// remote address host is parsed (IPv4 host:port or bracketed IPv6).
|
|
func GetClientIP(xForwardedFor, remoteAddr string) string {
|
|
clientIP := xForwardedFor
|
|
if clientIP == "" {
|
|
ipPort := strings.Split(remoteAddr, ":")
|
|
if len(ipPort) >= 1 && len(ipPort) <= 2 {
|
|
clientIP = ipPort[0]
|
|
} else if len(ipPort) > 2 {
|
|
idx := strings.LastIndex(remoteAddr, ":")
|
|
clientIP = remoteAddr[0:idx]
|
|
clientIP = strings.TrimLeft(clientIP, "[")
|
|
clientIP = strings.TrimRight(clientIP, "]")
|
|
}
|
|
}
|
|
|
|
return GetIPInfo(clientIP)
|
|
}
|