fix: skip update-in-place when shared token detected
CI / test (pull_request) Successful in 14s
CI / review (gpt-4.1, gpt, GPT_REVIEW_TOKEN) (pull_request) Successful in 22s
CI / review (gpt-5, security, SECURITY_REVIEW.md, SONNET_REVIEW_TOKEN) (pull_request) Successful in 39s
CI / review (gpt-5, sonnet, SONNET_REVIEW_TOKEN) (pull_request) Successful in 1m21s
CI / test (pull_request) Successful in 14s
CI / review (gpt-4.1, gpt, GPT_REVIEW_TOKEN) (pull_request) Successful in 22s
CI / review (gpt-5, security, SECURITY_REVIEW.md, SONNET_REVIEW_TOKEN) (pull_request) Successful in 39s
CI / review (gpt-5, sonnet, SONNET_REVIEW_TOKEN) (pull_request) Successful in 1m21s
When hasSharedToken() detects two roles sharing the same Gitea user, the bot now skips ALL update logic (PATCH, supersede) and always POSTs a fresh review. This prevents clobbering a sibling's review body or state when misconfigured. Tests now assert return values (true/false) rather than just verifying no panic. Added additional test case for three-roles-same-user scenario. Addresses review feedback: update logic and review state must not interact with sibling reviews under the same user.
This commit is contained in:
+15
-10
@@ -266,9 +266,12 @@ func main() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Warning: could not list existing reviews: %v", err)
|
log.Printf("Warning: could not list existing reviews: %v", err)
|
||||||
} else {
|
} else {
|
||||||
// Detect shared-token misconfiguration: warn if sibling sentinel exists from same user
|
// Detect shared-token misconfiguration: if detected, skip all
|
||||||
warnSharedToken(existingReviews, sentinel)
|
// update logic (PATCH/supersede) to avoid clobbering a sibling's review.
|
||||||
|
sharedToken := hasSharedToken(existingReviews, sentinel)
|
||||||
|
if sharedToken {
|
||||||
|
log.Printf("Shared token mode: skipping update-in-place logic to avoid clobbering sibling review")
|
||||||
|
} else {
|
||||||
existing := findOwnReview(existingReviews, sentinel)
|
existing := findOwnReview(existingReviews, sentinel)
|
||||||
|
|
||||||
if existing != nil {
|
if existing != nil {
|
||||||
@@ -307,6 +310,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// POST new review (first run, or state transition fallthrough)
|
// POST new review (first run, or state transition fallthrough)
|
||||||
log.Printf("Posting review (event=%s)...", event)
|
log.Printf("Posting review (event=%s)...", event)
|
||||||
@@ -490,11 +494,11 @@ func reviewUnchanged(reviews []gitea.Review, newBody, newEvent, sentinel string)
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// warnSharedToken logs a warning if another review-bot role posted under the
|
// hasSharedToken detects if another review-bot role posted under the same
|
||||||
// same Gitea user. This detects misconfiguration where two roles share a token
|
// Gitea user. This indicates misconfiguration where two roles share a token
|
||||||
// instead of having separate Gitea accounts. The bot continues normally (posts
|
// instead of having separate Gitea accounts. Returns true if shared token
|
||||||
// its own honest verdict) but warns operators to fix the token setup.
|
// detected (caller should skip update-in-place logic to avoid clobbering).
|
||||||
func warnSharedToken(reviews []gitea.Review, ownSentinel string) {
|
func hasSharedToken(reviews []gitea.Review, ownSentinel string) bool {
|
||||||
ownLogin := ""
|
ownLogin := ""
|
||||||
for _, r := range reviews {
|
for _, r := range reviews {
|
||||||
if strings.Contains(r.Body, ownSentinel) {
|
if strings.Contains(r.Body, ownSentinel) {
|
||||||
@@ -503,14 +507,15 @@ func warnSharedToken(reviews []gitea.Review, ownSentinel string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ownLogin == "" {
|
if ownLogin == "" {
|
||||||
return
|
return false
|
||||||
}
|
}
|
||||||
for _, r := range reviews {
|
for _, r := range reviews {
|
||||||
if r.User.Login == ownLogin && strings.Contains(r.Body, "<!-- review-bot:") && !strings.Contains(r.Body, ownSentinel) {
|
if r.User.Login == ownLogin && strings.Contains(r.Body, "<!-- review-bot:") && !strings.Contains(r.Body, ownSentinel) {
|
||||||
log.Printf("WARNING: shared token detected — another review-bot role (%s) is using the same Gitea user %q. Each role should have its own token/user for proper multi-reviewer blocking.", extractSentinelName(r.Body), ownLogin)
|
log.Printf("WARNING: shared token detected — another review-bot role (%s) is using the same Gitea user %q. Each role should have its own token/user for proper multi-reviewer blocking.", extractSentinelName(r.Body), ownLogin)
|
||||||
return
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// extractSentinelName pulls the reviewer name from a sentinel comment.
|
// extractSentinelName pulls the reviewer name from a sentinel comment.
|
||||||
|
|||||||
@@ -189,48 +189,63 @@ func TestFindOwnReview(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestWarnSharedToken(t *testing.T) {
|
func TestHasSharedToken(t *testing.T) {
|
||||||
// warnSharedToken should not panic and should handle edge cases gracefully.
|
|
||||||
// It only logs — we verify it doesn't crash.
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
reviews []gitea.Review
|
reviews []gitea.Review
|
||||||
sentinel string
|
sentinel string
|
||||||
|
want bool
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "no reviews",
|
name: "no reviews",
|
||||||
reviews: nil,
|
reviews: nil,
|
||||||
sentinel: "<!-- review-bot:sonnet -->",
|
sentinel: "<!-- review-bot:sonnet -->",
|
||||||
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "no own review yet",
|
name: "no own review yet - cannot detect",
|
||||||
reviews: []gitea.Review{
|
reviews: []gitea.Review{
|
||||||
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "other"}, Body: "<!-- review-bot:gpt --> body"},
|
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "other"}, Body: "<!-- review-bot:gpt --> body"},
|
||||||
},
|
},
|
||||||
sentinel: "<!-- review-bot:sonnet -->",
|
sentinel: "<!-- review-bot:sonnet -->",
|
||||||
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "separate users - no warning",
|
name: "separate users - no shared token",
|
||||||
reviews: []gitea.Review{
|
reviews: []gitea.Review{
|
||||||
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "sonnet-review-bot"}, Body: "<!-- review-bot:sonnet --> body"},
|
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "sonnet-review-bot"}, Body: "<!-- review-bot:sonnet --> body"},
|
||||||
{ID: 2, User: struct{ Login string `json:"login"` }{Login: "security-review-bot"}, Body: "<!-- review-bot:security --> body"},
|
{ID: 2, User: struct{ Login string `json:"login"` }{Login: "security-review-bot"}, Body: "<!-- review-bot:security --> body"},
|
||||||
},
|
},
|
||||||
sentinel: "<!-- review-bot:sonnet -->",
|
sentinel: "<!-- review-bot:sonnet -->",
|
||||||
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "shared token detected",
|
name: "shared token detected - same user different sentinels",
|
||||||
reviews: []gitea.Review{
|
reviews: []gitea.Review{
|
||||||
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "sonnet-review-bot"}, Body: "<!-- review-bot:sonnet --> body"},
|
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "sonnet-review-bot"}, Body: "<!-- review-bot:sonnet --> body"},
|
||||||
{ID: 2, User: struct{ Login string `json:"login"` }{Login: "sonnet-review-bot"}, Body: "<!-- review-bot:security --> body"},
|
{ID: 2, User: struct{ Login string `json:"login"` }{Login: "sonnet-review-bot"}, Body: "<!-- review-bot:security --> body"},
|
||||||
},
|
},
|
||||||
sentinel: "<!-- review-bot:sonnet -->",
|
sentinel: "<!-- review-bot:sonnet -->",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "three roles same user",
|
||||||
|
reviews: []gitea.Review{
|
||||||
|
{ID: 1, User: struct{ Login string `json:"login"` }{Login: "bot"}, Body: "<!-- review-bot:sonnet --> body"},
|
||||||
|
{ID: 2, User: struct{ Login string `json:"login"` }{Login: "bot"}, Body: "<!-- review-bot:security --> body"},
|
||||||
|
{ID: 3, User: struct{ Login string `json:"login"` }{Login: "bot"}, Body: "<!-- review-bot:gpt --> body"},
|
||||||
|
},
|
||||||
|
sentinel: "<!-- review-bot:sonnet -->",
|
||||||
|
want: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
// Should not panic
|
got := hasSharedToken(tc.reviews, tc.sentinel)
|
||||||
warnSharedToken(tc.reviews, tc.sentinel)
|
if got != tc.want {
|
||||||
|
t.Errorf("hasSharedToken() = %v, want %v", got, tc.want)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user