fix: address project audit gaps
This commit is contained in:
@@ -4,12 +4,26 @@ import (
|
||||
"log"
|
||||
|
||||
"senlinai-agent/backend/internal/config"
|
||||
"senlinai-agent/backend/internal/db"
|
||||
"senlinai-agent/backend/internal/domain"
|
||||
"senlinai-agent/backend/internal/httpx"
|
||||
"senlinai-agent/backend/internal/inbox"
|
||||
"senlinai-agent/backend/internal/projects"
|
||||
)
|
||||
|
||||
func main() {
|
||||
cfg := config.Load()
|
||||
router := httpx.NewRouter(cfg)
|
||||
database, err := db.Open(cfg.DatabaseURL)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if err := domain.AutoMigrate(database); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
projectHandler := projects.NewHandler(projects.NewService(database))
|
||||
inboxHandler := inbox.NewHandler(inbox.NewService(database, inbox.StaticAnalyzer{}))
|
||||
router := httpx.NewRouter(cfg, projectHandler, inboxHandler)
|
||||
if err := router.Run(":8080"); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -7,7 +7,11 @@ import (
|
||||
"senlinai-agent/backend/internal/config"
|
||||
)
|
||||
|
||||
func NewRouter(cfg config.Config) *gin.Engine {
|
||||
type RouteRegistrar interface {
|
||||
Register(router gin.IRouter)
|
||||
}
|
||||
|
||||
func NewRouter(cfg config.Config, registrars ...RouteRegistrar) *gin.Engine {
|
||||
if cfg.Env == "test" {
|
||||
gin.SetMode(gin.TestMode)
|
||||
}
|
||||
@@ -18,6 +22,10 @@ func NewRouter(cfg config.Config) *gin.Engine {
|
||||
router.GET("/healthz", func(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"status": "ok"})
|
||||
})
|
||||
api := router.Group("/api")
|
||||
for _, registrar := range registrars {
|
||||
registrar.Register(api)
|
||||
}
|
||||
|
||||
return router
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/stretchr/testify/require"
|
||||
"senlinai-agent/backend/internal/config"
|
||||
)
|
||||
@@ -19,3 +20,22 @@ func TestHealthz(t *testing.T) {
|
||||
require.Equal(t, http.StatusOK, rec.Code)
|
||||
require.JSONEq(t, `{"status":"ok"}`, rec.Body.String())
|
||||
}
|
||||
|
||||
func TestNewRouterRegistersFeatureRoutesUnderAPI(t *testing.T) {
|
||||
router := NewRouter(config.Config{Env: "test"}, testRegistrar{})
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/ping", nil)
|
||||
rec := httptest.NewRecorder()
|
||||
|
||||
router.ServeHTTP(rec, req)
|
||||
|
||||
require.Equal(t, http.StatusOK, rec.Code)
|
||||
require.JSONEq(t, `{"pong":true}`, rec.Body.String())
|
||||
}
|
||||
|
||||
type testRegistrar struct{}
|
||||
|
||||
func (testRegistrar) Register(router gin.IRouter) {
|
||||
router.GET("/ping", func(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"pong": true})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -32,30 +32,106 @@ func (s *Service) Search(userID uint, query string) ([]Result, error) {
|
||||
return s.searchPostgres(userID, query)
|
||||
}
|
||||
|
||||
like := "%" + query + "%"
|
||||
results := []Result{}
|
||||
var projects []domain.Project
|
||||
if err := s.db.Where("owner_id = ? AND (name LIKE ? OR description LIKE ?)", userID, like, like).Find(&projects).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, project := range projects {
|
||||
results = append(results, Result{Type: "project", ID: project.ID, ProjectID: project.ID, Title: project.Name, Snippet: project.Description})
|
||||
}
|
||||
|
||||
var tasks []domain.Task
|
||||
if err := s.db.Joins("JOIN projects ON projects.id = tasks.project_id").
|
||||
Where("projects.owner_id = ? AND (tasks.title LIKE ? OR tasks.description LIKE ?)", userID, like, like).
|
||||
Find(&tasks).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, task := range tasks {
|
||||
results = append(results, Result{Type: "task", ID: task.ID, ProjectID: task.ProjectID, Title: task.Title, Snippet: task.Description})
|
||||
}
|
||||
|
||||
var notes []domain.Note
|
||||
if err := s.db.Joins("JOIN projects ON projects.id = notes.project_id").
|
||||
Where("projects.owner_id = ? AND (notes.title LIKE ? OR notes.markdown LIKE ?)", userID, "%"+query+"%", "%"+query+"%").
|
||||
Where("projects.owner_id = ? AND (notes.title LIKE ? OR notes.markdown LIKE ?)", userID, like, like).
|
||||
Find(¬es).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
results := make([]Result, 0, len(notes))
|
||||
for _, note := range notes {
|
||||
results = append(results, Result{Type: "note", ID: note.ID, ProjectID: note.ProjectID, Title: note.Title, Snippet: note.Markdown})
|
||||
}
|
||||
|
||||
var sources []domain.Source
|
||||
if err := s.db.Joins("JOIN projects ON projects.id = sources.project_id").
|
||||
Where("projects.owner_id = ? AND (sources.title LIKE ? OR sources.url LIKE ? OR sources.content_text LIKE ?)", userID, like, like, like).
|
||||
Find(&sources).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, source := range sources {
|
||||
results = append(results, Result{Type: "source", ID: source.ID, ProjectID: source.ProjectID, Title: source.Title, Snippet: source.ContentText})
|
||||
}
|
||||
|
||||
var inboxItems []domain.InboxItem
|
||||
if err := s.db.Joins("JOIN projects ON projects.id = inbox_items.project_id").
|
||||
Where("projects.owner_id = ? AND (inbox_items.title LIKE ? OR inbox_items.body LIKE ?)", userID, like, like).
|
||||
Find(&inboxItems).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, item := range inboxItems {
|
||||
results = append(results, Result{Type: "inbox", ID: item.ID, ProjectID: item.ProjectID, Title: item.Title, Snippet: item.Body})
|
||||
}
|
||||
|
||||
var sessions []domain.AISession
|
||||
if err := s.db.Joins("JOIN projects ON projects.id = ai_sessions.project_id").
|
||||
Where("projects.owner_id = ? AND (ai_sessions.title LIKE ? OR ai_sessions.context LIKE ?)", userID, like, like).
|
||||
Find(&sessions).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, session := range sessions {
|
||||
results = append(results, Result{Type: "ai_session", ID: session.ID, ProjectID: session.ProjectID, Title: session.Title, Snippet: session.Context})
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
func (s *Service) searchPostgres(userID uint, query string) ([]Result, error) {
|
||||
var results []Result
|
||||
err := s.db.Raw(`
|
||||
SELECT 'project' AS type, projects.id, projects.id AS project_id, projects.name AS title, projects.description AS snippet
|
||||
FROM projects
|
||||
WHERE projects.owner_id = ?
|
||||
AND to_tsvector('simple', coalesce(projects.name, '') || ' ' || coalesce(projects.description, '')) @@ plainto_tsquery('simple', ?)
|
||||
UNION ALL
|
||||
SELECT 'task' AS type, tasks.id, tasks.project_id, tasks.title, tasks.description AS snippet
|
||||
FROM tasks
|
||||
JOIN projects ON projects.id = tasks.project_id
|
||||
WHERE projects.owner_id = ?
|
||||
AND to_tsvector('simple', coalesce(tasks.title, '') || ' ' || coalesce(tasks.description, '')) @@ plainto_tsquery('simple', ?)
|
||||
UNION ALL
|
||||
SELECT 'note' AS type, notes.id, notes.project_id, notes.title, notes.markdown AS snippet
|
||||
FROM notes
|
||||
JOIN projects ON projects.id = notes.project_id
|
||||
WHERE projects.owner_id = ?
|
||||
AND to_tsvector('simple', coalesce(notes.title, '') || ' ' || coalesce(notes.markdown, ''))
|
||||
@@ plainto_tsquery('simple', ?)
|
||||
ORDER BY notes.updated_at DESC
|
||||
AND to_tsvector('simple', coalesce(notes.title, '') || ' ' || coalesce(notes.markdown, '')) @@ plainto_tsquery('simple', ?)
|
||||
UNION ALL
|
||||
SELECT 'source' AS type, sources.id, sources.project_id, sources.title, sources.content_text AS snippet
|
||||
FROM sources
|
||||
JOIN projects ON projects.id = sources.project_id
|
||||
WHERE projects.owner_id = ?
|
||||
AND to_tsvector('simple', coalesce(sources.title, '') || ' ' || coalesce(sources.url, '') || ' ' || coalesce(sources.content_text, '')) @@ plainto_tsquery('simple', ?)
|
||||
UNION ALL
|
||||
SELECT 'inbox' AS type, inbox_items.id, inbox_items.project_id, inbox_items.title, inbox_items.body AS snippet
|
||||
FROM inbox_items
|
||||
JOIN projects ON projects.id = inbox_items.project_id
|
||||
WHERE projects.owner_id = ?
|
||||
AND to_tsvector('simple', coalesce(inbox_items.title, '') || ' ' || coalesce(inbox_items.body, '')) @@ plainto_tsquery('simple', ?)
|
||||
UNION ALL
|
||||
SELECT 'ai_session' AS type, ai_sessions.id, ai_sessions.project_id, ai_sessions.title, ai_sessions.context AS snippet
|
||||
FROM ai_sessions
|
||||
JOIN projects ON projects.id = ai_sessions.project_id
|
||||
WHERE projects.owner_id = ?
|
||||
AND to_tsvector('simple', coalesce(ai_sessions.title, '') || ' ' || coalesce(ai_sessions.context, '')) @@ plainto_tsquery('simple', ?)
|
||||
LIMIT 50
|
||||
`, userID, query).Scan(&results).Error
|
||||
`, userID, query, userID, query, userID, query, userID, query, userID, query, userID, query).Scan(&results).Error
|
||||
return results, err
|
||||
}
|
||||
|
||||
@@ -24,3 +24,27 @@ func TestSearchFindsNoteBody(t *testing.T) {
|
||||
require.Len(t, results, 1)
|
||||
require.Equal(t, "note", results[0].Type)
|
||||
}
|
||||
|
||||
func TestSearchFindsCoreProjectObjects(t *testing.T) {
|
||||
database, err := gorm.Open(sqlite.Open(fmt.Sprintf("file:%s?mode=memory&cache=shared", t.Name())), &gorm.Config{})
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, domain.AutoMigrate(database))
|
||||
require.NoError(t, database.Create(&domain.Project{ID: 1, OwnerID: 7, Name: "支付项目"}).Error)
|
||||
require.NoError(t, database.Create(&domain.Task{ProjectID: 1, CreatedBy: 7, Title: "回调任务", Description: "检查 webhook"}).Error)
|
||||
require.NoError(t, database.Create(&domain.Source{ProjectID: 1, CreatedBy: 7, Kind: "link", Title: "支付文档", URL: "https://example.com/pay", ContentText: "webhook 签名"}).Error)
|
||||
require.NoError(t, database.Create(&domain.InboxItem{ProjectID: 1, CreatedBy: 7, SourceType: "text", Title: "收集项", Body: "webhook 待整理"}).Error)
|
||||
require.NoError(t, database.Create(&domain.AISession{ProjectID: 1, CreatedBy: 7, Title: "AI 分析", Context: "webhook 问答"}).Error)
|
||||
|
||||
service := NewService(database)
|
||||
results, err := service.Search(7, "webhook")
|
||||
|
||||
require.NoError(t, err)
|
||||
types := make(map[string]bool)
|
||||
for _, result := range results {
|
||||
types[result.Type] = true
|
||||
}
|
||||
require.True(t, types["task"])
|
||||
require.True(t, types["source"])
|
||||
require.True(t, types["inbox"])
|
||||
require.True(t, types["ai_session"])
|
||||
}
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
CREATE INDEX IF NOT EXISTS idx_projects_search
|
||||
ON projects
|
||||
USING gin (to_tsvector('simple', coalesce(name, '') || ' ' || coalesce(description, '')));
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_notes_search
|
||||
ON notes
|
||||
USING gin (to_tsvector('simple', coalesce(title, '') || ' ' || coalesce(markdown, '')));
|
||||
|
||||
Reference in New Issue
Block a user