bbs.profullstack/agentbbs
1
0
Fork 0
mirror of https://github.com/profullstack/agentbbs.git synced 2026-08-13 22:37:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

files: /me and /public are two separate per-user areas

Browse source 
Per feedback: /me is PRIVATE and the public folder must be its own
top-level area, not nested under /me.

- A member now has two sibling areas over SFTP: /me (private,
  <root>/files/users/<name>) and /public (their own public files,
  <root>/files/public/<name>), served anonymously at ~<name>/public.
- Drop the global shared /public web route and the /me/public nesting.
  The anon surface only exposes ~name/public; /me has no anon route.
- Both owned areas count toward the quota gauge.
- Index publish hint, docs, and setup.sh updated to scp :/public/.

files.<host> stays a file server; member sites remain on the BBS.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Anthony Ettinger 2026-06-26 01:36:43 +00:00
parent a2d4817a8e
commit f2bcb7e063
7 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

51
internal/files/fs.go
View file

@ -15,17 +15,19 @@ import (
"github.com/profullstack/agentbbs/internal/store"
)
// area names exposed at the virtual root.
//
// A member's home is /me (private). Its public/ subdirectory is exposed
// anonymously on the web at ~<name>/public — the unix ~/public convention — so
// "publish a file" just means dropping it in /me/public. The single shared
// /public area is the old-school BBS file area.
// area names exposed at the virtual root. A member has two separate top-level
// areas: /me (private) and /public (their own public files, served anonymously
// on the web at ~<name>/public). /public is a sibling of /me, never nested
// inside it — /me stays fully private.
const (
areaMe = "me"
areaPublic = "public"
)
// metered reports whether writes to an area count against the member's quota.
// Both of a member's owned areas (/me and their /public) are metered.
func metered(area string) bool { return area == areaMe || area == areaPublic }
// errEscape is returned when a resolved path would leave its area root. It maps
// to an SFTP permission-denied; it must never reach the client as a real path.
var errEscape = errors.New("files: path escapes its area")
@ -34,24 +36,26 @@ var errEscape = errors.New("files: path escapes its area")
// connection. It implements the pkg/sftp request handlers and enforces area
// confinement, the public-area ACL, and the per-user quota.
type session struct {
svc *Service
user store.User
pubWrite bool
quota int64
used atomic.Int64 // live private-workspace usage, for quota checks
svc *Service
user store.User
quota int64
used atomic.Int64 // live owned-storage usage (/me + /public), for quota checks
}
func (s *Service) newSession(u store.User) (*session, error) {
// Ensure both the private home and its public/ subfolder exist, so writing to
// /me/public (which surfaces at ~name/public) just works.
if err := s.ensurePublicHome(u.Name); err != nil {
// Ensure both of the member's areas exist: their private /me and their own
// public /public (a sibling, not a subfolder of /me).
if err := s.ensureWorkspace(u.Name); err != nil {
return nil, err
}
used, err := dirSize(s.privRoot(u.Name))
if err := s.ensureUserPub(u.Name); err != nil {
return nil, err
}
used, err := s.ownedUsage(u.Name)
if err != nil {
return nil, err
}
sess := &session{svc: s, user: u, pubWrite: s.publicWritable(), quota: s.quotaFor(u.ID)}
sess := &session{svc: s, user: u, quota: s.quotaFor(u.ID)}
sess.used.Store(used)
return sess, nil
}
@ -83,7 +87,9 @@ func (s *session) resolve(p string) (resolved, error) {
case areaMe:
areaRoot, area, writable = s.svc.privRoot(s.user.Name), areaMe, true
case areaPublic:
areaRoot, area, writable = s.svc.pubRoot(), areaPublic, s.pubWrite
// The member's own public area (served anonymously at ~<name>/public);
// they read/write it.
areaRoot, area, writable = s.svc.userPub(s.user.Name), areaPublic, true
default:
return resolved{}, os.ErrNotExist
}
@ -303,8 +309,8 @@ func (s *session) webSave(vpath string, r io.Reader) (int64, error) {
if err != nil {
return 0, err
}
limit := int64(-1) // public area is operator-managed, unmetered
if res.area == areaMe {
limit := int64(-1)
if metered(res.area) {
if limit = s.quota - (s.used.Load() - existing); limit < 0 {
limit = 0
}
@ -318,7 +324,7 @@ func (s *session) webSave(vpath string, r io.Reader) (int64, error) {
if cerr != nil {
return 0, cerr
}
if res.area == areaMe {
if metered(res.area) {
s.used.Add(n - existing)
}
return n, nil
@ -380,9 +386,8 @@ func (s *session) Filewrite(r *sftp.Request) (io.WriterAt, error) {
if err != nil {
return nil, sftpErr(err)
}
// The public area is operator-managed (no per-user quota); the private
// workspace is metered.
if res.area != areaMe {
// Both of the member's owned areas (/me and their /public) are metered.
if !metered(res.area) {
return f, nil
}
return &quotaWriter{f: f, sess: s, tracked: startSize}, nil