bazel start + mcp start
This commit is contained in:
1 parent
a90653260a
commit
4c082aca7c
33 files changed
+1728
-79
No files matched your search
@@ -468,6 +468,23 @@ func (r *Remote) DeleteHome(ctx context.Context, drive, machine string) error {
|
||||
return r.callNode(ctx, "delete_home", callParams{Drive: drive, Machine: machine}, nil)
|
||||
}
|
||||
|
||||
func (r *Remote) ReadFile(ctx context.Context, drive, machine, path string, offset int64, limit int) ([]byte, int64, error) {
|
||||
var res callParams
|
||||
err := r.callNode(ctx, "read_file", callParams{Drive: drive, Machine: machine, Path: path, Offset: offset, Max: limit}, &res)
|
||||
return res.Data, res.FileSize, tooOld(err)
|
||||
}
|
||||
|
||||
func (r *Remote) WriteFile(ctx context.Context, drive, machine, path string, offset int64, data []byte) error {
|
||||
return tooOld(r.callNode(ctx, "write_file", callParams{Drive: drive, Machine: machine, Path: path, Offset: offset, Data: data}, nil))
|
||||
}
|
||||
|
||||
func tooOld(err error) error {
|
||||
if err != nil && strings.HasPrefix(err.Error(), "unknown call ") {
|
||||
return node.ErrTooOld
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (r *Remote) DialAgent(ctx context.Context, machine, secret string) (node.MsgConn, error) {
|
||||
l, err := r.currentLink()
|
||||
if err != nil {
|
||||
@@ -708,6 +725,10 @@ type callParams struct {
|
||||
Max int `json:"max,omitempty"`
|
||||
Data []byte `json:"data,omitempty"`
|
||||
EOF bool `json:"eof,omitempty"`
|
||||
|
||||
Path string `json:"path,omitempty"`
|
||||
Offset int64 `json:"offset,omitempty"`
|
||||
FileSize int64 `json:"file_size,omitempty"`
|
||||
}
|
||||
|
||||
func serveCall(ctx context.Context, l *link, local node.Node, f frame) {
|
||||
@@ -751,6 +772,11 @@ func serveCall(ctx context.Context, l *link, local node.Node, f frame) {
|
||||
l.reply(f.ID, nil, local.AbortImport(ctx, p.ID))
|
||||
case "delete_home":
|
||||
l.reply(f.ID, nil, local.DeleteHome(ctx, p.Drive, p.Machine))
|
||||
case "read_file":
|
||||
data, size, err := local.ReadFile(ctx, p.Drive, p.Machine, p.Path, p.Offset, min(p.Max, transferChunk))
|
||||
l.reply(f.ID, callParams{Data: data, FileSize: size}, err)
|
||||
case "write_file":
|
||||
l.reply(f.ID, nil, local.WriteFile(ctx, p.Drive, p.Machine, p.Path, p.Offset, p.Data))
|
||||
case "open_agent":
|
||||
agent, err := local.DialAgent(ctx, p.Machine, p.Secret)
|
||||
if err != nil {
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
package manager
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"slackerbot/internal/model"
|
||||
)
|
||||
|
||||
var ErrFileTooBig = errors.New("the file is bigger than allowed")
|
||||
|
||||
// homeRel turns a path inside the container (/root/…) into one relative to the home folder.
|
||||
func (m *Manager) homeRel(p string) (string, error) {
|
||||
home := path.Clean(m.cfg.AgentCwd)
|
||||
if !path.IsAbs(p) {
|
||||
p = path.Join(home, p)
|
||||
}
|
||||
p = path.Clean(p)
|
||||
rel := strings.TrimPrefix(p, home+"/")
|
||||
if rel == p || rel == "" {
|
||||
return "", fmt.Errorf("%s isn't inside %s", p, home)
|
||||
}
|
||||
return rel, nil
|
||||
}
|
||||
|
||||
// ReadFile streams a file from the owner's home into w, at most maxBytes.
|
||||
func (m *Manager) ReadFile(ctx context.Context, u *model.Owner, p string, maxBytes int64, w io.Writer) (int64, error) {
|
||||
rel, err := m.homeRel(p)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
n, err := m.nodeByName(u.Node)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
var off int64
|
||||
for {
|
||||
data, size, err := n.ReadFile(ctx, u.Drive, u.Machine, rel, off, transferChunk)
|
||||
if err != nil {
|
||||
return off, err
|
||||
}
|
||||
if size > maxBytes {
|
||||
return off, ErrFileTooBig
|
||||
}
|
||||
if _, err := w.Write(data); err != nil {
|
||||
return off, err
|
||||
}
|
||||
off += int64(len(data))
|
||||
if len(data) == 0 || off >= size {
|
||||
return off, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// WriteFile streams r into a file in the owner's home, giving up past maxBytes.
|
||||
func (m *Manager) WriteFile(ctx context.Context, u *model.Owner, p string, maxBytes int64, r io.Reader) error {
|
||||
rel, err := m.homeRel(p)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
n, err := m.nodeByName(u.Node)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
buf := make([]byte, transferChunk)
|
||||
var off int64
|
||||
for {
|
||||
k, rerr := io.ReadFull(r, buf)
|
||||
if k > 0 || off == 0 {
|
||||
if off+int64(k) > maxBytes {
|
||||
return ErrFileTooBig
|
||||
}
|
||||
if err := n.WriteFile(ctx, u.Drive, u.Machine, rel, off, buf[:k]); err != nil {
|
||||
return err
|
||||
}
|
||||
off += int64(k)
|
||||
}
|
||||
if errors.Is(rerr, io.EOF) || errors.Is(rerr, io.ErrUnexpectedEOF) {
|
||||
return nil
|
||||
}
|
||||
if rerr != nil {
|
||||
return rerr
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package manager_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"slackerbot/internal/manager"
|
||||
"slackerbot/internal/model"
|
||||
"slackerbot/internal/testutil"
|
||||
"slackerbot/internal/testutil/clustertest"
|
||||
)
|
||||
|
||||
func TestFilesThroughSlave(t *testing.T) {
|
||||
c := clustertest.New(t)
|
||||
c.Cfg.AgentCwd = "/root"
|
||||
u := &model.Owner{ID: "C1", Machine: "c-c1", Node: "slave-1", Drive: "/d"}
|
||||
data := testutil.HomeData()
|
||||
|
||||
if err := c.Mgr.WriteFile(c.Ctx, u, "/root/slack-uploads/1.0/big.bin", 100<<20, bytes.NewReader(data)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := c.Slave.Files["/d/c-c1/slack-uploads/1.0/big.bin"]; !bytes.Equal(got, data) {
|
||||
t.Fatalf("slave got %d bytes, want %d", len(got), len(data))
|
||||
}
|
||||
|
||||
var out bytes.Buffer
|
||||
if n, err := c.Mgr.ReadFile(c.Ctx, u, "/root/slack-uploads/1.0/big.bin", 100<<20, &out); err != nil || n != int64(len(data)) || !bytes.Equal(out.Bytes(), data) {
|
||||
t.Fatalf("read back %d bytes: %v", n, err)
|
||||
}
|
||||
if _, err := c.Mgr.ReadFile(c.Ctx, u, "/root/slack-uploads/1.0/big.bin", 1<<20, &out); !errors.Is(err, manager.ErrFileTooBig) {
|
||||
t.Fatalf("over the cap: %v", err)
|
||||
}
|
||||
if _, err := c.Mgr.ReadFile(c.Ctx, u, "/etc/passwd", 100<<20, &out); err == nil {
|
||||
t.Fatal("paths outside the home must be refused")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user