Stop publishing repository-wide prompt ledgers and enforce per-user prompt isolation through authenticated Gitea IDs.
Hop-State: A_06FN8NFDRFAFN5VCJTHJAAG Hop-Proposal: R_06FN8NEGJ054CPMJF9ZAN70 Hop-Task: T_06FN8HT6XG332C3XY6PYCCG Hop-Attempt: AT_06FN8HT6XGRXW0B4WPFFBJG
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
ALTER TABLE prompts ADD COLUMN gitea_user_id bigint CHECK (gitea_user_id > 0);
|
||||
|
||||
CREATE INDEX prompts_repository_user_created_at_idx
|
||||
ON prompts (repository_id, gitea_user_id, created_at DESC)
|
||||
WHERE gitea_user_id IS NOT NULL;
|
||||
@@ -40,6 +40,7 @@ type WebhookDelivery struct {
|
||||
|
||||
type Prompt struct {
|
||||
ID string `json:"id"`
|
||||
GiteaUserID int64 `json:"-"`
|
||||
TaskID string `json:"task_id,omitempty"`
|
||||
AttemptID string `json:"attempt_id,omitempty"`
|
||||
StateID string `json:"state_id,omitempty"`
|
||||
@@ -56,6 +57,7 @@ type Prompt struct {
|
||||
type CreatePromptInput struct {
|
||||
Owner string
|
||||
Repository string
|
||||
GiteaUserID int64
|
||||
TaskID string
|
||||
AttemptID string
|
||||
StateID string
|
||||
@@ -72,7 +74,7 @@ type Store interface {
|
||||
Ping(context.Context) error
|
||||
ListRepositories(context.Context) ([]Repository, error)
|
||||
UpsertRepository(context.Context, gitea.Repository) (Repository, error)
|
||||
ListPrompts(context.Context, string, string, int) ([]Prompt, error)
|
||||
ListPrompts(context.Context, string, string, int64, int) ([]Prompt, error)
|
||||
CreatePrompt(context.Context, CreatePromptInput) (Prompt, error)
|
||||
RecordWebhook(context.Context, WebhookDelivery) (bool, error)
|
||||
}
|
||||
@@ -162,15 +164,15 @@ func (p *Postgres) UpsertRepository(ctx context.Context, repository gitea.Reposi
|
||||
return upsertRepository(ctx, p.pool, id, repository)
|
||||
}
|
||||
|
||||
func (p *Postgres) ListPrompts(ctx context.Context, owner, name string, limit int) ([]Prompt, error) {
|
||||
func (p *Postgres) ListPrompts(ctx context.Context, owner, name string, giteaUserID int64, limit int) ([]Prompt, error) {
|
||||
rows, err := p.pool.Query(ctx, `
|
||||
SELECT p.id, p.task_id, p.attempt_id, p.state_id, p.prompt, p.agent_name, p.agent_model,
|
||||
SELECT p.id, p.gitea_user_id, p.task_id, p.attempt_id, p.state_id, p.prompt, p.agent_name, p.agent_model,
|
||||
p.status, p.response_summary, p.metadata, p.created_at, p.completed_at
|
||||
FROM prompts p
|
||||
JOIN repositories r ON r.id = p.repository_id
|
||||
WHERE r.owner=$1 AND r.name=$2
|
||||
WHERE r.owner=$1 AND r.name=$2 AND p.gitea_user_id=$3
|
||||
ORDER BY p.created_at DESC
|
||||
LIMIT $3`, owner, name, limit)
|
||||
LIMIT $4`, owner, name, giteaUserID, limit)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -178,7 +180,7 @@ func (p *Postgres) ListPrompts(ctx context.Context, owner, name string, limit in
|
||||
prompts := make([]Prompt, 0)
|
||||
for rows.Next() {
|
||||
var prompt Prompt
|
||||
if err := rows.Scan(&prompt.ID, &prompt.TaskID, &prompt.AttemptID, &prompt.StateID, &prompt.Prompt, &prompt.AgentName, &prompt.AgentModel, &prompt.Status, &prompt.ResponseSummary, &prompt.Metadata, &prompt.CreatedAt, &prompt.CompletedAt); err != nil {
|
||||
if err := rows.Scan(&prompt.ID, &prompt.GiteaUserID, &prompt.TaskID, &prompt.AttemptID, &prompt.StateID, &prompt.Prompt, &prompt.AgentName, &prompt.AgentModel, &prompt.Status, &prompt.ResponseSummary, &prompt.Metadata, &prompt.CreatedAt, &prompt.CompletedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
prompts = append(prompts, prompt)
|
||||
@@ -197,12 +199,12 @@ func (p *Postgres) CreatePrompt(ctx context.Context, input CreatePromptInput) (P
|
||||
}
|
||||
var prompt Prompt
|
||||
err = p.pool.QueryRow(ctx, `
|
||||
INSERT INTO prompts (id, repository_id, task_id, attempt_id, state_id, prompt, agent_name, agent_model, status, response_summary, metadata, completed_at)
|
||||
SELECT $1, r.id, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13
|
||||
INSERT INTO prompts (id, repository_id, gitea_user_id, task_id, attempt_id, state_id, prompt, agent_name, agent_model, status, response_summary, metadata, completed_at)
|
||||
SELECT $1, r.id, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14
|
||||
FROM repositories r WHERE r.owner=$2 AND r.name=$3
|
||||
RETURNING id, task_id, attempt_id, state_id, prompt, agent_name, agent_model, status, response_summary, metadata, created_at, completed_at`,
|
||||
id, input.Owner, input.Repository, input.TaskID, input.AttemptID, input.StateID, input.Prompt, input.AgentName, input.AgentModel, input.Status, input.ResponseSummary, metadata, input.CompletedAt,
|
||||
).Scan(&prompt.ID, &prompt.TaskID, &prompt.AttemptID, &prompt.StateID, &prompt.Prompt, &prompt.AgentName, &prompt.AgentModel, &prompt.Status, &prompt.ResponseSummary, &prompt.Metadata, &prompt.CreatedAt, &prompt.CompletedAt)
|
||||
RETURNING id, gitea_user_id, task_id, attempt_id, state_id, prompt, agent_name, agent_model, status, response_summary, metadata, created_at, completed_at`,
|
||||
id, input.Owner, input.Repository, input.GiteaUserID, input.TaskID, input.AttemptID, input.StateID, input.Prompt, input.AgentName, input.AgentModel, input.Status, input.ResponseSummary, metadata, input.CompletedAt,
|
||||
).Scan(&prompt.ID, &prompt.GiteaUserID, &prompt.TaskID, &prompt.AttemptID, &prompt.StateID, &prompt.Prompt, &prompt.AgentName, &prompt.AgentModel, &prompt.Status, &prompt.ResponseSummary, &prompt.Metadata, &prompt.CreatedAt, &prompt.CompletedAt)
|
||||
if err != nil {
|
||||
return Prompt{}, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user