3825859da6
build / build (push) Successful in 2m20s
PP 增加受控凭据更新、真实登录与目录检查,待验证修改不会替换生效配置;扫描与取件共享生效修订。 钉钉来源向导、校验与登记共用 DWS 授权,支持中途恢复与换账号保护,取消旧扫码自动回落。 认证审计复用已有来源审计页,配置响应不回传密码;补齐运行镜像脚本与权限。 验证:make verify 退出 0;PP/DWS/httpapi 目标 race 回归通过;隔离 HTTP 服务验证 PP 协议及扫描/取件消费者。 尚未部署;真实 PP 凭据与目录可用性在测试站部署后验证。
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
package httpapi
|
|
|
|
import (
|
|
"context"
|
|
postgresstore "knowledge-governance/internal/platform/postgres"
|
|
"knowledge-governance/internal/ppauth"
|
|
"sort"
|
|
)
|
|
|
|
// Credential events are committed with their secret revision in one atomic file.
|
|
// Merge them into the existing audit view without copying secrets into SQL.
|
|
func combinedSourceAudit(ctx context.Context, reader sourceAuditReader, manager *ppauth.Manager, limit, offset int) (postgresstore.SourceAuditPage, error) {
|
|
if manager == nil {
|
|
return reader.ListSourceAudit(ctx, limit, offset)
|
|
}
|
|
events, err := manager.Events(ctx)
|
|
if err != nil {
|
|
return postgresstore.SourceAuditPage{}, err
|
|
}
|
|
if len(events) == 0 {
|
|
return reader.ListSourceAudit(ctx, limit, offset)
|
|
}
|
|
start := offset - len(events)
|
|
if start < 0 {
|
|
start = 0
|
|
}
|
|
rows := make([]postgresstore.SourceAuditItem, 0, limit+len(events))
|
|
total := 0
|
|
for next := start; len(rows) < limit+len(events); {
|
|
take := limit + len(events) - len(rows)
|
|
if take > 100 {
|
|
take = 100
|
|
}
|
|
page, e := reader.ListSourceAudit(ctx, take, next)
|
|
if e != nil {
|
|
return postgresstore.SourceAuditPage{}, e
|
|
}
|
|
total = page.Total
|
|
rows = append(rows, page.Items...)
|
|
next += len(page.Items)
|
|
if next >= total || len(page.Items) == 0 {
|
|
break
|
|
}
|
|
}
|
|
for _, e := range events {
|
|
rows = append(rows, postgresstore.SourceAuditItem{ID: e.ID, ConnectionID: "", SourceName: e.SourceName, Action: e.Action, Actor: e.Actor, CreatedAt: e.CreatedAt, Detail: e.Detail})
|
|
}
|
|
sort.SliceStable(rows, func(i, j int) bool {
|
|
if rows[i].CreatedAt.Equal(rows[j].CreatedAt) {
|
|
return rows[i].ID > rows[j].ID
|
|
}
|
|
return rows[i].CreatedAt.After(rows[j].CreatedAt)
|
|
})
|
|
skip := offset - start
|
|
if skip > len(rows) {
|
|
skip = len(rows)
|
|
}
|
|
end := skip + limit
|
|
if end > len(rows) {
|
|
end = len(rows)
|
|
}
|
|
return postgresstore.SourceAuditPage{Items: rows[skip:end], Total: total + len(events), Limit: limit, Offset: offset}, nil
|
|
}
|