fix(participants): filter out empty entries from code owners (renovatebot#41576)

* fix(participants): filter out empty entries from code owners

* add defense in depth

Author: Churro

lib/modules/platform/bitbucket-server/index.spec.ts

@@ -980,6 +980,45 @@ describe('modules/platform/bitbucket-server/index', () => {
         await expect(bitbucket.addReviewers(5, ['name'])).toResolve();
       });
 
+      it('aborts instead of infinite recursion when invalid reviewers cannot be filtered', async () => {
+        const scope = await initRepo();
+        scope
+          .get(
+            `${urlPath}/rest/api/1.0/projects/SOME/repos/repo/pull-requests/5`,
+          )
+          .once()
+          .reply(200, prMock(url, 'SOME', 'repo'))
+          .put(
+            `${urlPath}/rest/api/1.0/projects/SOME/repos/repo/pull-requests/5`,
+          )
+          .once()
+          .reply(409, {
+            errors: [
+              {
+                context: 'reviewers',
+                message:
+                  'Errors encountered while adding some reviewers to this pull request.',
+                exceptionName:
+                  'com.atlassian.bitbucket.pull.InvalidPullRequestReviewersException',
+                reviewerErrors: [{ context: '', message: ' is not a user.' }],
+                validReviewers: [
+                  { user: { name: 'user1' } },
+                  { user: { name: 'user2' } },
+                ],
+              },
+            ],
+          });
+
+        await expect(
+          bitbucket.addReviewers(5, ['user1', 'user2', '']),
+        ).rejects.toThrow();
+
+        expect(logger.logger.warn).toHaveBeenCalledWith(
+          expect.anything(),
+          'Could not filter invalid reviewers from list, aborting to prevent infinite recursion',
+        );
+      });
+
       it('deals correctly with resolving reviewers', async () => {
         const scope = await initRepo();
         scope

lib/modules/platform/bitbucket-server/index.ts

@@ -792,7 +792,15 @@ async function updatePRAndAddReviewers(
         const filteredReviewers = reviewers.filter(
           (name) => !invalidReviewers.includes(name),
         );
-        await updatePRAndAddReviewers(prNo, filteredReviewers);
+        if (filteredReviewers.length < reviewers.length) {
+          await updatePRAndAddReviewers(prNo, filteredReviewers);
+        } else {
+          logger.warn(
+            { invalidReviewers, reviewers },
+            'Could not filter invalid reviewers from list, aborting to prevent infinite recursion',
+          );
+          throw err;
+        }
       } else {
         logger.debug(
           '409 response to adding reviewers - has repository changed?',

lib/workers/repository/update/pr/participants.spec.ts

@@ -204,6 +204,22 @@ describe('workers/repository/update/pr/participants', () => {
       ]);
     });
 
+    it('filters out bare @ from malformed CODEOWNERS entries', async () => {
+      codeOwners.codeOwnersForPr.mockResolvedValueOnce([
+        '@UserOne',
+        '@UserTwo',
+        '@',
+      ]);
+      await addParticipants(
+        { ...config, reviewers: [], reviewersFromCodeOwners: true },
+        pr,
+      );
+      expect(platform.addReviewers).toHaveBeenCalledExactlyOnceWith(123, [
+        'UserOne',
+        'UserTwo',
+      ]);
+    });
+
     it('supports additionalReviewers', async () => {
       await addParticipants(
         { ...config, additionalReviewers: ['foo', 'bar', 'baz'] },

lib/workers/repository/update/pr/participants.ts

@@ -1,4 +1,4 @@
-import { isArray, isNumber } from '@sindresorhus/is';
+import { isArray, isNonEmptyString, isNumber } from '@sindresorhus/is';
 import { GlobalConfig } from '../../../../config/global.ts';
 import type { RenovateConfig } from '../../../../config/types.ts';
 import { logger } from '../../../../logger/index.ts';
@@ -36,7 +36,9 @@ function prepareParticipants(
   config: RenovateConfig,
   usernames: string[],
 ): Promise<string[]> {
-  const normalizedUsernames = [...new Set(usernames.map(noLeadingAtSymbol))];
+  const normalizedUsernames = [
+    ...new Set(usernames.map(noLeadingAtSymbol).filter(isNonEmptyString)),
+  ];
   return filterUnavailableUsers(config, normalizedUsernames);
 }