mirror of
https://github.com/hanzoai/compute.git
synced 2026-11-02 07:34:18 +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]>
62 lines
1.9 KiB
Go
62 lines
1.9 KiB
Go
// Copyright 2024 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 routers
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/zap-proto/zip"
|
|
|
|
"github.com/hanzoai/visor/object"
|
|
"github.com/hanzoai/visor/util"
|
|
)
|
|
|
|
const recordUserIDKey = "recordUserId"
|
|
|
|
// RecordMessage is the audit-record middleware. Beego split this into a
|
|
// BeforeRouter hook (stash the acting user) and an AfterExec hook (build+persist
|
|
// the record from the response); ZAP composes both around one c.Next() — the
|
|
// before-work stashes the user id, the handler runs, then the after-work reads
|
|
// the response envelope the handler stashed and writes the audit record. Login,
|
|
// signup and get-assets are exempted from the user-id stash exactly as before.
|
|
func RecordMessage(c *zip.Ctx) error {
|
|
path := c.Path()
|
|
if path != "/v1/login" && path != "/v1/signup" && path != "/v1/get-assets" {
|
|
if userId := getUsername(c); userId != "" {
|
|
c.Locals(recordUserIDKey, userId)
|
|
}
|
|
}
|
|
|
|
err := c.Next()
|
|
|
|
afterRecordMessage(c)
|
|
return err
|
|
}
|
|
|
|
func afterRecordMessage(c *zip.Ctx) {
|
|
record, err := object.NewRecord(c, c.Locals(object.RecordResponseKey))
|
|
if err != nil {
|
|
fmt.Printf("AfterRecordMessage() error: %s\n", err.Error())
|
|
return
|
|
}
|
|
|
|
userId, _ := c.Locals(recordUserIDKey).(string)
|
|
if userId != "" {
|
|
record.Organization, record.User = util.GetOwnerAndNameFromId(userId)
|
|
}
|
|
|
|
object.AddRecord(record)
|
|
}
|