ops design and app
add more comments feature, more tags feature, and other frontend updates
This commit is contained in:
@@ -29,7 +29,12 @@ func (s *Server) handleSyncInit(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
snapshot, err := s.syncService.InitSync(r.Context(), req.DeviceID, principal.UserID)
|
||||
canRead, _, accessErr := s.syncAccessFilters(r)
|
||||
snapshot, err := s.syncService.InitSyncFiltered(r.Context(), req.DeviceID, principal.UserID, canRead)
|
||||
if accessErr() != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": accessErr().Error()})
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
s.logger.Error("sync init failed", "error", err)
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to initialize sync"})
|
||||
@@ -60,7 +65,12 @@ func (s *Server) handleSyncDelta(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
result, err := s.syncService.ApplyDelta(r.Context(), req.SnapshotID, principal.UserID, sync.Delta{Changes: req.ClientDelta})
|
||||
canRead, canWrite, accessErr := s.syncAccessFilters(r)
|
||||
result, err := s.syncService.ApplyDeltaFiltered(r.Context(), req.SnapshotID, principal.UserID, sync.Delta{Changes: req.ClientDelta}, canRead, canWrite)
|
||||
if accessErr() != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": accessErr().Error()})
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
if errors.Is(err, sync.ErrForbidden) {
|
||||
writeJSON(w, http.StatusForbidden, map[string]string{"error": "forbidden"})
|
||||
@@ -100,7 +110,12 @@ func (s *Server) handleSyncResolve(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
snapshot, err := s.syncService.ResolveConflicts(r.Context(), req.SnapshotID, principal.UserID, req.Resolutions)
|
||||
canRead, canWrite, accessErr := s.syncAccessFilters(r)
|
||||
snapshot, err := s.syncService.ResolveConflictsFiltered(r.Context(), req.SnapshotID, principal.UserID, req.Resolutions, canRead, canWrite)
|
||||
if accessErr() != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": accessErr().Error()})
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
if errors.Is(err, sync.ErrForbidden) {
|
||||
writeJSON(w, http.StatusForbidden, map[string]string{"error": "forbidden"})
|
||||
@@ -148,3 +163,45 @@ func (s *Server) handleContentFetch(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write(content)
|
||||
}
|
||||
|
||||
func (s *Server) syncAccessFilters(r *http.Request) (sync.FileAccessFunc, sync.PathAccessFunc, func() error) {
|
||||
var accessErr error
|
||||
canRead := func(file sync.FileEntry) bool {
|
||||
if accessErr != nil {
|
||||
return false
|
||||
}
|
||||
record, err := s.repository.GetDocumentByPath(r.Context(), file.Path)
|
||||
if err != nil {
|
||||
accessErr = err
|
||||
return false
|
||||
}
|
||||
ok, err := s.canReadDocumentRecord(r, *record)
|
||||
if err != nil {
|
||||
accessErr = err
|
||||
return false
|
||||
}
|
||||
return ok
|
||||
}
|
||||
canWrite := func(path string) bool {
|
||||
if accessErr != nil {
|
||||
return false
|
||||
}
|
||||
record, err := s.repository.GetDocumentByPath(r.Context(), path)
|
||||
if err == nil && record != nil {
|
||||
ok, err := s.canWriteDocumentRecord(r, *record)
|
||||
if err != nil {
|
||||
accessErr = err
|
||||
return false
|
||||
}
|
||||
return ok
|
||||
}
|
||||
if os.IsNotExist(err) {
|
||||
return s.canWriteNewDocument(r, path)
|
||||
}
|
||||
if err != nil {
|
||||
return s.canWriteNewDocument(r, path)
|
||||
}
|
||||
return false
|
||||
}
|
||||
return canRead, canWrite, func() error { return accessErr }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user