jobStatusAndActionProvider()\n+ {\n+ return Stream.of(\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \"trigger\"),\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \"schedule\"),\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \"pause\"),\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \"unschedule\"),\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \"resume\"),\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \"unschedule\"),\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \"delete\"));\n+ }\n+\n+ /**\n+ * Verify that each action URL on the page contains the right CSRF token.\n+ *\n+ * @param status the status of the job\n+ * @param action the action to verify\n+ */\n+ @ParameterizedTest\n+ @MethodSource(\"jobStatusAndActionProvider\")\n+ void checkCSRFTokenPresenceInActionURL(JobState status, String action) throws Exception\n+ {\n+ // Set the status of the displayed job to control which action URLs will be rendered.\n+ when(this.schedulerPluginApi.getJobStatus(this.testJobObjectApi)).thenReturn(status);\n+\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\n+ verify(this.schedulerPluginApi).getJobStatus(this.testJobObjectApi);\n+ Element actionLink = result.selectFirst(String.format(\"td a:contains(actions.%s)\", action));\n+ assertNotNull(actionLink);\n+\n+ // Check the presence of the CSRF token for the given action.\n+ assertEquals(String.format(\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\"\n+ + \".TestJob&form_token=%s\", action, CSRF_TOKEN), actionLink.attr(\"href\"));\n+ }\n+\n+ /**\n+ * Verify that the names of jobs are properly escaped in each action URL.\n+ *\n+ * @param status the status of the job\n+ * @param action the action to verify\n+ */\n+ @ParameterizedTest\n+ @MethodSource(\"jobStatusAndActionProvider\")\n+ void checkEscapingInJobNames(JobState status, String action) throws Exception\n+ {\n+ // Use the `noscript` macro to make sure that no code injection occurs.\n+ String jobName = \"\\\">]]{{/html}}{{noscript /}}\";\n+ String escapedJobName = \"%22%3E%5D%5D%7B%7B%2Fhtml%7D%7D%7B%7Bnoscript%20%2F%7D%7D\";\n+\n+ // Create a new job with a name that needs escaping and get a reference to its API.\n+ XWikiDocument escapedJob = new XWikiDocument(new DocumentReference(\"xwiki\", \"Scheduler\", jobName));\n+ BaseObject escapedJobObject =\n+ escapedJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE, this.context);\n+ Object escapedJobObjectApi = new Object(escapedJobObject, this.context);\n+ this.xwiki.saveDocument(escapedJob, this.context);\n+\n+ // Return the name of the new job through the Query Service.\n+ when(this.query.execute()).thenReturn(List.of(\"Scheduler.\" + jobName));\n+\n+ // Set the status of the new job to control which action URLs will be rendered.\n+ when(this.schedulerPluginApi.getJobStatus(escapedJobObjectApi)).thenReturn(status);\n+\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\n+ Element actionLink = result.selectFirst(String.format(\"td a:contains(actions.%s)\", action));\n+ assertNotNull(actionLink);\n+\n+ // Check the proper escaping of the job name for the given action.\n+ assertEquals(String.format(\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\"\n+ + \".%s&form_token=%s\", action, escapedJobName, CSRF_TOKEN), actionLink.attr(\"href\"));\n+ }\n+}\n"}],"string":"[\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/8a92cb4bef7e5f244ae81eed3e64fe9be95827cf\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-20851: Validate CSRF token before running job scheduling actions\\n\\n* Add a mandatory CSRF token for job management\\n* Add a page test for Scheduler.WebHome that checks for the proper use of the CSRF token\\n* Refactor scheduling actions URL generation\\n* Refactor Scheduler.WebHome to improve escaping\\n\\n(cherry picked from commit f16ca4ef1513f84ce2e685d4a05d689bd3a2ab4c)\",\n \"diff_code\": \"From 8a92cb4bef7e5f244ae81eed3e64fe9be95827cf Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Fri, 6 Oct 2023 17:43:23 +0200\\nSubject: [PATCH] XWIKI-20851: Validate CSRF token before running job\\n scheduling actions\\n\\n* Add a mandatory CSRF token for job management\\n* Add a page test for Scheduler.WebHome that checks for the proper use of the CSRF token\\n* Refactor scheduling actions URL generation\\n* Refactor Scheduler.WebHome to improve escaping\\n\\n(cherry picked from commit f16ca4ef1513f84ce2e685d4a05d689bd3a2ab4c)\\n---\\n .../resources/ApplicationResources.properties | 1 +\\n .../xwiki/scheduler/test/ui/SchedulerIT.java | 6 +-\\n .../xwiki-platform-scheduler-ui/pom.xml | 22 ++\\n .../resources/Scheduler/Translations.de.xml | 2 +-\\n .../resources/Scheduler/Translations.ru.xml | 2 +-\\n .../resources/Scheduler/Translations.uk.xml | 2 +-\\n .../src/main/resources/Scheduler/WebHome.xml | 25 +-\\n .../xwiki/scheduler/ui/SchedulerPageTest.java | 257 ++++++++++++++++++\\n 8 files changed, 300 insertions(+), 17 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\nindex c05d3339b01f..b1621a4ea058 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\n@@ -2887,6 +2887,7 @@ xe.scheduler.job.scriptexplanation=The script is the code that will be executed\\n xe.scheduler.job.backtolist=Back to the job list\\n xe.scheduler.job.object=This sheet must be applied to a page that holds a scheduler job object.\\n xe.scheduler.updateJobClassComment=Created/Updated Scheduler Job Class definition\\n+xe.scheduler.invalidToken=Invalid token, please try again by clicking on the desired action below.\\n \\n ### Statistics application\\n xe.statistics.activity=Activity Statistics\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\nindex 60e2ef17cdee..1dfd9a68a5c2 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\n@@ -70,11 +70,11 @@ void verifyScheduler(TestUtils setup)\\n // because we want to remain on the same page in case of a test failure so that our TestDebugger rule can\\n // collect accurate information about the failure. It's not a problem if the job remains scheduled because it\\n // does nothing. Other tests should not rely on the number of scheduler jobs though.\\n- setup.deletePage(\\\"Scheduler\\\", \\\"SchedulerTestJob\\\");\\n+ setup.deletePage(\\\"Scheduler\\\", \\\"Scheduler]]TestJob\\\");\\n \\n // Create Job\\n SchedulerHomePage schedulerHomePage = SchedulerHomePage.gotoPage();\\n- schedulerHomePage.setJobName(\\\"SchedulerTestJob\\\");\\n+ schedulerHomePage.setJobName(\\\"Scheduler]]TestJob\\\");\\n SchedulerEditPage schedulerEdit = schedulerHomePage.clickAdd();\\n \\n String jobName = \\\"Tester problem\\\";\\n@@ -107,7 +107,7 @@ void verifyScheduler(TestUtils setup)\\n assertFalse(setup.getDriver().hasElementWithoutWaiting(By.linkText(jobName)));\\n // Note: since the page doesn't exist, we need to disable the space redirect feature so that we end up on the\\n // terminal page that was removed.\\n- setup.gotoPage(\\\"Scheduler\\\", \\\"SchedulerTestJob\\\", \\\"view\\\", \\\"spaceRedirect=false\\\");\\n+ setup.gotoPage(\\\"Scheduler\\\", \\\"Scheduler]]TestJob\\\", \\\"view\\\", \\\"spaceRedirect=false\\\");\\n setup.getDriver().findElement(By.linkText(\\\"Restore\\\")).click();\\n schedulerPage = new SchedulerPage();\\n schedulerPage.backToHome();\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\nindex b80fc3405f90..4694ed452ad6 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\nindex 948bfde68b4b..0a3d781dd6d4 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Planer\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\nindex 4b9ba03940a7..ca2277407a67 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Планировщик\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\nindex 12aa833275df..5f435b0a0061 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Планувальник\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\nindex a0a4a2df1250..0ffcf5c31c70 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.1\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"Scheduler.WebHome\\\" locale=\\\"\\\">\\n <web>Scheduler</web>\\n <name>WebHome</name>\\n <language/>\\n@@ -51,7 +51,13 @@\\n #set ($tJobHolder = $request.which)\\n #set ($jobDoc = $xwiki.getDocument($tJobHolder))\\n #set ($jobObj = $jobDoc.getObject('XWiki.SchedulerJobClass'))\\n- #if ($request.do == 'schedule')\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ ##\\n+ ## Check that the CSRF token matches the user before any operation\\n+ ##\\n+ {{error}}$services.localization.render('xe.scheduler.invalidToken'){{/error}}\\n+\\n+ #elseif ($request.do == 'schedule')\\n ##\\n ## Schedule a job\\n ##\\n@@ -143,7 +149,6 @@ $services.localization.render('xe.scheduler.welcome')\\n ##\\n |=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.name')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.status')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.next')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.actions')\\n #foreach ($docName in $services.query.xwql('from doc.object(XWiki.SchedulerJobClass) as jobs where doc.fullName <> ''XWiki.SchedulerJobTemplate''').execute())\\n- #set ($actions = {})\\n #set ($jobHolder = $xwiki.getDocument($docName))\\n #set ($job = $jobHolder.getObject('XWiki.SchedulerJobClass'))\\n #set ($status = $scheduler.getJobStatus($job).value)\\n@@ -156,18 +161,16 @@ $services.localization.render('xe.scheduler.welcome')\\n #else\\n #set ($firetime = $services.localization.render('xe.scheduler.jobs.next.undefined'))\\n #end\\n- #set ($ok = $!actions.put('trigger', $doc.getURL('view', \\\"do=trigger&which=${jobHolder.fullName}\\\")))\\n+ #set ($actions = ['trigger'])\\n #if ($status == 'None')\\n- #set ($ok = $!actions.put('schedule', $doc.getURL('view', \\\"do=schedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.add('schedule'))\\n #elseif($status == 'Normal')\\n- #set ($ok = $!actions.put('pause', $doc.getURL('view', \\\"do=pause&which=${jobHolder.fullName}\\\")))\\n- #set ($ok = $!actions.put('unschedule', $doc.getURL('view', \\\"do=unschedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.addAll(['pause', 'unschedule']))\\n #elseif ($status == 'Paused')\\n- #set ($ok = $!actions.put('resume', $doc.getURL('view', \\\"do=resume&which=${jobHolder.fullName}\\\")))\\n- #set ($ok = $!actions.put('unschedule', $doc.getURL('view', \\\"do=unschedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.addAll(['resume', 'unschedule']))\\n #end\\n- #set ($ok = $!actions.put('delete', $doc.getURL('view', \\\"do=delete&which=${jobHolder.fullName}\\\")))\\n-|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$jobHolder.fullName]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions.entrySet()) [[$services.localization.render(\\\"xe.scheduler.jobs.actions.${action.key}\\\")>>path:${action.value}]]#end\\n+ #set ($ok = $actions.add('delete'))\\n+|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$services.rendering.escape($jobHolder.fullName, 'xwiki/2.1')]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions) [[$services.localization.render(\\\"xe.scheduler.jobs.actions.$action\\\")>>path:$doc.getURL('view', $escapetool.url({'do': $action, 'which': $jobHolder.fullName, 'form_token': $services.csrf.token}))]]#end\\n \\n #end\\n #if ($doc.hasAccessLevel('programming'))\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\nnew file mode 100644\\nindex 000000000000..6ad045b450cf\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\n@@ -0,0 +1,257 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.scheduler.ui;\\n+\\n+import java.util.List;\\n+import java.util.stream.Stream;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.jsoup.nodes.Element;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.junit.jupiter.params.ParameterizedTest;\\n+import org.junit.jupiter.params.provider.Arguments;\\n+import org.junit.jupiter.params.provider.MethodSource;\\n+import org.mockito.Mock;\\n+import org.quartz.Trigger;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.query.internal.ScriptQuery;\\n+import org.xwiki.query.script.QueryManagerScriptService;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.rendering.internal.macro.message.ErrorMessageMacro;\\n+import org.xwiki.rendering.internal.macro.message.InfoMessageMacro;\\n+import org.xwiki.rendering.internal.macro.message.WarningMessageMacro;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.annotation.ComponentList;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.TestNoScriptMacro;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.api.Object;\\n+import com.xpn.xwiki.doc.XWikiDocument;\\n+import com.xpn.xwiki.objects.BaseObject;\\n+import com.xpn.xwiki.plugin.scheduler.JobState;\\n+import com.xpn.xwiki.plugin.scheduler.SchedulerPluginApi;\\n+import com.xpn.xwiki.plugin.scheduler.internal.SchedulerJobClassDocumentInitializer;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\\n+import static org.junit.jupiter.api.Assertions.assertTrue;\\n+import static org.mockito.ArgumentMatchers.any;\\n+import static org.mockito.ArgumentMatchers.anyString;\\n+import static org.mockito.ArgumentMatchers.eq;\\n+import static org.mockito.Mockito.doReturn;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+/**\\n+ * Page tests for {@code Scheduler.WebHome}.\\n+ *\\n+ * @version $Id$\\n+ */\\n+@ComponentList({\\n+ InfoMessageMacro.class,\\n+ ErrorMessageMacro.class,\\n+ SchedulerJobClassDocumentInitializer.class,\\n+ TestNoScriptMacro.class,\\n+ WarningMessageMacro.class\\n+})\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class SchedulerPageTest extends PageTest\\n+{\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"Scheduler\\\";\\n+\\n+ private static final DocumentReference SCHEDULER_WEB_HOME =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"WebHome\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private QueryManagerScriptService queryService;\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ private SchedulerPluginApi schedulerPluginApi;\\n+\\n+ @Mock\\n+ private ScriptQuery query;\\n+\\n+ private Object testJobObjectApi;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Query Service to return a job.\\n+ this.queryService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"query\\\",\\n+ QueryManagerScriptService.class,\\n+ true);\\n+ when(this.queryService.xwql(anyString())).thenReturn(this.query);\\n+ when(this.query.execute()).thenReturn(List.of(\\\"Scheduler.TestJob\\\"));\\n+\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.getToken()).thenReturn(CSRF_TOKEN);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ // Spy the Scheduler Plugin to obtain a mocked API.\\n+ this.schedulerPluginApi = mock(SchedulerPluginApi.class);\\n+ doReturn(this.schedulerPluginApi).when(this.oldcore.getSpyXWiki()).getPluginApi(eq(\\\"scheduler\\\"),\\n+ any(XWikiContext.class));\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ // Create a new job and keep a reference to its API.\\n+ XWikiDocument testJob = new XWikiDocument(new DocumentReference(\\\"xwiki\\\", \\\"Scheduler\\\", \\\"TestJob\\\"));\\n+ BaseObject testJobObject = testJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE,\\n+ this.context);\\n+ this.xwiki.saveDocument(testJob, this.context);\\n+ this.testJobObjectApi = new Object(testJobObject, this.context);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ when(this.oldcore.getMockRightService().hasAccessLevel(eq(\\\"programming\\\"), anyString(), anyString(),\\n+ any(XWikiContext.class))).thenReturn(true);\\n+ }\\n+\\n+ /**\\n+ * Verify that the trigger operation is not called in the Scheduler Plugin API when the CSRF token is invalid, and\\n+ * that the corresponding error message is properly displayed.\\n+ */\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong token\\\";\\n+\\n+ this.request.put(\\\"do\\\", \\\"trigger\\\");\\n+ this.request.put(\\\"which\\\", \\\"Scheduler.TestJob\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+\\n+ verify(this.schedulerPluginApi, never()).triggerJob(any(Object.class));\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"xe.scheduler.invalidToken\\\", result.getElementsByClass(\\\"errormessage\\\").text());\\n+ }\\n+\\n+ /**\\n+ * Verify that the trigger operation is correctly called in the Scheduler Plugin API when the CSRF token is valid,\\n+ * and that no error displays.\\n+ */\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.schedulerPluginApi.triggerJob(this.testJobObjectApi)).thenReturn(true);\\n+\\n+ this.request.put(\\\"do\\\", \\\"trigger\\\");\\n+ this.request.put(\\\"which\\\", \\\"Scheduler.TestJob\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+\\n+ verify(this.schedulerPluginApi).triggerJob(this.testJobObjectApi);\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertTrue(result.getElementsByClass(\\\"errormessage\\\").isEmpty());\\n+ }\\n+\\n+ /**\\n+ * List every possible action that can be applied to a job depending on its current status.\\n+ *\\n+ * @return a {@link Stream} of {@link org.junit.jupiter.params.provider.Arguments} for every combination of job\\n+ * status and action\\n+ */\\n+ static Stream<Arguments> jobStatusAndActionProvider()\\n+ {\\n+ return Stream.of(\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"trigger\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"schedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \\\"pause\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \\\"unschedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \\\"resume\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \\\"unschedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"delete\\\"));\\n+ }\\n+\\n+ /**\\n+ * Verify that each action URL on the page contains the right CSRF token.\\n+ *\\n+ * @param status the status of the job\\n+ * @param action the action to verify\\n+ */\\n+ @ParameterizedTest\\n+ @MethodSource(\\\"jobStatusAndActionProvider\\\")\\n+ void checkCSRFTokenPresenceInActionURL(JobState status, String action) throws Exception\\n+ {\\n+ // Set the status of the displayed job to control which action URLs will be rendered.\\n+ when(this.schedulerPluginApi.getJobStatus(this.testJobObjectApi)).thenReturn(status);\\n+\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+ verify(this.schedulerPluginApi).getJobStatus(this.testJobObjectApi);\\n+ Element actionLink = result.selectFirst(String.format(\\\"td a:contains(actions.%s)\\\", action));\\n+ assertNotNull(actionLink);\\n+\\n+ // Check the presence of the CSRF token for the given action.\\n+ assertEquals(String.format(\\\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\\\"\\n+ + \\\".TestJob&form_token=%s\\\", action, CSRF_TOKEN), actionLink.attr(\\\"href\\\"));\\n+ }\\n+\\n+ /**\\n+ * Verify that the names of jobs are properly escaped in each action URL.\\n+ *\\n+ * @param status the status of the job\\n+ * @param action the action to verify\\n+ */\\n+ @ParameterizedTest\\n+ @MethodSource(\\\"jobStatusAndActionProvider\\\")\\n+ void checkEscapingInJobNames(JobState status, String action) throws Exception\\n+ {\\n+ // Use the `noscript` macro to make sure that no code injection occurs.\\n+ String jobName = \\\"\\\\\\\">]]{{/html}}{{noscript /}}\\\";\\n+ String escapedJobName = \\\"%22%3E%5D%5D%7B%7B%2Fhtml%7D%7D%7B%7Bnoscript%20%2F%7D%7D\\\";\\n+\\n+ // Create a new job with a name that needs escaping and get a reference to its API.\\n+ XWikiDocument escapedJob = new XWikiDocument(new DocumentReference(\\\"xwiki\\\", \\\"Scheduler\\\", jobName));\\n+ BaseObject escapedJobObject =\\n+ escapedJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE, this.context);\\n+ Object escapedJobObjectApi = new Object(escapedJobObject, this.context);\\n+ this.xwiki.saveDocument(escapedJob, this.context);\\n+\\n+ // Return the name of the new job through the Query Service.\\n+ when(this.query.execute()).thenReturn(List.of(\\\"Scheduler.\\\" + jobName));\\n+\\n+ // Set the status of the new job to control which action URLs will be rendered.\\n+ when(this.schedulerPluginApi.getJobStatus(escapedJobObjectApi)).thenReturn(status);\\n+\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+ Element actionLink = result.selectFirst(String.format(\\\"td a:contains(actions.%s)\\\", action));\\n+ assertNotNull(actionLink);\\n+\\n+ // Check the proper escaping of the job name for the given action.\\n+ assertEquals(String.format(\\\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\\\"\\n+ + \\\".%s&form_token=%s\\\", action, escapedJobName, CSRF_TOKEN), actionLink.attr(\\\"href\\\"));\\n+ }\\n+}\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/efd3570f3e5e944ec0ad0899bf799bf9563aef87\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-20851: Validate CSRF token before running job scheduling actions\\n\\n* Add a mandatory CSRF token for job management\\n* Add a page test for Scheduler.WebHome that checks for the proper use of the CSRF token\\n* Refactor scheduling actions URL generation\\n* Refactor Scheduler.WebHome to improve escaping\\n\\n(cherry picked from commit f16ca4ef1513f84ce2e685d4a05d689bd3a2ab4c)\",\n \"diff_code\": \"From efd3570f3e5e944ec0ad0899bf799bf9563aef87 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Fri, 6 Oct 2023 17:43:23 +0200\\nSubject: [PATCH] XWIKI-20851: Validate CSRF token before running job\\n scheduling actions\\n\\n* Add a mandatory CSRF token for job management\\n* Add a page test for Scheduler.WebHome that checks for the proper use of the CSRF token\\n* Refactor scheduling actions URL generation\\n* Refactor Scheduler.WebHome to improve escaping\\n\\n(cherry picked from commit f16ca4ef1513f84ce2e685d4a05d689bd3a2ab4c)\\n---\\n .../resources/ApplicationResources.properties | 1 +\\n .../xwiki/scheduler/test/ui/SchedulerIT.java | 6 +-\\n .../xwiki-platform-scheduler-ui/pom.xml | 22 ++\\n .../resources/Scheduler/Translations.de.xml | 2 +-\\n .../resources/Scheduler/Translations.ru.xml | 2 +-\\n .../resources/Scheduler/Translations.uk.xml | 2 +-\\n .../src/main/resources/Scheduler/WebHome.xml | 25 +-\\n .../xwiki/scheduler/ui/SchedulerPageTest.java | 257 ++++++++++++++++++\\n 8 files changed, 300 insertions(+), 17 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\nindex f01d943829e5..4598c721eaf3 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\n@@ -2874,6 +2874,7 @@ xe.scheduler.job.scriptexplanation=The script is the code that will be executed\\n xe.scheduler.job.backtolist=Back to the job list\\n xe.scheduler.job.object=This sheet must be applied to a page that holds a scheduler job object.\\n xe.scheduler.updateJobClassComment=Created/Updated Scheduler Job Class definition\\n+xe.scheduler.invalidToken=Invalid token, please try again by clicking on the desired action below.\\n \\n ### Statistics application\\n xe.statistics.activity=Activity Statistics\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\nindex 60e2ef17cdee..1dfd9a68a5c2 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\n@@ -70,11 +70,11 @@ void verifyScheduler(TestUtils setup)\\n // because we want to remain on the same page in case of a test failure so that our TestDebugger rule can\\n // collect accurate information about the failure. It's not a problem if the job remains scheduled because it\\n // does nothing. Other tests should not rely on the number of scheduler jobs though.\\n- setup.deletePage(\\\"Scheduler\\\", \\\"SchedulerTestJob\\\");\\n+ setup.deletePage(\\\"Scheduler\\\", \\\"Scheduler]]TestJob\\\");\\n \\n // Create Job\\n SchedulerHomePage schedulerHomePage = SchedulerHomePage.gotoPage();\\n- schedulerHomePage.setJobName(\\\"SchedulerTestJob\\\");\\n+ schedulerHomePage.setJobName(\\\"Scheduler]]TestJob\\\");\\n SchedulerEditPage schedulerEdit = schedulerHomePage.clickAdd();\\n \\n String jobName = \\\"Tester problem\\\";\\n@@ -107,7 +107,7 @@ void verifyScheduler(TestUtils setup)\\n assertFalse(setup.getDriver().hasElementWithoutWaiting(By.linkText(jobName)));\\n // Note: since the page doesn't exist, we need to disable the space redirect feature so that we end up on the\\n // terminal page that was removed.\\n- setup.gotoPage(\\\"Scheduler\\\", \\\"SchedulerTestJob\\\", \\\"view\\\", \\\"spaceRedirect=false\\\");\\n+ setup.gotoPage(\\\"Scheduler\\\", \\\"Scheduler]]TestJob\\\", \\\"view\\\", \\\"spaceRedirect=false\\\");\\n setup.getDriver().findElement(By.linkText(\\\"Restore\\\")).click();\\n schedulerPage = new SchedulerPage();\\n schedulerPage.backToHome();\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\nindex 05be02576e02..2611e1ffd562 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\nindex 948bfde68b4b..0a3d781dd6d4 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Planer\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\nindex 4b9ba03940a7..ca2277407a67 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Планировщик\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\nindex 12aa833275df..5f435b0a0061 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Планувальник\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\nindex a0a4a2df1250..0ffcf5c31c70 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.1\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"Scheduler.WebHome\\\" locale=\\\"\\\">\\n <web>Scheduler</web>\\n <name>WebHome</name>\\n <language/>\\n@@ -51,7 +51,13 @@\\n #set ($tJobHolder = $request.which)\\n #set ($jobDoc = $xwiki.getDocument($tJobHolder))\\n #set ($jobObj = $jobDoc.getObject('XWiki.SchedulerJobClass'))\\n- #if ($request.do == 'schedule')\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ ##\\n+ ## Check that the CSRF token matches the user before any operation\\n+ ##\\n+ {{error}}$services.localization.render('xe.scheduler.invalidToken'){{/error}}\\n+\\n+ #elseif ($request.do == 'schedule')\\n ##\\n ## Schedule a job\\n ##\\n@@ -143,7 +149,6 @@ $services.localization.render('xe.scheduler.welcome')\\n ##\\n |=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.name')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.status')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.next')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.actions')\\n #foreach ($docName in $services.query.xwql('from doc.object(XWiki.SchedulerJobClass) as jobs where doc.fullName <> ''XWiki.SchedulerJobTemplate''').execute())\\n- #set ($actions = {})\\n #set ($jobHolder = $xwiki.getDocument($docName))\\n #set ($job = $jobHolder.getObject('XWiki.SchedulerJobClass'))\\n #set ($status = $scheduler.getJobStatus($job).value)\\n@@ -156,18 +161,16 @@ $services.localization.render('xe.scheduler.welcome')\\n #else\\n #set ($firetime = $services.localization.render('xe.scheduler.jobs.next.undefined'))\\n #end\\n- #set ($ok = $!actions.put('trigger', $doc.getURL('view', \\\"do=trigger&which=${jobHolder.fullName}\\\")))\\n+ #set ($actions = ['trigger'])\\n #if ($status == 'None')\\n- #set ($ok = $!actions.put('schedule', $doc.getURL('view', \\\"do=schedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.add('schedule'))\\n #elseif($status == 'Normal')\\n- #set ($ok = $!actions.put('pause', $doc.getURL('view', \\\"do=pause&which=${jobHolder.fullName}\\\")))\\n- #set ($ok = $!actions.put('unschedule', $doc.getURL('view', \\\"do=unschedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.addAll(['pause', 'unschedule']))\\n #elseif ($status == 'Paused')\\n- #set ($ok = $!actions.put('resume', $doc.getURL('view', \\\"do=resume&which=${jobHolder.fullName}\\\")))\\n- #set ($ok = $!actions.put('unschedule', $doc.getURL('view', \\\"do=unschedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.addAll(['resume', 'unschedule']))\\n #end\\n- #set ($ok = $!actions.put('delete', $doc.getURL('view', \\\"do=delete&which=${jobHolder.fullName}\\\")))\\n-|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$jobHolder.fullName]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions.entrySet()) [[$services.localization.render(\\\"xe.scheduler.jobs.actions.${action.key}\\\")>>path:${action.value}]]#end\\n+ #set ($ok = $actions.add('delete'))\\n+|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$services.rendering.escape($jobHolder.fullName, 'xwiki/2.1')]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions) [[$services.localization.render(\\\"xe.scheduler.jobs.actions.$action\\\")>>path:$doc.getURL('view', $escapetool.url({'do': $action, 'which': $jobHolder.fullName, 'form_token': $services.csrf.token}))]]#end\\n \\n #end\\n #if ($doc.hasAccessLevel('programming'))\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\nnew file mode 100644\\nindex 000000000000..6ad045b450cf\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\n@@ -0,0 +1,257 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.scheduler.ui;\\n+\\n+import java.util.List;\\n+import java.util.stream.Stream;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.jsoup.nodes.Element;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.junit.jupiter.params.ParameterizedTest;\\n+import org.junit.jupiter.params.provider.Arguments;\\n+import org.junit.jupiter.params.provider.MethodSource;\\n+import org.mockito.Mock;\\n+import org.quartz.Trigger;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.query.internal.ScriptQuery;\\n+import org.xwiki.query.script.QueryManagerScriptService;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.rendering.internal.macro.message.ErrorMessageMacro;\\n+import org.xwiki.rendering.internal.macro.message.InfoMessageMacro;\\n+import org.xwiki.rendering.internal.macro.message.WarningMessageMacro;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.annotation.ComponentList;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.TestNoScriptMacro;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.api.Object;\\n+import com.xpn.xwiki.doc.XWikiDocument;\\n+import com.xpn.xwiki.objects.BaseObject;\\n+import com.xpn.xwiki.plugin.scheduler.JobState;\\n+import com.xpn.xwiki.plugin.scheduler.SchedulerPluginApi;\\n+import com.xpn.xwiki.plugin.scheduler.internal.SchedulerJobClassDocumentInitializer;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\\n+import static org.junit.jupiter.api.Assertions.assertTrue;\\n+import static org.mockito.ArgumentMatchers.any;\\n+import static org.mockito.ArgumentMatchers.anyString;\\n+import static org.mockito.ArgumentMatchers.eq;\\n+import static org.mockito.Mockito.doReturn;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+/**\\n+ * Page tests for {@code Scheduler.WebHome}.\\n+ *\\n+ * @version $Id$\\n+ */\\n+@ComponentList({\\n+ InfoMessageMacro.class,\\n+ ErrorMessageMacro.class,\\n+ SchedulerJobClassDocumentInitializer.class,\\n+ TestNoScriptMacro.class,\\n+ WarningMessageMacro.class\\n+})\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class SchedulerPageTest extends PageTest\\n+{\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"Scheduler\\\";\\n+\\n+ private static final DocumentReference SCHEDULER_WEB_HOME =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"WebHome\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private QueryManagerScriptService queryService;\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ private SchedulerPluginApi schedulerPluginApi;\\n+\\n+ @Mock\\n+ private ScriptQuery query;\\n+\\n+ private Object testJobObjectApi;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Query Service to return a job.\\n+ this.queryService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"query\\\",\\n+ QueryManagerScriptService.class,\\n+ true);\\n+ when(this.queryService.xwql(anyString())).thenReturn(this.query);\\n+ when(this.query.execute()).thenReturn(List.of(\\\"Scheduler.TestJob\\\"));\\n+\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.getToken()).thenReturn(CSRF_TOKEN);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ // Spy the Scheduler Plugin to obtain a mocked API.\\n+ this.schedulerPluginApi = mock(SchedulerPluginApi.class);\\n+ doReturn(this.schedulerPluginApi).when(this.oldcore.getSpyXWiki()).getPluginApi(eq(\\\"scheduler\\\"),\\n+ any(XWikiContext.class));\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ // Create a new job and keep a reference to its API.\\n+ XWikiDocument testJob = new XWikiDocument(new DocumentReference(\\\"xwiki\\\", \\\"Scheduler\\\", \\\"TestJob\\\"));\\n+ BaseObject testJobObject = testJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE,\\n+ this.context);\\n+ this.xwiki.saveDocument(testJob, this.context);\\n+ this.testJobObjectApi = new Object(testJobObject, this.context);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ when(this.oldcore.getMockRightService().hasAccessLevel(eq(\\\"programming\\\"), anyString(), anyString(),\\n+ any(XWikiContext.class))).thenReturn(true);\\n+ }\\n+\\n+ /**\\n+ * Verify that the trigger operation is not called in the Scheduler Plugin API when the CSRF token is invalid, and\\n+ * that the corresponding error message is properly displayed.\\n+ */\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong token\\\";\\n+\\n+ this.request.put(\\\"do\\\", \\\"trigger\\\");\\n+ this.request.put(\\\"which\\\", \\\"Scheduler.TestJob\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+\\n+ verify(this.schedulerPluginApi, never()).triggerJob(any(Object.class));\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"xe.scheduler.invalidToken\\\", result.getElementsByClass(\\\"errormessage\\\").text());\\n+ }\\n+\\n+ /**\\n+ * Verify that the trigger operation is correctly called in the Scheduler Plugin API when the CSRF token is valid,\\n+ * and that no error displays.\\n+ */\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.schedulerPluginApi.triggerJob(this.testJobObjectApi)).thenReturn(true);\\n+\\n+ this.request.put(\\\"do\\\", \\\"trigger\\\");\\n+ this.request.put(\\\"which\\\", \\\"Scheduler.TestJob\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+\\n+ verify(this.schedulerPluginApi).triggerJob(this.testJobObjectApi);\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertTrue(result.getElementsByClass(\\\"errormessage\\\").isEmpty());\\n+ }\\n+\\n+ /**\\n+ * List every possible action that can be applied to a job depending on its current status.\\n+ *\\n+ * @return a {@link Stream} of {@link org.junit.jupiter.params.provider.Arguments} for every combination of job\\n+ * status and action\\n+ */\\n+ static Stream<Arguments> jobStatusAndActionProvider()\\n+ {\\n+ return Stream.of(\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"trigger\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"schedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \\\"pause\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \\\"unschedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \\\"resume\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \\\"unschedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"delete\\\"));\\n+ }\\n+\\n+ /**\\n+ * Verify that each action URL on the page contains the right CSRF token.\\n+ *\\n+ * @param status the status of the job\\n+ * @param action the action to verify\\n+ */\\n+ @ParameterizedTest\\n+ @MethodSource(\\\"jobStatusAndActionProvider\\\")\\n+ void checkCSRFTokenPresenceInActionURL(JobState status, String action) throws Exception\\n+ {\\n+ // Set the status of the displayed job to control which action URLs will be rendered.\\n+ when(this.schedulerPluginApi.getJobStatus(this.testJobObjectApi)).thenReturn(status);\\n+\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+ verify(this.schedulerPluginApi).getJobStatus(this.testJobObjectApi);\\n+ Element actionLink = result.selectFirst(String.format(\\\"td a:contains(actions.%s)\\\", action));\\n+ assertNotNull(actionLink);\\n+\\n+ // Check the presence of the CSRF token for the given action.\\n+ assertEquals(String.format(\\\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\\\"\\n+ + \\\".TestJob&form_token=%s\\\", action, CSRF_TOKEN), actionLink.attr(\\\"href\\\"));\\n+ }\\n+\\n+ /**\\n+ * Verify that the names of jobs are properly escaped in each action URL.\\n+ *\\n+ * @param status the status of the job\\n+ * @param action the action to verify\\n+ */\\n+ @ParameterizedTest\\n+ @MethodSource(\\\"jobStatusAndActionProvider\\\")\\n+ void checkEscapingInJobNames(JobState status, String action) throws Exception\\n+ {\\n+ // Use the `noscript` macro to make sure that no code injection occurs.\\n+ String jobName = \\\"\\\\\\\">]]{{/html}}{{noscript /}}\\\";\\n+ String escapedJobName = \\\"%22%3E%5D%5D%7B%7B%2Fhtml%7D%7D%7B%7Bnoscript%20%2F%7D%7D\\\";\\n+\\n+ // Create a new job with a name that needs escaping and get a reference to its API.\\n+ XWikiDocument escapedJob = new XWikiDocument(new DocumentReference(\\\"xwiki\\\", \\\"Scheduler\\\", jobName));\\n+ BaseObject escapedJobObject =\\n+ escapedJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE, this.context);\\n+ Object escapedJobObjectApi = new Object(escapedJobObject, this.context);\\n+ this.xwiki.saveDocument(escapedJob, this.context);\\n+\\n+ // Return the name of the new job through the Query Service.\\n+ when(this.query.execute()).thenReturn(List.of(\\\"Scheduler.\\\" + jobName));\\n+\\n+ // Set the status of the new job to control which action URLs will be rendered.\\n+ when(this.schedulerPluginApi.getJobStatus(escapedJobObjectApi)).thenReturn(status);\\n+\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+ Element actionLink = result.selectFirst(String.format(\\\"td a:contains(actions.%s)\\\", action));\\n+ assertNotNull(actionLink);\\n+\\n+ // Check the proper escaping of the job name for the given action.\\n+ assertEquals(String.format(\\\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\\\"\\n+ + \\\".%s&form_token=%s\\\", action, escapedJobName, CSRF_TOKEN), actionLink.attr(\\\"href\\\"));\\n+ }\\n+}\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/f30d9c641750a3f034b5910c6a3a7724ae8f2269\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-20851: Validate CSRF token before running job scheduling actions\\n\\n* Add a mandatory CSRF token for job management\\n* Add a page test for Scheduler.WebHome that checks for the proper use of the CSRF token\\n* Refactor scheduling actions URL generation\\n* Refactor Scheduler.WebHome to improve escaping\\n\\n(cherry picked from commit f16ca4ef1513f84ce2e685d4a05d689bd3a2ab4c)\",\n \"diff_code\": \"From f30d9c641750a3f034b5910c6a3a7724ae8f2269 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Fri, 6 Oct 2023 17:43:23 +0200\\nSubject: [PATCH] XWIKI-20851: Validate CSRF token before running job\\n scheduling actions\\n\\n* Add a mandatory CSRF token for job management\\n* Add a page test for Scheduler.WebHome that checks for the proper use of the CSRF token\\n* Refactor scheduling actions URL generation\\n* Refactor Scheduler.WebHome to improve escaping\\n\\n(cherry picked from commit f16ca4ef1513f84ce2e685d4a05d689bd3a2ab4c)\\n---\\n .../resources/ApplicationResources.properties | 1 +\\n .../xwiki/scheduler/test/ui/SchedulerIT.java | 6 +-\\n .../xwiki-platform-scheduler-ui/pom.xml | 22 ++\\n .../resources/Scheduler/Translations.de.xml | 2 +-\\n .../resources/Scheduler/Translations.ru.xml | 2 +-\\n .../resources/Scheduler/Translations.uk.xml | 2 +-\\n .../src/main/resources/Scheduler/WebHome.xml | 25 +-\\n .../xwiki/scheduler/ui/SchedulerPageTest.java | 257 ++++++++++++++++++\\n 8 files changed, 300 insertions(+), 17 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\nindex e61f48d3a567..aa14a16258b3 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties\\n@@ -2889,6 +2889,7 @@ xe.scheduler.job.scriptexplanation=The script is the code that will be executed\\n xe.scheduler.job.backtolist=Back to the job list\\n xe.scheduler.job.object=This sheet must be applied to a page that holds a scheduler job object.\\n xe.scheduler.updateJobClassComment=Created/Updated Scheduler Job Class definition\\n+xe.scheduler.invalidToken=Invalid token, please try again by clicking on the desired action below.\\n \\n ### Statistics application\\n xe.statistics.activity=Activity Statistics\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\nindex 60e2ef17cdee..1dfd9a68a5c2 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/src/test/it/org/xwiki/scheduler/test/ui/SchedulerIT.java\\n@@ -70,11 +70,11 @@ void verifyScheduler(TestUtils setup)\\n // because we want to remain on the same page in case of a test failure so that our TestDebugger rule can\\n // collect accurate information about the failure. It's not a problem if the job remains scheduled because it\\n // does nothing. Other tests should not rely on the number of scheduler jobs though.\\n- setup.deletePage(\\\"Scheduler\\\", \\\"SchedulerTestJob\\\");\\n+ setup.deletePage(\\\"Scheduler\\\", \\\"Scheduler]]TestJob\\\");\\n \\n // Create Job\\n SchedulerHomePage schedulerHomePage = SchedulerHomePage.gotoPage();\\n- schedulerHomePage.setJobName(\\\"SchedulerTestJob\\\");\\n+ schedulerHomePage.setJobName(\\\"Scheduler]]TestJob\\\");\\n SchedulerEditPage schedulerEdit = schedulerHomePage.clickAdd();\\n \\n String jobName = \\\"Tester problem\\\";\\n@@ -107,7 +107,7 @@ void verifyScheduler(TestUtils setup)\\n assertFalse(setup.getDriver().hasElementWithoutWaiting(By.linkText(jobName)));\\n // Note: since the page doesn't exist, we need to disable the space redirect feature so that we end up on the\\n // terminal page that was removed.\\n- setup.gotoPage(\\\"Scheduler\\\", \\\"SchedulerTestJob\\\", \\\"view\\\", \\\"spaceRedirect=false\\\");\\n+ setup.gotoPage(\\\"Scheduler\\\", \\\"Scheduler]]TestJob\\\", \\\"view\\\", \\\"spaceRedirect=false\\\");\\n setup.getDriver().findElement(By.linkText(\\\"Restore\\\")).click();\\n schedulerPage = new SchedulerPage();\\n schedulerPage.backToHome();\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\nindex 60fdc02fa109..61c59af3cfc2 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\nindex 948bfde68b4b..0a3d781dd6d4 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.de.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Planer\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\nindex 4b9ba03940a7..ca2277407a67 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.ru.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Планировщик\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\nindex 12aa833275df..5f435b0a0061 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/Translations.uk.xml\\n@@ -38,4 +38,4 @@\\n <hidden>true</hidden>\\n <content>scheduler.applicationsPanelEntryLabel=Планувальник\\n </content>\\n- </xwikidoc>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\nindex 19a4b87e596e..404ed2130ab8 100644\\n--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/main/resources/Scheduler/WebHome.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.1\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"Scheduler.WebHome\\\" locale=\\\"\\\">\\n <web>Scheduler</web>\\n <name>WebHome</name>\\n <language/>\\n@@ -51,7 +51,13 @@\\n #set ($tJobHolder = $request.which)\\n #set ($jobDoc = $xwiki.getDocument($tJobHolder))\\n #set ($jobObj = $jobDoc.getObject('XWiki.SchedulerJobClass'))\\n- #if ($request.do == 'schedule')\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ ##\\n+ ## Check that the CSRF token matches the user before any operation\\n+ ##\\n+ {{error}}$services.localization.render('xe.scheduler.invalidToken'){{/error}}\\n+\\n+ #elseif ($request.do == 'schedule')\\n ##\\n ## Schedule a job\\n ##\\n@@ -143,7 +149,6 @@ $services.localization.render('xe.scheduler.welcome')\\n ##\\n |=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.name')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.status')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.next')|=(%scope=\\\"col\\\"%)$services.localization.render('xe.scheduler.jobs.actions')\\n #foreach ($docName in $services.query.xwql('from doc.object(XWiki.SchedulerJobClass) as jobs where doc.fullName <> ''XWiki.SchedulerJobTemplate''').execute())\\n- #set ($actions = {})\\n #set ($jobHolder = $xwiki.getDocument($docName))\\n #set ($job = $jobHolder.getObject('XWiki.SchedulerJobClass'))\\n #set ($status = $scheduler.getJobStatus($job).value)\\n@@ -156,18 +161,16 @@ $services.localization.render('xe.scheduler.welcome')\\n #else\\n #set ($firetime = $services.localization.render('xe.scheduler.jobs.next.undefined'))\\n #end\\n- #set ($ok = $!actions.put('trigger', $doc.getURL('view', \\\"do=trigger&which=${jobHolder.fullName}\\\")))\\n+ #set ($actions = ['trigger'])\\n #if ($status == 'None')\\n- #set ($ok = $!actions.put('schedule', $doc.getURL('view', \\\"do=schedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.add('schedule'))\\n #elseif($status == 'Normal')\\n- #set ($ok = $!actions.put('pause', $doc.getURL('view', \\\"do=pause&which=${jobHolder.fullName}\\\")))\\n- #set ($ok = $!actions.put('unschedule', $doc.getURL('view', \\\"do=unschedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.addAll(['pause', 'unschedule']))\\n #elseif ($status == 'Paused')\\n- #set ($ok = $!actions.put('resume', $doc.getURL('view', \\\"do=resume&which=${jobHolder.fullName}\\\")))\\n- #set ($ok = $!actions.put('unschedule', $doc.getURL('view', \\\"do=unschedule&which=${jobHolder.fullName}\\\")))\\n+ #set ($ok = $actions.addAll(['resume', 'unschedule']))\\n #end\\n- #set ($ok = $!actions.put('delete', $doc.getURL('view', \\\"do=delete&which=${jobHolder.fullName}\\\")))\\n-|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$jobHolder.fullName]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions.entrySet()) [[$services.localization.render(\\\"xe.scheduler.jobs.actions.${action.key}\\\")>>path:${action.value}]]#end\\n+ #set ($ok = $actions.add('delete'))\\n+|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$services.rendering.escape($jobHolder.fullName, 'xwiki/2.1')]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions) [[$services.localization.render(\\\"xe.scheduler.jobs.actions.$action\\\")>>path:$doc.getURL('view', $escapetool.url({'do': $action, 'which': $jobHolder.fullName, 'form_token': $services.csrf.token}))]]#end\\n \\n #end\\n #if ($doc.hasAccessLevel('programming'))\\ndiff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\nnew file mode 100644\\nindex 000000000000..6ad045b450cf\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/src/test/java/org/xwiki/scheduler/ui/SchedulerPageTest.java\\n@@ -0,0 +1,257 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.scheduler.ui;\\n+\\n+import java.util.List;\\n+import java.util.stream.Stream;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.jsoup.nodes.Element;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.junit.jupiter.params.ParameterizedTest;\\n+import org.junit.jupiter.params.provider.Arguments;\\n+import org.junit.jupiter.params.provider.MethodSource;\\n+import org.mockito.Mock;\\n+import org.quartz.Trigger;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.query.internal.ScriptQuery;\\n+import org.xwiki.query.script.QueryManagerScriptService;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.rendering.internal.macro.message.ErrorMessageMacro;\\n+import org.xwiki.rendering.internal.macro.message.InfoMessageMacro;\\n+import org.xwiki.rendering.internal.macro.message.WarningMessageMacro;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.annotation.ComponentList;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.TestNoScriptMacro;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.api.Object;\\n+import com.xpn.xwiki.doc.XWikiDocument;\\n+import com.xpn.xwiki.objects.BaseObject;\\n+import com.xpn.xwiki.plugin.scheduler.JobState;\\n+import com.xpn.xwiki.plugin.scheduler.SchedulerPluginApi;\\n+import com.xpn.xwiki.plugin.scheduler.internal.SchedulerJobClassDocumentInitializer;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\\n+import static org.junit.jupiter.api.Assertions.assertTrue;\\n+import static org.mockito.ArgumentMatchers.any;\\n+import static org.mockito.ArgumentMatchers.anyString;\\n+import static org.mockito.ArgumentMatchers.eq;\\n+import static org.mockito.Mockito.doReturn;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+/**\\n+ * Page tests for {@code Scheduler.WebHome}.\\n+ *\\n+ * @version $Id$\\n+ */\\n+@ComponentList({\\n+ InfoMessageMacro.class,\\n+ ErrorMessageMacro.class,\\n+ SchedulerJobClassDocumentInitializer.class,\\n+ TestNoScriptMacro.class,\\n+ WarningMessageMacro.class\\n+})\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class SchedulerPageTest extends PageTest\\n+{\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"Scheduler\\\";\\n+\\n+ private static final DocumentReference SCHEDULER_WEB_HOME =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"WebHome\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private QueryManagerScriptService queryService;\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ private SchedulerPluginApi schedulerPluginApi;\\n+\\n+ @Mock\\n+ private ScriptQuery query;\\n+\\n+ private Object testJobObjectApi;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Query Service to return a job.\\n+ this.queryService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"query\\\",\\n+ QueryManagerScriptService.class,\\n+ true);\\n+ when(this.queryService.xwql(anyString())).thenReturn(this.query);\\n+ when(this.query.execute()).thenReturn(List.of(\\\"Scheduler.TestJob\\\"));\\n+\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.getToken()).thenReturn(CSRF_TOKEN);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ // Spy the Scheduler Plugin to obtain a mocked API.\\n+ this.schedulerPluginApi = mock(SchedulerPluginApi.class);\\n+ doReturn(this.schedulerPluginApi).when(this.oldcore.getSpyXWiki()).getPluginApi(eq(\\\"scheduler\\\"),\\n+ any(XWikiContext.class));\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ // Create a new job and keep a reference to its API.\\n+ XWikiDocument testJob = new XWikiDocument(new DocumentReference(\\\"xwiki\\\", \\\"Scheduler\\\", \\\"TestJob\\\"));\\n+ BaseObject testJobObject = testJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE,\\n+ this.context);\\n+ this.xwiki.saveDocument(testJob, this.context);\\n+ this.testJobObjectApi = new Object(testJobObject, this.context);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ when(this.oldcore.getMockRightService().hasAccessLevel(eq(\\\"programming\\\"), anyString(), anyString(),\\n+ any(XWikiContext.class))).thenReturn(true);\\n+ }\\n+\\n+ /**\\n+ * Verify that the trigger operation is not called in the Scheduler Plugin API when the CSRF token is invalid, and\\n+ * that the corresponding error message is properly displayed.\\n+ */\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong token\\\";\\n+\\n+ this.request.put(\\\"do\\\", \\\"trigger\\\");\\n+ this.request.put(\\\"which\\\", \\\"Scheduler.TestJob\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+\\n+ verify(this.schedulerPluginApi, never()).triggerJob(any(Object.class));\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"xe.scheduler.invalidToken\\\", result.getElementsByClass(\\\"errormessage\\\").text());\\n+ }\\n+\\n+ /**\\n+ * Verify that the trigger operation is correctly called in the Scheduler Plugin API when the CSRF token is valid,\\n+ * and that no error displays.\\n+ */\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.schedulerPluginApi.triggerJob(this.testJobObjectApi)).thenReturn(true);\\n+\\n+ this.request.put(\\\"do\\\", \\\"trigger\\\");\\n+ this.request.put(\\\"which\\\", \\\"Scheduler.TestJob\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+\\n+ verify(this.schedulerPluginApi).triggerJob(this.testJobObjectApi);\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertTrue(result.getElementsByClass(\\\"errormessage\\\").isEmpty());\\n+ }\\n+\\n+ /**\\n+ * List every possible action that can be applied to a job depending on its current status.\\n+ *\\n+ * @return a {@link Stream} of {@link org.junit.jupiter.params.provider.Arguments} for every combination of job\\n+ * status and action\\n+ */\\n+ static Stream<Arguments> jobStatusAndActionProvider()\\n+ {\\n+ return Stream.of(\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"trigger\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"schedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \\\"pause\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NORMAL), \\\"unschedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \\\"resume\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.PAUSED), \\\"unschedule\\\"),\\n+ Arguments.of(new JobState(Trigger.TriggerState.NONE), \\\"delete\\\"));\\n+ }\\n+\\n+ /**\\n+ * Verify that each action URL on the page contains the right CSRF token.\\n+ *\\n+ * @param status the status of the job\\n+ * @param action the action to verify\\n+ */\\n+ @ParameterizedTest\\n+ @MethodSource(\\\"jobStatusAndActionProvider\\\")\\n+ void checkCSRFTokenPresenceInActionURL(JobState status, String action) throws Exception\\n+ {\\n+ // Set the status of the displayed job to control which action URLs will be rendered.\\n+ when(this.schedulerPluginApi.getJobStatus(this.testJobObjectApi)).thenReturn(status);\\n+\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+ verify(this.schedulerPluginApi).getJobStatus(this.testJobObjectApi);\\n+ Element actionLink = result.selectFirst(String.format(\\\"td a:contains(actions.%s)\\\", action));\\n+ assertNotNull(actionLink);\\n+\\n+ // Check the presence of the CSRF token for the given action.\\n+ assertEquals(String.format(\\\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\\\"\\n+ + \\\".TestJob&form_token=%s\\\", action, CSRF_TOKEN), actionLink.attr(\\\"href\\\"));\\n+ }\\n+\\n+ /**\\n+ * Verify that the names of jobs are properly escaped in each action URL.\\n+ *\\n+ * @param status the status of the job\\n+ * @param action the action to verify\\n+ */\\n+ @ParameterizedTest\\n+ @MethodSource(\\\"jobStatusAndActionProvider\\\")\\n+ void checkEscapingInJobNames(JobState status, String action) throws Exception\\n+ {\\n+ // Use the `noscript` macro to make sure that no code injection occurs.\\n+ String jobName = \\\"\\\\\\\">]]{{/html}}{{noscript /}}\\\";\\n+ String escapedJobName = \\\"%22%3E%5D%5D%7B%7B%2Fhtml%7D%7D%7B%7Bnoscript%20%2F%7D%7D\\\";\\n+\\n+ // Create a new job with a name that needs escaping and get a reference to its API.\\n+ XWikiDocument escapedJob = new XWikiDocument(new DocumentReference(\\\"xwiki\\\", \\\"Scheduler\\\", jobName));\\n+ BaseObject escapedJobObject =\\n+ escapedJob.newXObject(SchedulerJobClassDocumentInitializer.XWIKI_JOB_CLASSREFERENCE, this.context);\\n+ Object escapedJobObjectApi = new Object(escapedJobObject, this.context);\\n+ this.xwiki.saveDocument(escapedJob, this.context);\\n+\\n+ // Return the name of the new job through the Query Service.\\n+ when(this.query.execute()).thenReturn(List.of(\\\"Scheduler.\\\" + jobName));\\n+\\n+ // Set the status of the new job to control which action URLs will be rendered.\\n+ when(this.schedulerPluginApi.getJobStatus(escapedJobObjectApi)).thenReturn(status);\\n+\\n+ Document result = renderHTMLPage(SCHEDULER_WEB_HOME);\\n+ Element actionLink = result.selectFirst(String.format(\\\"td a:contains(actions.%s)\\\", action));\\n+ assertNotNull(actionLink);\\n+\\n+ // Check the proper escaping of the job name for the given action.\\n+ assertEquals(String.format(\\\"path:/xwiki/bin/view/Scheduler/?do=%s&which=Scheduler\\\"\\n+ + \\\".%s&form_token=%s\\\", action, escapedJobName, CSRF_TOKEN), actionLink.attr(\\\"href\\\"));\\n+ }\\n+}\\n\"\n }\n]","isConversational":false}}},{"rowIdx":1194,"cells":{"CVE_ID":{"kind":"string","value":"CVE-2024-31987"},"category":{"kind":"string","value":"Fixes for Multiple Locations Across Different Branches or Projects"},"patches":{"kind":"list like","value":[{"commit url":"https://github.com/xwiki/xwiki-platform/commit/3d4dbb41f52d1a6e39835cfb1695ca6668605a39","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21478: Improve rights check of template macros","diff_code":"From 3d4dbb41f52d1a6e39835cfb1695ca6668605a39 Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Mon, 30 Oct 2023 14:15:04 +0100\nSubject: [PATCH] XWIKI-21478: Improve rights check of template macros\n\n---\n .../velocity/XWikiVelocityManager.java | 30 ++++---\n .../velocity/XWikiVelocityManagerTest.java | 78 +++++++++++++++++--\n 2 files changed, 92 insertions(+), 16 deletions(-)\n\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java\nindex 07ddaa6f112d..841980cd1b47 100644\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java\n@@ -42,6 +42,9 @@\n import org.xwiki.observation.EventListener;\n import org.xwiki.observation.ObservationManager;\n import org.xwiki.observation.event.Event;\n+import org.xwiki.security.authorization.AuthorExecutor;\n+import org.xwiki.security.authorization.AuthorizationManager;\n+import org.xwiki.security.authorization.Right;\n import org.xwiki.skin.Skin;\n import org.xwiki.skin.SkinManager;\n import org.xwiki.template.Template;\n@@ -73,7 +76,7 @@ public class XWikiVelocityManager extends DefaultVelocityManager implements Init\n private static final String VELOCITYENGINE_CACHEKEY_NAME = \"velocity.engine.key\";\n \n private static final List<Event> EVENTS =\n- Arrays.<Event>asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\n+ Arrays.asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\n \n /**\n * Used to access the current {@link XWikiContext}.\n@@ -96,10 +99,16 @@ public class XWikiVelocityManager extends DefaultVelocityManager implements Init\n @Inject\n private Environment environment;\n \n+ @Inject\n+ private AuthorExecutor authorExecutor;\n+\n+ @Inject\n+ private AuthorizationManager authorizationManager;\n+\n @Inject\n private Logger logger;\n \n- private Map<String, VelocityEngine> velocityEngines = new ConcurrentHashMap<>();\n+ private final Map<String, VelocityEngine> velocityEngines = new ConcurrentHashMap<>();\n \n @Override\n public void initialize() throws InitializationException\n@@ -114,7 +123,7 @@ public void onEvent(Event event, Object source, Object data)\n if (event instanceof TemplateEvent) {\n TemplateEvent templateEvent = (TemplateEvent) event;\n \n- velocityEngines.remove(templateEvent.getId());\n+ XWikiVelocityManager.this.velocityEngines.remove(templateEvent.getId());\n }\n }\n \n@@ -177,8 +186,8 @@ private Template getVelocityEngineMacrosTemplate()\n \n /**\n * @return the Velocity Engine corresponding to the current execution context. More specifically returns the\n- * Velocity Engine for the current skin since each skin has its own Velocity Engine so that each skin can\n- * have global velocimacros defined\n+ * Velocity Engine for the current skin since each skin has its own Velocity Engine so that each skin can have\n+ * global velocimacros defined\n * @throws XWikiVelocityException in case of an error while creating a Velocity Engine\n */\n @Override\n@@ -248,10 +257,13 @@ private void injectBaseMacros(VelocityEngine velocityEngine, Template skinMacros\n }\n }\n \n- // Inject skin macros\n- if (skinMacrosTemplate != null) {\n- VelocityTemplate skinMacros = compile(\"\", new StringReader(skinMacrosTemplate.getContent().getContent()));\n-\n+ // Inject skin macros if their author has at least Script rights.\n+ if (skinMacrosTemplate != null\n+ && this.authorizationManager.hasAccess(Right.SCRIPT, skinMacrosTemplate.getContent().getAuthorReference(),\n+ skinMacrosTemplate.getContent().getDocumentReference()))\n+ {\n+ VelocityTemplate skinMacros =\n+ compile(\"\", new StringReader(skinMacrosTemplate.getContent().getContent()));\n velocityEngine.addGlobalMacros(skinMacros.getMacros());\n }\n }\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java\nindex 7ab150ee4894..8815d5b14ce0 100644\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java\n@@ -22,15 +22,24 @@\n import org.apache.velocity.VelocityContext;\n import org.junit.jupiter.api.BeforeEach;\n import org.junit.jupiter.api.Test;\n-import org.xwiki.component.manager.ComponentLookupException;\n+import org.mockito.Mock;\n import org.xwiki.internal.script.XWikiScriptContextInitializer;\n import org.xwiki.localization.ContextualLocalizationManager;\n import org.xwiki.logging.internal.DefaultLoggerConfiguration;\n import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.properties.ConverterManager;\n import org.xwiki.script.internal.DefaultScriptContextManager;\n+import org.xwiki.security.authorization.AuthorizationManager;\n+import org.xwiki.security.authorization.Right;\n+import org.xwiki.skin.Skin;\n+import org.xwiki.skin.SkinManager;\n+import org.xwiki.template.Template;\n+import org.xwiki.template.TemplateContent;\n+import org.xwiki.template.TemplateManager;\n import org.xwiki.test.annotation.ComponentList;\n import org.xwiki.test.junit5.mockito.InjectMockComponents;\n import org.xwiki.test.junit5.mockito.MockComponent;\n+import org.xwiki.velocity.VelocityEngine;\n import org.xwiki.velocity.internal.DefaultVelocityConfiguration;\n import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;\n \n@@ -44,17 +53,29 @@\n import static org.junit.jupiter.api.Assertions.assertNotSame;\n import static org.junit.jupiter.api.Assertions.assertNull;\n import static org.junit.jupiter.api.Assertions.assertSame;\n+import static org.mockito.ArgumentMatchers.anyMap;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n \n /**\n * Validate {@link XWikiVelocityManager}.\n- * \n+ *\n * @version $Id$\n */\n-@ComponentList(value = {DefaultScriptContextManager.class, XWikiScriptContextInitializer.class,\n- DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class})\n+@ComponentList({\n+ DefaultScriptContextManager.class,\n+ XWikiScriptContextInitializer.class,\n+ DefaultVelocityConfiguration.class,\n+ DefaultLoggerConfiguration.class\n+})\n @OldcoreTest\n public class XWikiVelocityManagerTest\n {\n+ private static final DocumentReference TEMPLATE_DOCUMENT = new DocumentReference(\"xwiki\", \"XWiki\", \"TestMacros\");\n+\n+ private static final DocumentReference SCRIPT_USER = new DocumentReference(\"xwiki\", \"XWiki\", \"Script\");\n+\n @MockComponent\n private ContextualLocalizationManager localizationManager;\n \n@@ -64,19 +85,47 @@ public class XWikiVelocityManagerTest\n @InjectMockitoOldcore\n private MockitoOldcore oldcore;\n \n+ @MockComponent\n+ private SkinManager skinManager;\n+\n+ @Mock\n+ private Skin skin;\n+\n+ @MockComponent\n+ private TemplateManager templateManager;\n+\n+ @Mock\n+ private Template template;\n+\n+ @Mock\n+ private TemplateContent templateContent;\n+\n+ @MockComponent\n+ private ConverterManager converterManager;\n+\n @BeforeEach\n- public void beforeEach() throws ComponentLookupException\n+ void beforeEach() throws Exception\n {\n this.oldcore.getExecutionContext().setProperty(VelocityExecutionContextInitializer.VELOCITY_CONTEXT_ID,\n new VelocityContext());\n+\n+ when(this.skinManager.getCurrentSkin(true)).thenReturn(this.skin);\n+ when(this.templateManager.getTemplate(\"macros.vm\")).thenReturn(this.template);\n+ when(this.template.getId()).thenReturn(\"testMacros\");\n+ when(this.template.getContent()).thenReturn(this.templateContent);\n+ when(this.templateContent.getDocumentReference()).thenReturn(TEMPLATE_DOCUMENT);\n+ when(this.templateContent.getContent()).thenReturn(\"\");\n+\n+ AuthorizationManager authorizationManager = this.oldcore.getMockAuthorizationManager();\n+ when(authorizationManager.hasAccess(Right.SCRIPT, SCRIPT_USER, TEMPLATE_DOCUMENT)).thenReturn(true);\n }\n \n // Tests\n \n @Test\n- public void getVelocityContext()\n+ void getVelocityContext()\n {\n- VelocityContext context = velocityManager.getVelocityContext();\n+ VelocityContext context = this.velocityManager.getVelocityContext();\n \n assertNull(context.get(\"doc\"));\n assertNull(context.get(\"sdoc\"));\n@@ -112,4 +161,19 @@ public void getVelocityContext()\n assertNotNull(context.get(\"sdoc\"));\n assertNotSame(sdoc, context.get(\"sdoc\"));\n }\n+\n+ @Test\n+ void checkMacrosInjectionWithoutScriptRights() throws Exception\n+ {\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\n+ verify(engine, never()).addGlobalMacros(anyMap());\n+ }\n+\n+ @Test\n+ void checkMacrosInjectionWithScriptRights() throws Exception\n+ {\n+ when(this.templateContent.getAuthorReference()).thenReturn(SCRIPT_USER);\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\n+ verify(engine).addGlobalMacros(anyMap());\n+ }\n }\n"},{"commit url":"https://github.com/xwiki/xwiki-platform/commit/626d2a5dbf95b4e719ae13bf1a0a9c76e4edd5a2","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21478: Improve rights check of template macros\n\n(cherry picked from commit da177c3c972e797d92c1a31e278f946012c41b56)","diff_code":"From 626d2a5dbf95b4e719ae13bf1a0a9c76e4edd5a2 Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Thu, 2 Nov 2023 19:01:11 +0100\nSubject: [PATCH] XWIKI-21478: Improve rights check of template macros\n\n(cherry picked from commit da177c3c972e797d92c1a31e278f946012c41b56)\n---\n .../xwiki/render/DefaultVelocityManager.java | 23 ++--\n .../render/DefaultVelocityManagerTest.java | 127 ++++++++++++++----\n 2 files changed, 115 insertions(+), 35 deletions(-)\n\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\nindex b9a57cac3768..701719218c39 100644\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\n@@ -47,6 +47,8 @@\n import org.xwiki.observation.event.Event;\n import org.xwiki.script.ScriptContextManager;\n import org.xwiki.security.authorization.AuthorExecutor;\n+import org.xwiki.security.authorization.AuthorizationManager;\n+import org.xwiki.security.authorization.Right;\n import org.xwiki.skin.Skin;\n import org.xwiki.skin.SkinManager;\n import org.xwiki.template.Template;\n@@ -80,7 +82,7 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\n private static final String VELOCITYENGINE_CACHEKEY_NAME = \"velocity.engine.key\";\n \n private static final List<Event> EVENTS =\n- Arrays.<Event>asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\n+ Arrays.asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\n \n /**\n * Used to access the current {@link org.xwiki.context.ExecutionContext}.\n@@ -121,6 +123,9 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\n @Inject\n private AuthorExecutor authorExecutor;\n \n+ @Inject\n+ private AuthorizationManager authorizationManager;\n+\n @Inject\n private Logger logger;\n \n@@ -286,11 +291,13 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\n if (velocityEngine == null) {\n velocityEngine = this.velocityFactory.createVelocityEngine(cacheKey, null);\n \n- if (template != null) {\n- // Local macros template\n- // We execute it ourself to support any kind of template, Velocity only support resource\n- // template by default\n- try {\n+ try {\n+ if (template != null && this.authorizationManager.hasAccess(Right.SCRIPT,\n+ template.getContent().getAuthorReference(), template.getContent().getDocumentReference()))\n+ {\n+ // Local macros template, applied only if their author has at least Script rights.\n+ // We execute it ourself to support any kind of template, Velocity only support resource\n+ // template by default\n final VelocityEngine finalVelocityEngine = velocityEngine;\n \n this.authorExecutor.call(() -> {\n@@ -300,9 +307,9 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\n return null;\n }, template.getContent().getAuthorReference(),\n template.getContent().getDocumentReference());\n- } catch (Exception e) {\n- this.logger.error(\"Failed to evaluate macros templates [{}]\", template.getPath(), e);\n }\n+ } catch (Exception e) {\n+ this.logger.error(\"Failed to evaluate macros templates [{}]\", template.getPath(), e);\n }\n }\n }\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\nindex 3ea0e555c4e7..e2db048d0cec 100644\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\n@@ -19,60 +19,118 @@\n */\n package com.xpn.xwiki.render;\n \n+import java.io.Writer;\n+\n import org.apache.velocity.VelocityContext;\n-import org.junit.Before;\n-import org.junit.Rule;\n-import org.junit.Test;\n-import org.xwiki.component.manager.ComponentLookupException;\n+import org.apache.velocity.context.Context;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+import org.mockito.Mock;\n import org.xwiki.localization.ContextualLocalizationManager;\n import org.xwiki.logging.internal.DefaultLoggerConfiguration;\n import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.properties.ConverterManager;\n import org.xwiki.script.internal.DefaultScriptContextManager;\n+import org.xwiki.security.authorization.AuthorizationManager;\n+import org.xwiki.security.authorization.Right;\n+import org.xwiki.skin.Skin;\n+import org.xwiki.skin.SkinManager;\n+import org.xwiki.template.Template;\n+import org.xwiki.template.TemplateContent;\n+import org.xwiki.template.TemplateManager;\n import org.xwiki.test.annotation.ComponentList;\n-import org.xwiki.test.mockito.MockitoComponentMockingRule;\n-import org.xwiki.velocity.VelocityManager;\n+import org.xwiki.test.junit5.mockito.InjectMockComponents;\n+import org.xwiki.test.junit5.mockito.MockComponent;\n+import org.xwiki.velocity.VelocityEngine;\n import org.xwiki.velocity.internal.DefaultVelocityConfiguration;\n+import org.xwiki.velocity.internal.DefaultVelocityFactory;\n import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;\n \n import com.xpn.xwiki.api.Document;\n import com.xpn.xwiki.doc.XWikiDocument;\n-import com.xpn.xwiki.test.MockitoOldcoreRule;\n-\n-import static org.junit.Assert.assertNotNull;\n-import static org.junit.Assert.assertNotSame;\n-import static org.junit.Assert.assertNull;\n-import static org.junit.Assert.assertSame;\n+import com.xpn.xwiki.internal.security.authorization.DefaultAuthorExecutor;\n+import com.xpn.xwiki.test.MockitoOldcore;\n+import com.xpn.xwiki.test.junit5.mockito.InjectMockitoOldcore;\n+import com.xpn.xwiki.test.junit5.mockito.OldcoreTest;\n+\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\n+import static org.junit.jupiter.api.Assertions.assertNotSame;\n+import static org.junit.jupiter.api.Assertions.assertNull;\n+import static org.junit.jupiter.api.Assertions.assertSame;\n+import static org.mockito.ArgumentMatchers.any;\n+import static org.mockito.ArgumentMatchers.anyString;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n \n /**\n * Validate {@link DefaultVelocityManager}.\n- * \n+ *\n * @version $Id$\n */\n @ComponentList(value = { DefaultScriptContextManager.class, XWikiScriptContextInitializer.class,\n-DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class })\n+ DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class, DefaultVelocityFactory.class,\n+ DefaultAuthorExecutor.class })\n+@OldcoreTest\n public class DefaultVelocityManagerTest\n {\n- public MockitoComponentMockingRule<VelocityManager> mocker =\n- new MockitoComponentMockingRule<VelocityManager>(DefaultVelocityManager.class);\n+ private static final DocumentReference TEMPLATE_DOCUMENT = new DocumentReference(\"xwiki\", \"XWiki\", \"TestMacros\");\n \n- @Rule\n- public MockitoOldcoreRule oldcore = new MockitoOldcoreRule(this.mocker);\n+ private static final DocumentReference SCRIPT_USER = new DocumentReference(\"xwiki\", \"XWiki\", \"Script\");\n \n- @Before\n- public void before() throws Exception\n- {\n- this.mocker.registerMockComponent(ContextualLocalizationManager.class);\n+ @MockComponent\n+ private ContextualLocalizationManager localizationManager;\n+\n+ @InjectMockComponents\n+ private DefaultVelocityManager velocityManager;\n+\n+ @InjectMockitoOldcore\n+ private MockitoOldcore oldcore;\n+\n+ @MockComponent\n+ private SkinManager skinManager;\n+\n+ @Mock\n+ private Skin skin;\n+\n+ @MockComponent\n+ private TemplateManager templateManager;\n+\n+ @Mock\n+ private Template template;\n+\n+ @Mock\n+ private TemplateContent templateContent;\n+\n+ @MockComponent\n+ private ConverterManager converterManager;\n \n+ @MockComponent\n+ private VelocityEngine velocityEngine;\n+\n+ @BeforeEach\n+ void before() throws Exception\n+ {\n this.oldcore.getExecutionContext().setProperty(VelocityExecutionContextInitializer.VELOCITY_CONTEXT_ID,\n new VelocityContext());\n+\n+ when(this.skinManager.getCurrentSkin(true)).thenReturn(this.skin);\n+ when(this.templateManager.getTemplate(\"macros.vm\")).thenReturn(this.template);\n+ when(this.template.getId()).thenReturn(\"testMacros\");\n+ when(this.template.getContent()).thenReturn(this.templateContent);\n+ when(this.templateContent.getDocumentReference()).thenReturn(TEMPLATE_DOCUMENT);\n+ when(this.templateContent.getContent()).thenReturn(\"\");\n+\n+ AuthorizationManager authorizationManager = this.oldcore.getMockAuthorizationManager();\n+ when(authorizationManager.hasAccess(Right.SCRIPT, SCRIPT_USER, TEMPLATE_DOCUMENT)).thenReturn(true);\n }\n \n // Tests\n \n @Test\n- public void getVelocityContext() throws ComponentLookupException\n+ void getVelocityContext()\n {\n- VelocityContext context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ VelocityContext context = this.velocityManager.getVelocityContext();\n \n assertNull(context.get(\"doc\"));\n assertNull(context.get(\"sdoc\"));\n@@ -83,7 +141,7 @@ public void getVelocityContext() throws ComponentLookupException\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\n this.oldcore.getXWikiContext().put(\"sdoc\", new XWikiDocument(sdocReference));\n \n- context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ context = this.velocityManager.getVelocityContext();\n \n Document doc = (Document) context.get(\"doc\");\n assertNotNull(doc);\n@@ -92,7 +150,7 @@ public void getVelocityContext() throws ComponentLookupException\n assertNotNull(sdoc);\n \n // Instances are kept the same when the documents in the context don't change\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ context = this.velocityManager.getVelocityContext();\n assertSame(doc, context.get(\"doc\"));\n assertSame(sdoc, context.get(\"sdoc\"));\n \n@@ -102,10 +160,25 @@ public void getVelocityContext() throws ComponentLookupException\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\n this.oldcore.getXWikiContext().put(\"sdoc\", new XWikiDocument(sdocReference));\n \n- context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ context = this.velocityManager.getVelocityContext();\n assertNotNull(context.get(\"doc\"));\n assertNotSame(doc, context.get(\"doc\"));\n assertNotNull(context.get(\"sdoc\"));\n assertNotSame(sdoc, context.get(\"sdoc\"));\n }\n+\n+ @Test\n+ void checkMacrosInjectionWithoutScriptRights() throws Exception\n+ {\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\n+ verify(engine, never()).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\n+ }\n+\n+ @Test\n+ void checkMacrosInjectionWithScriptRights() throws Exception\n+ {\n+ when(this.templateContent.getAuthorReference()).thenReturn(SCRIPT_USER);\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\n+ verify(engine).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\n+ }\n }\n"},{"commit url":"https://github.com/xwiki/xwiki-platform/commit/da177c3c972e797d92c1a31e278f946012c41b56","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21478: Improve rights check of template macros","diff_code":"From da177c3c972e797d92c1a31e278f946012c41b56 Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Thu, 2 Nov 2023 19:01:11 +0100\nSubject: [PATCH] XWIKI-21478: Improve rights check of template macros\n\n---\n .../xwiki/render/DefaultVelocityManager.java | 23 ++--\n .../render/DefaultVelocityManagerTest.java | 127 ++++++++++++++----\n 2 files changed, 115 insertions(+), 35 deletions(-)\n\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\nindex b9a57cac3768..701719218c39 100644\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\n@@ -47,6 +47,8 @@\n import org.xwiki.observation.event.Event;\n import org.xwiki.script.ScriptContextManager;\n import org.xwiki.security.authorization.AuthorExecutor;\n+import org.xwiki.security.authorization.AuthorizationManager;\n+import org.xwiki.security.authorization.Right;\n import org.xwiki.skin.Skin;\n import org.xwiki.skin.SkinManager;\n import org.xwiki.template.Template;\n@@ -80,7 +82,7 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\n private static final String VELOCITYENGINE_CACHEKEY_NAME = \"velocity.engine.key\";\n \n private static final List<Event> EVENTS =\n- Arrays.<Event>asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\n+ Arrays.asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\n \n /**\n * Used to access the current {@link org.xwiki.context.ExecutionContext}.\n@@ -121,6 +123,9 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\n @Inject\n private AuthorExecutor authorExecutor;\n \n+ @Inject\n+ private AuthorizationManager authorizationManager;\n+\n @Inject\n private Logger logger;\n \n@@ -286,11 +291,13 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\n if (velocityEngine == null) {\n velocityEngine = this.velocityFactory.createVelocityEngine(cacheKey, null);\n \n- if (template != null) {\n- // Local macros template\n- // We execute it ourself to support any kind of template, Velocity only support resource\n- // template by default\n- try {\n+ try {\n+ if (template != null && this.authorizationManager.hasAccess(Right.SCRIPT,\n+ template.getContent().getAuthorReference(), template.getContent().getDocumentReference()))\n+ {\n+ // Local macros template, applied only if their author has at least Script rights.\n+ // We execute it ourself to support any kind of template, Velocity only support resource\n+ // template by default\n final VelocityEngine finalVelocityEngine = velocityEngine;\n \n this.authorExecutor.call(() -> {\n@@ -300,9 +307,9 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\n return null;\n }, template.getContent().getAuthorReference(),\n template.getContent().getDocumentReference());\n- } catch (Exception e) {\n- this.logger.error(\"Failed to evaluate macros templates [{}]\", template.getPath(), e);\n }\n+ } catch (Exception e) {\n+ this.logger.error(\"Failed to evaluate macros templates [{}]\", template.getPath(), e);\n }\n }\n }\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\nindex 3ea0e555c4e7..e2db048d0cec 100644\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\n@@ -19,60 +19,118 @@\n */\n package com.xpn.xwiki.render;\n \n+import java.io.Writer;\n+\n import org.apache.velocity.VelocityContext;\n-import org.junit.Before;\n-import org.junit.Rule;\n-import org.junit.Test;\n-import org.xwiki.component.manager.ComponentLookupException;\n+import org.apache.velocity.context.Context;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+import org.mockito.Mock;\n import org.xwiki.localization.ContextualLocalizationManager;\n import org.xwiki.logging.internal.DefaultLoggerConfiguration;\n import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.properties.ConverterManager;\n import org.xwiki.script.internal.DefaultScriptContextManager;\n+import org.xwiki.security.authorization.AuthorizationManager;\n+import org.xwiki.security.authorization.Right;\n+import org.xwiki.skin.Skin;\n+import org.xwiki.skin.SkinManager;\n+import org.xwiki.template.Template;\n+import org.xwiki.template.TemplateContent;\n+import org.xwiki.template.TemplateManager;\n import org.xwiki.test.annotation.ComponentList;\n-import org.xwiki.test.mockito.MockitoComponentMockingRule;\n-import org.xwiki.velocity.VelocityManager;\n+import org.xwiki.test.junit5.mockito.InjectMockComponents;\n+import org.xwiki.test.junit5.mockito.MockComponent;\n+import org.xwiki.velocity.VelocityEngine;\n import org.xwiki.velocity.internal.DefaultVelocityConfiguration;\n+import org.xwiki.velocity.internal.DefaultVelocityFactory;\n import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;\n \n import com.xpn.xwiki.api.Document;\n import com.xpn.xwiki.doc.XWikiDocument;\n-import com.xpn.xwiki.test.MockitoOldcoreRule;\n-\n-import static org.junit.Assert.assertNotNull;\n-import static org.junit.Assert.assertNotSame;\n-import static org.junit.Assert.assertNull;\n-import static org.junit.Assert.assertSame;\n+import com.xpn.xwiki.internal.security.authorization.DefaultAuthorExecutor;\n+import com.xpn.xwiki.test.MockitoOldcore;\n+import com.xpn.xwiki.test.junit5.mockito.InjectMockitoOldcore;\n+import com.xpn.xwiki.test.junit5.mockito.OldcoreTest;\n+\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\n+import static org.junit.jupiter.api.Assertions.assertNotSame;\n+import static org.junit.jupiter.api.Assertions.assertNull;\n+import static org.junit.jupiter.api.Assertions.assertSame;\n+import static org.mockito.ArgumentMatchers.any;\n+import static org.mockito.ArgumentMatchers.anyString;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n \n /**\n * Validate {@link DefaultVelocityManager}.\n- * \n+ *\n * @version $Id$\n */\n @ComponentList(value = { DefaultScriptContextManager.class, XWikiScriptContextInitializer.class,\n-DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class })\n+ DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class, DefaultVelocityFactory.class,\n+ DefaultAuthorExecutor.class })\n+@OldcoreTest\n public class DefaultVelocityManagerTest\n {\n- public MockitoComponentMockingRule<VelocityManager> mocker =\n- new MockitoComponentMockingRule<VelocityManager>(DefaultVelocityManager.class);\n+ private static final DocumentReference TEMPLATE_DOCUMENT = new DocumentReference(\"xwiki\", \"XWiki\", \"TestMacros\");\n \n- @Rule\n- public MockitoOldcoreRule oldcore = new MockitoOldcoreRule(this.mocker);\n+ private static final DocumentReference SCRIPT_USER = new DocumentReference(\"xwiki\", \"XWiki\", \"Script\");\n \n- @Before\n- public void before() throws Exception\n- {\n- this.mocker.registerMockComponent(ContextualLocalizationManager.class);\n+ @MockComponent\n+ private ContextualLocalizationManager localizationManager;\n+\n+ @InjectMockComponents\n+ private DefaultVelocityManager velocityManager;\n+\n+ @InjectMockitoOldcore\n+ private MockitoOldcore oldcore;\n+\n+ @MockComponent\n+ private SkinManager skinManager;\n+\n+ @Mock\n+ private Skin skin;\n+\n+ @MockComponent\n+ private TemplateManager templateManager;\n+\n+ @Mock\n+ private Template template;\n+\n+ @Mock\n+ private TemplateContent templateContent;\n+\n+ @MockComponent\n+ private ConverterManager converterManager;\n \n+ @MockComponent\n+ private VelocityEngine velocityEngine;\n+\n+ @BeforeEach\n+ void before() throws Exception\n+ {\n this.oldcore.getExecutionContext().setProperty(VelocityExecutionContextInitializer.VELOCITY_CONTEXT_ID,\n new VelocityContext());\n+\n+ when(this.skinManager.getCurrentSkin(true)).thenReturn(this.skin);\n+ when(this.templateManager.getTemplate(\"macros.vm\")).thenReturn(this.template);\n+ when(this.template.getId()).thenReturn(\"testMacros\");\n+ when(this.template.getContent()).thenReturn(this.templateContent);\n+ when(this.templateContent.getDocumentReference()).thenReturn(TEMPLATE_DOCUMENT);\n+ when(this.templateContent.getContent()).thenReturn(\"\");\n+\n+ AuthorizationManager authorizationManager = this.oldcore.getMockAuthorizationManager();\n+ when(authorizationManager.hasAccess(Right.SCRIPT, SCRIPT_USER, TEMPLATE_DOCUMENT)).thenReturn(true);\n }\n \n // Tests\n \n @Test\n- public void getVelocityContext() throws ComponentLookupException\n+ void getVelocityContext()\n {\n- VelocityContext context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ VelocityContext context = this.velocityManager.getVelocityContext();\n \n assertNull(context.get(\"doc\"));\n assertNull(context.get(\"sdoc\"));\n@@ -83,7 +141,7 @@ public void getVelocityContext() throws ComponentLookupException\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\n this.oldcore.getXWikiContext().put(\"sdoc\", new XWikiDocument(sdocReference));\n \n- context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ context = this.velocityManager.getVelocityContext();\n \n Document doc = (Document) context.get(\"doc\");\n assertNotNull(doc);\n@@ -92,7 +150,7 @@ public void getVelocityContext() throws ComponentLookupException\n assertNotNull(sdoc);\n \n // Instances are kept the same when the documents in the context don't change\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ context = this.velocityManager.getVelocityContext();\n assertSame(doc, context.get(\"doc\"));\n assertSame(sdoc, context.get(\"sdoc\"));\n \n@@ -102,10 +160,25 @@ public void getVelocityContext() throws ComponentLookupException\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\n this.oldcore.getXWikiContext().put(\"sdoc\", new XWikiDocument(sdocReference));\n \n- context = this.mocker.getComponentUnderTest().getVelocityContext();\n+ context = this.velocityManager.getVelocityContext();\n assertNotNull(context.get(\"doc\"));\n assertNotSame(doc, context.get(\"doc\"));\n assertNotNull(context.get(\"sdoc\"));\n assertNotSame(sdoc, context.get(\"sdoc\"));\n }\n+\n+ @Test\n+ void checkMacrosInjectionWithoutScriptRights() throws Exception\n+ {\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\n+ verify(engine, never()).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\n+ }\n+\n+ @Test\n+ void checkMacrosInjectionWithScriptRights() throws Exception\n+ {\n+ when(this.templateContent.getAuthorReference()).thenReturn(SCRIPT_USER);\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\n+ verify(engine).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\n+ }\n }\n"}],"string":"[\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/3d4dbb41f52d1a6e39835cfb1695ca6668605a39\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21478: Improve rights check of template macros\",\n \"diff_code\": \"From 3d4dbb41f52d1a6e39835cfb1695ca6668605a39 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Mon, 30 Oct 2023 14:15:04 +0100\\nSubject: [PATCH] XWIKI-21478: Improve rights check of template macros\\n\\n---\\n .../velocity/XWikiVelocityManager.java | 30 ++++---\\n .../velocity/XWikiVelocityManagerTest.java | 78 +++++++++++++++++--\\n 2 files changed, 92 insertions(+), 16 deletions(-)\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java\\nindex 07ddaa6f112d..841980cd1b47 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/velocity/XWikiVelocityManager.java\\n@@ -42,6 +42,9 @@\\n import org.xwiki.observation.EventListener;\\n import org.xwiki.observation.ObservationManager;\\n import org.xwiki.observation.event.Event;\\n+import org.xwiki.security.authorization.AuthorExecutor;\\n+import org.xwiki.security.authorization.AuthorizationManager;\\n+import org.xwiki.security.authorization.Right;\\n import org.xwiki.skin.Skin;\\n import org.xwiki.skin.SkinManager;\\n import org.xwiki.template.Template;\\n@@ -73,7 +76,7 @@ public class XWikiVelocityManager extends DefaultVelocityManager implements Init\\n private static final String VELOCITYENGINE_CACHEKEY_NAME = \\\"velocity.engine.key\\\";\\n \\n private static final List<Event> EVENTS =\\n- Arrays.<Event>asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\\n+ Arrays.asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\\n \\n /**\\n * Used to access the current {@link XWikiContext}.\\n@@ -96,10 +99,16 @@ public class XWikiVelocityManager extends DefaultVelocityManager implements Init\\n @Inject\\n private Environment environment;\\n \\n+ @Inject\\n+ private AuthorExecutor authorExecutor;\\n+\\n+ @Inject\\n+ private AuthorizationManager authorizationManager;\\n+\\n @Inject\\n private Logger logger;\\n \\n- private Map<String, VelocityEngine> velocityEngines = new ConcurrentHashMap<>();\\n+ private final Map<String, VelocityEngine> velocityEngines = new ConcurrentHashMap<>();\\n \\n @Override\\n public void initialize() throws InitializationException\\n@@ -114,7 +123,7 @@ public void onEvent(Event event, Object source, Object data)\\n if (event instanceof TemplateEvent) {\\n TemplateEvent templateEvent = (TemplateEvent) event;\\n \\n- velocityEngines.remove(templateEvent.getId());\\n+ XWikiVelocityManager.this.velocityEngines.remove(templateEvent.getId());\\n }\\n }\\n \\n@@ -177,8 +186,8 @@ private Template getVelocityEngineMacrosTemplate()\\n \\n /**\\n * @return the Velocity Engine corresponding to the current execution context. More specifically returns the\\n- * Velocity Engine for the current skin since each skin has its own Velocity Engine so that each skin can\\n- * have global velocimacros defined\\n+ * Velocity Engine for the current skin since each skin has its own Velocity Engine so that each skin can have\\n+ * global velocimacros defined\\n * @throws XWikiVelocityException in case of an error while creating a Velocity Engine\\n */\\n @Override\\n@@ -248,10 +257,13 @@ private void injectBaseMacros(VelocityEngine velocityEngine, Template skinMacros\\n }\\n }\\n \\n- // Inject skin macros\\n- if (skinMacrosTemplate != null) {\\n- VelocityTemplate skinMacros = compile(\\\"\\\", new StringReader(skinMacrosTemplate.getContent().getContent()));\\n-\\n+ // Inject skin macros if their author has at least Script rights.\\n+ if (skinMacrosTemplate != null\\n+ && this.authorizationManager.hasAccess(Right.SCRIPT, skinMacrosTemplate.getContent().getAuthorReference(),\\n+ skinMacrosTemplate.getContent().getDocumentReference()))\\n+ {\\n+ VelocityTemplate skinMacros =\\n+ compile(\\\"\\\", new StringReader(skinMacrosTemplate.getContent().getContent()));\\n velocityEngine.addGlobalMacros(skinMacros.getMacros());\\n }\\n }\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java\\nindex 7ab150ee4894..8815d5b14ce0 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/velocity/XWikiVelocityManagerTest.java\\n@@ -22,15 +22,24 @@\\n import org.apache.velocity.VelocityContext;\\n import org.junit.jupiter.api.BeforeEach;\\n import org.junit.jupiter.api.Test;\\n-import org.xwiki.component.manager.ComponentLookupException;\\n+import org.mockito.Mock;\\n import org.xwiki.internal.script.XWikiScriptContextInitializer;\\n import org.xwiki.localization.ContextualLocalizationManager;\\n import org.xwiki.logging.internal.DefaultLoggerConfiguration;\\n import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.properties.ConverterManager;\\n import org.xwiki.script.internal.DefaultScriptContextManager;\\n+import org.xwiki.security.authorization.AuthorizationManager;\\n+import org.xwiki.security.authorization.Right;\\n+import org.xwiki.skin.Skin;\\n+import org.xwiki.skin.SkinManager;\\n+import org.xwiki.template.Template;\\n+import org.xwiki.template.TemplateContent;\\n+import org.xwiki.template.TemplateManager;\\n import org.xwiki.test.annotation.ComponentList;\\n import org.xwiki.test.junit5.mockito.InjectMockComponents;\\n import org.xwiki.test.junit5.mockito.MockComponent;\\n+import org.xwiki.velocity.VelocityEngine;\\n import org.xwiki.velocity.internal.DefaultVelocityConfiguration;\\n import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;\\n \\n@@ -44,17 +53,29 @@\\n import static org.junit.jupiter.api.Assertions.assertNotSame;\\n import static org.junit.jupiter.api.Assertions.assertNull;\\n import static org.junit.jupiter.api.Assertions.assertSame;\\n+import static org.mockito.ArgumentMatchers.anyMap;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n \\n /**\\n * Validate {@link XWikiVelocityManager}.\\n- * \\n+ *\\n * @version $Id$\\n */\\n-@ComponentList(value = {DefaultScriptContextManager.class, XWikiScriptContextInitializer.class,\\n- DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class})\\n+@ComponentList({\\n+ DefaultScriptContextManager.class,\\n+ XWikiScriptContextInitializer.class,\\n+ DefaultVelocityConfiguration.class,\\n+ DefaultLoggerConfiguration.class\\n+})\\n @OldcoreTest\\n public class XWikiVelocityManagerTest\\n {\\n+ private static final DocumentReference TEMPLATE_DOCUMENT = new DocumentReference(\\\"xwiki\\\", \\\"XWiki\\\", \\\"TestMacros\\\");\\n+\\n+ private static final DocumentReference SCRIPT_USER = new DocumentReference(\\\"xwiki\\\", \\\"XWiki\\\", \\\"Script\\\");\\n+\\n @MockComponent\\n private ContextualLocalizationManager localizationManager;\\n \\n@@ -64,19 +85,47 @@ public class XWikiVelocityManagerTest\\n @InjectMockitoOldcore\\n private MockitoOldcore oldcore;\\n \\n+ @MockComponent\\n+ private SkinManager skinManager;\\n+\\n+ @Mock\\n+ private Skin skin;\\n+\\n+ @MockComponent\\n+ private TemplateManager templateManager;\\n+\\n+ @Mock\\n+ private Template template;\\n+\\n+ @Mock\\n+ private TemplateContent templateContent;\\n+\\n+ @MockComponent\\n+ private ConverterManager converterManager;\\n+\\n @BeforeEach\\n- public void beforeEach() throws ComponentLookupException\\n+ void beforeEach() throws Exception\\n {\\n this.oldcore.getExecutionContext().setProperty(VelocityExecutionContextInitializer.VELOCITY_CONTEXT_ID,\\n new VelocityContext());\\n+\\n+ when(this.skinManager.getCurrentSkin(true)).thenReturn(this.skin);\\n+ when(this.templateManager.getTemplate(\\\"macros.vm\\\")).thenReturn(this.template);\\n+ when(this.template.getId()).thenReturn(\\\"testMacros\\\");\\n+ when(this.template.getContent()).thenReturn(this.templateContent);\\n+ when(this.templateContent.getDocumentReference()).thenReturn(TEMPLATE_DOCUMENT);\\n+ when(this.templateContent.getContent()).thenReturn(\\\"\\\");\\n+\\n+ AuthorizationManager authorizationManager = this.oldcore.getMockAuthorizationManager();\\n+ when(authorizationManager.hasAccess(Right.SCRIPT, SCRIPT_USER, TEMPLATE_DOCUMENT)).thenReturn(true);\\n }\\n \\n // Tests\\n \\n @Test\\n- public void getVelocityContext()\\n+ void getVelocityContext()\\n {\\n- VelocityContext context = velocityManager.getVelocityContext();\\n+ VelocityContext context = this.velocityManager.getVelocityContext();\\n \\n assertNull(context.get(\\\"doc\\\"));\\n assertNull(context.get(\\\"sdoc\\\"));\\n@@ -112,4 +161,19 @@ public void getVelocityContext()\\n assertNotNull(context.get(\\\"sdoc\\\"));\\n assertNotSame(sdoc, context.get(\\\"sdoc\\\"));\\n }\\n+\\n+ @Test\\n+ void checkMacrosInjectionWithoutScriptRights() throws Exception\\n+ {\\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\\n+ verify(engine, never()).addGlobalMacros(anyMap());\\n+ }\\n+\\n+ @Test\\n+ void checkMacrosInjectionWithScriptRights() throws Exception\\n+ {\\n+ when(this.templateContent.getAuthorReference()).thenReturn(SCRIPT_USER);\\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\\n+ verify(engine).addGlobalMacros(anyMap());\\n+ }\\n }\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/626d2a5dbf95b4e719ae13bf1a0a9c76e4edd5a2\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21478: Improve rights check of template macros\\n\\n(cherry picked from commit da177c3c972e797d92c1a31e278f946012c41b56)\",\n \"diff_code\": \"From 626d2a5dbf95b4e719ae13bf1a0a9c76e4edd5a2 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Thu, 2 Nov 2023 19:01:11 +0100\\nSubject: [PATCH] XWIKI-21478: Improve rights check of template macros\\n\\n(cherry picked from commit da177c3c972e797d92c1a31e278f946012c41b56)\\n---\\n .../xwiki/render/DefaultVelocityManager.java | 23 ++--\\n .../render/DefaultVelocityManagerTest.java | 127 ++++++++++++++----\\n 2 files changed, 115 insertions(+), 35 deletions(-)\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\\nindex b9a57cac3768..701719218c39 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\\n@@ -47,6 +47,8 @@\\n import org.xwiki.observation.event.Event;\\n import org.xwiki.script.ScriptContextManager;\\n import org.xwiki.security.authorization.AuthorExecutor;\\n+import org.xwiki.security.authorization.AuthorizationManager;\\n+import org.xwiki.security.authorization.Right;\\n import org.xwiki.skin.Skin;\\n import org.xwiki.skin.SkinManager;\\n import org.xwiki.template.Template;\\n@@ -80,7 +82,7 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\\n private static final String VELOCITYENGINE_CACHEKEY_NAME = \\\"velocity.engine.key\\\";\\n \\n private static final List<Event> EVENTS =\\n- Arrays.<Event>asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\\n+ Arrays.asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\\n \\n /**\\n * Used to access the current {@link org.xwiki.context.ExecutionContext}.\\n@@ -121,6 +123,9 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\\n @Inject\\n private AuthorExecutor authorExecutor;\\n \\n+ @Inject\\n+ private AuthorizationManager authorizationManager;\\n+\\n @Inject\\n private Logger logger;\\n \\n@@ -286,11 +291,13 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\\n if (velocityEngine == null) {\\n velocityEngine = this.velocityFactory.createVelocityEngine(cacheKey, null);\\n \\n- if (template != null) {\\n- // Local macros template\\n- // We execute it ourself to support any kind of template, Velocity only support resource\\n- // template by default\\n- try {\\n+ try {\\n+ if (template != null && this.authorizationManager.hasAccess(Right.SCRIPT,\\n+ template.getContent().getAuthorReference(), template.getContent().getDocumentReference()))\\n+ {\\n+ // Local macros template, applied only if their author has at least Script rights.\\n+ // We execute it ourself to support any kind of template, Velocity only support resource\\n+ // template by default\\n final VelocityEngine finalVelocityEngine = velocityEngine;\\n \\n this.authorExecutor.call(() -> {\\n@@ -300,9 +307,9 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\\n return null;\\n }, template.getContent().getAuthorReference(),\\n template.getContent().getDocumentReference());\\n- } catch (Exception e) {\\n- this.logger.error(\\\"Failed to evaluate macros templates [{}]\\\", template.getPath(), e);\\n }\\n+ } catch (Exception e) {\\n+ this.logger.error(\\\"Failed to evaluate macros templates [{}]\\\", template.getPath(), e);\\n }\\n }\\n }\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\\nindex 3ea0e555c4e7..e2db048d0cec 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\\n@@ -19,60 +19,118 @@\\n */\\n package com.xpn.xwiki.render;\\n \\n+import java.io.Writer;\\n+\\n import org.apache.velocity.VelocityContext;\\n-import org.junit.Before;\\n-import org.junit.Rule;\\n-import org.junit.Test;\\n-import org.xwiki.component.manager.ComponentLookupException;\\n+import org.apache.velocity.context.Context;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.mockito.Mock;\\n import org.xwiki.localization.ContextualLocalizationManager;\\n import org.xwiki.logging.internal.DefaultLoggerConfiguration;\\n import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.properties.ConverterManager;\\n import org.xwiki.script.internal.DefaultScriptContextManager;\\n+import org.xwiki.security.authorization.AuthorizationManager;\\n+import org.xwiki.security.authorization.Right;\\n+import org.xwiki.skin.Skin;\\n+import org.xwiki.skin.SkinManager;\\n+import org.xwiki.template.Template;\\n+import org.xwiki.template.TemplateContent;\\n+import org.xwiki.template.TemplateManager;\\n import org.xwiki.test.annotation.ComponentList;\\n-import org.xwiki.test.mockito.MockitoComponentMockingRule;\\n-import org.xwiki.velocity.VelocityManager;\\n+import org.xwiki.test.junit5.mockito.InjectMockComponents;\\n+import org.xwiki.test.junit5.mockito.MockComponent;\\n+import org.xwiki.velocity.VelocityEngine;\\n import org.xwiki.velocity.internal.DefaultVelocityConfiguration;\\n+import org.xwiki.velocity.internal.DefaultVelocityFactory;\\n import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;\\n \\n import com.xpn.xwiki.api.Document;\\n import com.xpn.xwiki.doc.XWikiDocument;\\n-import com.xpn.xwiki.test.MockitoOldcoreRule;\\n-\\n-import static org.junit.Assert.assertNotNull;\\n-import static org.junit.Assert.assertNotSame;\\n-import static org.junit.Assert.assertNull;\\n-import static org.junit.Assert.assertSame;\\n+import com.xpn.xwiki.internal.security.authorization.DefaultAuthorExecutor;\\n+import com.xpn.xwiki.test.MockitoOldcore;\\n+import com.xpn.xwiki.test.junit5.mockito.InjectMockitoOldcore;\\n+import com.xpn.xwiki.test.junit5.mockito.OldcoreTest;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\\n+import static org.junit.jupiter.api.Assertions.assertNotSame;\\n+import static org.junit.jupiter.api.Assertions.assertNull;\\n+import static org.junit.jupiter.api.Assertions.assertSame;\\n+import static org.mockito.ArgumentMatchers.any;\\n+import static org.mockito.ArgumentMatchers.anyString;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n \\n /**\\n * Validate {@link DefaultVelocityManager}.\\n- * \\n+ *\\n * @version $Id$\\n */\\n @ComponentList(value = { DefaultScriptContextManager.class, XWikiScriptContextInitializer.class,\\n-DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class })\\n+ DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class, DefaultVelocityFactory.class,\\n+ DefaultAuthorExecutor.class })\\n+@OldcoreTest\\n public class DefaultVelocityManagerTest\\n {\\n- public MockitoComponentMockingRule<VelocityManager> mocker =\\n- new MockitoComponentMockingRule<VelocityManager>(DefaultVelocityManager.class);\\n+ private static final DocumentReference TEMPLATE_DOCUMENT = new DocumentReference(\\\"xwiki\\\", \\\"XWiki\\\", \\\"TestMacros\\\");\\n \\n- @Rule\\n- public MockitoOldcoreRule oldcore = new MockitoOldcoreRule(this.mocker);\\n+ private static final DocumentReference SCRIPT_USER = new DocumentReference(\\\"xwiki\\\", \\\"XWiki\\\", \\\"Script\\\");\\n \\n- @Before\\n- public void before() throws Exception\\n- {\\n- this.mocker.registerMockComponent(ContextualLocalizationManager.class);\\n+ @MockComponent\\n+ private ContextualLocalizationManager localizationManager;\\n+\\n+ @InjectMockComponents\\n+ private DefaultVelocityManager velocityManager;\\n+\\n+ @InjectMockitoOldcore\\n+ private MockitoOldcore oldcore;\\n+\\n+ @MockComponent\\n+ private SkinManager skinManager;\\n+\\n+ @Mock\\n+ private Skin skin;\\n+\\n+ @MockComponent\\n+ private TemplateManager templateManager;\\n+\\n+ @Mock\\n+ private Template template;\\n+\\n+ @Mock\\n+ private TemplateContent templateContent;\\n+\\n+ @MockComponent\\n+ private ConverterManager converterManager;\\n \\n+ @MockComponent\\n+ private VelocityEngine velocityEngine;\\n+\\n+ @BeforeEach\\n+ void before() throws Exception\\n+ {\\n this.oldcore.getExecutionContext().setProperty(VelocityExecutionContextInitializer.VELOCITY_CONTEXT_ID,\\n new VelocityContext());\\n+\\n+ when(this.skinManager.getCurrentSkin(true)).thenReturn(this.skin);\\n+ when(this.templateManager.getTemplate(\\\"macros.vm\\\")).thenReturn(this.template);\\n+ when(this.template.getId()).thenReturn(\\\"testMacros\\\");\\n+ when(this.template.getContent()).thenReturn(this.templateContent);\\n+ when(this.templateContent.getDocumentReference()).thenReturn(TEMPLATE_DOCUMENT);\\n+ when(this.templateContent.getContent()).thenReturn(\\\"\\\");\\n+\\n+ AuthorizationManager authorizationManager = this.oldcore.getMockAuthorizationManager();\\n+ when(authorizationManager.hasAccess(Right.SCRIPT, SCRIPT_USER, TEMPLATE_DOCUMENT)).thenReturn(true);\\n }\\n \\n // Tests\\n \\n @Test\\n- public void getVelocityContext() throws ComponentLookupException\\n+ void getVelocityContext()\\n {\\n- VelocityContext context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ VelocityContext context = this.velocityManager.getVelocityContext();\\n \\n assertNull(context.get(\\\"doc\\\"));\\n assertNull(context.get(\\\"sdoc\\\"));\\n@@ -83,7 +141,7 @@ public void getVelocityContext() throws ComponentLookupException\\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\\n this.oldcore.getXWikiContext().put(\\\"sdoc\\\", new XWikiDocument(sdocReference));\\n \\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ context = this.velocityManager.getVelocityContext();\\n \\n Document doc = (Document) context.get(\\\"doc\\\");\\n assertNotNull(doc);\\n@@ -92,7 +150,7 @@ public void getVelocityContext() throws ComponentLookupException\\n assertNotNull(sdoc);\\n \\n // Instances are kept the same when the documents in the context don't change\\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ context = this.velocityManager.getVelocityContext();\\n assertSame(doc, context.get(\\\"doc\\\"));\\n assertSame(sdoc, context.get(\\\"sdoc\\\"));\\n \\n@@ -102,10 +160,25 @@ public void getVelocityContext() throws ComponentLookupException\\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\\n this.oldcore.getXWikiContext().put(\\\"sdoc\\\", new XWikiDocument(sdocReference));\\n \\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ context = this.velocityManager.getVelocityContext();\\n assertNotNull(context.get(\\\"doc\\\"));\\n assertNotSame(doc, context.get(\\\"doc\\\"));\\n assertNotNull(context.get(\\\"sdoc\\\"));\\n assertNotSame(sdoc, context.get(\\\"sdoc\\\"));\\n }\\n+\\n+ @Test\\n+ void checkMacrosInjectionWithoutScriptRights() throws Exception\\n+ {\\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\\n+ verify(engine, never()).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\\n+ }\\n+\\n+ @Test\\n+ void checkMacrosInjectionWithScriptRights() throws Exception\\n+ {\\n+ when(this.templateContent.getAuthorReference()).thenReturn(SCRIPT_USER);\\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\\n+ verify(engine).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\\n+ }\\n }\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/da177c3c972e797d92c1a31e278f946012c41b56\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21478: Improve rights check of template macros\",\n \"diff_code\": \"From da177c3c972e797d92c1a31e278f946012c41b56 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Thu, 2 Nov 2023 19:01:11 +0100\\nSubject: [PATCH] XWIKI-21478: Improve rights check of template macros\\n\\n---\\n .../xwiki/render/DefaultVelocityManager.java | 23 ++--\\n .../render/DefaultVelocityManagerTest.java | 127 ++++++++++++++----\\n 2 files changed, 115 insertions(+), 35 deletions(-)\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\\nindex b9a57cac3768..701719218c39 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/DefaultVelocityManager.java\\n@@ -47,6 +47,8 @@\\n import org.xwiki.observation.event.Event;\\n import org.xwiki.script.ScriptContextManager;\\n import org.xwiki.security.authorization.AuthorExecutor;\\n+import org.xwiki.security.authorization.AuthorizationManager;\\n+import org.xwiki.security.authorization.Right;\\n import org.xwiki.skin.Skin;\\n import org.xwiki.skin.SkinManager;\\n import org.xwiki.template.Template;\\n@@ -80,7 +82,7 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\\n private static final String VELOCITYENGINE_CACHEKEY_NAME = \\\"velocity.engine.key\\\";\\n \\n private static final List<Event> EVENTS =\\n- Arrays.<Event>asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\\n+ Arrays.asList(new TemplateUpdatedEvent(), new TemplateDeletedEvent());\\n \\n /**\\n * Used to access the current {@link org.xwiki.context.ExecutionContext}.\\n@@ -121,6 +123,9 @@ public class DefaultVelocityManager implements VelocityManager, Initializable\\n @Inject\\n private AuthorExecutor authorExecutor;\\n \\n+ @Inject\\n+ private AuthorizationManager authorizationManager;\\n+\\n @Inject\\n private Logger logger;\\n \\n@@ -286,11 +291,13 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\\n if (velocityEngine == null) {\\n velocityEngine = this.velocityFactory.createVelocityEngine(cacheKey, null);\\n \\n- if (template != null) {\\n- // Local macros template\\n- // We execute it ourself to support any kind of template, Velocity only support resource\\n- // template by default\\n- try {\\n+ try {\\n+ if (template != null && this.authorizationManager.hasAccess(Right.SCRIPT,\\n+ template.getContent().getAuthorReference(), template.getContent().getDocumentReference()))\\n+ {\\n+ // Local macros template, applied only if their author has at least Script rights.\\n+ // We execute it ourself to support any kind of template, Velocity only support resource\\n+ // template by default\\n final VelocityEngine finalVelocityEngine = velocityEngine;\\n \\n this.authorExecutor.call(() -> {\\n@@ -300,9 +307,9 @@ public VelocityEngine getVelocityEngine() throws XWikiVelocityException\\n return null;\\n }, template.getContent().getAuthorReference(),\\n template.getContent().getDocumentReference());\\n- } catch (Exception e) {\\n- this.logger.error(\\\"Failed to evaluate macros templates [{}]\\\", template.getPath(), e);\\n }\\n+ } catch (Exception e) {\\n+ this.logger.error(\\\"Failed to evaluate macros templates [{}]\\\", template.getPath(), e);\\n }\\n }\\n }\\ndiff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\\nindex 3ea0e555c4e7..e2db048d0cec 100644\\n--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\\n+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/render/DefaultVelocityManagerTest.java\\n@@ -19,60 +19,118 @@\\n */\\n package com.xpn.xwiki.render;\\n \\n+import java.io.Writer;\\n+\\n import org.apache.velocity.VelocityContext;\\n-import org.junit.Before;\\n-import org.junit.Rule;\\n-import org.junit.Test;\\n-import org.xwiki.component.manager.ComponentLookupException;\\n+import org.apache.velocity.context.Context;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.mockito.Mock;\\n import org.xwiki.localization.ContextualLocalizationManager;\\n import org.xwiki.logging.internal.DefaultLoggerConfiguration;\\n import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.properties.ConverterManager;\\n import org.xwiki.script.internal.DefaultScriptContextManager;\\n+import org.xwiki.security.authorization.AuthorizationManager;\\n+import org.xwiki.security.authorization.Right;\\n+import org.xwiki.skin.Skin;\\n+import org.xwiki.skin.SkinManager;\\n+import org.xwiki.template.Template;\\n+import org.xwiki.template.TemplateContent;\\n+import org.xwiki.template.TemplateManager;\\n import org.xwiki.test.annotation.ComponentList;\\n-import org.xwiki.test.mockito.MockitoComponentMockingRule;\\n-import org.xwiki.velocity.VelocityManager;\\n+import org.xwiki.test.junit5.mockito.InjectMockComponents;\\n+import org.xwiki.test.junit5.mockito.MockComponent;\\n+import org.xwiki.velocity.VelocityEngine;\\n import org.xwiki.velocity.internal.DefaultVelocityConfiguration;\\n+import org.xwiki.velocity.internal.DefaultVelocityFactory;\\n import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;\\n \\n import com.xpn.xwiki.api.Document;\\n import com.xpn.xwiki.doc.XWikiDocument;\\n-import com.xpn.xwiki.test.MockitoOldcoreRule;\\n-\\n-import static org.junit.Assert.assertNotNull;\\n-import static org.junit.Assert.assertNotSame;\\n-import static org.junit.Assert.assertNull;\\n-import static org.junit.Assert.assertSame;\\n+import com.xpn.xwiki.internal.security.authorization.DefaultAuthorExecutor;\\n+import com.xpn.xwiki.test.MockitoOldcore;\\n+import com.xpn.xwiki.test.junit5.mockito.InjectMockitoOldcore;\\n+import com.xpn.xwiki.test.junit5.mockito.OldcoreTest;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertNotNull;\\n+import static org.junit.jupiter.api.Assertions.assertNotSame;\\n+import static org.junit.jupiter.api.Assertions.assertNull;\\n+import static org.junit.jupiter.api.Assertions.assertSame;\\n+import static org.mockito.ArgumentMatchers.any;\\n+import static org.mockito.ArgumentMatchers.anyString;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n \\n /**\\n * Validate {@link DefaultVelocityManager}.\\n- * \\n+ *\\n * @version $Id$\\n */\\n @ComponentList(value = { DefaultScriptContextManager.class, XWikiScriptContextInitializer.class,\\n-DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class })\\n+ DefaultVelocityConfiguration.class, DefaultLoggerConfiguration.class, DefaultVelocityFactory.class,\\n+ DefaultAuthorExecutor.class })\\n+@OldcoreTest\\n public class DefaultVelocityManagerTest\\n {\\n- public MockitoComponentMockingRule<VelocityManager> mocker =\\n- new MockitoComponentMockingRule<VelocityManager>(DefaultVelocityManager.class);\\n+ private static final DocumentReference TEMPLATE_DOCUMENT = new DocumentReference(\\\"xwiki\\\", \\\"XWiki\\\", \\\"TestMacros\\\");\\n \\n- @Rule\\n- public MockitoOldcoreRule oldcore = new MockitoOldcoreRule(this.mocker);\\n+ private static final DocumentReference SCRIPT_USER = new DocumentReference(\\\"xwiki\\\", \\\"XWiki\\\", \\\"Script\\\");\\n \\n- @Before\\n- public void before() throws Exception\\n- {\\n- this.mocker.registerMockComponent(ContextualLocalizationManager.class);\\n+ @MockComponent\\n+ private ContextualLocalizationManager localizationManager;\\n+\\n+ @InjectMockComponents\\n+ private DefaultVelocityManager velocityManager;\\n+\\n+ @InjectMockitoOldcore\\n+ private MockitoOldcore oldcore;\\n+\\n+ @MockComponent\\n+ private SkinManager skinManager;\\n+\\n+ @Mock\\n+ private Skin skin;\\n+\\n+ @MockComponent\\n+ private TemplateManager templateManager;\\n+\\n+ @Mock\\n+ private Template template;\\n+\\n+ @Mock\\n+ private TemplateContent templateContent;\\n+\\n+ @MockComponent\\n+ private ConverterManager converterManager;\\n \\n+ @MockComponent\\n+ private VelocityEngine velocityEngine;\\n+\\n+ @BeforeEach\\n+ void before() throws Exception\\n+ {\\n this.oldcore.getExecutionContext().setProperty(VelocityExecutionContextInitializer.VELOCITY_CONTEXT_ID,\\n new VelocityContext());\\n+\\n+ when(this.skinManager.getCurrentSkin(true)).thenReturn(this.skin);\\n+ when(this.templateManager.getTemplate(\\\"macros.vm\\\")).thenReturn(this.template);\\n+ when(this.template.getId()).thenReturn(\\\"testMacros\\\");\\n+ when(this.template.getContent()).thenReturn(this.templateContent);\\n+ when(this.templateContent.getDocumentReference()).thenReturn(TEMPLATE_DOCUMENT);\\n+ when(this.templateContent.getContent()).thenReturn(\\\"\\\");\\n+\\n+ AuthorizationManager authorizationManager = this.oldcore.getMockAuthorizationManager();\\n+ when(authorizationManager.hasAccess(Right.SCRIPT, SCRIPT_USER, TEMPLATE_DOCUMENT)).thenReturn(true);\\n }\\n \\n // Tests\\n \\n @Test\\n- public void getVelocityContext() throws ComponentLookupException\\n+ void getVelocityContext()\\n {\\n- VelocityContext context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ VelocityContext context = this.velocityManager.getVelocityContext();\\n \\n assertNull(context.get(\\\"doc\\\"));\\n assertNull(context.get(\\\"sdoc\\\"));\\n@@ -83,7 +141,7 @@ public void getVelocityContext() throws ComponentLookupException\\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\\n this.oldcore.getXWikiContext().put(\\\"sdoc\\\", new XWikiDocument(sdocReference));\\n \\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ context = this.velocityManager.getVelocityContext();\\n \\n Document doc = (Document) context.get(\\\"doc\\\");\\n assertNotNull(doc);\\n@@ -92,7 +150,7 @@ public void getVelocityContext() throws ComponentLookupException\\n assertNotNull(sdoc);\\n \\n // Instances are kept the same when the documents in the context don't change\\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ context = this.velocityManager.getVelocityContext();\\n assertSame(doc, context.get(\\\"doc\\\"));\\n assertSame(sdoc, context.get(\\\"sdoc\\\"));\\n \\n@@ -102,10 +160,25 @@ public void getVelocityContext() throws ComponentLookupException\\n this.oldcore.getXWikiContext().setDoc(new XWikiDocument(docReference));\\n this.oldcore.getXWikiContext().put(\\\"sdoc\\\", new XWikiDocument(sdocReference));\\n \\n- context = this.mocker.getComponentUnderTest().getVelocityContext();\\n+ context = this.velocityManager.getVelocityContext();\\n assertNotNull(context.get(\\\"doc\\\"));\\n assertNotSame(doc, context.get(\\\"doc\\\"));\\n assertNotNull(context.get(\\\"sdoc\\\"));\\n assertNotSame(sdoc, context.get(\\\"sdoc\\\"));\\n }\\n+\\n+ @Test\\n+ void checkMacrosInjectionWithoutScriptRights() throws Exception\\n+ {\\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\\n+ verify(engine, never()).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\\n+ }\\n+\\n+ @Test\\n+ void checkMacrosInjectionWithScriptRights() throws Exception\\n+ {\\n+ when(this.templateContent.getAuthorReference()).thenReturn(SCRIPT_USER);\\n+ VelocityEngine engine = this.velocityManager.getVelocityEngine();\\n+ verify(engine).evaluate(any(Context.class), any(Writer.class), anyString(), anyString());\\n+ }\\n }\\n\"\n }\n]","isConversational":false}}},{"rowIdx":1195,"cells":{"CVE_ID":{"kind":"string","value":"CVE-2024-31988"},"category":{"kind":"string","value":"Fixes for Multiple Locations Across Different Branches or Projects"},"patches":{"kind":"list like","value":[{"commit url":"https://github.com/xwiki/xwiki-platform/commit/4896712ee6483da623f131be2e618f1f2b79cb8d","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml","diff_code":"From 4896712ee6483da623f131be2e618f1f2b79cb8d Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Tue, 10 Oct 2023 17:48:12 +0200\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\n API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n---\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\n .../src/main/webjar/loader.js | 6 +-\n 5 files changed, 230 insertions(+), 4 deletions(-)\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\nindex 3dc374757c29..9b846a7baeb2 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n@@ -75,5 +75,27 @@\n <version>${project.version}</version>\n <scope>runtime</scope>\n </dependency>\n+ <!-- Test dependencies. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-test-page</artifactId>\n+ <version>${project.version}</version>\n+ <scope>test</scope>\n+ </dependency>\n+ <!-- Provides the component list for RenderingScriptService. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n </dependencies>\n </project>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\nindex faa65e1e708b..a9065d7cb5da 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n@@ -20,7 +20,7 @@\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n -->\n \n-<xwikidoc version=\"1.4\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n+<xwikidoc version=\"1.5\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n <web>RTFrontend</web>\n <name>ConvertHTML</name>\n <language/>\n@@ -52,8 +52,13 @@\n 'documentReference': $documentReference\n })\n #if ($xcontext.action == 'get')\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ ## Check that the CSRF token matches the user.\n+ #if (!$services.csrf.isTokenValid($request.form_token))\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\n+ #else\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ #end\n #end\n {{/velocity}}</content>\n </xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\nnew file mode 100644\nindex 000000000000..c63d2e2faa8f\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n@@ -0,0 +1,77 @@\n+<?xml version=\"1.1\" encoding=\"UTF-8\"?>\n+\n+<!--\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+-->\n+\n+<xwikidoc version=\"1.5\" reference=\"XWiki.Realtime.Translations\" locale=\"\">\n+ <web>XWiki.Realtime</web>\n+ <name>Translations</name>\n+ <language/>\n+ <defaultLanguage>en</defaultLanguage>\n+ <translation>0</translation>\n+ <creator>xwiki:XWiki.Admin</creator>\n+ <parent>Main.WebHome</parent>\n+ <author>xwiki:XWiki.Admin</author>\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\n+ <version>1.1</version>\n+ <title/>\n+ <comment/>\n+ <minorEdit>false</minorEdit>\n+ <syntaxId>plain/1.0</syntaxId>\n+ <hidden>true</hidden>\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\n+ <object>\n+ <name>XWiki.Realtime.Translations</name>\n+ <number>0</number>\n+ <className>XWiki.TranslationDocumentClass</className>\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\n+ <class>\n+ <name>XWiki.TranslationDocumentClass</name>\n+ <customClass/>\n+ <customMapping/>\n+ <defaultViewSheet/>\n+ <defaultEditSheet/>\n+ <defaultWeb/>\n+ <nameField/>\n+ <validationScript/>\n+ <scope>\n+ <cache>0</cache>\n+ <disabled>0</disabled>\n+ <displayType>select</displayType>\n+ <freeText>forbidden</freeText>\n+ <largeStorage>0</largeStorage>\n+ <multiSelect>0</multiSelect>\n+ <name>scope</name>\n+ <number>1</number>\n+ <prettyName>Scope</prettyName>\n+ <relationalStorage>0</relationalStorage>\n+ <separator> </separator>\n+ <separators>|, </separators>\n+ <size>1</size>\n+ <unmodifiable>0</unmodifiable>\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\n+ </scope>\n+ </class>\n+ <property>\n+ <scope>WIKI</scope>\n+ </property>\n+ </object>\n+</xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\nnew file mode 100644\nindex 000000000000..dde6b3d7cf04\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n@@ -0,0 +1,118 @@\n+/*\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+ */\n+package org.xwiki.realtime.ui;\n+\n+import javax.inject.Provider;\n+\n+import org.jsoup.nodes.Document;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\n+import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\n+import org.xwiki.script.service.ScriptService;\n+import org.xwiki.test.page.HTML50ComponentList;\n+import org.xwiki.test.page.PageTest;\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\n+\n+import com.xpn.xwiki.XWikiContext;\n+import com.xpn.xwiki.user.api.XWikiRightService;\n+\n+import static org.junit.jupiter.api.Assertions.assertEquals;\n+import static org.mockito.ArgumentMatchers.anyInt;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.spy;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+\n+@RenderingScriptServiceComponentList\n+@DefaultRenderingConfigurationComponentList\n+@HTML50ComponentList\n+@XWikiSyntax21ComponentList\n+class ConvertHTMLPageTest extends PageTest\n+{\n+\n+ private static final String WIKI_NAME = \"xwiki\";\n+\n+ private static final String XWIKI_SPACE = \"RTFrontend\";\n+\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \"ConvertHTML\");\n+\n+ private static final String CSRF_TOKEN = \"a0a0a0a0\";\n+\n+ private CSRFTokenScriptService tokenService;\n+\n+ @BeforeEach\n+ void setUp() throws Exception\n+ {\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \"csrf\",\n+ CSRFTokenScriptService.class, true);\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\n+\n+ this.xwiki.initializeMandatoryDocuments(this.context);\n+\n+ this.context = mock(XWikiContext.class);\n+ Provider<XWikiContext> xcontextProvider =\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\n+ when(xcontextProvider.get()).thenReturn(this.context);\n+ when(this.context.getRequest()).thenReturn(this.request);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\n+\n+ // Fake programming access level to display the complete page.\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\n+ this.response = spy(this.response);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ }\n+\n+ @Test\n+ void checkValidCSRFToken() throws Exception\n+ {\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", CSRF_TOKEN);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response, never()).setStatus(anyInt());\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\n+ assertEquals(\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\",\n+ result.getElementsByTag(\"body\").text());\n+ }\n+\n+ @Test\n+ void checkInvalidCSRFToken() throws Exception\n+ {\n+ String wrongToken = \"wrong_token\";\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", wrongToken);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response).sendError(403, \"rtfFrontend.convertHtml.invalidCsrfToken\");\n+ verify(this.tokenService).isTokenValid(wrongToken);\n+ assertEquals(\"\", result.getElementsByTag(\"body\").text());\n+ }\n+}\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\nindex 41a510ac5046..4f9399d59c28 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\n return {\n WebsocketURL: realtimeConfig.webSocketURL,\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\n+ 'xpage': 'plain',\n+ 'outputSyntax': 'plain',\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\n+ })),\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\n String(Math.random()).substring(2),\n"},{"commit url":"https://github.com/xwiki/xwiki-platform/commit/9f8cc88497418750b09ce9fde5d67d840f038fbf","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)","diff_code":"From 9f8cc88497418750b09ce9fde5d67d840f038fbf Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Tue, 10 Oct 2023 17:48:12 +0200\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\n API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\n---\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\n .../src/main/webjar/loader.js | 6 +-\n 5 files changed, 230 insertions(+), 4 deletions(-)\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\nindex e09bdb02fb60..b99c769b406e 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n@@ -75,5 +75,27 @@\n <version>${project.version}</version>\n <scope>runtime</scope>\n </dependency>\n+ <!-- Test dependencies. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-test-page</artifactId>\n+ <version>${project.version}</version>\n+ <scope>test</scope>\n+ </dependency>\n+ <!-- Provides the component list for RenderingScriptService. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n </dependencies>\n </project>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\nindex faa65e1e708b..a9065d7cb5da 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n@@ -20,7 +20,7 @@\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n -->\n \n-<xwikidoc version=\"1.4\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n+<xwikidoc version=\"1.5\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n <web>RTFrontend</web>\n <name>ConvertHTML</name>\n <language/>\n@@ -52,8 +52,13 @@\n 'documentReference': $documentReference\n })\n #if ($xcontext.action == 'get')\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ ## Check that the CSRF token matches the user.\n+ #if (!$services.csrf.isTokenValid($request.form_token))\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\n+ #else\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ #end\n #end\n {{/velocity}}</content>\n </xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\nnew file mode 100644\nindex 000000000000..c63d2e2faa8f\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n@@ -0,0 +1,77 @@\n+<?xml version=\"1.1\" encoding=\"UTF-8\"?>\n+\n+<!--\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+-->\n+\n+<xwikidoc version=\"1.5\" reference=\"XWiki.Realtime.Translations\" locale=\"\">\n+ <web>XWiki.Realtime</web>\n+ <name>Translations</name>\n+ <language/>\n+ <defaultLanguage>en</defaultLanguage>\n+ <translation>0</translation>\n+ <creator>xwiki:XWiki.Admin</creator>\n+ <parent>Main.WebHome</parent>\n+ <author>xwiki:XWiki.Admin</author>\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\n+ <version>1.1</version>\n+ <title/>\n+ <comment/>\n+ <minorEdit>false</minorEdit>\n+ <syntaxId>plain/1.0</syntaxId>\n+ <hidden>true</hidden>\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\n+ <object>\n+ <name>XWiki.Realtime.Translations</name>\n+ <number>0</number>\n+ <className>XWiki.TranslationDocumentClass</className>\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\n+ <class>\n+ <name>XWiki.TranslationDocumentClass</name>\n+ <customClass/>\n+ <customMapping/>\n+ <defaultViewSheet/>\n+ <defaultEditSheet/>\n+ <defaultWeb/>\n+ <nameField/>\n+ <validationScript/>\n+ <scope>\n+ <cache>0</cache>\n+ <disabled>0</disabled>\n+ <displayType>select</displayType>\n+ <freeText>forbidden</freeText>\n+ <largeStorage>0</largeStorage>\n+ <multiSelect>0</multiSelect>\n+ <name>scope</name>\n+ <number>1</number>\n+ <prettyName>Scope</prettyName>\n+ <relationalStorage>0</relationalStorage>\n+ <separator> </separator>\n+ <separators>|, </separators>\n+ <size>1</size>\n+ <unmodifiable>0</unmodifiable>\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\n+ </scope>\n+ </class>\n+ <property>\n+ <scope>WIKI</scope>\n+ </property>\n+ </object>\n+</xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\nnew file mode 100644\nindex 000000000000..dde6b3d7cf04\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n@@ -0,0 +1,118 @@\n+/*\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+ */\n+package org.xwiki.realtime.ui;\n+\n+import javax.inject.Provider;\n+\n+import org.jsoup.nodes.Document;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\n+import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\n+import org.xwiki.script.service.ScriptService;\n+import org.xwiki.test.page.HTML50ComponentList;\n+import org.xwiki.test.page.PageTest;\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\n+\n+import com.xpn.xwiki.XWikiContext;\n+import com.xpn.xwiki.user.api.XWikiRightService;\n+\n+import static org.junit.jupiter.api.Assertions.assertEquals;\n+import static org.mockito.ArgumentMatchers.anyInt;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.spy;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+\n+@RenderingScriptServiceComponentList\n+@DefaultRenderingConfigurationComponentList\n+@HTML50ComponentList\n+@XWikiSyntax21ComponentList\n+class ConvertHTMLPageTest extends PageTest\n+{\n+\n+ private static final String WIKI_NAME = \"xwiki\";\n+\n+ private static final String XWIKI_SPACE = \"RTFrontend\";\n+\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \"ConvertHTML\");\n+\n+ private static final String CSRF_TOKEN = \"a0a0a0a0\";\n+\n+ private CSRFTokenScriptService tokenService;\n+\n+ @BeforeEach\n+ void setUp() throws Exception\n+ {\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \"csrf\",\n+ CSRFTokenScriptService.class, true);\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\n+\n+ this.xwiki.initializeMandatoryDocuments(this.context);\n+\n+ this.context = mock(XWikiContext.class);\n+ Provider<XWikiContext> xcontextProvider =\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\n+ when(xcontextProvider.get()).thenReturn(this.context);\n+ when(this.context.getRequest()).thenReturn(this.request);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\n+\n+ // Fake programming access level to display the complete page.\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\n+ this.response = spy(this.response);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ }\n+\n+ @Test\n+ void checkValidCSRFToken() throws Exception\n+ {\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", CSRF_TOKEN);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response, never()).setStatus(anyInt());\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\n+ assertEquals(\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\",\n+ result.getElementsByTag(\"body\").text());\n+ }\n+\n+ @Test\n+ void checkInvalidCSRFToken() throws Exception\n+ {\n+ String wrongToken = \"wrong_token\";\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", wrongToken);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response).sendError(403, \"rtfFrontend.convertHtml.invalidCsrfToken\");\n+ verify(this.tokenService).isTokenValid(wrongToken);\n+ assertEquals(\"\", result.getElementsByTag(\"body\").text());\n+ }\n+}\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\nindex 41a510ac5046..4f9399d59c28 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\n return {\n WebsocketURL: realtimeConfig.webSocketURL,\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\n+ 'xpage': 'plain',\n+ 'outputSyntax': 'plain',\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\n+ })),\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\n String(Math.random()).substring(2),\n"},{"commit url":"https://github.com/xwiki/xwiki-platform/commit/d88da4572fb7d4f95e1f54bb0cce33fce3df08d9","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)","diff_code":"From d88da4572fb7d4f95e1f54bb0cce33fce3df08d9 Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Tue, 10 Oct 2023 17:48:12 +0200\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\n API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\n---\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\n .../src/main/webjar/loader.js | 6 +-\n 5 files changed, 230 insertions(+), 4 deletions(-)\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\nindex 2af569a6b931..c2aa1e30b5e8 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n@@ -75,5 +75,27 @@\n <version>${project.version}</version>\n <scope>runtime</scope>\n </dependency>\n+ <!-- Test dependencies. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-test-page</artifactId>\n+ <version>${project.version}</version>\n+ <scope>test</scope>\n+ </dependency>\n+ <!-- Provides the component list for RenderingScriptService. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n </dependencies>\n </project>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\nindex faa65e1e708b..a9065d7cb5da 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n@@ -20,7 +20,7 @@\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n -->\n \n-<xwikidoc version=\"1.4\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n+<xwikidoc version=\"1.5\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n <web>RTFrontend</web>\n <name>ConvertHTML</name>\n <language/>\n@@ -52,8 +52,13 @@\n 'documentReference': $documentReference\n })\n #if ($xcontext.action == 'get')\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ ## Check that the CSRF token matches the user.\n+ #if (!$services.csrf.isTokenValid($request.form_token))\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\n+ #else\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ #end\n #end\n {{/velocity}}</content>\n </xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\nnew file mode 100644\nindex 000000000000..c63d2e2faa8f\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n@@ -0,0 +1,77 @@\n+<?xml version=\"1.1\" encoding=\"UTF-8\"?>\n+\n+<!--\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+-->\n+\n+<xwikidoc version=\"1.5\" reference=\"XWiki.Realtime.Translations\" locale=\"\">\n+ <web>XWiki.Realtime</web>\n+ <name>Translations</name>\n+ <language/>\n+ <defaultLanguage>en</defaultLanguage>\n+ <translation>0</translation>\n+ <creator>xwiki:XWiki.Admin</creator>\n+ <parent>Main.WebHome</parent>\n+ <author>xwiki:XWiki.Admin</author>\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\n+ <version>1.1</version>\n+ <title/>\n+ <comment/>\n+ <minorEdit>false</minorEdit>\n+ <syntaxId>plain/1.0</syntaxId>\n+ <hidden>true</hidden>\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\n+ <object>\n+ <name>XWiki.Realtime.Translations</name>\n+ <number>0</number>\n+ <className>XWiki.TranslationDocumentClass</className>\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\n+ <class>\n+ <name>XWiki.TranslationDocumentClass</name>\n+ <customClass/>\n+ <customMapping/>\n+ <defaultViewSheet/>\n+ <defaultEditSheet/>\n+ <defaultWeb/>\n+ <nameField/>\n+ <validationScript/>\n+ <scope>\n+ <cache>0</cache>\n+ <disabled>0</disabled>\n+ <displayType>select</displayType>\n+ <freeText>forbidden</freeText>\n+ <largeStorage>0</largeStorage>\n+ <multiSelect>0</multiSelect>\n+ <name>scope</name>\n+ <number>1</number>\n+ <prettyName>Scope</prettyName>\n+ <relationalStorage>0</relationalStorage>\n+ <separator> </separator>\n+ <separators>|, </separators>\n+ <size>1</size>\n+ <unmodifiable>0</unmodifiable>\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\n+ </scope>\n+ </class>\n+ <property>\n+ <scope>WIKI</scope>\n+ </property>\n+ </object>\n+</xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\nnew file mode 100644\nindex 000000000000..dde6b3d7cf04\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n@@ -0,0 +1,118 @@\n+/*\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+ */\n+package org.xwiki.realtime.ui;\n+\n+import javax.inject.Provider;\n+\n+import org.jsoup.nodes.Document;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\n+import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\n+import org.xwiki.script.service.ScriptService;\n+import org.xwiki.test.page.HTML50ComponentList;\n+import org.xwiki.test.page.PageTest;\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\n+\n+import com.xpn.xwiki.XWikiContext;\n+import com.xpn.xwiki.user.api.XWikiRightService;\n+\n+import static org.junit.jupiter.api.Assertions.assertEquals;\n+import static org.mockito.ArgumentMatchers.anyInt;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.spy;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+\n+@RenderingScriptServiceComponentList\n+@DefaultRenderingConfigurationComponentList\n+@HTML50ComponentList\n+@XWikiSyntax21ComponentList\n+class ConvertHTMLPageTest extends PageTest\n+{\n+\n+ private static final String WIKI_NAME = \"xwiki\";\n+\n+ private static final String XWIKI_SPACE = \"RTFrontend\";\n+\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \"ConvertHTML\");\n+\n+ private static final String CSRF_TOKEN = \"a0a0a0a0\";\n+\n+ private CSRFTokenScriptService tokenService;\n+\n+ @BeforeEach\n+ void setUp() throws Exception\n+ {\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \"csrf\",\n+ CSRFTokenScriptService.class, true);\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\n+\n+ this.xwiki.initializeMandatoryDocuments(this.context);\n+\n+ this.context = mock(XWikiContext.class);\n+ Provider<XWikiContext> xcontextProvider =\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\n+ when(xcontextProvider.get()).thenReturn(this.context);\n+ when(this.context.getRequest()).thenReturn(this.request);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\n+\n+ // Fake programming access level to display the complete page.\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\n+ this.response = spy(this.response);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ }\n+\n+ @Test\n+ void checkValidCSRFToken() throws Exception\n+ {\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", CSRF_TOKEN);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response, never()).setStatus(anyInt());\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\n+ assertEquals(\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\",\n+ result.getElementsByTag(\"body\").text());\n+ }\n+\n+ @Test\n+ void checkInvalidCSRFToken() throws Exception\n+ {\n+ String wrongToken = \"wrong_token\";\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", wrongToken);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response).sendError(403, \"rtfFrontend.convertHtml.invalidCsrfToken\");\n+ verify(this.tokenService).isTokenValid(wrongToken);\n+ assertEquals(\"\", result.getElementsByTag(\"body\").text());\n+ }\n+}\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\nindex 41a510ac5046..4f9399d59c28 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\n return {\n WebsocketURL: realtimeConfig.webSocketURL,\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\n+ 'xpage': 'plain',\n+ 'outputSyntax': 'plain',\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\n+ })),\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\n String(Math.random()).substring(2),\n"},{"commit url":"https://github.com/xwiki/xwiki-platform/commit/d9f5043da289ff106f08e23576746fd8baf98794","owner":"xwiki","repo_name":"xwiki-platform","commit_message":"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)","diff_code":"From d9f5043da289ff106f08e23576746fd8baf98794 Mon Sep 17 00:00:00 2001\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\nDate: Tue, 10 Oct 2023 17:48:12 +0200\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\n API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\n* Improve URL creation and add Translations.xml\n\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\n---\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\n .../src/main/webjar/loader.js | 6 +-\n 5 files changed, 230 insertions(+), 4 deletions(-)\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\nindex db16f98f7750..2bfdf8401ed1 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\n@@ -75,5 +75,27 @@\n <version>${project.version}</version>\n <scope>runtime</scope>\n </dependency>\n+ <!-- Test dependencies. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-test-page</artifactId>\n+ <version>${project.version}</version>\n+ <scope>test</scope>\n+ </dependency>\n+ <!-- Provides the component list for RenderingScriptService. -->\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.xwiki.platform</groupId>\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\n+ <version>${project.version}</version>\n+ <type>test-jar</type>\n+ <scope>test</scope>\n+ </dependency>\n </dependencies>\n </project>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\nindex faa65e1e708b..a9065d7cb5da 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\n@@ -20,7 +20,7 @@\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n -->\n \n-<xwikidoc version=\"1.4\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n+<xwikidoc version=\"1.5\" reference=\"RTFrontend.ConvertHTML\" locale=\"\">\n <web>RTFrontend</web>\n <name>ConvertHTML</name>\n <language/>\n@@ -52,8 +52,13 @@\n 'documentReference': $documentReference\n })\n #if ($xcontext.action == 'get')\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ ## Check that the CSRF token matches the user.\n+ #if (!$services.csrf.isTokenValid($request.form_token))\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\n+ #else\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\n+ #end\n #end\n {{/velocity}}</content>\n </xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\nnew file mode 100644\nindex 000000000000..c63d2e2faa8f\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\n@@ -0,0 +1,77 @@\n+<?xml version=\"1.1\" encoding=\"UTF-8\"?>\n+\n+<!--\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+-->\n+\n+<xwikidoc version=\"1.5\" reference=\"XWiki.Realtime.Translations\" locale=\"\">\n+ <web>XWiki.Realtime</web>\n+ <name>Translations</name>\n+ <language/>\n+ <defaultLanguage>en</defaultLanguage>\n+ <translation>0</translation>\n+ <creator>xwiki:XWiki.Admin</creator>\n+ <parent>Main.WebHome</parent>\n+ <author>xwiki:XWiki.Admin</author>\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\n+ <version>1.1</version>\n+ <title/>\n+ <comment/>\n+ <minorEdit>false</minorEdit>\n+ <syntaxId>plain/1.0</syntaxId>\n+ <hidden>true</hidden>\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\n+ <object>\n+ <name>XWiki.Realtime.Translations</name>\n+ <number>0</number>\n+ <className>XWiki.TranslationDocumentClass</className>\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\n+ <class>\n+ <name>XWiki.TranslationDocumentClass</name>\n+ <customClass/>\n+ <customMapping/>\n+ <defaultViewSheet/>\n+ <defaultEditSheet/>\n+ <defaultWeb/>\n+ <nameField/>\n+ <validationScript/>\n+ <scope>\n+ <cache>0</cache>\n+ <disabled>0</disabled>\n+ <displayType>select</displayType>\n+ <freeText>forbidden</freeText>\n+ <largeStorage>0</largeStorage>\n+ <multiSelect>0</multiSelect>\n+ <name>scope</name>\n+ <number>1</number>\n+ <prettyName>Scope</prettyName>\n+ <relationalStorage>0</relationalStorage>\n+ <separator> </separator>\n+ <separators>|, </separators>\n+ <size>1</size>\n+ <unmodifiable>0</unmodifiable>\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\n+ </scope>\n+ </class>\n+ <property>\n+ <scope>WIKI</scope>\n+ </property>\n+ </object>\n+</xwikidoc>\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\nnew file mode 100644\nindex 000000000000..dde6b3d7cf04\n--- /dev/null\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\n@@ -0,0 +1,118 @@\n+/*\n+ * See the NOTICE file distributed with this work for additional\n+ * information regarding copyright ownership.\n+ *\n+ * This is free software; you can redistribute it and/or modify it\n+ * under the terms of the GNU Lesser General Public License as\n+ * published by the Free Software Foundation; either version 2.1 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This software is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this software; if not, write to the Free\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n+ */\n+package org.xwiki.realtime.ui;\n+\n+import javax.inject.Provider;\n+\n+import org.jsoup.nodes.Document;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\n+import org.xwiki.model.reference.DocumentReference;\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\n+import org.xwiki.script.service.ScriptService;\n+import org.xwiki.test.page.HTML50ComponentList;\n+import org.xwiki.test.page.PageTest;\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\n+\n+import com.xpn.xwiki.XWikiContext;\n+import com.xpn.xwiki.user.api.XWikiRightService;\n+\n+import static org.junit.jupiter.api.Assertions.assertEquals;\n+import static org.mockito.ArgumentMatchers.anyInt;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.never;\n+import static org.mockito.Mockito.spy;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+\n+@RenderingScriptServiceComponentList\n+@DefaultRenderingConfigurationComponentList\n+@HTML50ComponentList\n+@XWikiSyntax21ComponentList\n+class ConvertHTMLPageTest extends PageTest\n+{\n+\n+ private static final String WIKI_NAME = \"xwiki\";\n+\n+ private static final String XWIKI_SPACE = \"RTFrontend\";\n+\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \"ConvertHTML\");\n+\n+ private static final String CSRF_TOKEN = \"a0a0a0a0\";\n+\n+ private CSRFTokenScriptService tokenService;\n+\n+ @BeforeEach\n+ void setUp() throws Exception\n+ {\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \"csrf\",\n+ CSRFTokenScriptService.class, true);\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\n+\n+ this.xwiki.initializeMandatoryDocuments(this.context);\n+\n+ this.context = mock(XWikiContext.class);\n+ Provider<XWikiContext> xcontextProvider =\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\n+ when(xcontextProvider.get()).thenReturn(this.context);\n+ when(this.context.getRequest()).thenReturn(this.request);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\n+\n+ // Fake programming access level to display the complete page.\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\n+ this.response = spy(this.response);\n+ when(this.context.getResponse()).thenReturn(this.response);\n+ }\n+\n+ @Test\n+ void checkValidCSRFToken() throws Exception\n+ {\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", CSRF_TOKEN);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response, never()).setStatus(anyInt());\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\n+ assertEquals(\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\",\n+ result.getElementsByTag(\"body\").text());\n+ }\n+\n+ @Test\n+ void checkInvalidCSRFToken() throws Exception\n+ {\n+ String wrongToken = \"wrong_token\";\n+ when(this.context.getAction()).thenReturn(\"get\");\n+ this.request.put(\"text\", \"Hello\");\n+ this.request.put(\"form_token\", wrongToken);\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\n+\n+ verify(this.response).sendError(403, \"rtfFrontend.convertHtml.invalidCsrfToken\");\n+ verify(this.tokenService).isTokenValid(wrongToken);\n+ assertEquals(\"\", result.getElementsByTag(\"body\").text());\n+ }\n+}\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\nindex 41a510ac5046..4f9399d59c28 100644\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\n return {\n WebsocketURL: realtimeConfig.webSocketURL,\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\n+ 'xpage': 'plain',\n+ 'outputSyntax': 'plain',\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\n+ })),\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\n String(Math.random()).substring(2),\n"}],"string":"[\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/4896712ee6483da623f131be2e618f1f2b79cb8d\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\",\n \"diff_code\": \"From 4896712ee6483da623f131be2e618f1f2b79cb8d Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Tue, 10 Oct 2023 17:48:12 +0200\\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\\n API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n---\\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\\n .../src/main/webjar/loader.js | 6 +-\\n 5 files changed, 230 insertions(+), 4 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\nindex 3dc374757c29..9b846a7baeb2 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\nindex faa65e1e708b..a9065d7cb5da 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.4\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n <web>RTFrontend</web>\\n <name>ConvertHTML</name>\\n <language/>\\n@@ -52,8 +52,13 @@\\n 'documentReference': $documentReference\\n })\\n #if ($xcontext.action == 'get')\\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ ## Check that the CSRF token matches the user.\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\\n+ #else\\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ #end\\n #end\\n {{/velocity}}</content>\\n </xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\nnew file mode 100644\\nindex 000000000000..c63d2e2faa8f\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n@@ -0,0 +1,77 @@\\n+<?xml version=\\\"1.1\\\" encoding=\\\"UTF-8\\\"?>\\n+\\n+<!--\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+-->\\n+\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"XWiki.Realtime.Translations\\\" locale=\\\"\\\">\\n+ <web>XWiki.Realtime</web>\\n+ <name>Translations</name>\\n+ <language/>\\n+ <defaultLanguage>en</defaultLanguage>\\n+ <translation>0</translation>\\n+ <creator>xwiki:XWiki.Admin</creator>\\n+ <parent>Main.WebHome</parent>\\n+ <author>xwiki:XWiki.Admin</author>\\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\\n+ <version>1.1</version>\\n+ <title/>\\n+ <comment/>\\n+ <minorEdit>false</minorEdit>\\n+ <syntaxId>plain/1.0</syntaxId>\\n+ <hidden>true</hidden>\\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\\n+ <object>\\n+ <name>XWiki.Realtime.Translations</name>\\n+ <number>0</number>\\n+ <className>XWiki.TranslationDocumentClass</className>\\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\\n+ <class>\\n+ <name>XWiki.TranslationDocumentClass</name>\\n+ <customClass/>\\n+ <customMapping/>\\n+ <defaultViewSheet/>\\n+ <defaultEditSheet/>\\n+ <defaultWeb/>\\n+ <nameField/>\\n+ <validationScript/>\\n+ <scope>\\n+ <cache>0</cache>\\n+ <disabled>0</disabled>\\n+ <displayType>select</displayType>\\n+ <freeText>forbidden</freeText>\\n+ <largeStorage>0</largeStorage>\\n+ <multiSelect>0</multiSelect>\\n+ <name>scope</name>\\n+ <number>1</number>\\n+ <prettyName>Scope</prettyName>\\n+ <relationalStorage>0</relationalStorage>\\n+ <separator> </separator>\\n+ <separators>|, </separators>\\n+ <size>1</size>\\n+ <unmodifiable>0</unmodifiable>\\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\\n+ </scope>\\n+ </class>\\n+ <property>\\n+ <scope>WIKI</scope>\\n+ </property>\\n+ </object>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\nnew file mode 100644\\nindex 000000000000..dde6b3d7cf04\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n@@ -0,0 +1,118 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.realtime.ui;\\n+\\n+import javax.inject.Provider;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.user.api.XWikiRightService;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.mockito.ArgumentMatchers.anyInt;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.spy;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class ConvertHTMLPageTest extends PageTest\\n+{\\n+\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"RTFrontend\\\";\\n+\\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"ConvertHTML\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ this.context = mock(XWikiContext.class);\\n+ Provider<XWikiContext> xcontextProvider =\\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\\n+ when(xcontextProvider.get()).thenReturn(this.context);\\n+ when(this.context.getRequest()).thenReturn(this.request);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\\n+ this.response = spy(this.response);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ }\\n+\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response, never()).setStatus(anyInt());\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertEquals(\\\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\\",\\n+ result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong_token\\\";\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response).sendError(403, \\\"rtfFrontend.convertHtml.invalidCsrfToken\\\");\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"\\\", result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+}\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\nindex 41a510ac5046..4f9399d59c28 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\\n return {\\n WebsocketURL: realtimeConfig.webSocketURL,\\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\\n+ 'xpage': 'plain',\\n+ 'outputSyntax': 'plain',\\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\\n+ })),\\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\\n String(Math.random()).substring(2),\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/9f8cc88497418750b09ce9fde5d67d840f038fbf\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n\\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\",\n \"diff_code\": \"From 9f8cc88497418750b09ce9fde5d67d840f038fbf Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Tue, 10 Oct 2023 17:48:12 +0200\\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\\n API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n\\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\\n---\\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\\n .../src/main/webjar/loader.js | 6 +-\\n 5 files changed, 230 insertions(+), 4 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\nindex e09bdb02fb60..b99c769b406e 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\nindex faa65e1e708b..a9065d7cb5da 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.4\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n <web>RTFrontend</web>\\n <name>ConvertHTML</name>\\n <language/>\\n@@ -52,8 +52,13 @@\\n 'documentReference': $documentReference\\n })\\n #if ($xcontext.action == 'get')\\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ ## Check that the CSRF token matches the user.\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\\n+ #else\\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ #end\\n #end\\n {{/velocity}}</content>\\n </xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\nnew file mode 100644\\nindex 000000000000..c63d2e2faa8f\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n@@ -0,0 +1,77 @@\\n+<?xml version=\\\"1.1\\\" encoding=\\\"UTF-8\\\"?>\\n+\\n+<!--\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+-->\\n+\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"XWiki.Realtime.Translations\\\" locale=\\\"\\\">\\n+ <web>XWiki.Realtime</web>\\n+ <name>Translations</name>\\n+ <language/>\\n+ <defaultLanguage>en</defaultLanguage>\\n+ <translation>0</translation>\\n+ <creator>xwiki:XWiki.Admin</creator>\\n+ <parent>Main.WebHome</parent>\\n+ <author>xwiki:XWiki.Admin</author>\\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\\n+ <version>1.1</version>\\n+ <title/>\\n+ <comment/>\\n+ <minorEdit>false</minorEdit>\\n+ <syntaxId>plain/1.0</syntaxId>\\n+ <hidden>true</hidden>\\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\\n+ <object>\\n+ <name>XWiki.Realtime.Translations</name>\\n+ <number>0</number>\\n+ <className>XWiki.TranslationDocumentClass</className>\\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\\n+ <class>\\n+ <name>XWiki.TranslationDocumentClass</name>\\n+ <customClass/>\\n+ <customMapping/>\\n+ <defaultViewSheet/>\\n+ <defaultEditSheet/>\\n+ <defaultWeb/>\\n+ <nameField/>\\n+ <validationScript/>\\n+ <scope>\\n+ <cache>0</cache>\\n+ <disabled>0</disabled>\\n+ <displayType>select</displayType>\\n+ <freeText>forbidden</freeText>\\n+ <largeStorage>0</largeStorage>\\n+ <multiSelect>0</multiSelect>\\n+ <name>scope</name>\\n+ <number>1</number>\\n+ <prettyName>Scope</prettyName>\\n+ <relationalStorage>0</relationalStorage>\\n+ <separator> </separator>\\n+ <separators>|, </separators>\\n+ <size>1</size>\\n+ <unmodifiable>0</unmodifiable>\\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\\n+ </scope>\\n+ </class>\\n+ <property>\\n+ <scope>WIKI</scope>\\n+ </property>\\n+ </object>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\nnew file mode 100644\\nindex 000000000000..dde6b3d7cf04\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n@@ -0,0 +1,118 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.realtime.ui;\\n+\\n+import javax.inject.Provider;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.user.api.XWikiRightService;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.mockito.ArgumentMatchers.anyInt;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.spy;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class ConvertHTMLPageTest extends PageTest\\n+{\\n+\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"RTFrontend\\\";\\n+\\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"ConvertHTML\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ this.context = mock(XWikiContext.class);\\n+ Provider<XWikiContext> xcontextProvider =\\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\\n+ when(xcontextProvider.get()).thenReturn(this.context);\\n+ when(this.context.getRequest()).thenReturn(this.request);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\\n+ this.response = spy(this.response);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ }\\n+\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response, never()).setStatus(anyInt());\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertEquals(\\\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\\",\\n+ result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong_token\\\";\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response).sendError(403, \\\"rtfFrontend.convertHtml.invalidCsrfToken\\\");\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"\\\", result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+}\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\nindex 41a510ac5046..4f9399d59c28 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\\n return {\\n WebsocketURL: realtimeConfig.webSocketURL,\\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\\n+ 'xpage': 'plain',\\n+ 'outputSyntax': 'plain',\\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\\n+ })),\\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\\n String(Math.random()).substring(2),\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/d88da4572fb7d4f95e1f54bb0cce33fce3df08d9\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n\\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\",\n \"diff_code\": \"From d88da4572fb7d4f95e1f54bb0cce33fce3df08d9 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Tue, 10 Oct 2023 17:48:12 +0200\\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\\n API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n\\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\\n---\\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\\n .../src/main/webjar/loader.js | 6 +-\\n 5 files changed, 230 insertions(+), 4 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\nindex 2af569a6b931..c2aa1e30b5e8 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\nindex faa65e1e708b..a9065d7cb5da 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.4\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n <web>RTFrontend</web>\\n <name>ConvertHTML</name>\\n <language/>\\n@@ -52,8 +52,13 @@\\n 'documentReference': $documentReference\\n })\\n #if ($xcontext.action == 'get')\\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ ## Check that the CSRF token matches the user.\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\\n+ #else\\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ #end\\n #end\\n {{/velocity}}</content>\\n </xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\nnew file mode 100644\\nindex 000000000000..c63d2e2faa8f\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n@@ -0,0 +1,77 @@\\n+<?xml version=\\\"1.1\\\" encoding=\\\"UTF-8\\\"?>\\n+\\n+<!--\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+-->\\n+\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"XWiki.Realtime.Translations\\\" locale=\\\"\\\">\\n+ <web>XWiki.Realtime</web>\\n+ <name>Translations</name>\\n+ <language/>\\n+ <defaultLanguage>en</defaultLanguage>\\n+ <translation>0</translation>\\n+ <creator>xwiki:XWiki.Admin</creator>\\n+ <parent>Main.WebHome</parent>\\n+ <author>xwiki:XWiki.Admin</author>\\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\\n+ <version>1.1</version>\\n+ <title/>\\n+ <comment/>\\n+ <minorEdit>false</minorEdit>\\n+ <syntaxId>plain/1.0</syntaxId>\\n+ <hidden>true</hidden>\\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\\n+ <object>\\n+ <name>XWiki.Realtime.Translations</name>\\n+ <number>0</number>\\n+ <className>XWiki.TranslationDocumentClass</className>\\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\\n+ <class>\\n+ <name>XWiki.TranslationDocumentClass</name>\\n+ <customClass/>\\n+ <customMapping/>\\n+ <defaultViewSheet/>\\n+ <defaultEditSheet/>\\n+ <defaultWeb/>\\n+ <nameField/>\\n+ <validationScript/>\\n+ <scope>\\n+ <cache>0</cache>\\n+ <disabled>0</disabled>\\n+ <displayType>select</displayType>\\n+ <freeText>forbidden</freeText>\\n+ <largeStorage>0</largeStorage>\\n+ <multiSelect>0</multiSelect>\\n+ <name>scope</name>\\n+ <number>1</number>\\n+ <prettyName>Scope</prettyName>\\n+ <relationalStorage>0</relationalStorage>\\n+ <separator> </separator>\\n+ <separators>|, </separators>\\n+ <size>1</size>\\n+ <unmodifiable>0</unmodifiable>\\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\\n+ </scope>\\n+ </class>\\n+ <property>\\n+ <scope>WIKI</scope>\\n+ </property>\\n+ </object>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\nnew file mode 100644\\nindex 000000000000..dde6b3d7cf04\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n@@ -0,0 +1,118 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.realtime.ui;\\n+\\n+import javax.inject.Provider;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.user.api.XWikiRightService;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.mockito.ArgumentMatchers.anyInt;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.spy;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class ConvertHTMLPageTest extends PageTest\\n+{\\n+\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"RTFrontend\\\";\\n+\\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"ConvertHTML\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ this.context = mock(XWikiContext.class);\\n+ Provider<XWikiContext> xcontextProvider =\\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\\n+ when(xcontextProvider.get()).thenReturn(this.context);\\n+ when(this.context.getRequest()).thenReturn(this.request);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\\n+ this.response = spy(this.response);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ }\\n+\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response, never()).setStatus(anyInt());\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertEquals(\\\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\\",\\n+ result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong_token\\\";\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response).sendError(403, \\\"rtfFrontend.convertHtml.invalidCsrfToken\\\");\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"\\\", result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+}\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\nindex 41a510ac5046..4f9399d59c28 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\\n return {\\n WebsocketURL: realtimeConfig.webSocketURL,\\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\\n+ 'xpage': 'plain',\\n+ 'outputSyntax': 'plain',\\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\\n+ })),\\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\\n String(Math.random()).substring(2),\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-platform/commit/d9f5043da289ff106f08e23576746fd8baf98794\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-platform\",\n \"commit_message\": \"XWIKI-21424: Use CSRF token in the realtime HTML Converter API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n\\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\",\n \"diff_code\": \"From d9f5043da289ff106f08e23576746fd8baf98794 Mon Sep 17 00:00:00 2001\\nFrom: pjeanjean <pierre.jeanjean@xwiki.com>\\nDate: Tue, 10 Oct 2023 17:48:12 +0200\\nSubject: [PATCH] XWIKI-21424: Use CSRF token in the realtime HTML Converter\\n API\\n\\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\\n* Add a page test for RTFrontend.ConvertHTML that checks for the proper use of the CSRF token\\n* Improve URL creation and add Translations.xml\\n\\n(cherry picked from commit 4896712ee6483da623f131be2e618f1f2b79cb8d)\\n---\\n .../xwiki-platform-realtime-ui/pom.xml | 22 ++++\\n .../main/resources/RTFrontend/ConvertHTML.xml | 11 +-\\n .../resources/XWiki/Realtime/Translations.xml | 77 ++++++++++++\\n .../realtime/ui/ConvertHTMLPageTest.java | 118 ++++++++++++++++++\\n .../src/main/webjar/loader.js | 6 +-\\n 5 files changed, 230 insertions(+), 4 deletions(-)\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\nindex db16f98f7750..2bfdf8401ed1 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml\\n@@ -75,5 +75,27 @@\\n <version>${project.version}</version>\\n <scope>runtime</scope>\\n </dependency>\\n+ <!-- Test dependencies. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-test-page</artifactId>\\n+ <version>${project.version}</version>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <!-- Provides the component list for RenderingScriptService. -->\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-xwiki</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n+ <dependency>\\n+ <groupId>org.xwiki.platform</groupId>\\n+ <artifactId>xwiki-platform-rendering-configuration-default</artifactId>\\n+ <version>${project.version}</version>\\n+ <type>test-jar</type>\\n+ <scope>test</scope>\\n+ </dependency>\\n </dependencies>\\n </project>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\nindex faa65e1e708b..a9065d7cb5da 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml\\n@@ -20,7 +20,7 @@\\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n -->\\n \\n-<xwikidoc version=\\\"1.4\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"RTFrontend.ConvertHTML\\\" locale=\\\"\\\">\\n <web>RTFrontend</web>\\n <name>ConvertHTML</name>\\n <language/>\\n@@ -52,8 +52,13 @@\\n 'documentReference': $documentReference\\n })\\n #if ($xcontext.action == 'get')\\n- ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n- $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ ## Check that the CSRF token matches the user.\\n+ #if (!$services.csrf.isTokenValid($request.form_token))\\n+ $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))\\n+ #else\\n+ ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.\\n+ $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\n+ #end\\n #end\\n {{/velocity}}</content>\\n </xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\nnew file mode 100644\\nindex 000000000000..c63d2e2faa8f\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml\\n@@ -0,0 +1,77 @@\\n+<?xml version=\\\"1.1\\\" encoding=\\\"UTF-8\\\"?>\\n+\\n+<!--\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+-->\\n+\\n+<xwikidoc version=\\\"1.5\\\" reference=\\\"XWiki.Realtime.Translations\\\" locale=\\\"\\\">\\n+ <web>XWiki.Realtime</web>\\n+ <name>Translations</name>\\n+ <language/>\\n+ <defaultLanguage>en</defaultLanguage>\\n+ <translation>0</translation>\\n+ <creator>xwiki:XWiki.Admin</creator>\\n+ <parent>Main.WebHome</parent>\\n+ <author>xwiki:XWiki.Admin</author>\\n+ <contentAuthor>xwiki:XWiki.Admin</contentAuthor>\\n+ <version>1.1</version>\\n+ <title/>\\n+ <comment/>\\n+ <minorEdit>false</minorEdit>\\n+ <syntaxId>plain/1.0</syntaxId>\\n+ <hidden>true</hidden>\\n+ <content>rtfFrontend.convertHtml.invalidCsrfToken=Invalid CSRF Token</content>\\n+ <object>\\n+ <name>XWiki.Realtime.Translations</name>\\n+ <number>0</number>\\n+ <className>XWiki.TranslationDocumentClass</className>\\n+ <guid>41105c55-62ec-47bc-9dd0-c502cad68de6</guid>\\n+ <class>\\n+ <name>XWiki.TranslationDocumentClass</name>\\n+ <customClass/>\\n+ <customMapping/>\\n+ <defaultViewSheet/>\\n+ <defaultEditSheet/>\\n+ <defaultWeb/>\\n+ <nameField/>\\n+ <validationScript/>\\n+ <scope>\\n+ <cache>0</cache>\\n+ <disabled>0</disabled>\\n+ <displayType>select</displayType>\\n+ <freeText>forbidden</freeText>\\n+ <largeStorage>0</largeStorage>\\n+ <multiSelect>0</multiSelect>\\n+ <name>scope</name>\\n+ <number>1</number>\\n+ <prettyName>Scope</prettyName>\\n+ <relationalStorage>0</relationalStorage>\\n+ <separator> </separator>\\n+ <separators>|, </separators>\\n+ <size>1</size>\\n+ <unmodifiable>0</unmodifiable>\\n+ <values>GLOBAL|WIKI|USER|ON_DEMAND</values>\\n+ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\\n+ </scope>\\n+ </class>\\n+ <property>\\n+ <scope>WIKI</scope>\\n+ </property>\\n+ </object>\\n+</xwikidoc>\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\nnew file mode 100644\\nindex 000000000000..dde6b3d7cf04\\n--- /dev/null\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java\\n@@ -0,0 +1,118 @@\\n+/*\\n+ * See the NOTICE file distributed with this work for additional\\n+ * information regarding copyright ownership.\\n+ *\\n+ * This is free software; you can redistribute it and/or modify it\\n+ * under the terms of the GNU Lesser General Public License as\\n+ * published by the Free Software Foundation; either version 2.1 of\\n+ * the License, or (at your option) any later version.\\n+ *\\n+ * This software is distributed in the hope that it will be useful,\\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ * Lesser General Public License for more details.\\n+ *\\n+ * You should have received a copy of the GNU Lesser General Public\\n+ * License along with this software; if not, write to the Free\\n+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\\n+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\\n+ */\\n+package org.xwiki.realtime.ui;\\n+\\n+import javax.inject.Provider;\\n+\\n+import org.jsoup.nodes.Document;\\n+import org.junit.jupiter.api.BeforeEach;\\n+import org.junit.jupiter.api.Test;\\n+import org.xwiki.csrf.script.CSRFTokenScriptService;\\n+import org.xwiki.model.reference.DocumentReference;\\n+import org.xwiki.rendering.RenderingScriptServiceComponentList;\\n+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;\\n+import org.xwiki.script.service.ScriptService;\\n+import org.xwiki.test.page.HTML50ComponentList;\\n+import org.xwiki.test.page.PageTest;\\n+import org.xwiki.test.page.XWikiSyntax21ComponentList;\\n+\\n+import com.xpn.xwiki.XWikiContext;\\n+import com.xpn.xwiki.user.api.XWikiRightService;\\n+\\n+import static org.junit.jupiter.api.Assertions.assertEquals;\\n+import static org.mockito.ArgumentMatchers.anyInt;\\n+import static org.mockito.Mockito.mock;\\n+import static org.mockito.Mockito.never;\\n+import static org.mockito.Mockito.spy;\\n+import static org.mockito.Mockito.verify;\\n+import static org.mockito.Mockito.when;\\n+\\n+@RenderingScriptServiceComponentList\\n+@DefaultRenderingConfigurationComponentList\\n+@HTML50ComponentList\\n+@XWikiSyntax21ComponentList\\n+class ConvertHTMLPageTest extends PageTest\\n+{\\n+\\n+ private static final String WIKI_NAME = \\\"xwiki\\\";\\n+\\n+ private static final String XWIKI_SPACE = \\\"RTFrontend\\\";\\n+\\n+ private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =\\n+ new DocumentReference(WIKI_NAME, XWIKI_SPACE, \\\"ConvertHTML\\\");\\n+\\n+ private static final String CSRF_TOKEN = \\\"a0a0a0a0\\\";\\n+\\n+ private CSRFTokenScriptService tokenService;\\n+\\n+ @BeforeEach\\n+ void setUp() throws Exception\\n+ {\\n+ // Mock the Token Service to get a consistent CSRF token throughout the tests.\\n+ this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, \\\"csrf\\\",\\n+ CSRFTokenScriptService.class, true);\\n+ when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);\\n+\\n+ this.xwiki.initializeMandatoryDocuments(this.context);\\n+\\n+ this.context = mock(XWikiContext.class);\\n+ Provider<XWikiContext> xcontextProvider =\\n+ this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);\\n+ when(xcontextProvider.get()).thenReturn(this.context);\\n+ when(this.context.getRequest()).thenReturn(this.request);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ when(this.context.getWiki()).thenReturn(this.xwiki);\\n+\\n+ // Fake programming access level to display the complete page.\\n+ XWikiRightService rightService = this.oldcore.getMockRightService();\\n+ when(this.xwiki.getRightService()).thenReturn(rightService);\\n+ when(rightService.hasProgrammingRights(this.context)).thenReturn(true);\\n+ this.response = spy(this.response);\\n+ when(this.context.getResponse()).thenReturn(this.response);\\n+ }\\n+\\n+ @Test\\n+ void checkValidCSRFToken() throws Exception\\n+ {\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", CSRF_TOKEN);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response, never()).setStatus(anyInt());\\n+ verify(this.tokenService).isTokenValid(CSRF_TOKEN);\\n+ assertEquals(\\\"$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()\\\",\\n+ result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+\\n+ @Test\\n+ void checkInvalidCSRFToken() throws Exception\\n+ {\\n+ String wrongToken = \\\"wrong_token\\\";\\n+ when(this.context.getAction()).thenReturn(\\\"get\\\");\\n+ this.request.put(\\\"text\\\", \\\"Hello\\\");\\n+ this.request.put(\\\"form_token\\\", wrongToken);\\n+ Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);\\n+\\n+ verify(this.response).sendError(403, \\\"rtfFrontend.convertHtml.invalidCsrfToken\\\");\\n+ verify(this.tokenService).isTokenValid(wrongToken);\\n+ assertEquals(\\\"\\\", result.getElementsByTag(\\\"body\\\").text());\\n+ }\\n+}\\ndiff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\nindex 41a510ac5046..4f9399d59c28 100644\\n--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js\\n@@ -71,7 +71,11 @@ define('xwiki-realtime-loader', [\\n var userReference = xm.userReference ? XWiki.Model.serialize(xm.userReference) : 'xwiki:XWiki.XWikiGuest';\\n return {\\n WebsocketURL: realtimeConfig.webSocketURL,\\n- htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),\\n+ htmlConverterUrl: new XWiki.Document('ConvertHTML', 'RTFrontend').getURL('get', $.param({\\n+ 'xpage': 'plain',\\n+ 'outputSyntax': 'plain',\\n+ 'form_token': document.documentElement.dataset.xwikiFormToken\\n+ })),\\n // userId === <userReference>-encoded(<userName>)%2d<randomNumber>\\n userName: userReference + '-' + encodeURIComponent(realtimeConfig.user.name + '-').replace(/-/g, '%2d') +\\n String(Math.random()).substring(2),\\n\"\n }\n]","isConversational":false}}},{"rowIdx":1196,"cells":{"CVE_ID":{"kind":"string","value":"CVE-2024-31989"},"category":{"kind":"string","value":"Fixes for Multiple Locations Across Different Branches or Projects"},"patches":{"kind":"list like","value":[{"commit url":"https://github.com/argoproj/argo-cd/commit/2de0ceade243039c120c28374016c04ff9590d1d","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From 2de0ceade243039c120c28374016c04ff9590d1d Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:23:09 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/35a7d6c7fa1534aceba763d6a68697f36c12e678","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From 35a7d6c7fa1534aceba763d6a68697f36c12e678 Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:22:43 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n---\n cmd/argocd/commands/admin/admin.go | 1 +\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\n docs/faq.md | 42 ++++++\n docs/getting_started.md | 3 +\n docs/user-guide/commands/argocd_admin.md | 1 +\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\n ...cd-application-controller-statefulset.yaml | 5 +\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\n manifests/base/redis/kustomization.yaml | 2 +\n .../argocd-repo-server-deployment.yaml | 5 +\n .../base/server/argocd-server-deployment.yaml | 5 +\n manifests/core-install.yaml | 74 +++++++++\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\n .../ha/base/redis-ha/chart/upstream.yaml | 125 +++++++++------\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\n .../overlays/deployment-initContainers.yaml | 16 ++\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\n manifests/ha/install.yaml | 142 ++++++++++++++----\n manifests/ha/namespace-install.yaml | 142 ++++++++++++++----\n manifests/install.yaml | 79 ++++++++++\n manifests/namespace-install.yaml | 79 ++++++++++\n reposerver/repository/repository_test.go | 2 +-\n 26 files changed, 887 insertions(+), 116 deletions(-)\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\nindex 15e83585c411d..9dd2f02521f30 100644\n--- a/cmd/argocd/commands/admin/admin.go\n+++ b/cmd/argocd/commands/admin/admin.go\n@@ -59,6 +59,7 @@ func NewAdminCommand() *cobra.Command {\n \tcommand.AddCommand(NewDashboardCommand())\n \tcommand.AddCommand(NewNotificationsCommand())\n \tcommand.AddCommand(NewInitialPasswordCommand())\n+\tcommand.AddCommand(NewRedisInitialPasswordCommand())\n \n \tcommand.Flags().StringVar(&cmdutil.LogFormat, \"logformat\", \"text\", \"Set the logging format. One of: text|json\")\n \tcommand.Flags().StringVar(&cmdutil.LogLevel, \"loglevel\", \"info\", \"Set the logging level. One of: debug|info|warn|error\")\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\nnew file mode 100644\nindex 0000000000000..8fa1e70ad890e\n--- /dev/null\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\n@@ -0,0 +1,98 @@\n+package admin\n+\n+import (\n+\t\"context\"\n+\t\"crypto/rand\"\n+\t\"fmt\"\n+\t\"math/big\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\"\n+\t\"github.com/argoproj/argo-cd/v2/util/cli\"\n+\tapierr \"k8s.io/apimachinery/pkg/api/errors\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/util/errors\"\n+\tmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\tv1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\t\"k8s.io/client-go/kubernetes\"\n+\t\"k8s.io/client-go/tools/clientcmd\"\n+\n+\t\"github.com/spf13/cobra\"\n+\tcorev1 \"k8s.io/api/core/v1\"\n+)\n+\n+const defaulRedisInitialPasswordSecretName = \"argocd-redis\"\n+const defaultResisInitialPasswordKey = \"auth\"\n+\n+func generateRandomPassword() (string, error) {\n+\tconst initialPasswordLength = 16\n+\tconst letters = \"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\"\n+\trandBytes := make([]byte, initialPasswordLength)\n+\tfor i := 0; i < initialPasswordLength; i++ {\n+\t\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\n+\t\tif err != nil {\n+\t\t\treturn \"\", err\n+\t\t}\n+\t\trandBytes[i] = letters[num.Int64()]\n+\t}\n+\tinitialPassword := string(randBytes)\n+\treturn initialPassword, nil\n+}\n+\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\n+func NewRedisInitialPasswordCommand() *cobra.Command {\n+\tvar (\n+\t\tclientConfig clientcmd.ClientConfig\n+\t)\n+\tvar command = cobra.Command{\n+\t\tUse: \"redis-initial-password\",\n+\t\tShort: \"Ensure the Redis password exists, creating a new one if necessary.\",\n+\t\tRun: func(c *cobra.Command, args []string) {\n+\t\t\tnamespace, _, err := clientConfig.Namespace()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\n+\t\t\tredisInitialPasswordKey := defaultResisInitialPasswordKey\n+\t\t\tfmt.Printf(\"Checking for initial Redis password in secret %s/%s at key %s. \\n\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\n+\n+\t\t\tconfig, err := clientConfig.ClientConfig()\n+\t\t\terrors.CheckError(err)\n+\t\t\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\n+\n+\t\t\tkubeClientset := kubernetes.NewForConfigOrDie(config)\n+\n+\t\t\trandomPassword, err := generateRandomPassword()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tdata := map[string][]byte{\n+\t\t\t\tredisInitialPasswordKey: []byte(randomPassword),\n+\t\t\t}\n+\t\t\tsecret := &corev1.Secret{\n+\t\t\t\tObjectMeta: metav1.ObjectMeta{\n+\t\t\t\t\tName: redisInitialPasswordSecretName,\n+\t\t\t\t\tNamespace: namespace,\n+\t\t\t\t},\n+\t\t\t\tData: data,\n+\t\t\t\tType: corev1.SecretTypeOpaque,\n+\t\t\t}\n+\t\t\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\n+\t\t\tif err != nil && !apierr.IsAlreadyExists(err) {\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\n+\t\t\tfmt.Println(\"Argo CD Redis secret state confirmed: secret name argocd-redis.\")\n+\t\t\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\n+\t\t\t\tfmt.Println(\"Password secret is configured properly.\")\n+\t\t\t} else {\n+\t\t\t\terr := fmt.Errorf(\"key %s doesn't exist in secret %s. \\n\", redisInitialPasswordKey, redisInitialPasswordSecretName)\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\t\t},\n+\t}\n+\n+\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\n+\n+\treturn &command\n+}\ndiff --git a/docs/faq.md b/docs/faq.md\nindex 588415fc04d2d..111c8dfa9d4fb 100644\n--- a/docs/faq.md\n+++ b/docs/faq.md\n@@ -259,3 +259,45 @@ The most common instance of this error is with `env:` fields for `containers`.\n \n !!! note \"Dynamic applications\"\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\n+\n+## How to rotate Redis secret?\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \n+```bash\n+kubectl delete secret argocd-redis -n <argocd namesapce>\n+```\n+* If you are running Redis in HA mode, restart Redis in HA.\n+```bash\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\n+kubectl rollout restart statefulset argocd-redis-ha-server\n+```\n+* If you are running Redis in non-HA mode, restart Redis.\n+```bash\n+kubectl rollout restart deployment argocd-redis\n+```\n+* Restart other components.\n+```bash\n+kubectl rollout restart deployment argocd-server argocd-repo-server\n+kubectl rollout restart statefulset argocd-application-controller\n+```\n+\n+## How to turn off Redis auth if users really want to?\n+\n+Argo CD default installation is now configured automatically enable Redis authentication. \n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\n+\n+* You need to have your own Redis installation.\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\n+ * When HA Redis is used:\n+ * kubectl delete deployment argocd-redis-ha-haproxy\n+ * kubectl delete statefulset argocd-redis-ha-server\n+ * When non-HA Redis is used:\n+ * kubectl delete deployment argocd-redis\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\n+ * Deployment: argocd-repo-server:\n+ * Deployment: argocd-server\n+ * StatefulSet: argocd-application-controller\n+ \n+## How do I provide my own Redis credentials?\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+You can config your secret provider to generate Kubernetes secret accordingly.\n\\ No newline at end of file\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\nindex d81bd08897ad8..c4438b14705d0 100644\n--- a/docs/getting_started.md\n+++ b/docs/getting_started.md\n@@ -38,6 +38,9 @@ Do one of:\n \n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\n \n+!!! note\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+\n ## 2. Download Argo CD CLI\n \n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\nindex aff92561bdf7f..f1291ffde9184 100644\n--- a/docs/user-guide/commands/argocd_admin.md\n+++ b/docs/user-guide/commands/argocd_admin.md\n@@ -46,6 +46,7 @@ argocd admin [flags]\n * [argocd admin initial-password](argocd_admin_initial-password.md)\t - Prints initial password to log in to Argo CD for the first time\n * [argocd admin notifications](argocd_admin_notifications.md)\t - Set of CLI commands that helps manage notifications settings\n * [argocd admin proj](argocd_admin_proj.md)\t - Manage projects configuration\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\t - Ensure the Redis password exists, creating a new one if necessary.\n * [argocd admin repo](argocd_admin_repo.md)\t - Manage repositories configuration\n * [argocd admin settings](argocd_admin_settings.md)\t - Provides set of commands for settings validation and troubleshooting\n \ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\nnew file mode 100644\nindex 0000000000000..85e56195758dd\n--- /dev/null\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\n@@ -0,0 +1,67 @@\n+# `argocd admin redis-initial-password` Command Reference\n+\n+## argocd admin redis-initial-password\n+\n+Ensure the Redis password exists, creating a new one if necessary.\n+\n+```\n+argocd admin redis-initial-password [flags]\n+```\n+\n+### Options\n+\n+```\n+ --as string Username to impersonate for the operation\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\n+ --as-uid string UID to impersonate for the operation\n+ --certificate-authority string Path to a cert file for the certificate authority\n+ --client-certificate string Path to a client certificate file for TLS\n+ --client-key string Path to a client key file for TLS\n+ --cluster string The name of the kubeconfig cluster to use\n+ --context string The name of the kubeconfig context to use\n+ --disable-compression If true, opt-out of response compression for all requests to the server\n+ -h, --help help for redis-initial-password\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\n+ -n, --namespace string If present, the namespace scope for this CLI request\n+ --password string Password for basic authentication to the API server\n+ --proxy-url string If provided, this URL will be used to connect via proxy\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \"0\")\n+ --server string The address and port of the Kubernetes API server\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\n+ --token string Bearer token for authentication to the API server\n+ --user string The name of the kubeconfig user to use\n+ --username string Username for basic authentication to the API server\n+```\n+\n+### Options inherited from parent commands\n+\n+```\n+ --auth-token string Authentication token\n+ --client-crt string Client certificate file\n+ --client-crt-key string Client certificate key file\n+ --config string Path to Argo CD config (default \"/home/user/.config/argocd/config\")\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \"argocd-application-controller\")\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\n+ --insecure Skip server certificate and domain verification\n+ --kube-context string Directs the command to the given kube-context\n+ --logformat string Set the logging format. One of: text|json (default \"text\")\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \"info\")\n+ --plaintext Disable TLS\n+ --port-forward Connect to a random argocd-server port using port forwarding\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis-ha-haproxy\")\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis\")\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-repo-server\")\n+ --server-crt string Server certificate file\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-server\")\n+```\n+\n+### SEE ALSO\n+\n+* [argocd admin](argocd_admin.md)\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\n+\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\nindex c1573ec3a3501..c4e369e4b88e5 100644\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n@@ -21,6 +21,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\nindex bcbe729ac6d00..c591db0d0aa4a 100644\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\n@@ -15,6 +15,23 @@ spec:\n labels:\n app.kubernetes.io/name: argocd-redis\n spec:\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -30,6 +47,13 @@ spec:\n - \"\"\n - \"--appendonly\"\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n ports:\n - containerPort: 6379\n securityContext:\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\nnew file mode 100644\nindex 0000000000000..a7a33f48a4c11\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-role.yaml\n@@ -0,0 +1,23 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\nnew file mode 100644\nindex 0000000000000..f396914dffdca\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\n@@ -0,0 +1,15 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+ - kind: ServiceAccount\n+ name: argocd-redis\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\nindex 4a0b64c4da6a8..f13b17e134234 100644\n--- a/manifests/base/redis/kustomization.yaml\n+++ b/manifests/base/redis/kustomization.yaml\n@@ -6,3 +6,5 @@ resources:\n - argocd-redis-sa.yaml\n - argocd-redis-service.yaml\n - argocd-redis-network-policy.yaml\n+- argocd-redis-role.yaml\n+- argocd-redis-rolebinding.yaml\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\nindex eb230e0f9b856..49182f59f1a09 100644\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n@@ -24,6 +24,11 @@ spec:\n args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\nindex 45b2cdb8df285..f8a5fb2570970 100644\n--- a/manifests/base/server/argocd-server-deployment.yaml\n+++ b/manifests/base/server/argocd-server-deployment.yaml\n@@ -23,6 +23,11 @@ spec:\n args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\nindex d57d56ce0f069..2fd3b4d83fdb2 100644\n--- a/manifests/core-install.yaml\n+++ b/manifests/core-install.yaml\n@@ -18524,6 +18524,30 @@ rules:\n - watch\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRole\n metadata:\n labels:\n@@ -18576,6 +18600,22 @@ subjects:\n name: argocd-applicationset-controller\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRoleBinding\n metadata:\n labels:\n@@ -18969,6 +19009,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -18980,6 +19027,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -19024,6 +19088,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -19311,6 +19380,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\nindex 9e5e9273942da..25a568b2620d4 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\n@@ -1,6 +1,6 @@\n dependencies:\n - name: redis-ha\n repository: https://dandydeveloper.github.io/charts\n- version: 4.22.3\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\n-generated: \"2022-11-02T16:57:25.047025473-07:00\"\n+ version: 4.26.6\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\n+generated: \"2024-04-10T11:02:32.957812-07:00\"\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\nindex bdcde75a60727..618eecda6ddcc 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\n@@ -1,4 +1,4 @@\n dependencies:\n - name: redis-ha\n- version: 4.22.3\n+ version: 4.26.6\n repository: https://dandydeveloper.github.io/charts\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\nindex a94bba0f09062..3d705de257c83 100644\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\n@@ -9,8 +9,10 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\n apiVersion: v1\n@@ -21,7 +23,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\n@@ -33,7 +35,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis.conf: |\n@@ -50,6 +52,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n \n sentinel.conf: |\n dir \"/data\"\n@@ -59,6 +63,7 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n \n init.sh: |\n echo \"$(date) Start...\"\n@@ -82,7 +87,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -191,9 +196,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -226,7 +231,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -345,7 +350,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -454,9 +459,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -489,7 +494,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -554,9 +559,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -564,9 +569,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -576,9 +581,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -591,6 +596,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -674,6 +680,8 @@ data:\n mode tcp\n option tcp-check\n tcp-check connect\n+ tcp-check send \"AUTH ${AUTH}\"\\r\\n\n+ tcp-check expect string +OK\n tcp-check send PING\\r\\n\n tcp-check expect string +PONG\n tcp-check send info\\ replication\\r\\n\n@@ -723,6 +731,7 @@ data:\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -759,12 +768,13 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -777,6 +787,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -809,7 +820,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n rules:\n - apiGroups:\n - \"\"\n@@ -828,7 +839,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n rules:\n - apiGroups:\n@@ -848,7 +859,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n subjects:\n - kind: ServiceAccount\n name: argocd-redis-ha\n@@ -867,7 +878,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n subjects:\n - kind: ServiceAccount\n@@ -887,9 +898,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -917,9 +927,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -947,9 +956,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -977,7 +985,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n spec:\n type: ClusterIP\n@@ -1005,7 +1013,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n annotations:\n spec:\n@@ -1029,7 +1037,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n spec:\n strategy:\n type: RollingUpdate\n@@ -1045,9 +1053,11 @@ spec:\n labels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n annotations:\n- checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321\n+ prometheus.io/port: \"9101\"\n+ prometheus.io/scrape: \"true\"\n+ prometheus.io/path: \"/metrics\"\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n spec:\n # Needed when using unmodified rbac-setup.yml\n \n@@ -1067,11 +1077,10 @@ spec:\n matchLabels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n topologyKey: kubernetes.io/hostname\n initContainers:\n - name: config-init\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1095,7 +1104,7 @@ spec:\n mountPath: /data\n containers:\n - name: haproxy\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n securityContext: \n allowPrivilegeEscalation: false\n@@ -1105,6 +1114,12 @@ spec:\n runAsNonRoot: true\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n httpGet:\n path: /healthz\n@@ -1151,7 +1166,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n {}\n spec:\n@@ -1167,7 +1182,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n release: argocd\n app: redis-ha\n@@ -1191,7 +1206,7 @@ spec:\n automountServiceAccountToken: false\n initContainers:\n - name: config-init\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1215,6 +1230,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n volumeMounts:\n - name: config\n mountPath: /readonly-config\n@@ -1225,12 +1245,12 @@ spec:\n \n containers:\n - name: redis\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n- - redis-server\n+ - redis-server\n args:\n- - /data/conf/redis.conf\n+ - /data/conf/redis.conf\n securityContext: \n allowPrivilegeEscalation: false\n capabilities:\n@@ -1240,6 +1260,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1282,7 +1308,7 @@ spec:\n - /bin/sh\n - /readonly-config/trigger-failover-if-master.sh\n - name: sentinel\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - redis-sentinel\n@@ -1297,6 +1323,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1333,7 +1365,7 @@ spec:\n {}\n \n - name: split-brain-fix\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - sh\n@@ -1355,6 +1387,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n resources:\n {}\n volumeMounts:\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\nindex 3fe3647c0b4a4..c6e6bb9dc246a 100644\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\n@@ -1,4 +1,7 @@\n redis-ha:\n+ auth: true\n+ authKey: auth\n+ existingSecret: argocd-redis\n persistentVolume:\n enabled: false\n redis:\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\nindex bf0c6c3dff255..0da9beb9930e8 100644\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\n@@ -20,7 +20,7 @@ patches:\n kind: ConfigMap\n name: argocd-redis-ha-configmap\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n version: v1\n group: \"\"\n@@ -34,28 +34,28 @@ patches:\n kind: ServiceAccount\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: RoleBinding\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n@@ -294,3 +294,15 @@ patches:\n kind: StatefulSet\n name: argocd-redis-ha-server\n path: overlays/statefulset-containers-securityContext.yaml\n+- target:\n+ group: rbac.authorization.k8s.io\n+ version: v1\n+ kind: Role\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/haproxy-role.yaml\n+- target:\n+ group: apps\n+ version: v1\n+ kind: Deployment\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/deployment-initContainers.yaml\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\nnew file mode 100644\nindex 0000000000000..8e6ea2754a9fa\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n@@ -0,0 +1,16 @@\n+- op: add\n+ path: /spec/template/spec/initContainers/0\n+ value:\n+ name: secret-init\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\nnew file mode 100644\nindex 0000000000000..b74a48006a977\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n@@ -0,0 +1,20 @@\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\nindex 5008af2fd2e85..7f4b50f07295a 100644\n--- a/manifests/ha/install.yaml\n+++ b/manifests/ha/install.yaml\n@@ -18426,6 +18426,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -18648,6 +18650,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -18985,7 +19001,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -19094,9 +19110,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -19129,7 +19145,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -19194,9 +19210,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -19204,9 +19220,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -19216,9 +19232,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -19231,6 +19247,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -19273,9 +19290,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -19336,7 +19354,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -19445,9 +19463,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -19480,7 +19498,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -19588,6 +19606,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -19596,10 +19616,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -19639,6 +19661,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -19651,6 +19674,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -19838,8 +19862,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -19864,8 +19886,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -19890,8 +19910,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -20380,7 +20398,10 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n+ prometheus.io/path: /metrics\n+ prometheus.io/port: \"9101\"\n+ prometheus.io/scrape: \"true\"\n labels:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n name: argocd-redis-ha-haproxy\n@@ -20393,7 +20414,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -20426,11 +20453,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -20498,6 +20541,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -20785,6 +20833,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -21107,6 +21160,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -21307,7 +21365,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -21324,7 +21382,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -21378,7 +21442,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -21431,7 +21501,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -21461,7 +21536,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\nindex 77663b1c6559e..3fe7ba1a493af 100644\n--- a/manifests/ha/namespace-install.yaml\n+++ b/manifests/ha/namespace-install.yaml\n@@ -43,6 +43,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -265,6 +267,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -497,7 +513,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -606,9 +622,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -641,7 +657,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -706,9 +722,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -716,9 +732,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -728,9 +744,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -743,6 +759,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -785,9 +802,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -848,7 +866,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -957,9 +975,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -992,7 +1010,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -1100,6 +1118,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -1108,10 +1128,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -1151,6 +1173,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1163,6 +1186,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1350,8 +1374,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1376,8 +1398,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1402,8 +1422,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1892,7 +1910,10 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n+ prometheus.io/path: /metrics\n+ prometheus.io/port: \"9101\"\n+ prometheus.io/scrape: \"true\"\n labels:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n name: argocd-redis-ha-haproxy\n@@ -1905,7 +1926,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -1938,11 +1965,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -2010,6 +2053,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -2297,6 +2345,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -2619,6 +2672,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -2819,7 +2877,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -2836,7 +2894,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -2890,7 +2954,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -2943,7 +3013,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -2973,7 +3048,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\nindex d50d7152cf323..a01695bd478a6 100644\n--- a/manifests/install.yaml\n+++ b/manifests/install.yaml\n@@ -18616,6 +18616,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -18795,6 +18819,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -19500,6 +19540,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -19511,6 +19558,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -19555,6 +19619,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -19840,6 +19909,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -20162,6 +20236,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\nindex 65c776d3fa371..4ff8fb79f8d15 100644\n--- a/manifests/namespace-install.yaml\n+++ b/manifests/namespace-install.yaml\n@@ -233,6 +233,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -341,6 +365,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -1012,6 +1052,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -1023,6 +1070,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -1067,6 +1131,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -1352,6 +1421,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -1674,6 +1748,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\nindex 4e96db6621376..80c008ab1b2d0 100644\n--- a/reposerver/repository/repository_test.go\n+++ b/reposerver/repository/repository_test.go\n@@ -159,7 +159,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\n \t}\n \n \t// update this value if we add/remove manifests\n-\tconst countOfManifests = 48\n+\tconst countOfManifests = 50\n \n \tres1, err := service.GenerateManifest(context.Background(), &q)\n \n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/4e2fe302c3352a0012ecbe7f03476b0e07f7fc6c","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From 4e2fe302c3352a0012ecbe7f03476b0e07f7fc6c Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:23:10 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/53570cbd143bced49d4376d6e31bd9c7bd2659ff","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From 53570cbd143bced49d4376d6e31bd9c7bd2659ff Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:22:43 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n---\n cmd/argocd/commands/admin/admin.go | 1 +\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\n docs/faq.md | 42 ++++++\n docs/getting_started.md | 3 +\n docs/user-guide/commands/argocd_admin.md | 1 +\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\n ...ocd-application-controller-deployment.yaml | 7 +-\n ...cd-application-controller-statefulset.yaml | 5 +\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\n manifests/base/redis/kustomization.yaml | 2 +\n .../argocd-repo-server-deployment.yaml | 5 +\n .../base/server/argocd-server-deployment.yaml | 5 +\n manifests/core-install.yaml | 74 ++++++++++\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\n .../ha/base/redis-ha/chart/upstream.yaml | 122 +++++++++------\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\n .../overlays/deployment-initContainers.yaml | 16 ++\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\n manifests/ha/install.yaml | 139 ++++++++++++++----\n manifests/ha/namespace-install.yaml | 139 ++++++++++++++----\n manifests/install.yaml | 79 ++++++++++\n manifests/namespace-install.yaml | 79 ++++++++++\n reposerver/repository/repository_test.go | 2 +-\n 27 files changed, 884 insertions(+), 117 deletions(-)\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\nindex b2aa8aab8d05c..b72398a9d70ac 100644\n--- a/cmd/argocd/commands/admin/admin.go\n+++ b/cmd/argocd/commands/admin/admin.go\n@@ -60,6 +60,7 @@ func NewAdminCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {\n \tcommand.AddCommand(NewDashboardCommand(clientOpts))\n \tcommand.AddCommand(NewNotificationsCommand())\n \tcommand.AddCommand(NewInitialPasswordCommand())\n+\tcommand.AddCommand(NewRedisInitialPasswordCommand())\n \n \tcommand.Flags().StringVar(&cmdutil.LogFormat, \"logformat\", \"text\", \"Set the logging format. One of: text|json\")\n \tcommand.Flags().StringVar(&cmdutil.LogLevel, \"loglevel\", \"info\", \"Set the logging level. One of: debug|info|warn|error\")\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\nnew file mode 100644\nindex 0000000000000..8fa1e70ad890e\n--- /dev/null\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\n@@ -0,0 +1,98 @@\n+package admin\n+\n+import (\n+\t\"context\"\n+\t\"crypto/rand\"\n+\t\"fmt\"\n+\t\"math/big\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\"\n+\t\"github.com/argoproj/argo-cd/v2/util/cli\"\n+\tapierr \"k8s.io/apimachinery/pkg/api/errors\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/util/errors\"\n+\tmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\tv1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\t\"k8s.io/client-go/kubernetes\"\n+\t\"k8s.io/client-go/tools/clientcmd\"\n+\n+\t\"github.com/spf13/cobra\"\n+\tcorev1 \"k8s.io/api/core/v1\"\n+)\n+\n+const defaulRedisInitialPasswordSecretName = \"argocd-redis\"\n+const defaultResisInitialPasswordKey = \"auth\"\n+\n+func generateRandomPassword() (string, error) {\n+\tconst initialPasswordLength = 16\n+\tconst letters = \"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\"\n+\trandBytes := make([]byte, initialPasswordLength)\n+\tfor i := 0; i < initialPasswordLength; i++ {\n+\t\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\n+\t\tif err != nil {\n+\t\t\treturn \"\", err\n+\t\t}\n+\t\trandBytes[i] = letters[num.Int64()]\n+\t}\n+\tinitialPassword := string(randBytes)\n+\treturn initialPassword, nil\n+}\n+\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\n+func NewRedisInitialPasswordCommand() *cobra.Command {\n+\tvar (\n+\t\tclientConfig clientcmd.ClientConfig\n+\t)\n+\tvar command = cobra.Command{\n+\t\tUse: \"redis-initial-password\",\n+\t\tShort: \"Ensure the Redis password exists, creating a new one if necessary.\",\n+\t\tRun: func(c *cobra.Command, args []string) {\n+\t\t\tnamespace, _, err := clientConfig.Namespace()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\n+\t\t\tredisInitialPasswordKey := defaultResisInitialPasswordKey\n+\t\t\tfmt.Printf(\"Checking for initial Redis password in secret %s/%s at key %s. \\n\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\n+\n+\t\t\tconfig, err := clientConfig.ClientConfig()\n+\t\t\terrors.CheckError(err)\n+\t\t\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\n+\n+\t\t\tkubeClientset := kubernetes.NewForConfigOrDie(config)\n+\n+\t\t\trandomPassword, err := generateRandomPassword()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tdata := map[string][]byte{\n+\t\t\t\tredisInitialPasswordKey: []byte(randomPassword),\n+\t\t\t}\n+\t\t\tsecret := &corev1.Secret{\n+\t\t\t\tObjectMeta: metav1.ObjectMeta{\n+\t\t\t\t\tName: redisInitialPasswordSecretName,\n+\t\t\t\t\tNamespace: namespace,\n+\t\t\t\t},\n+\t\t\t\tData: data,\n+\t\t\t\tType: corev1.SecretTypeOpaque,\n+\t\t\t}\n+\t\t\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\n+\t\t\tif err != nil && !apierr.IsAlreadyExists(err) {\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\n+\t\t\tfmt.Println(\"Argo CD Redis secret state confirmed: secret name argocd-redis.\")\n+\t\t\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\n+\t\t\t\tfmt.Println(\"Password secret is configured properly.\")\n+\t\t\t} else {\n+\t\t\t\terr := fmt.Errorf(\"key %s doesn't exist in secret %s. \\n\", redisInitialPasswordKey, redisInitialPasswordSecretName)\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\t\t},\n+\t}\n+\n+\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\n+\n+\treturn &command\n+}\ndiff --git a/docs/faq.md b/docs/faq.md\nindex 19273acc04d23..505f47d143bba 100644\n--- a/docs/faq.md\n+++ b/docs/faq.md\n@@ -259,3 +259,45 @@ The most common instance of this error is with `env:` fields for `containers`.\n \n !!! note \"Dynamic applications\"\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\n+\n+## How to rotate Redis secret?\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \n+```bash\n+kubectl delete secret argocd-redis -n <argocd namesapce>\n+```\n+* If you are running Redis in HA mode, restart Redis in HA.\n+```bash\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\n+kubectl rollout restart statefulset argocd-redis-ha-server\n+```\n+* If you are running Redis in non-HA mode, restart Redis.\n+```bash\n+kubectl rollout restart deployment argocd-redis\n+```\n+* Restart other components.\n+```bash\n+kubectl rollout restart deployment argocd-server argocd-repo-server\n+kubectl rollout restart statefulset argocd-application-controller\n+```\n+\n+## How to turn off Redis auth if users really want to?\n+\n+Argo CD default installation is now configured automatically enable Redis authentication. \n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\n+\n+* You need to have your own Redis installation.\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\n+ * When HA Redis is used:\n+ * kubectl delete deployment argocd-redis-ha-haproxy\n+ * kubectl delete statefulset argocd-redis-ha-server\n+ * When non-HA Redis is used:\n+ * kubectl delete deployment argocd-redis\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\n+ * Deployment: argocd-repo-server:\n+ * Deployment: argocd-server\n+ * StatefulSet: argocd-application-controller\n+ \n+## How do I provide my own Redis credentials?\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+You can config your secret provider to generate Kubernetes secret accordingly.\n\\ No newline at end of file\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\nindex d81bd08897ad8..c4438b14705d0 100644\n--- a/docs/getting_started.md\n+++ b/docs/getting_started.md\n@@ -38,6 +38,9 @@ Do one of:\n \n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\n \n+!!! note\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+\n ## 2. Download Argo CD CLI\n \n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\nindex 7a3ff2fde6e89..b6e09566d5119 100644\n--- a/docs/user-guide/commands/argocd_admin.md\n+++ b/docs/user-guide/commands/argocd_admin.md\n@@ -53,6 +53,7 @@ argocd admin [flags]\n * [argocd admin initial-password](argocd_admin_initial-password.md)\t - Prints initial password to log in to Argo CD for the first time\n * [argocd admin notifications](argocd_admin_notifications.md)\t - Set of CLI commands that helps manage notifications settings\n * [argocd admin proj](argocd_admin_proj.md)\t - Manage projects configuration\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\t - Ensure the Redis password exists, creating a new one if necessary.\n * [argocd admin repo](argocd_admin_repo.md)\t - Manage repositories configuration\n * [argocd admin settings](argocd_admin_settings.md)\t - Provides set of commands for settings validation and troubleshooting\n \ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\nnew file mode 100644\nindex 0000000000000..85e56195758dd\n--- /dev/null\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\n@@ -0,0 +1,67 @@\n+# `argocd admin redis-initial-password` Command Reference\n+\n+## argocd admin redis-initial-password\n+\n+Ensure the Redis password exists, creating a new one if necessary.\n+\n+```\n+argocd admin redis-initial-password [flags]\n+```\n+\n+### Options\n+\n+```\n+ --as string Username to impersonate for the operation\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\n+ --as-uid string UID to impersonate for the operation\n+ --certificate-authority string Path to a cert file for the certificate authority\n+ --client-certificate string Path to a client certificate file for TLS\n+ --client-key string Path to a client key file for TLS\n+ --cluster string The name of the kubeconfig cluster to use\n+ --context string The name of the kubeconfig context to use\n+ --disable-compression If true, opt-out of response compression for all requests to the server\n+ -h, --help help for redis-initial-password\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\n+ -n, --namespace string If present, the namespace scope for this CLI request\n+ --password string Password for basic authentication to the API server\n+ --proxy-url string If provided, this URL will be used to connect via proxy\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \"0\")\n+ --server string The address and port of the Kubernetes API server\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\n+ --token string Bearer token for authentication to the API server\n+ --user string The name of the kubeconfig user to use\n+ --username string Username for basic authentication to the API server\n+```\n+\n+### Options inherited from parent commands\n+\n+```\n+ --auth-token string Authentication token\n+ --client-crt string Client certificate file\n+ --client-crt-key string Client certificate key file\n+ --config string Path to Argo CD config (default \"/home/user/.config/argocd/config\")\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \"argocd-application-controller\")\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\n+ --insecure Skip server certificate and domain verification\n+ --kube-context string Directs the command to the given kube-context\n+ --logformat string Set the logging format. One of: text|json (default \"text\")\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \"info\")\n+ --plaintext Disable TLS\n+ --port-forward Connect to a random argocd-server port using port forwarding\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis-ha-haproxy\")\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis\")\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-repo-server\")\n+ --server-crt string Server certificate file\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-server\")\n+```\n+\n+### SEE ALSO\n+\n+* [argocd admin](argocd_admin.md)\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\n+\ndiff --git a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\nindex 14cb1a317bab3..f67587fa91f7e 100644\n--- a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\n+++ b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\n@@ -22,6 +22,11 @@ spec:\n env:\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -215,4 +220,4 @@ spec:\n - key: tls.key\n path: tls.key\n - key: ca.crt\n- path: ca.crt\n\\ No newline at end of file\n+ path: ca.crt\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\nindex a15350e941c2f..002a7e2e292b1 100644\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n@@ -21,6 +21,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\nindex bcbe729ac6d00..c591db0d0aa4a 100644\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\n@@ -15,6 +15,23 @@ spec:\n labels:\n app.kubernetes.io/name: argocd-redis\n spec:\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -30,6 +47,13 @@ spec:\n - \"\"\n - \"--appendonly\"\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n ports:\n - containerPort: 6379\n securityContext:\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\nnew file mode 100644\nindex 0000000000000..a7a33f48a4c11\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-role.yaml\n@@ -0,0 +1,23 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\nnew file mode 100644\nindex 0000000000000..f396914dffdca\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\n@@ -0,0 +1,15 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+ - kind: ServiceAccount\n+ name: argocd-redis\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\nindex 4a0b64c4da6a8..f13b17e134234 100644\n--- a/manifests/base/redis/kustomization.yaml\n+++ b/manifests/base/redis/kustomization.yaml\n@@ -6,3 +6,5 @@ resources:\n - argocd-redis-sa.yaml\n - argocd-redis-service.yaml\n - argocd-redis-network-policy.yaml\n+- argocd-redis-role.yaml\n+- argocd-redis-rolebinding.yaml\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\nindex eb230e0f9b856..49182f59f1a09 100644\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n@@ -24,6 +24,11 @@ spec:\n args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\nindex 45b2cdb8df285..f8a5fb2570970 100644\n--- a/manifests/base/server/argocd-server-deployment.yaml\n+++ b/manifests/base/server/argocd-server-deployment.yaml\n@@ -23,6 +23,11 @@ spec:\n args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\nindex 9775ec65f1737..99683d9b0e4e2 100644\n--- a/manifests/core-install.yaml\n+++ b/manifests/core-install.yaml\n@@ -20382,6 +20382,30 @@ rules:\n - watch\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRole\n metadata:\n labels:\n@@ -20434,6 +20458,22 @@ subjects:\n name: argocd-applicationset-controller\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRoleBinding\n metadata:\n labels:\n@@ -20839,6 +20879,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -20850,6 +20897,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -20894,6 +20958,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -21181,6 +21250,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\nindex 9e5e9273942da..25a568b2620d4 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\n@@ -1,6 +1,6 @@\n dependencies:\n - name: redis-ha\n repository: https://dandydeveloper.github.io/charts\n- version: 4.22.3\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\n-generated: \"2022-11-02T16:57:25.047025473-07:00\"\n+ version: 4.26.6\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\n+generated: \"2024-04-10T11:02:32.957812-07:00\"\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\nindex bdcde75a60727..618eecda6ddcc 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\n@@ -1,4 +1,4 @@\n dependencies:\n - name: redis-ha\n- version: 4.22.3\n+ version: 4.26.6\n repository: https://dandydeveloper.github.io/charts\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\nindex e78ed94856d91..3aeabcbf53f64 100644\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\n@@ -9,8 +9,10 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\n apiVersion: v1\n@@ -21,7 +23,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\n@@ -33,7 +35,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis.conf: |\n@@ -50,6 +52,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n \n sentinel.conf: |\n dir \"/data\"\n@@ -59,6 +63,7 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n \n init.sh: |\n echo \"$(date) Start...\"\n@@ -82,7 +87,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -191,9 +196,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -226,7 +231,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -345,7 +350,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -454,9 +459,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -489,7 +494,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -554,9 +559,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -564,9 +569,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -576,9 +581,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -591,6 +596,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -674,6 +680,8 @@ data:\n mode tcp\n option tcp-check\n tcp-check connect\n+ tcp-check send \"AUTH ${AUTH}\"\\r\\n\n+ tcp-check expect string +OK\n tcp-check send PING\\r\\n\n tcp-check expect string +PONG\n tcp-check send info\\ replication\\r\\n\n@@ -730,6 +738,7 @@ data:\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -766,12 +775,13 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -784,6 +794,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -816,7 +827,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n rules:\n - apiGroups:\n - \"\"\n@@ -835,7 +846,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n rules:\n - apiGroups:\n@@ -855,7 +866,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n subjects:\n - kind: ServiceAccount\n name: argocd-redis-ha\n@@ -874,7 +885,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n subjects:\n - kind: ServiceAccount\n@@ -894,9 +905,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -924,9 +934,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -954,9 +963,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -984,7 +992,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n spec:\n type: ClusterIP\n@@ -1012,7 +1020,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n annotations:\n spec:\n@@ -1040,7 +1048,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n spec:\n strategy:\n type: RollingUpdate\n@@ -1056,12 +1064,11 @@ spec:\n labels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n annotations:\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n prometheus.io/path: \"/metrics\"\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n spec:\n # Needed when using unmodified rbac-setup.yml\n \n@@ -1081,11 +1088,10 @@ spec:\n matchLabels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n topologyKey: kubernetes.io/hostname\n initContainers:\n - name: config-init\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1109,7 +1115,7 @@ spec:\n mountPath: /data\n containers:\n - name: haproxy\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n securityContext: \n allowPrivilegeEscalation: false\n@@ -1119,6 +1125,12 @@ spec:\n runAsNonRoot: true\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n httpGet:\n path: /healthz\n@@ -1167,7 +1179,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n {}\n spec:\n@@ -1183,7 +1195,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n release: argocd\n app: redis-ha\n@@ -1207,7 +1219,7 @@ spec:\n automountServiceAccountToken: false\n initContainers:\n - name: config-init\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1231,6 +1243,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n volumeMounts:\n - name: config\n mountPath: /readonly-config\n@@ -1241,12 +1258,12 @@ spec:\n \n containers:\n - name: redis\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n- - redis-server\n+ - redis-server\n args:\n- - /data/conf/redis.conf\n+ - /data/conf/redis.conf\n securityContext: \n allowPrivilegeEscalation: false\n capabilities:\n@@ -1256,6 +1273,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1298,7 +1321,7 @@ spec:\n - /bin/sh\n - /readonly-config/trigger-failover-if-master.sh\n - name: sentinel\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - redis-sentinel\n@@ -1313,6 +1336,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1349,7 +1378,7 @@ spec:\n {}\n \n - name: split-brain-fix\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - sh\n@@ -1371,6 +1400,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n resources:\n {}\n volumeMounts:\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\nindex c15def91ece21..9ba9fa918d34c 100644\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\n@@ -1,4 +1,7 @@\n redis-ha:\n+ auth: true\n+ authKey: auth\n+ existingSecret: argocd-redis\n persistentVolume:\n enabled: false\n redis:\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\nindex bf0c6c3dff255..0da9beb9930e8 100644\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\n@@ -20,7 +20,7 @@ patches:\n kind: ConfigMap\n name: argocd-redis-ha-configmap\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n version: v1\n group: \"\"\n@@ -34,28 +34,28 @@ patches:\n kind: ServiceAccount\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: RoleBinding\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n@@ -294,3 +294,15 @@ patches:\n kind: StatefulSet\n name: argocd-redis-ha-server\n path: overlays/statefulset-containers-securityContext.yaml\n+- target:\n+ group: rbac.authorization.k8s.io\n+ version: v1\n+ kind: Role\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/haproxy-role.yaml\n+- target:\n+ group: apps\n+ version: v1\n+ kind: Deployment\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/deployment-initContainers.yaml\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\nnew file mode 100644\nindex 0000000000000..8e6ea2754a9fa\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n@@ -0,0 +1,16 @@\n+- op: add\n+ path: /spec/template/spec/initContainers/0\n+ value:\n+ name: secret-init\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\nnew file mode 100644\nindex 0000000000000..b74a48006a977\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n@@ -0,0 +1,20 @@\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\nindex bdd458ab42f8f..05487656e47c2 100644\n--- a/manifests/ha/install.yaml\n+++ b/manifests/ha/install.yaml\n@@ -20276,6 +20276,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -20506,6 +20508,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -20844,7 +20860,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -20953,9 +20969,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -20988,7 +21004,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -21053,9 +21069,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -21063,9 +21079,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -21075,9 +21091,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -21090,6 +21106,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -21132,9 +21149,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -21197,7 +21215,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -21306,9 +21324,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -21341,7 +21359,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -21449,6 +21467,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -21457,10 +21477,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -21500,6 +21522,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -21512,6 +21535,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -21700,8 +21724,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -21726,8 +21748,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -21752,8 +21772,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22258,7 +22276,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n prometheus.io/path: /metrics\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n@@ -22274,7 +22292,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -22309,11 +22333,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -22381,6 +22421,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -22668,6 +22713,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -22990,6 +23040,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -23190,7 +23245,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -23207,7 +23262,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -23261,7 +23322,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -23314,7 +23381,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -23344,7 +23416,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\nindex 002462ba3e09d..444d85bccc317 100644\n--- a/manifests/ha/namespace-install.yaml\n+++ b/manifests/ha/namespace-install.yaml\n@@ -43,6 +43,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -273,6 +275,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -505,7 +521,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -614,9 +630,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -649,7 +665,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -714,9 +730,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -724,9 +740,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -736,9 +752,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -751,6 +767,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -793,9 +810,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -858,7 +876,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -967,9 +985,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -1002,7 +1020,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -1110,6 +1128,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -1118,10 +1138,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -1161,6 +1183,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1173,6 +1196,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1361,8 +1385,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1387,8 +1409,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1413,8 +1433,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1919,7 +1937,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n prometheus.io/path: /metrics\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n@@ -1935,7 +1953,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -1970,11 +1994,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -2042,6 +2082,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -2329,6 +2374,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -2651,6 +2701,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -2851,7 +2906,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -2868,7 +2923,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -2922,7 +2983,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -2975,7 +3042,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -3005,7 +3077,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\nindex fbff6dbf89f29..459d398167b0e 100644\n--- a/manifests/install.yaml\n+++ b/manifests/install.yaml\n@@ -20474,6 +20474,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -20654,6 +20678,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -21372,6 +21412,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -21383,6 +21430,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -21427,6 +21491,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -21712,6 +21781,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -22034,6 +22108,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\nindex 85e4c203a91f1..2d2ab382c369f 100644\n--- a/manifests/namespace-install.yaml\n+++ b/manifests/namespace-install.yaml\n@@ -241,6 +241,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -349,6 +373,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -1033,6 +1073,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -1044,6 +1091,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -1088,6 +1152,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -1373,6 +1442,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -1695,6 +1769,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\nindex 225d68dc45235..d7d05bbdf5de8 100644\n--- a/reposerver/repository/repository_test.go\n+++ b/reposerver/repository/repository_test.go\n@@ -199,7 +199,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\n \t}\n \n \t// update this value if we add/remove manifests\n-\tconst countOfManifests = 48\n+\tconst countOfManifests = 50\n \n \tres1, err := service.GenerateManifest(context.Background(), &q)\n \n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/6ef7b62a0f67e74b4aac2aee31c98ae49dd95d12","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From 6ef7b62a0f67e74b4aac2aee31c98ae49dd95d12 Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:23:09 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/9552034a80070a93a161bfa330359585f3b85f07","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From 9552034a80070a93a161bfa330359585f3b85f07 Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:23:10 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/bdd889d43969ba738ddd15e1f674d27964048994","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From bdd889d43969ba738ddd15e1f674d27964048994 Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:22:43 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n---\n cmd/argocd/commands/admin/admin.go | 1 +\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\n docs/faq.md | 42 ++++++\n docs/getting_started.md | 3 +\n docs/user-guide/commands/argocd_admin.md | 1 +\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\n ...ocd-application-controller-deployment.yaml | 5 +\n ...cd-application-controller-statefulset.yaml | 5 +\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\n manifests/base/redis/kustomization.yaml | 2 +\n .../argocd-repo-server-deployment.yaml | 5 +\n .../base/server/argocd-server-deployment.yaml | 5 +\n manifests/core-install.yaml | 74 ++++++++++\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\n .../ha/base/redis-ha/chart/upstream.yaml | 122 +++++++++------\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\n .../overlays/deployment-initContainers.yaml | 16 ++\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\n manifests/ha/install.yaml | 139 ++++++++++++++----\n manifests/ha/namespace-install.yaml | 139 ++++++++++++++----\n manifests/install.yaml | 79 ++++++++++\n manifests/namespace-install.yaml | 79 ++++++++++\n reposerver/repository/repository_test.go | 2 +-\n 27 files changed, 883 insertions(+), 116 deletions(-)\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\nindex 49c81e4da4bfe..73f93deb898c9 100644\n--- a/cmd/argocd/commands/admin/admin.go\n+++ b/cmd/argocd/commands/admin/admin.go\n@@ -141,6 +141,7 @@ $ argocd admin initial-password reset\n \tcommand.AddCommand(NewDashboardCommand(clientOpts))\n \tcommand.AddCommand(NewNotificationsCommand())\n \tcommand.AddCommand(NewInitialPasswordCommand())\n+\tcommand.AddCommand(NewRedisInitialPasswordCommand())\n \n \tcommand.Flags().StringVar(&cmdutil.LogFormat, \"logformat\", \"text\", \"Set the logging format. One of: text|json\")\n \tcommand.Flags().StringVar(&cmdutil.LogLevel, \"loglevel\", \"info\", \"Set the logging level. One of: debug|info|warn|error\")\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\nnew file mode 100644\nindex 0000000000000..8fa1e70ad890e\n--- /dev/null\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\n@@ -0,0 +1,98 @@\n+package admin\n+\n+import (\n+\t\"context\"\n+\t\"crypto/rand\"\n+\t\"fmt\"\n+\t\"math/big\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\"\n+\t\"github.com/argoproj/argo-cd/v2/util/cli\"\n+\tapierr \"k8s.io/apimachinery/pkg/api/errors\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/util/errors\"\n+\tmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\tv1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\t\"k8s.io/client-go/kubernetes\"\n+\t\"k8s.io/client-go/tools/clientcmd\"\n+\n+\t\"github.com/spf13/cobra\"\n+\tcorev1 \"k8s.io/api/core/v1\"\n+)\n+\n+const defaulRedisInitialPasswordSecretName = \"argocd-redis\"\n+const defaultResisInitialPasswordKey = \"auth\"\n+\n+func generateRandomPassword() (string, error) {\n+\tconst initialPasswordLength = 16\n+\tconst letters = \"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\"\n+\trandBytes := make([]byte, initialPasswordLength)\n+\tfor i := 0; i < initialPasswordLength; i++ {\n+\t\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\n+\t\tif err != nil {\n+\t\t\treturn \"\", err\n+\t\t}\n+\t\trandBytes[i] = letters[num.Int64()]\n+\t}\n+\tinitialPassword := string(randBytes)\n+\treturn initialPassword, nil\n+}\n+\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\n+func NewRedisInitialPasswordCommand() *cobra.Command {\n+\tvar (\n+\t\tclientConfig clientcmd.ClientConfig\n+\t)\n+\tvar command = cobra.Command{\n+\t\tUse: \"redis-initial-password\",\n+\t\tShort: \"Ensure the Redis password exists, creating a new one if necessary.\",\n+\t\tRun: func(c *cobra.Command, args []string) {\n+\t\t\tnamespace, _, err := clientConfig.Namespace()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\n+\t\t\tredisInitialPasswordKey := defaultResisInitialPasswordKey\n+\t\t\tfmt.Printf(\"Checking for initial Redis password in secret %s/%s at key %s. \\n\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\n+\n+\t\t\tconfig, err := clientConfig.ClientConfig()\n+\t\t\terrors.CheckError(err)\n+\t\t\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\n+\n+\t\t\tkubeClientset := kubernetes.NewForConfigOrDie(config)\n+\n+\t\t\trandomPassword, err := generateRandomPassword()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tdata := map[string][]byte{\n+\t\t\t\tredisInitialPasswordKey: []byte(randomPassword),\n+\t\t\t}\n+\t\t\tsecret := &corev1.Secret{\n+\t\t\t\tObjectMeta: metav1.ObjectMeta{\n+\t\t\t\t\tName: redisInitialPasswordSecretName,\n+\t\t\t\t\tNamespace: namespace,\n+\t\t\t\t},\n+\t\t\t\tData: data,\n+\t\t\t\tType: corev1.SecretTypeOpaque,\n+\t\t\t}\n+\t\t\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\n+\t\t\tif err != nil && !apierr.IsAlreadyExists(err) {\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\n+\t\t\tfmt.Println(\"Argo CD Redis secret state confirmed: secret name argocd-redis.\")\n+\t\t\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\n+\t\t\t\tfmt.Println(\"Password secret is configured properly.\")\n+\t\t\t} else {\n+\t\t\t\terr := fmt.Errorf(\"key %s doesn't exist in secret %s. \\n\", redisInitialPasswordKey, redisInitialPasswordSecretName)\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\t\t},\n+\t}\n+\n+\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\n+\n+\treturn &command\n+}\ndiff --git a/docs/faq.md b/docs/faq.md\nindex 83bdf8d7d38b5..5ce6ca134ff1b 100644\n--- a/docs/faq.md\n+++ b/docs/faq.md\n@@ -268,3 +268,45 @@ The most common instance of this error is with `env:` fields for `containers`.\n \n !!! note \"Dynamic applications\"\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\n+\n+## How to rotate Redis secret?\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \n+```bash\n+kubectl delete secret argocd-redis -n <argocd namesapce>\n+```\n+* If you are running Redis in HA mode, restart Redis in HA.\n+```bash\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\n+kubectl rollout restart statefulset argocd-redis-ha-server\n+```\n+* If you are running Redis in non-HA mode, restart Redis.\n+```bash\n+kubectl rollout restart deployment argocd-redis\n+```\n+* Restart other components.\n+```bash\n+kubectl rollout restart deployment argocd-server argocd-repo-server\n+kubectl rollout restart statefulset argocd-application-controller\n+```\n+\n+## How to turn off Redis auth if users really want to?\n+\n+Argo CD default installation is now configured automatically enable Redis authentication. \n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\n+\n+* You need to have your own Redis installation.\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\n+ * When HA Redis is used:\n+ * kubectl delete deployment argocd-redis-ha-haproxy\n+ * kubectl delete statefulset argocd-redis-ha-server\n+ * When non-HA Redis is used:\n+ * kubectl delete deployment argocd-redis\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\n+ * Deployment: argocd-repo-server:\n+ * Deployment: argocd-server\n+ * StatefulSet: argocd-application-controller\n+ \n+## How do I provide my own Redis credentials?\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+You can config your secret provider to generate Kubernetes secret accordingly.\n\\ No newline at end of file\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\nindex d81bd08897ad8..c4438b14705d0 100644\n--- a/docs/getting_started.md\n+++ b/docs/getting_started.md\n@@ -38,6 +38,9 @@ Do one of:\n \n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\n \n+!!! note\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+\n ## 2. Download Argo CD CLI\n \n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\nindex 7966e5a3cb9b1..6f8587e68db4e 100644\n--- a/docs/user-guide/commands/argocd_admin.md\n+++ b/docs/user-guide/commands/argocd_admin.md\n@@ -139,6 +139,7 @@ $ argocd admin initial-password reset\n * [argocd admin initial-password](argocd_admin_initial-password.md)\t - Prints initial password to log in to Argo CD for the first time\n * [argocd admin notifications](argocd_admin_notifications.md)\t - Set of CLI commands that helps manage notifications settings\n * [argocd admin proj](argocd_admin_proj.md)\t - Manage projects configuration\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\t - Ensure the Redis password exists, creating a new one if necessary.\n * [argocd admin repo](argocd_admin_repo.md)\t - Manage repositories configuration\n * [argocd admin settings](argocd_admin_settings.md)\t - Provides set of commands for settings validation and troubleshooting\n \ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\nnew file mode 100644\nindex 0000000000000..85e56195758dd\n--- /dev/null\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\n@@ -0,0 +1,67 @@\n+# `argocd admin redis-initial-password` Command Reference\n+\n+## argocd admin redis-initial-password\n+\n+Ensure the Redis password exists, creating a new one if necessary.\n+\n+```\n+argocd admin redis-initial-password [flags]\n+```\n+\n+### Options\n+\n+```\n+ --as string Username to impersonate for the operation\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\n+ --as-uid string UID to impersonate for the operation\n+ --certificate-authority string Path to a cert file for the certificate authority\n+ --client-certificate string Path to a client certificate file for TLS\n+ --client-key string Path to a client key file for TLS\n+ --cluster string The name of the kubeconfig cluster to use\n+ --context string The name of the kubeconfig context to use\n+ --disable-compression If true, opt-out of response compression for all requests to the server\n+ -h, --help help for redis-initial-password\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\n+ -n, --namespace string If present, the namespace scope for this CLI request\n+ --password string Password for basic authentication to the API server\n+ --proxy-url string If provided, this URL will be used to connect via proxy\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \"0\")\n+ --server string The address and port of the Kubernetes API server\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\n+ --token string Bearer token for authentication to the API server\n+ --user string The name of the kubeconfig user to use\n+ --username string Username for basic authentication to the API server\n+```\n+\n+### Options inherited from parent commands\n+\n+```\n+ --auth-token string Authentication token\n+ --client-crt string Client certificate file\n+ --client-crt-key string Client certificate key file\n+ --config string Path to Argo CD config (default \"/home/user/.config/argocd/config\")\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \"argocd-application-controller\")\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\n+ --insecure Skip server certificate and domain verification\n+ --kube-context string Directs the command to the given kube-context\n+ --logformat string Set the logging format. One of: text|json (default \"text\")\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \"info\")\n+ --plaintext Disable TLS\n+ --port-forward Connect to a random argocd-server port using port forwarding\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis-ha-haproxy\")\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis\")\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-repo-server\")\n+ --server-crt string Server certificate file\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-server\")\n+```\n+\n+### SEE ALSO\n+\n+* [argocd admin](argocd_admin.md)\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\n+\ndiff --git a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\nindex 68dd75de2f47f..815e4123d05e3 100644\n--- a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\n+++ b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\n@@ -20,6 +20,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\nindex 7b6302a09c449..2219f5f9b4731 100644\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n@@ -21,6 +21,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\nindex bcbe729ac6d00..c591db0d0aa4a 100644\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\n@@ -15,6 +15,23 @@ spec:\n labels:\n app.kubernetes.io/name: argocd-redis\n spec:\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -30,6 +47,13 @@ spec:\n - \"\"\n - \"--appendonly\"\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n ports:\n - containerPort: 6379\n securityContext:\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\nnew file mode 100644\nindex 0000000000000..a7a33f48a4c11\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-role.yaml\n@@ -0,0 +1,23 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\nnew file mode 100644\nindex 0000000000000..f396914dffdca\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\n@@ -0,0 +1,15 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+ - kind: ServiceAccount\n+ name: argocd-redis\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\nindex 4a0b64c4da6a8..f13b17e134234 100644\n--- a/manifests/base/redis/kustomization.yaml\n+++ b/manifests/base/redis/kustomization.yaml\n@@ -6,3 +6,5 @@ resources:\n - argocd-redis-sa.yaml\n - argocd-redis-service.yaml\n - argocd-redis-network-policy.yaml\n+- argocd-redis-role.yaml\n+- argocd-redis-rolebinding.yaml\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\nindex 907bc80a34e56..7093acd27702a 100644\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n@@ -24,6 +24,11 @@ spec:\n args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\nindex 0ebeb70e08531..1107323b2e3b9 100644\n--- a/manifests/base/server/argocd-server-deployment.yaml\n+++ b/manifests/base/server/argocd-server-deployment.yaml\n@@ -23,6 +23,11 @@ spec:\n args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\nindex 5f68a58863233..a3ff38a1684e0 100644\n--- a/manifests/core-install.yaml\n+++ b/manifests/core-install.yaml\n@@ -20652,6 +20652,30 @@ rules:\n - watch\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRole\n metadata:\n labels:\n@@ -20704,6 +20728,22 @@ subjects:\n name: argocd-applicationset-controller\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRoleBinding\n metadata:\n labels:\n@@ -21115,6 +21155,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -21126,6 +21173,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -21170,6 +21234,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -21481,6 +21550,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\nindex 9e5e9273942da..25a568b2620d4 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\n@@ -1,6 +1,6 @@\n dependencies:\n - name: redis-ha\n repository: https://dandydeveloper.github.io/charts\n- version: 4.22.3\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\n-generated: \"2022-11-02T16:57:25.047025473-07:00\"\n+ version: 4.26.6\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\n+generated: \"2024-04-10T11:02:32.957812-07:00\"\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\nindex bdcde75a60727..618eecda6ddcc 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\n@@ -1,4 +1,4 @@\n dependencies:\n - name: redis-ha\n- version: 4.22.3\n+ version: 4.26.6\n repository: https://dandydeveloper.github.io/charts\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\nindex e78ed94856d91..3aeabcbf53f64 100644\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\n@@ -9,8 +9,10 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\n apiVersion: v1\n@@ -21,7 +23,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\n@@ -33,7 +35,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis.conf: |\n@@ -50,6 +52,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n \n sentinel.conf: |\n dir \"/data\"\n@@ -59,6 +63,7 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n \n init.sh: |\n echo \"$(date) Start...\"\n@@ -82,7 +87,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -191,9 +196,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -226,7 +231,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -345,7 +350,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -454,9 +459,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -489,7 +494,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -554,9 +559,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -564,9 +569,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -576,9 +581,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -591,6 +596,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -674,6 +680,8 @@ data:\n mode tcp\n option tcp-check\n tcp-check connect\n+ tcp-check send \"AUTH ${AUTH}\"\\r\\n\n+ tcp-check expect string +OK\n tcp-check send PING\\r\\n\n tcp-check expect string +PONG\n tcp-check send info\\ replication\\r\\n\n@@ -730,6 +738,7 @@ data:\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -766,12 +775,13 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -784,6 +794,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -816,7 +827,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n rules:\n - apiGroups:\n - \"\"\n@@ -835,7 +846,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n rules:\n - apiGroups:\n@@ -855,7 +866,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n subjects:\n - kind: ServiceAccount\n name: argocd-redis-ha\n@@ -874,7 +885,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n subjects:\n - kind: ServiceAccount\n@@ -894,9 +905,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -924,9 +934,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -954,9 +963,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -984,7 +992,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n spec:\n type: ClusterIP\n@@ -1012,7 +1020,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n annotations:\n spec:\n@@ -1040,7 +1048,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n spec:\n strategy:\n type: RollingUpdate\n@@ -1056,12 +1064,11 @@ spec:\n labels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n annotations:\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n prometheus.io/path: \"/metrics\"\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n spec:\n # Needed when using unmodified rbac-setup.yml\n \n@@ -1081,11 +1088,10 @@ spec:\n matchLabels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n topologyKey: kubernetes.io/hostname\n initContainers:\n - name: config-init\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1109,7 +1115,7 @@ spec:\n mountPath: /data\n containers:\n - name: haproxy\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n securityContext: \n allowPrivilegeEscalation: false\n@@ -1119,6 +1125,12 @@ spec:\n runAsNonRoot: true\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n httpGet:\n path: /healthz\n@@ -1167,7 +1179,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n {}\n spec:\n@@ -1183,7 +1195,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n release: argocd\n app: redis-ha\n@@ -1207,7 +1219,7 @@ spec:\n automountServiceAccountToken: false\n initContainers:\n - name: config-init\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1231,6 +1243,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n volumeMounts:\n - name: config\n mountPath: /readonly-config\n@@ -1241,12 +1258,12 @@ spec:\n \n containers:\n - name: redis\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n- - redis-server\n+ - redis-server\n args:\n- - /data/conf/redis.conf\n+ - /data/conf/redis.conf\n securityContext: \n allowPrivilegeEscalation: false\n capabilities:\n@@ -1256,6 +1273,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1298,7 +1321,7 @@ spec:\n - /bin/sh\n - /readonly-config/trigger-failover-if-master.sh\n - name: sentinel\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - redis-sentinel\n@@ -1313,6 +1336,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1349,7 +1378,7 @@ spec:\n {}\n \n - name: split-brain-fix\n- image: redis:7.0.15-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - sh\n@@ -1371,6 +1400,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n resources:\n {}\n volumeMounts:\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\nindex c15def91ece21..9ba9fa918d34c 100644\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\n@@ -1,4 +1,7 @@\n redis-ha:\n+ auth: true\n+ authKey: auth\n+ existingSecret: argocd-redis\n persistentVolume:\n enabled: false\n redis:\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\nindex bf0c6c3dff255..0da9beb9930e8 100644\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\n@@ -20,7 +20,7 @@ patches:\n kind: ConfigMap\n name: argocd-redis-ha-configmap\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n version: v1\n group: \"\"\n@@ -34,28 +34,28 @@ patches:\n kind: ServiceAccount\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: RoleBinding\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n@@ -294,3 +294,15 @@ patches:\n kind: StatefulSet\n name: argocd-redis-ha-server\n path: overlays/statefulset-containers-securityContext.yaml\n+- target:\n+ group: rbac.authorization.k8s.io\n+ version: v1\n+ kind: Role\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/haproxy-role.yaml\n+- target:\n+ group: apps\n+ version: v1\n+ kind: Deployment\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/deployment-initContainers.yaml\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\nnew file mode 100644\nindex 0000000000000..8e6ea2754a9fa\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n@@ -0,0 +1,16 @@\n+- op: add\n+ path: /spec/template/spec/initContainers/0\n+ value:\n+ name: secret-init\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\nnew file mode 100644\nindex 0000000000000..b74a48006a977\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n@@ -0,0 +1,20 @@\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\nindex a2fc369bae16e..2f98ce67fd987 100644\n--- a/manifests/ha/install.yaml\n+++ b/manifests/ha/install.yaml\n@@ -20546,6 +20546,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -20776,6 +20778,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -21220,7 +21236,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -21329,9 +21345,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -21364,7 +21380,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -21429,9 +21445,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -21439,9 +21455,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -21451,9 +21467,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -21466,6 +21482,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -21508,9 +21525,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -21573,7 +21591,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -21682,9 +21700,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -21717,7 +21735,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -21825,6 +21843,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -21833,10 +21853,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -21876,6 +21898,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -21888,6 +21911,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -22076,8 +22100,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22102,8 +22124,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22128,8 +22148,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22646,7 +22664,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n prometheus.io/path: /metrics\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n@@ -22662,7 +22680,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -22697,11 +22721,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -22769,6 +22809,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -23080,6 +23125,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -23426,6 +23476,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -23668,7 +23723,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -23685,7 +23740,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -23739,7 +23800,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -23792,7 +23859,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -23822,7 +23894,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\nindex 491f46191b41c..aa7dbd74637ff 100644\n--- a/manifests/ha/namespace-install.yaml\n+++ b/manifests/ha/namespace-install.yaml\n@@ -43,6 +43,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -273,6 +275,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -505,7 +521,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -614,9 +630,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -649,7 +665,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -714,9 +730,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -724,9 +740,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -736,9 +752,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -751,6 +767,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -793,9 +810,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -858,7 +876,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -967,9 +985,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -1002,7 +1020,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -1110,6 +1128,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -1118,10 +1138,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -1161,6 +1183,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1173,6 +1196,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1361,8 +1385,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1387,8 +1409,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1413,8 +1433,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1931,7 +1949,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n prometheus.io/path: /metrics\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n@@ -1947,7 +1965,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -1982,11 +2006,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -2054,6 +2094,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -2365,6 +2410,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -2711,6 +2761,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -2953,7 +3008,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -2970,7 +3025,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -3024,7 +3085,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.15-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -3077,7 +3144,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -3107,7 +3179,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.15-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\nindex 2d6755a7682bf..05db343fc7a15 100644\n--- a/manifests/install.yaml\n+++ b/manifests/install.yaml\n@@ -20744,6 +20744,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -21013,6 +21037,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -21760,6 +21800,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -21771,6 +21818,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -21815,6 +21879,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -22124,6 +22193,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -22470,6 +22544,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\nindex d26dd1ef18011..974aae54e1ce6 100644\n--- a/manifests/namespace-install.yaml\n+++ b/manifests/namespace-install.yaml\n@@ -241,6 +241,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -349,6 +373,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -1045,6 +1085,13 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n@@ -1056,6 +1103,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -1100,6 +1164,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -1409,6 +1478,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -1755,6 +1829,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\nindex b27c88dc2b7e0..74a842bcb6faa 100644\n--- a/reposerver/repository/repository_test.go\n+++ b/reposerver/repository/repository_test.go\n@@ -199,7 +199,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\n \t}\n \n \t// update this value if we add/remove manifests\n-\tconst countOfManifests = 48\n+\tconst countOfManifests = 50\n \n \tres1, err := service.GenerateManifest(context.Background(), &q)\n \n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/f1a449e83ee73f8f14d441563b6a31b504f8d8b0","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>","diff_code":"From f1a449e83ee73f8f14d441563b6a31b504f8d8b0 Mon Sep 17 00:00:00 2001\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\nDate: Tue, 21 May 2024 09:22:43 -0400\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\n\n* chore: fix git_test unit test\n\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\n\n---------\n\nSigned-off-by: May Zhang <may_zhang@intuit.com>\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\nCo-authored-by: May Zhang <may_zhang@intuit.com>\n---\n cmd/argocd/commands/admin/admin.go | 1 +\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\n docs/faq.md | 42 ++++++\n docs/getting_started.md | 3 +\n docs/user-guide/commands/argocd_admin.md | 1 +\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\n ...ocd-application-controller-deployment.yaml | 5 +\n ...cd-application-controller-statefulset.yaml | 5 +\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\n manifests/base/redis/kustomization.yaml | 2 +\n .../argocd-repo-server-deployment.yaml | 5 +\n .../base/server/argocd-server-deployment.yaml | 5 +\n manifests/core-install.yaml | 76 +++++++++-\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\n .../ha/base/redis-ha/chart/upstream.yaml | 122 +++++++++------\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\n .../overlays/deployment-initContainers.yaml | 16 ++\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\n manifests/ha/install.yaml | 139 ++++++++++++++----\n manifests/ha/namespace-install.yaml | 139 ++++++++++++++----\n manifests/install.yaml | 81 +++++++++-\n manifests/namespace-install.yaml | 81 +++++++++-\n reposerver/repository/repository_test.go | 2 +-\n 27 files changed, 886 insertions(+), 119 deletions(-)\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\nindex 01a07e3021fc9..9c56b066d552c 100644\n--- a/cmd/argocd/commands/admin/admin.go\n+++ b/cmd/argocd/commands/admin/admin.go\n@@ -66,6 +66,7 @@ $ argocd admin initial-password reset\n \tcommand.AddCommand(NewDashboardCommand(clientOpts))\n \tcommand.AddCommand(NewNotificationsCommand())\n \tcommand.AddCommand(NewInitialPasswordCommand())\n+\tcommand.AddCommand(NewRedisInitialPasswordCommand())\n \n \tcommand.Flags().StringVar(&cmdutil.LogFormat, \"logformat\", \"text\", \"Set the logging format. One of: text|json\")\n \tcommand.Flags().StringVar(&cmdutil.LogLevel, \"loglevel\", \"info\", \"Set the logging level. One of: debug|info|warn|error\")\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\nnew file mode 100644\nindex 0000000000000..8fa1e70ad890e\n--- /dev/null\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\n@@ -0,0 +1,98 @@\n+package admin\n+\n+import (\n+\t\"context\"\n+\t\"crypto/rand\"\n+\t\"fmt\"\n+\t\"math/big\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\"\n+\t\"github.com/argoproj/argo-cd/v2/util/cli\"\n+\tapierr \"k8s.io/apimachinery/pkg/api/errors\"\n+\n+\t\"github.com/argoproj/argo-cd/v2/util/errors\"\n+\tmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\tv1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+\t\"k8s.io/client-go/kubernetes\"\n+\t\"k8s.io/client-go/tools/clientcmd\"\n+\n+\t\"github.com/spf13/cobra\"\n+\tcorev1 \"k8s.io/api/core/v1\"\n+)\n+\n+const defaulRedisInitialPasswordSecretName = \"argocd-redis\"\n+const defaultResisInitialPasswordKey = \"auth\"\n+\n+func generateRandomPassword() (string, error) {\n+\tconst initialPasswordLength = 16\n+\tconst letters = \"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\"\n+\trandBytes := make([]byte, initialPasswordLength)\n+\tfor i := 0; i < initialPasswordLength; i++ {\n+\t\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\n+\t\tif err != nil {\n+\t\t\treturn \"\", err\n+\t\t}\n+\t\trandBytes[i] = letters[num.Int64()]\n+\t}\n+\tinitialPassword := string(randBytes)\n+\treturn initialPassword, nil\n+}\n+\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\n+func NewRedisInitialPasswordCommand() *cobra.Command {\n+\tvar (\n+\t\tclientConfig clientcmd.ClientConfig\n+\t)\n+\tvar command = cobra.Command{\n+\t\tUse: \"redis-initial-password\",\n+\t\tShort: \"Ensure the Redis password exists, creating a new one if necessary.\",\n+\t\tRun: func(c *cobra.Command, args []string) {\n+\t\t\tnamespace, _, err := clientConfig.Namespace()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\n+\t\t\tredisInitialPasswordKey := defaultResisInitialPasswordKey\n+\t\t\tfmt.Printf(\"Checking for initial Redis password in secret %s/%s at key %s. \\n\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\n+\n+\t\t\tconfig, err := clientConfig.ClientConfig()\n+\t\t\terrors.CheckError(err)\n+\t\t\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\n+\n+\t\t\tkubeClientset := kubernetes.NewForConfigOrDie(config)\n+\n+\t\t\trandomPassword, err := generateRandomPassword()\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tdata := map[string][]byte{\n+\t\t\t\tredisInitialPasswordKey: []byte(randomPassword),\n+\t\t\t}\n+\t\t\tsecret := &corev1.Secret{\n+\t\t\t\tObjectMeta: metav1.ObjectMeta{\n+\t\t\t\t\tName: redisInitialPasswordSecretName,\n+\t\t\t\t\tNamespace: namespace,\n+\t\t\t\t},\n+\t\t\t\tData: data,\n+\t\t\t\tType: corev1.SecretTypeOpaque,\n+\t\t\t}\n+\t\t\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\n+\t\t\tif err != nil && !apierr.IsAlreadyExists(err) {\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\n+\t\t\tfmt.Println(\"Argo CD Redis secret state confirmed: secret name argocd-redis.\")\n+\t\t\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\n+\t\t\terrors.CheckError(err)\n+\n+\t\t\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\n+\t\t\t\tfmt.Println(\"Password secret is configured properly.\")\n+\t\t\t} else {\n+\t\t\t\terr := fmt.Errorf(\"key %s doesn't exist in secret %s. \\n\", redisInitialPasswordKey, redisInitialPasswordSecretName)\n+\t\t\t\terrors.CheckError(err)\n+\t\t\t}\n+\t\t},\n+\t}\n+\n+\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\n+\n+\treturn &command\n+}\ndiff --git a/docs/faq.md b/docs/faq.md\nindex 83bdf8d7d38b5..5ce6ca134ff1b 100644\n--- a/docs/faq.md\n+++ b/docs/faq.md\n@@ -268,3 +268,45 @@ The most common instance of this error is with `env:` fields for `containers`.\n \n !!! note \"Dynamic applications\"\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\n+\n+## How to rotate Redis secret?\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \n+```bash\n+kubectl delete secret argocd-redis -n <argocd namesapce>\n+```\n+* If you are running Redis in HA mode, restart Redis in HA.\n+```bash\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\n+kubectl rollout restart statefulset argocd-redis-ha-server\n+```\n+* If you are running Redis in non-HA mode, restart Redis.\n+```bash\n+kubectl rollout restart deployment argocd-redis\n+```\n+* Restart other components.\n+```bash\n+kubectl rollout restart deployment argocd-server argocd-repo-server\n+kubectl rollout restart statefulset argocd-application-controller\n+```\n+\n+## How to turn off Redis auth if users really want to?\n+\n+Argo CD default installation is now configured automatically enable Redis authentication. \n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\n+\n+* You need to have your own Redis installation.\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\n+ * When HA Redis is used:\n+ * kubectl delete deployment argocd-redis-ha-haproxy\n+ * kubectl delete statefulset argocd-redis-ha-server\n+ * When non-HA Redis is used:\n+ * kubectl delete deployment argocd-redis\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\n+ * Deployment: argocd-repo-server:\n+ * Deployment: argocd-server\n+ * StatefulSet: argocd-application-controller\n+ \n+## How do I provide my own Redis credentials?\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+You can config your secret provider to generate Kubernetes secret accordingly.\n\\ No newline at end of file\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\nindex 68d9f8f9e8872..4afe4add47267 100644\n--- a/docs/getting_started.md\n+++ b/docs/getting_started.md\n@@ -40,6 +40,9 @@ Do one of:\n \n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\n \n+!!! note\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\n+\n ## 2. Download Argo CD CLI\n \n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\nindex 4375c7f2e3cae..0aa338f1570e2 100644\n--- a/docs/user-guide/commands/argocd_admin.md\n+++ b/docs/user-guide/commands/argocd_admin.md\n@@ -64,6 +64,7 @@ $ argocd admin initial-password reset\n * [argocd admin initial-password](argocd_admin_initial-password.md)\t - Prints initial password to log in to Argo CD for the first time\n * [argocd admin notifications](argocd_admin_notifications.md)\t - Set of CLI commands that helps manage notifications settings\n * [argocd admin proj](argocd_admin_proj.md)\t - Manage projects configuration\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\t - Ensure the Redis password exists, creating a new one if necessary.\n * [argocd admin repo](argocd_admin_repo.md)\t - Manage repositories configuration\n * [argocd admin settings](argocd_admin_settings.md)\t - Provides set of commands for settings validation and troubleshooting\n \ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\nnew file mode 100644\nindex 0000000000000..85e56195758dd\n--- /dev/null\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\n@@ -0,0 +1,67 @@\n+# `argocd admin redis-initial-password` Command Reference\n+\n+## argocd admin redis-initial-password\n+\n+Ensure the Redis password exists, creating a new one if necessary.\n+\n+```\n+argocd admin redis-initial-password [flags]\n+```\n+\n+### Options\n+\n+```\n+ --as string Username to impersonate for the operation\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\n+ --as-uid string UID to impersonate for the operation\n+ --certificate-authority string Path to a cert file for the certificate authority\n+ --client-certificate string Path to a client certificate file for TLS\n+ --client-key string Path to a client key file for TLS\n+ --cluster string The name of the kubeconfig cluster to use\n+ --context string The name of the kubeconfig context to use\n+ --disable-compression If true, opt-out of response compression for all requests to the server\n+ -h, --help help for redis-initial-password\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\n+ -n, --namespace string If present, the namespace scope for this CLI request\n+ --password string Password for basic authentication to the API server\n+ --proxy-url string If provided, this URL will be used to connect via proxy\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \"0\")\n+ --server string The address and port of the Kubernetes API server\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\n+ --token string Bearer token for authentication to the API server\n+ --user string The name of the kubeconfig user to use\n+ --username string Username for basic authentication to the API server\n+```\n+\n+### Options inherited from parent commands\n+\n+```\n+ --auth-token string Authentication token\n+ --client-crt string Client certificate file\n+ --client-crt-key string Client certificate key file\n+ --config string Path to Argo CD config (default \"/home/user/.config/argocd/config\")\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \"argocd-application-controller\")\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\n+ --insecure Skip server certificate and domain verification\n+ --kube-context string Directs the command to the given kube-context\n+ --logformat string Set the logging format. One of: text|json (default \"text\")\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \"info\")\n+ --plaintext Disable TLS\n+ --port-forward Connect to a random argocd-server port using port forwarding\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis-ha-haproxy\")\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \"argocd-redis\")\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-repo-server\")\n+ --server-crt string Server certificate file\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \"argocd-server\")\n+```\n+\n+### SEE ALSO\n+\n+* [argocd admin](argocd_admin.md)\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\n+\ndiff --git a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\nindex 68dd75de2f47f..815e4123d05e3 100644\n--- a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\n+++ b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\n@@ -20,6 +20,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\nindex 7b6302a09c449..2219f5f9b4731 100644\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\n@@ -21,6 +21,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\nindex 6fc776785185f..a2951694ed7d7 100644\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\n@@ -15,6 +15,23 @@ spec:\n labels:\n app.kubernetes.io/name: argocd-redis\n spec:\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -30,6 +47,13 @@ spec:\n - \"\"\n - \"--appendonly\"\n - \"no\"\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n ports:\n - containerPort: 6379\n securityContext:\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\nnew file mode 100644\nindex 0000000000000..a7a33f48a4c11\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-role.yaml\n@@ -0,0 +1,23 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+ - apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\nnew file mode 100644\nindex 0000000000000..f396914dffdca\n--- /dev/null\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\n@@ -0,0 +1,15 @@\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+ - kind: ServiceAccount\n+ name: argocd-redis\n\\ No newline at end of file\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\nindex 4a0b64c4da6a8..f13b17e134234 100644\n--- a/manifests/base/redis/kustomization.yaml\n+++ b/manifests/base/redis/kustomization.yaml\n@@ -6,3 +6,5 @@ resources:\n - argocd-redis-sa.yaml\n - argocd-redis-service.yaml\n - argocd-redis-network-policy.yaml\n+- argocd-redis-role.yaml\n+- argocd-redis-rolebinding.yaml\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\nindex 2c30c8ad1d71b..971b7a21c2151 100644\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\n@@ -24,6 +24,11 @@ spec:\n args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\nindex 0ebeb70e08531..1107323b2e3b9 100644\n--- a/manifests/base/server/argocd-server-deployment.yaml\n+++ b/manifests/base/server/argocd-server-deployment.yaml\n@@ -23,6 +23,11 @@ spec:\n args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\nindex 30db6ed76f6a1..b34db579534db 100644\n--- a/manifests/core-install.yaml\n+++ b/manifests/core-install.yaml\n@@ -20816,6 +20816,30 @@ rules:\n - watch\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRole\n metadata:\n labels:\n@@ -20868,6 +20892,22 @@ subjects:\n name: argocd-applicationset-controller\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n kind: ClusterRoleBinding\n metadata:\n labels:\n@@ -21279,7 +21319,14 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n- image: redis:7.0.14-alpine\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n ports:\n@@ -21290,6 +21337,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -21334,6 +21398,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -21651,6 +21720,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\nindex 9e5e9273942da..25a568b2620d4 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\n@@ -1,6 +1,6 @@\n dependencies:\n - name: redis-ha\n repository: https://dandydeveloper.github.io/charts\n- version: 4.22.3\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\n-generated: \"2022-11-02T16:57:25.047025473-07:00\"\n+ version: 4.26.6\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\n+generated: \"2024-04-10T11:02:32.957812-07:00\"\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\nindex bdcde75a60727..618eecda6ddcc 100644\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\n@@ -1,4 +1,4 @@\n dependencies:\n - name: redis-ha\n- version: 4.22.3\n+ version: 4.26.6\n repository: https://dandydeveloper.github.io/charts\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\nindex 1d0e4b3c247f8..3aeabcbf53f64 100644\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\n@@ -9,8 +9,10 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\n apiVersion: v1\n@@ -21,7 +23,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n ---\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\n@@ -33,7 +35,7 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis.conf: |\n@@ -50,6 +52,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n \n sentinel.conf: |\n dir \"/data\"\n@@ -59,6 +63,7 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n \n init.sh: |\n echo \"$(date) Start...\"\n@@ -82,7 +87,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -191,9 +196,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -226,7 +231,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -345,7 +350,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -454,9 +459,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -489,7 +494,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -554,9 +559,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -564,9 +569,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -576,9 +581,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -591,6 +596,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -674,6 +680,8 @@ data:\n mode tcp\n option tcp-check\n tcp-check connect\n+ tcp-check send \"AUTH ${AUTH}\"\\r\\n\n+ tcp-check expect string +OK\n tcp-check send PING\\r\\n\n tcp-check expect string +PONG\n tcp-check send info\\ replication\\r\\n\n@@ -730,6 +738,7 @@ data:\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -766,12 +775,13 @@ metadata:\n labels:\n heritage: Helm\n release: argocd\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n app: argocd-redis-ha\n data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -784,6 +794,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -816,7 +827,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n rules:\n - apiGroups:\n - \"\"\n@@ -835,7 +846,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n rules:\n - apiGroups:\n@@ -855,7 +866,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n subjects:\n - kind: ServiceAccount\n name: argocd-redis-ha\n@@ -874,7 +885,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n subjects:\n - kind: ServiceAccount\n@@ -894,9 +905,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -924,9 +934,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -954,9 +963,8 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n spec:\n publishNotReadyAddresses: true\n type: ClusterIP\n@@ -984,7 +992,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n spec:\n type: ClusterIP\n@@ -1012,7 +1020,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n component: argocd-redis-ha-haproxy\n annotations:\n spec:\n@@ -1040,7 +1048,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n spec:\n strategy:\n type: RollingUpdate\n@@ -1056,12 +1064,11 @@ spec:\n labels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n annotations:\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n prometheus.io/path: \"/metrics\"\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n spec:\n # Needed when using unmodified rbac-setup.yml\n \n@@ -1081,11 +1088,10 @@ spec:\n matchLabels:\n app: redis-ha-haproxy\n release: argocd\n- revision: \"1\"\n topologyKey: kubernetes.io/hostname\n initContainers:\n - name: config-init\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1109,7 +1115,7 @@ spec:\n mountPath: /data\n containers:\n - name: haproxy\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n securityContext: \n allowPrivilegeEscalation: false\n@@ -1119,6 +1125,12 @@ spec:\n runAsNonRoot: true\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n httpGet:\n path: /healthz\n@@ -1167,7 +1179,7 @@ metadata:\n app: redis-ha\n heritage: \"Helm\"\n release: \"argocd\"\n- chart: redis-ha-4.22.3\n+ chart: redis-ha-4.26.6\n annotations:\n {}\n spec:\n@@ -1183,7 +1195,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n release: argocd\n app: redis-ha\n@@ -1207,7 +1219,7 @@ spec:\n automountServiceAccountToken: false\n initContainers:\n - name: config-init\n- image: redis:7.0.14-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n resources:\n {}\n@@ -1231,6 +1243,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n volumeMounts:\n - name: config\n mountPath: /readonly-config\n@@ -1241,12 +1258,12 @@ spec:\n \n containers:\n - name: redis\n- image: redis:7.0.14-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n- - redis-server\n+ - redis-server\n args:\n- - /data/conf/redis.conf\n+ - /data/conf/redis.conf\n securityContext: \n allowPrivilegeEscalation: false\n capabilities:\n@@ -1256,6 +1273,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1298,7 +1321,7 @@ spec:\n - /bin/sh\n - /readonly-config/trigger-failover-if-master.sh\n - name: sentinel\n- image: redis:7.0.14-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - redis-sentinel\n@@ -1313,6 +1336,12 @@ spec:\n runAsUser: 1000\n seccompProfile:\n type: RuntimeDefault\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n livenessProbe:\n initialDelaySeconds: 30\n periodSeconds: 15\n@@ -1349,7 +1378,7 @@ spec:\n {}\n \n - name: split-brain-fix\n- image: redis:7.0.14-alpine\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n command:\n - sh\n@@ -1371,6 +1400,11 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ name: argocd-redis\n+ key: auth\n resources:\n {}\n volumeMounts:\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\nindex 5606daac34bb3..805f541af850d 100644\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\n@@ -1,4 +1,7 @@\n redis-ha:\n+ auth: true\n+ authKey: auth\n+ existingSecret: argocd-redis\n persistentVolume:\n enabled: false\n redis:\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\nindex bf0c6c3dff255..0da9beb9930e8 100644\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\n@@ -20,7 +20,7 @@ patches:\n kind: ConfigMap\n name: argocd-redis-ha-configmap\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n version: v1\n group: \"\"\n@@ -34,28 +34,28 @@ patches:\n kind: ServiceAccount\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: Role\n name: argocd-redis-ha-haproxy\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n kind: RoleBinding\n name: argocd-redis-ha\n namespace: argocd\n- path: overlays/remove-namespace.yaml \n+ path: overlays/remove-namespace.yaml\n - target:\n group: rbac.authorization.k8s.io\n version: v1\n@@ -294,3 +294,15 @@ patches:\n kind: StatefulSet\n name: argocd-redis-ha-server\n path: overlays/statefulset-containers-securityContext.yaml\n+- target:\n+ group: rbac.authorization.k8s.io\n+ version: v1\n+ kind: Role\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/haproxy-role.yaml\n+- target:\n+ group: apps\n+ version: v1\n+ kind: Deployment\n+ name: argocd-redis-ha-haproxy\n+ path: overlays/deployment-initContainers.yaml\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\nnew file mode 100644\nindex 0000000000000..8e6ea2754a9fa\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\n@@ -0,0 +1,16 @@\n+- op: add\n+ path: /spec/template/spec/initContainers/0\n+ value:\n+ name: secret-init\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n\\ No newline at end of file\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\nnew file mode 100644\nindex 0000000000000..b74a48006a977\n--- /dev/null\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\n@@ -0,0 +1,20 @@\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ resourceNames:\n+ - argocd-redis\n+ verbs:\n+ - get\n+- op: add\n+ path: /rules/0\n+ value:\n+ apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n\\ No newline at end of file\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\nindex b13b7c1f2d188..8d2a4d7ce43b9 100644\n--- a/manifests/ha/install.yaml\n+++ b/manifests/ha/install.yaml\n@@ -20710,6 +20710,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -20940,6 +20942,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -21384,7 +21400,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -21493,9 +21509,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -21528,7 +21544,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -21593,9 +21609,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -21603,9 +21619,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -21615,9 +21631,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -21630,6 +21646,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -21672,9 +21689,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -21737,7 +21755,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -21846,9 +21864,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -21881,7 +21899,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -21989,6 +22007,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -21997,10 +22017,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -22040,6 +22062,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -22052,6 +22075,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -22240,8 +22264,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22266,8 +22288,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22292,8 +22312,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -22810,7 +22828,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n prometheus.io/path: /metrics\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n@@ -22826,7 +22844,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -22861,11 +22885,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -22933,6 +22973,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -23250,6 +23295,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -23596,6 +23646,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -23838,7 +23893,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -23855,7 +23910,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.14-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -23909,7 +23970,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.14-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -23962,7 +24029,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.14-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -23992,7 +24064,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.14-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\nindex 591ca73e6a9e3..9f557fc1f43d8 100644\n--- a/manifests/ha/namespace-install.yaml\n+++ b/manifests/ha/namespace-install.yaml\n@@ -43,6 +43,8 @@ metadata:\n app.kubernetes.io/name: argocd-redis-ha\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha\n+secrets:\n+- name: argocd-redis\n ---\n apiVersion: v1\n kind: ServiceAccount\n@@ -273,6 +275,20 @@ metadata:\n app.kubernetes.io/part-of: argocd\n name: argocd-redis-ha-haproxy\n rules:\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n - apiGroups:\n - \"\"\n resources:\n@@ -505,7 +521,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -614,9 +630,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -649,7 +665,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -714,9 +730,9 @@ data:\n redis_role() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- ROLE=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\r//')\n else\n- ROLE=$(redis-cli -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n+ ROLE=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep role | sed 's/role://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -724,9 +740,9 @@ data:\n identify_redis_master() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n else\n- REDIS_MASTER=$(redis-cli -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n+ REDIS_MASTER=$(redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" info | grep master_host | sed 's/master_host://' | sed 's/\\r//')\n fi\n set -e\n }\n@@ -736,9 +752,9 @@ data:\n sh /readonly-config/init.sh\n \n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- echo \"shutdown\" | redis-cli -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\n else\n- echo \"shutdown\" | redis-cli -p \"${REDIS_PORT}\"\n+ echo \"shutdown\" | redis-cli -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\"\n fi\n set -e\n }\n@@ -751,6 +767,7 @@ data:\n identify_announce_ip\n done\n \n+ trap \"exit 0\" TERM\n while true; do\n sleep 60\n \n@@ -793,9 +810,10 @@ data:\n decide redis backend to use\\n#master\\nfrontend ft_redis_master\\n bind :6379 \\n\n \\ use_backend bk_redis_master\\n# Check all redis servers to see if they think\n they are master\\nbackend bk_redis_master\\n mode tcp\\n option tcp-check\\n tcp-check\n- connect\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check\n- send info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check\n- send QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n+ connect\\n tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n tcp-check expect string +OK\\n\n+ \\ tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send\n+ info\\\\ replication\\\\r\\\\n\\n tcp-check expect string role:master\\n tcp-check send\n+ QUIT\\\\r\\\\n\\n tcp-check expect string +OK\\n use-server R0 if { srv_is_up(R0)\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\n server R0 argocd-redis-ha-announce-0:6379\n check inter 3s fall 1 rise 1\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\n ge 2 }\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\n@@ -858,7 +876,7 @@ data:\n sentinel_get_master() {\n set +e\n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n- redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n+ redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n grep -E '((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?s*$))'\n else\n redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_PORT}\" sentinel get-master-addr-by-name \"${MASTER_GROUP}\" |\\\n@@ -967,9 +985,9 @@ data:\n redis_ping() {\n set +e\n if [ \"$REDIS_PORT\" -eq 0 ]; then\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\n else\n- redis-cli -h \"${MASTER}\" -p \"${REDIS_PORT}\" ping\n+ redis-cli -h \"${MASTER}\" -a \"${AUTH}\" --no-auth-warning -p \"${REDIS_PORT}\" ping\n fi\n set -e\n }\n@@ -1002,7 +1020,7 @@ data:\n \n if [ \"$SENTINEL_PORT\" -eq 0 ]; then\n echo \" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\"\n- if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n+ if redis-cli -h \"${SERVICE}\" -p \"${SENTINEL_TLS_PORT}\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \"${MASTER_GROUP}\" | grep -q 'NOGOODSLAVE' ; then\n echo \" $(date) Failover returned with 'NOGOODSLAVE'\"\n echo \"Setting defaults for this pod..\"\n setup_defaults\n@@ -1110,6 +1128,8 @@ data:\n rdbcompression yes\n repl-diskless-sync yes\n save \"\"\n+ requirepass replace-default-auth\n+ masterauth replace-default-auth\n sentinel.conf: |\n dir \"/data\"\n port 26379\n@@ -1118,10 +1138,12 @@ data:\n sentinel failover-timeout argocd 180000\n maxclients 10000\n sentinel parallel-syncs argocd 5\n+ sentinel auth-pass argocd replace-default-auth\n trigger-failover-if-master.sh: |\n get_redis_role() {\n is_master=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n info | grep -c 'role:master' || true\n@@ -1161,6 +1183,7 @@ data:\n redis_liveness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1173,6 +1196,7 @@ data:\n redis_readiness.sh: |\n response=$(\n redis-cli \\\n+ -a \"${AUTH}\" --no-auth-warning \\\n -h localhost \\\n -p 6379 \\\n ping\n@@ -1361,8 +1385,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1387,8 +1409,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1413,8 +1433,6 @@ spec:\n apiVersion: v1\n kind: Service\n metadata:\n- annotations:\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \"true\"\n labels:\n app.kubernetes.io/component: redis\n app.kubernetes.io/name: argocd-redis-ha\n@@ -1931,7 +1949,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\n prometheus.io/path: /metrics\n prometheus.io/port: \"9101\"\n prometheus.io/scrape: \"true\"\n@@ -1947,7 +1965,13 @@ spec:\n app.kubernetes.io/name: argocd-redis-ha-haproxy\n topologyKey: kubernetes.io/hostname\n containers:\n- - image: haproxy:2.6.14-alpine\n+ - env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -1982,11 +2006,27 @@ spec:\n - mountPath: /run/haproxy\n name: shared-socket\n initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n - args:\n - /readonly/haproxy_init.sh\n command:\n - sh\n- image: haproxy:2.6.14-alpine\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\n@@ -2054,6 +2094,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -2371,6 +2416,11 @@ spec:\n env:\n - name: ARGOCD_API_SERVER_REPLICAS\n value: \"2\"\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -2717,6 +2767,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n@@ -2959,7 +3014,7 @@ spec:\n template:\n metadata:\n annotations:\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\n labels:\n app.kubernetes.io/name: argocd-redis-ha\n spec:\n@@ -2976,7 +3031,13 @@ spec:\n - /data/conf/redis.conf\n command:\n - redis-server\n- image: redis:7.0.14-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle:\n preStop:\n@@ -3030,7 +3091,13 @@ spec:\n - /data/conf/sentinel.conf\n command:\n - redis-sentinel\n- image: redis:7.0.14-alpine\n+ env:\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n lifecycle: {}\n livenessProbe:\n@@ -3083,7 +3150,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.14-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: split-brain-fix\n resources: {}\n@@ -3113,7 +3185,12 @@ spec:\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\n - name: SENTINEL_ID_2\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\n- image: redis:7.0.14-alpine\n+ - name: AUTH\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\n imagePullPolicy: IfNotPresent\n name: config-init\n securityContext:\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\nindex 4e803ae379d56..c2871ec4451b4 100644\n--- a/manifests/install.yaml\n+++ b/manifests/install.yaml\n@@ -20908,6 +20908,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -21177,6 +21201,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -21924,7 +21964,14 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n- image: redis:7.0.14-alpine\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n ports:\n@@ -21935,6 +21982,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -21979,6 +22043,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -22294,6 +22363,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -22640,6 +22714,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\nindex 9cb8620aa6232..d64e1db7046b9 100644\n--- a/manifests/namespace-install.yaml\n+++ b/manifests/namespace-install.yaml\n@@ -241,6 +241,30 @@ rules:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: Role\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+rules:\n+- apiGroups:\n+ - \"\"\n+ resourceNames:\n+ - argocd-redis\n+ resources:\n+ - secrets\n+ verbs:\n+ - get\n+- apiGroups:\n+ - \"\"\n+ resources:\n+ - secrets\n+ verbs:\n+ - create\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: Role\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -349,6 +373,22 @@ subjects:\n ---\n apiVersion: rbac.authorization.k8s.io/v1\n kind: RoleBinding\n+metadata:\n+ labels:\n+ app.kubernetes.io/component: redis\n+ app.kubernetes.io/name: argocd-redis\n+ app.kubernetes.io/part-of: argocd\n+ name: argocd-redis\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: Role\n+ name: argocd-redis\n+subjects:\n+- kind: ServiceAccount\n+ name: argocd-redis\n+---\n+apiVersion: rbac.authorization.k8s.io/v1\n+kind: RoleBinding\n metadata:\n labels:\n app.kubernetes.io/component: server\n@@ -1045,7 +1085,14 @@ spec:\n - \"\"\n - --appendonly\n - \"no\"\n- image: redis:7.0.14-alpine\n+ - --requirepass $(REDIS_PASSWORD)\n+ env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n+ image: redis:7.0.15-alpine\n imagePullPolicy: Always\n name: redis\n ports:\n@@ -1056,6 +1103,23 @@ spec:\n drop:\n - ALL\n readOnlyRootFilesystem: true\n+ initContainers:\n+ - command:\n+ - argocd\n+ - admin\n+ - redis-initial-password\n+ image: quay.io/argoproj/argocd:latest\n+ imagePullPolicy: IfNotPresent\n+ name: secret-init\n+ securityContext:\n+ allowPrivilegeEscalation: false\n+ capabilities:\n+ drop:\n+ - ALL\n+ readOnlyRootFilesystem: true\n+ runAsNonRoot: true\n+ seccompProfile:\n+ type: RuntimeDefault\n securityContext:\n runAsNonRoot: true\n runAsUser: 999\n@@ -1100,6 +1164,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-repo-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_RECONCILIATION_TIMEOUT\n valueFrom:\n configMapKeyRef:\n@@ -1415,6 +1484,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-server\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_SERVER_INSECURE\n valueFrom:\n configMapKeyRef:\n@@ -1761,6 +1835,11 @@ spec:\n - args:\n - /usr/local/bin/argocd-application-controller\n env:\n+ - name: REDIS_PASSWORD\n+ valueFrom:\n+ secretKeyRef:\n+ key: auth\n+ name: argocd-redis\n - name: ARGOCD_CONTROLLER_REPLICAS\n value: \"1\"\n - name: ARGOCD_RECONCILIATION_TIMEOUT\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\nindex fe8463f80ea9c..00a348fee21c9 100644\n--- a/reposerver/repository/repository_test.go\n+++ b/reposerver/repository/repository_test.go\n@@ -205,7 +205,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\n \t}\n \n \t// update this value if we add/remove manifests\n-\tconst countOfManifests = 48\n+\tconst countOfManifests = 50\n \n \tres1, err := service.GenerateManifest(context.Background(), &q)\n \n"}],"string":"[\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/2de0ceade243039c120c28374016c04ff9590d1d\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From 2de0ceade243039c120c28374016c04ff9590d1d Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:23:09 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/35a7d6c7fa1534aceba763d6a68697f36c12e678\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From 35a7d6c7fa1534aceba763d6a68697f36c12e678 Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:22:43 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n---\\n cmd/argocd/commands/admin/admin.go | 1 +\\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\\n docs/faq.md | 42 ++++++\\n docs/getting_started.md | 3 +\\n docs/user-guide/commands/argocd_admin.md | 1 +\\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\\n ...cd-application-controller-statefulset.yaml | 5 +\\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\\n manifests/base/redis/kustomization.yaml | 2 +\\n .../argocd-repo-server-deployment.yaml | 5 +\\n .../base/server/argocd-server-deployment.yaml | 5 +\\n manifests/core-install.yaml | 74 +++++++++\\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\\n .../ha/base/redis-ha/chart/upstream.yaml | 125 +++++++++------\\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\\n .../overlays/deployment-initContainers.yaml | 16 ++\\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\\n manifests/ha/install.yaml | 142 ++++++++++++++----\\n manifests/ha/namespace-install.yaml | 142 ++++++++++++++----\\n manifests/install.yaml | 79 ++++++++++\\n manifests/namespace-install.yaml | 79 ++++++++++\\n reposerver/repository/repository_test.go | 2 +-\\n 26 files changed, 887 insertions(+), 116 deletions(-)\\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n\\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\\nindex 15e83585c411d..9dd2f02521f30 100644\\n--- a/cmd/argocd/commands/admin/admin.go\\n+++ b/cmd/argocd/commands/admin/admin.go\\n@@ -59,6 +59,7 @@ func NewAdminCommand() *cobra.Command {\\n \\tcommand.AddCommand(NewDashboardCommand())\\n \\tcommand.AddCommand(NewNotificationsCommand())\\n \\tcommand.AddCommand(NewInitialPasswordCommand())\\n+\\tcommand.AddCommand(NewRedisInitialPasswordCommand())\\n \\n \\tcommand.Flags().StringVar(&cmdutil.LogFormat, \\\"logformat\\\", \\\"text\\\", \\\"Set the logging format. One of: text|json\\\")\\n \\tcommand.Flags().StringVar(&cmdutil.LogLevel, \\\"loglevel\\\", \\\"info\\\", \\\"Set the logging level. One of: debug|info|warn|error\\\")\\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\\nnew file mode 100644\\nindex 0000000000000..8fa1e70ad890e\\n--- /dev/null\\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\\n@@ -0,0 +1,98 @@\\n+package admin\\n+\\n+import (\\n+\\t\\\"context\\\"\\n+\\t\\\"crypto/rand\\\"\\n+\\t\\\"fmt\\\"\\n+\\t\\\"math/big\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\\\"\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/cli\\\"\\n+\\tapierr \\\"k8s.io/apimachinery/pkg/api/errors\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/errors\\\"\\n+\\tmetav1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\tv1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\t\\\"k8s.io/client-go/kubernetes\\\"\\n+\\t\\\"k8s.io/client-go/tools/clientcmd\\\"\\n+\\n+\\t\\\"github.com/spf13/cobra\\\"\\n+\\tcorev1 \\\"k8s.io/api/core/v1\\\"\\n+)\\n+\\n+const defaulRedisInitialPasswordSecretName = \\\"argocd-redis\\\"\\n+const defaultResisInitialPasswordKey = \\\"auth\\\"\\n+\\n+func generateRandomPassword() (string, error) {\\n+\\tconst initialPasswordLength = 16\\n+\\tconst letters = \\\"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\\\"\\n+\\trandBytes := make([]byte, initialPasswordLength)\\n+\\tfor i := 0; i < initialPasswordLength; i++ {\\n+\\t\\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\\n+\\t\\tif err != nil {\\n+\\t\\t\\treturn \\\"\\\", err\\n+\\t\\t}\\n+\\t\\trandBytes[i] = letters[num.Int64()]\\n+\\t}\\n+\\tinitialPassword := string(randBytes)\\n+\\treturn initialPassword, nil\\n+}\\n+\\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\\n+func NewRedisInitialPasswordCommand() *cobra.Command {\\n+\\tvar (\\n+\\t\\tclientConfig clientcmd.ClientConfig\\n+\\t)\\n+\\tvar command = cobra.Command{\\n+\\t\\tUse: \\\"redis-initial-password\\\",\\n+\\t\\tShort: \\\"Ensure the Redis password exists, creating a new one if necessary.\\\",\\n+\\t\\tRun: func(c *cobra.Command, args []string) {\\n+\\t\\t\\tnamespace, _, err := clientConfig.Namespace()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\\n+\\t\\t\\tredisInitialPasswordKey := defaultResisInitialPasswordKey\\n+\\t\\t\\tfmt.Printf(\\\"Checking for initial Redis password in secret %s/%s at key %s. \\\\n\\\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\\n+\\n+\\t\\t\\tconfig, err := clientConfig.ClientConfig()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\\n+\\n+\\t\\t\\tkubeClientset := kubernetes.NewForConfigOrDie(config)\\n+\\n+\\t\\t\\trandomPassword, err := generateRandomPassword()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tdata := map[string][]byte{\\n+\\t\\t\\t\\tredisInitialPasswordKey: []byte(randomPassword),\\n+\\t\\t\\t}\\n+\\t\\t\\tsecret := &corev1.Secret{\\n+\\t\\t\\t\\tObjectMeta: metav1.ObjectMeta{\\n+\\t\\t\\t\\t\\tName: redisInitialPasswordSecretName,\\n+\\t\\t\\t\\t\\tNamespace: namespace,\\n+\\t\\t\\t\\t},\\n+\\t\\t\\t\\tData: data,\\n+\\t\\t\\t\\tType: corev1.SecretTypeOpaque,\\n+\\t\\t\\t}\\n+\\t\\t\\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\\n+\\t\\t\\tif err != nil && !apierr.IsAlreadyExists(err) {\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\n+\\t\\t\\tfmt.Println(\\\"Argo CD Redis secret state confirmed: secret name argocd-redis.\\\")\\n+\\t\\t\\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\\n+\\t\\t\\t\\tfmt.Println(\\\"Password secret is configured properly.\\\")\\n+\\t\\t\\t} else {\\n+\\t\\t\\t\\terr := fmt.Errorf(\\\"key %s doesn't exist in secret %s. \\\\n\\\", redisInitialPasswordKey, redisInitialPasswordSecretName)\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\t\\t},\\n+\\t}\\n+\\n+\\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\\n+\\n+\\treturn &command\\n+}\\ndiff --git a/docs/faq.md b/docs/faq.md\\nindex 588415fc04d2d..111c8dfa9d4fb 100644\\n--- a/docs/faq.md\\n+++ b/docs/faq.md\\n@@ -259,3 +259,45 @@ The most common instance of this error is with `env:` fields for `containers`.\\n \\n !!! note \\\"Dynamic applications\\\"\\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\\n+\\n+## How to rotate Redis secret?\\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \\n+```bash\\n+kubectl delete secret argocd-redis -n <argocd namesapce>\\n+```\\n+* If you are running Redis in HA mode, restart Redis in HA.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\\n+kubectl rollout restart statefulset argocd-redis-ha-server\\n+```\\n+* If you are running Redis in non-HA mode, restart Redis.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis\\n+```\\n+* Restart other components.\\n+```bash\\n+kubectl rollout restart deployment argocd-server argocd-repo-server\\n+kubectl rollout restart statefulset argocd-application-controller\\n+```\\n+\\n+## How to turn off Redis auth if users really want to?\\n+\\n+Argo CD default installation is now configured automatically enable Redis authentication. \\n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\\n+\\n+* You need to have your own Redis installation.\\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\\n+ * When HA Redis is used:\\n+ * kubectl delete deployment argocd-redis-ha-haproxy\\n+ * kubectl delete statefulset argocd-redis-ha-server\\n+ * When non-HA Redis is used:\\n+ * kubectl delete deployment argocd-redis\\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\\n+ * Deployment: argocd-repo-server:\\n+ * Deployment: argocd-server\\n+ * StatefulSet: argocd-application-controller\\n+ \\n+## How do I provide my own Redis credentials?\\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+You can config your secret provider to generate Kubernetes secret accordingly.\\n\\\\ No newline at end of file\\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\\nindex d81bd08897ad8..c4438b14705d0 100644\\n--- a/docs/getting_started.md\\n+++ b/docs/getting_started.md\\n@@ -38,6 +38,9 @@ Do one of:\\n \\n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\\n \\n+!!! note\\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+\\n ## 2. Download Argo CD CLI\\n \\n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\\nindex aff92561bdf7f..f1291ffde9184 100644\\n--- a/docs/user-guide/commands/argocd_admin.md\\n+++ b/docs/user-guide/commands/argocd_admin.md\\n@@ -46,6 +46,7 @@ argocd admin [flags]\\n * [argocd admin initial-password](argocd_admin_initial-password.md)\\t - Prints initial password to log in to Argo CD for the first time\\n * [argocd admin notifications](argocd_admin_notifications.md)\\t - Set of CLI commands that helps manage notifications settings\\n * [argocd admin proj](argocd_admin_proj.md)\\t - Manage projects configuration\\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\\t - Ensure the Redis password exists, creating a new one if necessary.\\n * [argocd admin repo](argocd_admin_repo.md)\\t - Manage repositories configuration\\n * [argocd admin settings](argocd_admin_settings.md)\\t - Provides set of commands for settings validation and troubleshooting\\n \\ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\nnew file mode 100644\\nindex 0000000000000..85e56195758dd\\n--- /dev/null\\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n@@ -0,0 +1,67 @@\\n+# `argocd admin redis-initial-password` Command Reference\\n+\\n+## argocd admin redis-initial-password\\n+\\n+Ensure the Redis password exists, creating a new one if necessary.\\n+\\n+```\\n+argocd admin redis-initial-password [flags]\\n+```\\n+\\n+### Options\\n+\\n+```\\n+ --as string Username to impersonate for the operation\\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\\n+ --as-uid string UID to impersonate for the operation\\n+ --certificate-authority string Path to a cert file for the certificate authority\\n+ --client-certificate string Path to a client certificate file for TLS\\n+ --client-key string Path to a client key file for TLS\\n+ --cluster string The name of the kubeconfig cluster to use\\n+ --context string The name of the kubeconfig context to use\\n+ --disable-compression If true, opt-out of response compression for all requests to the server\\n+ -h, --help help for redis-initial-password\\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\\n+ -n, --namespace string If present, the namespace scope for this CLI request\\n+ --password string Password for basic authentication to the API server\\n+ --proxy-url string If provided, this URL will be used to connect via proxy\\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \\\"0\\\")\\n+ --server string The address and port of the Kubernetes API server\\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\\n+ --token string Bearer token for authentication to the API server\\n+ --user string The name of the kubeconfig user to use\\n+ --username string Username for basic authentication to the API server\\n+```\\n+\\n+### Options inherited from parent commands\\n+\\n+```\\n+ --auth-token string Authentication token\\n+ --client-crt string Client certificate file\\n+ --client-crt-key string Client certificate key file\\n+ --config string Path to Argo CD config (default \\\"/home/user/.config/argocd/config\\\")\\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-application-controller\\\")\\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\\n+ --insecure Skip server certificate and domain verification\\n+ --kube-context string Directs the command to the given kube-context\\n+ --logformat string Set the logging format. One of: text|json (default \\\"text\\\")\\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \\\"info\\\")\\n+ --plaintext Disable TLS\\n+ --port-forward Connect to a random argocd-server port using port forwarding\\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis-ha-haproxy\\\")\\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis\\\")\\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-repo-server\\\")\\n+ --server-crt string Server certificate file\\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-server\\\")\\n+```\\n+\\n+### SEE ALSO\\n+\\n+* [argocd admin](argocd_admin.md)\\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\\n+\\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\nindex c1573ec3a3501..c4e369e4b88e5 100644\\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n@@ -21,6 +21,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\\nindex bcbe729ac6d00..c591db0d0aa4a 100644\\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\\n@@ -15,6 +15,23 @@ spec:\\n labels:\\n app.kubernetes.io/name: argocd-redis\\n spec:\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -30,6 +47,13 @@ spec:\\n - \\\"\\\"\\n - \\\"--appendonly\\\"\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n ports:\\n - containerPort: 6379\\n securityContext:\\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\\nnew file mode 100644\\nindex 0000000000000..a7a33f48a4c11\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-role.yaml\\n@@ -0,0 +1,23 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\\nnew file mode 100644\\nindex 0000000000000..f396914dffdca\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\\n@@ -0,0 +1,15 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+ - kind: ServiceAccount\\n+ name: argocd-redis\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\\nindex 4a0b64c4da6a8..f13b17e134234 100644\\n--- a/manifests/base/redis/kustomization.yaml\\n+++ b/manifests/base/redis/kustomization.yaml\\n@@ -6,3 +6,5 @@ resources:\\n - argocd-redis-sa.yaml\\n - argocd-redis-service.yaml\\n - argocd-redis-network-policy.yaml\\n+- argocd-redis-role.yaml\\n+- argocd-redis-rolebinding.yaml\\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\nindex eb230e0f9b856..49182f59f1a09 100644\\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n@@ -24,6 +24,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\\nindex 45b2cdb8df285..f8a5fb2570970 100644\\n--- a/manifests/base/server/argocd-server-deployment.yaml\\n+++ b/manifests/base/server/argocd-server-deployment.yaml\\n@@ -23,6 +23,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\\nindex d57d56ce0f069..2fd3b4d83fdb2 100644\\n--- a/manifests/core-install.yaml\\n+++ b/manifests/core-install.yaml\\n@@ -18524,6 +18524,30 @@ rules:\\n - watch\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRole\\n metadata:\\n labels:\\n@@ -18576,6 +18600,22 @@ subjects:\\n name: argocd-applicationset-controller\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRoleBinding\\n metadata:\\n labels:\\n@@ -18969,6 +19009,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -18980,6 +19027,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -19024,6 +19088,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -19311,6 +19380,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\\nindex 9e5e9273942da..25a568b2620d4 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\\n@@ -1,6 +1,6 @@\\n dependencies:\\n - name: redis-ha\\n repository: https://dandydeveloper.github.io/charts\\n- version: 4.22.3\\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\\n-generated: \\\"2022-11-02T16:57:25.047025473-07:00\\\"\\n+ version: 4.26.6\\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\\n+generated: \\\"2024-04-10T11:02:32.957812-07:00\\\"\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\\nindex bdcde75a60727..618eecda6ddcc 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\\n@@ -1,4 +1,4 @@\\n dependencies:\\n - name: redis-ha\\n- version: 4.22.3\\n+ version: 4.26.6\\n repository: https://dandydeveloper.github.io/charts\\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\\nindex a94bba0f09062..3d705de257c83 100644\\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\\n@@ -9,8 +9,10 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\\n apiVersion: v1\\n@@ -21,7 +23,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\\n@@ -33,7 +35,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis.conf: |\\n@@ -50,6 +52,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n \\n sentinel.conf: |\\n dir \\\"/data\\\"\\n@@ -59,6 +63,7 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n \\n init.sh: |\\n echo \\\"$(date) Start...\\\"\\n@@ -82,7 +87,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -191,9 +196,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -226,7 +231,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -345,7 +350,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -454,9 +459,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -489,7 +494,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -554,9 +559,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -564,9 +569,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -576,9 +581,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -591,6 +596,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -674,6 +680,8 @@ data:\\n mode tcp\\n option tcp-check\\n tcp-check connect\\n+ tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n+ tcp-check expect string +OK\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send info\\\\ replication\\\\r\\\\n\\n@@ -723,6 +731,7 @@ data:\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -759,12 +768,13 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -777,6 +787,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -809,7 +820,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n rules:\\n - apiGroups:\\n - \\\"\\\"\\n@@ -828,7 +839,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n rules:\\n - apiGroups:\\n@@ -848,7 +859,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n subjects:\\n - kind: ServiceAccount\\n name: argocd-redis-ha\\n@@ -867,7 +878,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n subjects:\\n - kind: ServiceAccount\\n@@ -887,9 +898,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -917,9 +927,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -947,9 +956,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -977,7 +985,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n spec:\\n type: ClusterIP\\n@@ -1005,7 +1013,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n annotations:\\n spec:\\n@@ -1029,7 +1037,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n spec:\\n strategy:\\n type: RollingUpdate\\n@@ -1045,9 +1053,11 @@ spec:\\n labels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n annotations:\\n- checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321\\n+ prometheus.io/port: \\\"9101\\\"\\n+ prometheus.io/scrape: \\\"true\\\"\\n+ prometheus.io/path: \\\"/metrics\\\"\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n spec:\\n # Needed when using unmodified rbac-setup.yml\\n \\n@@ -1067,11 +1077,10 @@ spec:\\n matchLabels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n topologyKey: kubernetes.io/hostname\\n initContainers:\\n - name: config-init\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1095,7 +1104,7 @@ spec:\\n mountPath: /data\\n containers:\\n - name: haproxy\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n securityContext: \\n allowPrivilegeEscalation: false\\n@@ -1105,6 +1114,12 @@ spec:\\n runAsNonRoot: true\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n httpGet:\\n path: /healthz\\n@@ -1151,7 +1166,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n {}\\n spec:\\n@@ -1167,7 +1182,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n release: argocd\\n app: redis-ha\\n@@ -1191,7 +1206,7 @@ spec:\\n automountServiceAccountToken: false\\n initContainers:\\n - name: config-init\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1215,6 +1230,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n volumeMounts:\\n - name: config\\n mountPath: /readonly-config\\n@@ -1225,12 +1245,12 @@ spec:\\n \\n containers:\\n - name: redis\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n- - redis-server\\n+ - redis-server\\n args:\\n- - /data/conf/redis.conf\\n+ - /data/conf/redis.conf\\n securityContext: \\n allowPrivilegeEscalation: false\\n capabilities:\\n@@ -1240,6 +1260,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1282,7 +1308,7 @@ spec:\\n - /bin/sh\\n - /readonly-config/trigger-failover-if-master.sh\\n - name: sentinel\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - redis-sentinel\\n@@ -1297,6 +1323,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1333,7 +1365,7 @@ spec:\\n {}\\n \\n - name: split-brain-fix\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - sh\\n@@ -1355,6 +1387,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n resources:\\n {}\\n volumeMounts:\\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\\nindex 3fe3647c0b4a4..c6e6bb9dc246a 100644\\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\\n@@ -1,4 +1,7 @@\\n redis-ha:\\n+ auth: true\\n+ authKey: auth\\n+ existingSecret: argocd-redis\\n persistentVolume:\\n enabled: false\\n redis:\\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\\nindex bf0c6c3dff255..0da9beb9930e8 100644\\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\\n@@ -20,7 +20,7 @@ patches:\\n kind: ConfigMap\\n name: argocd-redis-ha-configmap\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n version: v1\\n group: \\\"\\\"\\n@@ -34,28 +34,28 @@ patches:\\n kind: ServiceAccount\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: RoleBinding\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n@@ -294,3 +294,15 @@ patches:\\n kind: StatefulSet\\n name: argocd-redis-ha-server\\n path: overlays/statefulset-containers-securityContext.yaml\\n+- target:\\n+ group: rbac.authorization.k8s.io\\n+ version: v1\\n+ kind: Role\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/haproxy-role.yaml\\n+- target:\\n+ group: apps\\n+ version: v1\\n+ kind: Deployment\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/deployment-initContainers.yaml\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\nnew file mode 100644\\nindex 0000000000000..8e6ea2754a9fa\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n@@ -0,0 +1,16 @@\\n+- op: add\\n+ path: /spec/template/spec/initContainers/0\\n+ value:\\n+ name: secret-init\\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\nnew file mode 100644\\nindex 0000000000000..b74a48006a977\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n@@ -0,0 +1,20 @@\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\\nindex 5008af2fd2e85..7f4b50f07295a 100644\\n--- a/manifests/ha/install.yaml\\n+++ b/manifests/ha/install.yaml\\n@@ -18426,6 +18426,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -18648,6 +18650,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -18985,7 +19001,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -19094,9 +19110,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -19129,7 +19145,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -19194,9 +19210,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -19204,9 +19220,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -19216,9 +19232,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -19231,6 +19247,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -19273,9 +19290,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -19336,7 +19354,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -19445,9 +19463,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -19480,7 +19498,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -19588,6 +19606,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -19596,10 +19616,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -19639,6 +19661,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -19651,6 +19674,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -19838,8 +19862,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -19864,8 +19886,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -19890,8 +19910,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -20380,7 +20398,10 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n+ prometheus.io/path: /metrics\\n+ prometheus.io/port: \\\"9101\\\"\\n+ prometheus.io/scrape: \\\"true\\\"\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n name: argocd-redis-ha-haproxy\\n@@ -20393,7 +20414,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -20426,11 +20453,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -20498,6 +20541,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -20785,6 +20833,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -21107,6 +21160,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -21307,7 +21365,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -21324,7 +21382,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -21378,7 +21442,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -21431,7 +21501,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -21461,7 +21536,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\\nindex 77663b1c6559e..3fe7ba1a493af 100644\\n--- a/manifests/ha/namespace-install.yaml\\n+++ b/manifests/ha/namespace-install.yaml\\n@@ -43,6 +43,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -265,6 +267,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -497,7 +513,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -606,9 +622,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -641,7 +657,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -706,9 +722,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -716,9 +732,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -728,9 +744,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -743,6 +759,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -785,9 +802,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -848,7 +866,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -957,9 +975,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -992,7 +1010,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -1100,6 +1118,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -1108,10 +1128,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -1151,6 +1173,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1163,6 +1186,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1350,8 +1374,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1376,8 +1398,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1402,8 +1422,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1892,7 +1910,10 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n+ prometheus.io/path: /metrics\\n+ prometheus.io/port: \\\"9101\\\"\\n+ prometheus.io/scrape: \\\"true\\\"\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n name: argocd-redis-ha-haproxy\\n@@ -1905,7 +1926,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -1938,11 +1965,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -2010,6 +2053,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -2297,6 +2345,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -2619,6 +2672,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -2819,7 +2877,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -2836,7 +2894,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -2890,7 +2954,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -2943,7 +3013,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -2973,7 +3048,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\\nindex d50d7152cf323..a01695bd478a6 100644\\n--- a/manifests/install.yaml\\n+++ b/manifests/install.yaml\\n@@ -18616,6 +18616,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -18795,6 +18819,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -19500,6 +19540,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -19511,6 +19558,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -19555,6 +19619,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -19840,6 +19909,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -20162,6 +20236,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\\nindex 65c776d3fa371..4ff8fb79f8d15 100644\\n--- a/manifests/namespace-install.yaml\\n+++ b/manifests/namespace-install.yaml\\n@@ -233,6 +233,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -341,6 +365,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -1012,6 +1052,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -1023,6 +1070,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -1067,6 +1131,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -1352,6 +1421,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -1674,6 +1748,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\\nindex 4e96db6621376..80c008ab1b2d0 100644\\n--- a/reposerver/repository/repository_test.go\\n+++ b/reposerver/repository/repository_test.go\\n@@ -159,7 +159,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\\n \\t}\\n \\n \\t// update this value if we add/remove manifests\\n-\\tconst countOfManifests = 48\\n+\\tconst countOfManifests = 50\\n \\n \\tres1, err := service.GenerateManifest(context.Background(), &q)\\n \\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/4e2fe302c3352a0012ecbe7f03476b0e07f7fc6c\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From 4e2fe302c3352a0012ecbe7f03476b0e07f7fc6c Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:23:10 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/53570cbd143bced49d4376d6e31bd9c7bd2659ff\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From 53570cbd143bced49d4376d6e31bd9c7bd2659ff Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:22:43 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n---\\n cmd/argocd/commands/admin/admin.go | 1 +\\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\\n docs/faq.md | 42 ++++++\\n docs/getting_started.md | 3 +\\n docs/user-guide/commands/argocd_admin.md | 1 +\\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\\n ...ocd-application-controller-deployment.yaml | 7 +-\\n ...cd-application-controller-statefulset.yaml | 5 +\\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\\n manifests/base/redis/kustomization.yaml | 2 +\\n .../argocd-repo-server-deployment.yaml | 5 +\\n .../base/server/argocd-server-deployment.yaml | 5 +\\n manifests/core-install.yaml | 74 ++++++++++\\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\\n .../ha/base/redis-ha/chart/upstream.yaml | 122 +++++++++------\\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\\n .../overlays/deployment-initContainers.yaml | 16 ++\\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\\n manifests/ha/install.yaml | 139 ++++++++++++++----\\n manifests/ha/namespace-install.yaml | 139 ++++++++++++++----\\n manifests/install.yaml | 79 ++++++++++\\n manifests/namespace-install.yaml | 79 ++++++++++\\n reposerver/repository/repository_test.go | 2 +-\\n 27 files changed, 884 insertions(+), 117 deletions(-)\\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n\\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\\nindex b2aa8aab8d05c..b72398a9d70ac 100644\\n--- a/cmd/argocd/commands/admin/admin.go\\n+++ b/cmd/argocd/commands/admin/admin.go\\n@@ -60,6 +60,7 @@ func NewAdminCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {\\n \\tcommand.AddCommand(NewDashboardCommand(clientOpts))\\n \\tcommand.AddCommand(NewNotificationsCommand())\\n \\tcommand.AddCommand(NewInitialPasswordCommand())\\n+\\tcommand.AddCommand(NewRedisInitialPasswordCommand())\\n \\n \\tcommand.Flags().StringVar(&cmdutil.LogFormat, \\\"logformat\\\", \\\"text\\\", \\\"Set the logging format. One of: text|json\\\")\\n \\tcommand.Flags().StringVar(&cmdutil.LogLevel, \\\"loglevel\\\", \\\"info\\\", \\\"Set the logging level. One of: debug|info|warn|error\\\")\\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\\nnew file mode 100644\\nindex 0000000000000..8fa1e70ad890e\\n--- /dev/null\\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\\n@@ -0,0 +1,98 @@\\n+package admin\\n+\\n+import (\\n+\\t\\\"context\\\"\\n+\\t\\\"crypto/rand\\\"\\n+\\t\\\"fmt\\\"\\n+\\t\\\"math/big\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\\\"\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/cli\\\"\\n+\\tapierr \\\"k8s.io/apimachinery/pkg/api/errors\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/errors\\\"\\n+\\tmetav1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\tv1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\t\\\"k8s.io/client-go/kubernetes\\\"\\n+\\t\\\"k8s.io/client-go/tools/clientcmd\\\"\\n+\\n+\\t\\\"github.com/spf13/cobra\\\"\\n+\\tcorev1 \\\"k8s.io/api/core/v1\\\"\\n+)\\n+\\n+const defaulRedisInitialPasswordSecretName = \\\"argocd-redis\\\"\\n+const defaultResisInitialPasswordKey = \\\"auth\\\"\\n+\\n+func generateRandomPassword() (string, error) {\\n+\\tconst initialPasswordLength = 16\\n+\\tconst letters = \\\"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\\\"\\n+\\trandBytes := make([]byte, initialPasswordLength)\\n+\\tfor i := 0; i < initialPasswordLength; i++ {\\n+\\t\\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\\n+\\t\\tif err != nil {\\n+\\t\\t\\treturn \\\"\\\", err\\n+\\t\\t}\\n+\\t\\trandBytes[i] = letters[num.Int64()]\\n+\\t}\\n+\\tinitialPassword := string(randBytes)\\n+\\treturn initialPassword, nil\\n+}\\n+\\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\\n+func NewRedisInitialPasswordCommand() *cobra.Command {\\n+\\tvar (\\n+\\t\\tclientConfig clientcmd.ClientConfig\\n+\\t)\\n+\\tvar command = cobra.Command{\\n+\\t\\tUse: \\\"redis-initial-password\\\",\\n+\\t\\tShort: \\\"Ensure the Redis password exists, creating a new one if necessary.\\\",\\n+\\t\\tRun: func(c *cobra.Command, args []string) {\\n+\\t\\t\\tnamespace, _, err := clientConfig.Namespace()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\\n+\\t\\t\\tredisInitialPasswordKey := defaultResisInitialPasswordKey\\n+\\t\\t\\tfmt.Printf(\\\"Checking for initial Redis password in secret %s/%s at key %s. \\\\n\\\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\\n+\\n+\\t\\t\\tconfig, err := clientConfig.ClientConfig()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\\n+\\n+\\t\\t\\tkubeClientset := kubernetes.NewForConfigOrDie(config)\\n+\\n+\\t\\t\\trandomPassword, err := generateRandomPassword()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tdata := map[string][]byte{\\n+\\t\\t\\t\\tredisInitialPasswordKey: []byte(randomPassword),\\n+\\t\\t\\t}\\n+\\t\\t\\tsecret := &corev1.Secret{\\n+\\t\\t\\t\\tObjectMeta: metav1.ObjectMeta{\\n+\\t\\t\\t\\t\\tName: redisInitialPasswordSecretName,\\n+\\t\\t\\t\\t\\tNamespace: namespace,\\n+\\t\\t\\t\\t},\\n+\\t\\t\\t\\tData: data,\\n+\\t\\t\\t\\tType: corev1.SecretTypeOpaque,\\n+\\t\\t\\t}\\n+\\t\\t\\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\\n+\\t\\t\\tif err != nil && !apierr.IsAlreadyExists(err) {\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\n+\\t\\t\\tfmt.Println(\\\"Argo CD Redis secret state confirmed: secret name argocd-redis.\\\")\\n+\\t\\t\\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\\n+\\t\\t\\t\\tfmt.Println(\\\"Password secret is configured properly.\\\")\\n+\\t\\t\\t} else {\\n+\\t\\t\\t\\terr := fmt.Errorf(\\\"key %s doesn't exist in secret %s. \\\\n\\\", redisInitialPasswordKey, redisInitialPasswordSecretName)\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\t\\t},\\n+\\t}\\n+\\n+\\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\\n+\\n+\\treturn &command\\n+}\\ndiff --git a/docs/faq.md b/docs/faq.md\\nindex 19273acc04d23..505f47d143bba 100644\\n--- a/docs/faq.md\\n+++ b/docs/faq.md\\n@@ -259,3 +259,45 @@ The most common instance of this error is with `env:` fields for `containers`.\\n \\n !!! note \\\"Dynamic applications\\\"\\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\\n+\\n+## How to rotate Redis secret?\\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \\n+```bash\\n+kubectl delete secret argocd-redis -n <argocd namesapce>\\n+```\\n+* If you are running Redis in HA mode, restart Redis in HA.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\\n+kubectl rollout restart statefulset argocd-redis-ha-server\\n+```\\n+* If you are running Redis in non-HA mode, restart Redis.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis\\n+```\\n+* Restart other components.\\n+```bash\\n+kubectl rollout restart deployment argocd-server argocd-repo-server\\n+kubectl rollout restart statefulset argocd-application-controller\\n+```\\n+\\n+## How to turn off Redis auth if users really want to?\\n+\\n+Argo CD default installation is now configured automatically enable Redis authentication. \\n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\\n+\\n+* You need to have your own Redis installation.\\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\\n+ * When HA Redis is used:\\n+ * kubectl delete deployment argocd-redis-ha-haproxy\\n+ * kubectl delete statefulset argocd-redis-ha-server\\n+ * When non-HA Redis is used:\\n+ * kubectl delete deployment argocd-redis\\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\\n+ * Deployment: argocd-repo-server:\\n+ * Deployment: argocd-server\\n+ * StatefulSet: argocd-application-controller\\n+ \\n+## How do I provide my own Redis credentials?\\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+You can config your secret provider to generate Kubernetes secret accordingly.\\n\\\\ No newline at end of file\\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\\nindex d81bd08897ad8..c4438b14705d0 100644\\n--- a/docs/getting_started.md\\n+++ b/docs/getting_started.md\\n@@ -38,6 +38,9 @@ Do one of:\\n \\n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\\n \\n+!!! note\\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+\\n ## 2. Download Argo CD CLI\\n \\n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\\nindex 7a3ff2fde6e89..b6e09566d5119 100644\\n--- a/docs/user-guide/commands/argocd_admin.md\\n+++ b/docs/user-guide/commands/argocd_admin.md\\n@@ -53,6 +53,7 @@ argocd admin [flags]\\n * [argocd admin initial-password](argocd_admin_initial-password.md)\\t - Prints initial password to log in to Argo CD for the first time\\n * [argocd admin notifications](argocd_admin_notifications.md)\\t - Set of CLI commands that helps manage notifications settings\\n * [argocd admin proj](argocd_admin_proj.md)\\t - Manage projects configuration\\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\\t - Ensure the Redis password exists, creating a new one if necessary.\\n * [argocd admin repo](argocd_admin_repo.md)\\t - Manage repositories configuration\\n * [argocd admin settings](argocd_admin_settings.md)\\t - Provides set of commands for settings validation and troubleshooting\\n \\ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\nnew file mode 100644\\nindex 0000000000000..85e56195758dd\\n--- /dev/null\\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n@@ -0,0 +1,67 @@\\n+# `argocd admin redis-initial-password` Command Reference\\n+\\n+## argocd admin redis-initial-password\\n+\\n+Ensure the Redis password exists, creating a new one if necessary.\\n+\\n+```\\n+argocd admin redis-initial-password [flags]\\n+```\\n+\\n+### Options\\n+\\n+```\\n+ --as string Username to impersonate for the operation\\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\\n+ --as-uid string UID to impersonate for the operation\\n+ --certificate-authority string Path to a cert file for the certificate authority\\n+ --client-certificate string Path to a client certificate file for TLS\\n+ --client-key string Path to a client key file for TLS\\n+ --cluster string The name of the kubeconfig cluster to use\\n+ --context string The name of the kubeconfig context to use\\n+ --disable-compression If true, opt-out of response compression for all requests to the server\\n+ -h, --help help for redis-initial-password\\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\\n+ -n, --namespace string If present, the namespace scope for this CLI request\\n+ --password string Password for basic authentication to the API server\\n+ --proxy-url string If provided, this URL will be used to connect via proxy\\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \\\"0\\\")\\n+ --server string The address and port of the Kubernetes API server\\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\\n+ --token string Bearer token for authentication to the API server\\n+ --user string The name of the kubeconfig user to use\\n+ --username string Username for basic authentication to the API server\\n+```\\n+\\n+### Options inherited from parent commands\\n+\\n+```\\n+ --auth-token string Authentication token\\n+ --client-crt string Client certificate file\\n+ --client-crt-key string Client certificate key file\\n+ --config string Path to Argo CD config (default \\\"/home/user/.config/argocd/config\\\")\\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-application-controller\\\")\\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\\n+ --insecure Skip server certificate and domain verification\\n+ --kube-context string Directs the command to the given kube-context\\n+ --logformat string Set the logging format. One of: text|json (default \\\"text\\\")\\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \\\"info\\\")\\n+ --plaintext Disable TLS\\n+ --port-forward Connect to a random argocd-server port using port forwarding\\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis-ha-haproxy\\\")\\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis\\\")\\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-repo-server\\\")\\n+ --server-crt string Server certificate file\\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-server\\\")\\n+```\\n+\\n+### SEE ALSO\\n+\\n+* [argocd admin](argocd_admin.md)\\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\\n+\\ndiff --git a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\nindex 14cb1a317bab3..f67587fa91f7e 100644\\n--- a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\n+++ b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\n@@ -22,6 +22,11 @@ spec:\\n env:\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -215,4 +220,4 @@ spec:\\n - key: tls.key\\n path: tls.key\\n - key: ca.crt\\n- path: ca.crt\\n\\\\ No newline at end of file\\n+ path: ca.crt\\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\nindex a15350e941c2f..002a7e2e292b1 100644\\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n@@ -21,6 +21,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\\nindex bcbe729ac6d00..c591db0d0aa4a 100644\\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\\n@@ -15,6 +15,23 @@ spec:\\n labels:\\n app.kubernetes.io/name: argocd-redis\\n spec:\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -30,6 +47,13 @@ spec:\\n - \\\"\\\"\\n - \\\"--appendonly\\\"\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n ports:\\n - containerPort: 6379\\n securityContext:\\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\\nnew file mode 100644\\nindex 0000000000000..a7a33f48a4c11\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-role.yaml\\n@@ -0,0 +1,23 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\\nnew file mode 100644\\nindex 0000000000000..f396914dffdca\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\\n@@ -0,0 +1,15 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+ - kind: ServiceAccount\\n+ name: argocd-redis\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\\nindex 4a0b64c4da6a8..f13b17e134234 100644\\n--- a/manifests/base/redis/kustomization.yaml\\n+++ b/manifests/base/redis/kustomization.yaml\\n@@ -6,3 +6,5 @@ resources:\\n - argocd-redis-sa.yaml\\n - argocd-redis-service.yaml\\n - argocd-redis-network-policy.yaml\\n+- argocd-redis-role.yaml\\n+- argocd-redis-rolebinding.yaml\\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\nindex eb230e0f9b856..49182f59f1a09 100644\\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n@@ -24,6 +24,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\\nindex 45b2cdb8df285..f8a5fb2570970 100644\\n--- a/manifests/base/server/argocd-server-deployment.yaml\\n+++ b/manifests/base/server/argocd-server-deployment.yaml\\n@@ -23,6 +23,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\\nindex 9775ec65f1737..99683d9b0e4e2 100644\\n--- a/manifests/core-install.yaml\\n+++ b/manifests/core-install.yaml\\n@@ -20382,6 +20382,30 @@ rules:\\n - watch\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRole\\n metadata:\\n labels:\\n@@ -20434,6 +20458,22 @@ subjects:\\n name: argocd-applicationset-controller\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRoleBinding\\n metadata:\\n labels:\\n@@ -20839,6 +20879,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -20850,6 +20897,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -20894,6 +20958,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -21181,6 +21250,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\\nindex 9e5e9273942da..25a568b2620d4 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\\n@@ -1,6 +1,6 @@\\n dependencies:\\n - name: redis-ha\\n repository: https://dandydeveloper.github.io/charts\\n- version: 4.22.3\\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\\n-generated: \\\"2022-11-02T16:57:25.047025473-07:00\\\"\\n+ version: 4.26.6\\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\\n+generated: \\\"2024-04-10T11:02:32.957812-07:00\\\"\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\\nindex bdcde75a60727..618eecda6ddcc 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\\n@@ -1,4 +1,4 @@\\n dependencies:\\n - name: redis-ha\\n- version: 4.22.3\\n+ version: 4.26.6\\n repository: https://dandydeveloper.github.io/charts\\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\\nindex e78ed94856d91..3aeabcbf53f64 100644\\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\\n@@ -9,8 +9,10 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\\n apiVersion: v1\\n@@ -21,7 +23,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\\n@@ -33,7 +35,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis.conf: |\\n@@ -50,6 +52,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n \\n sentinel.conf: |\\n dir \\\"/data\\\"\\n@@ -59,6 +63,7 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n \\n init.sh: |\\n echo \\\"$(date) Start...\\\"\\n@@ -82,7 +87,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -191,9 +196,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -226,7 +231,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -345,7 +350,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -454,9 +459,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -489,7 +494,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -554,9 +559,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -564,9 +569,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -576,9 +581,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -591,6 +596,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -674,6 +680,8 @@ data:\\n mode tcp\\n option tcp-check\\n tcp-check connect\\n+ tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n+ tcp-check expect string +OK\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send info\\\\ replication\\\\r\\\\n\\n@@ -730,6 +738,7 @@ data:\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -766,12 +775,13 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -784,6 +794,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -816,7 +827,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n rules:\\n - apiGroups:\\n - \\\"\\\"\\n@@ -835,7 +846,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n rules:\\n - apiGroups:\\n@@ -855,7 +866,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n subjects:\\n - kind: ServiceAccount\\n name: argocd-redis-ha\\n@@ -874,7 +885,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n subjects:\\n - kind: ServiceAccount\\n@@ -894,9 +905,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -924,9 +934,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -954,9 +963,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -984,7 +992,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n spec:\\n type: ClusterIP\\n@@ -1012,7 +1020,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n annotations:\\n spec:\\n@@ -1040,7 +1048,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n spec:\\n strategy:\\n type: RollingUpdate\\n@@ -1056,12 +1064,11 @@ spec:\\n labels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n annotations:\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n prometheus.io/path: \\\"/metrics\\\"\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n spec:\\n # Needed when using unmodified rbac-setup.yml\\n \\n@@ -1081,11 +1088,10 @@ spec:\\n matchLabels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n topologyKey: kubernetes.io/hostname\\n initContainers:\\n - name: config-init\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1109,7 +1115,7 @@ spec:\\n mountPath: /data\\n containers:\\n - name: haproxy\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n securityContext: \\n allowPrivilegeEscalation: false\\n@@ -1119,6 +1125,12 @@ spec:\\n runAsNonRoot: true\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n httpGet:\\n path: /healthz\\n@@ -1167,7 +1179,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n {}\\n spec:\\n@@ -1183,7 +1195,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n release: argocd\\n app: redis-ha\\n@@ -1207,7 +1219,7 @@ spec:\\n automountServiceAccountToken: false\\n initContainers:\\n - name: config-init\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1231,6 +1243,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n volumeMounts:\\n - name: config\\n mountPath: /readonly-config\\n@@ -1241,12 +1258,12 @@ spec:\\n \\n containers:\\n - name: redis\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n- - redis-server\\n+ - redis-server\\n args:\\n- - /data/conf/redis.conf\\n+ - /data/conf/redis.conf\\n securityContext: \\n allowPrivilegeEscalation: false\\n capabilities:\\n@@ -1256,6 +1273,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1298,7 +1321,7 @@ spec:\\n - /bin/sh\\n - /readonly-config/trigger-failover-if-master.sh\\n - name: sentinel\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - redis-sentinel\\n@@ -1313,6 +1336,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1349,7 +1378,7 @@ spec:\\n {}\\n \\n - name: split-brain-fix\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - sh\\n@@ -1371,6 +1400,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n resources:\\n {}\\n volumeMounts:\\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\\nindex c15def91ece21..9ba9fa918d34c 100644\\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\\n@@ -1,4 +1,7 @@\\n redis-ha:\\n+ auth: true\\n+ authKey: auth\\n+ existingSecret: argocd-redis\\n persistentVolume:\\n enabled: false\\n redis:\\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\\nindex bf0c6c3dff255..0da9beb9930e8 100644\\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\\n@@ -20,7 +20,7 @@ patches:\\n kind: ConfigMap\\n name: argocd-redis-ha-configmap\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n version: v1\\n group: \\\"\\\"\\n@@ -34,28 +34,28 @@ patches:\\n kind: ServiceAccount\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: RoleBinding\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n@@ -294,3 +294,15 @@ patches:\\n kind: StatefulSet\\n name: argocd-redis-ha-server\\n path: overlays/statefulset-containers-securityContext.yaml\\n+- target:\\n+ group: rbac.authorization.k8s.io\\n+ version: v1\\n+ kind: Role\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/haproxy-role.yaml\\n+- target:\\n+ group: apps\\n+ version: v1\\n+ kind: Deployment\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/deployment-initContainers.yaml\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\nnew file mode 100644\\nindex 0000000000000..8e6ea2754a9fa\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n@@ -0,0 +1,16 @@\\n+- op: add\\n+ path: /spec/template/spec/initContainers/0\\n+ value:\\n+ name: secret-init\\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\nnew file mode 100644\\nindex 0000000000000..b74a48006a977\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n@@ -0,0 +1,20 @@\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\\nindex bdd458ab42f8f..05487656e47c2 100644\\n--- a/manifests/ha/install.yaml\\n+++ b/manifests/ha/install.yaml\\n@@ -20276,6 +20276,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -20506,6 +20508,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -20844,7 +20860,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -20953,9 +20969,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -20988,7 +21004,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -21053,9 +21069,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -21063,9 +21079,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -21075,9 +21091,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -21090,6 +21106,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -21132,9 +21149,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -21197,7 +21215,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -21306,9 +21324,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -21341,7 +21359,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -21449,6 +21467,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -21457,10 +21477,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -21500,6 +21522,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -21512,6 +21535,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -21700,8 +21724,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -21726,8 +21748,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -21752,8 +21772,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22258,7 +22276,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n prometheus.io/path: /metrics\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n@@ -22274,7 +22292,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -22309,11 +22333,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -22381,6 +22421,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -22668,6 +22713,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -22990,6 +23040,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -23190,7 +23245,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -23207,7 +23262,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -23261,7 +23322,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -23314,7 +23381,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -23344,7 +23416,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\\nindex 002462ba3e09d..444d85bccc317 100644\\n--- a/manifests/ha/namespace-install.yaml\\n+++ b/manifests/ha/namespace-install.yaml\\n@@ -43,6 +43,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -273,6 +275,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -505,7 +521,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -614,9 +630,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -649,7 +665,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -714,9 +730,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -724,9 +740,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -736,9 +752,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -751,6 +767,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -793,9 +810,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -858,7 +876,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -967,9 +985,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -1002,7 +1020,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -1110,6 +1128,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -1118,10 +1138,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -1161,6 +1183,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1173,6 +1196,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1361,8 +1385,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1387,8 +1409,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1413,8 +1433,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1919,7 +1937,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n prometheus.io/path: /metrics\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n@@ -1935,7 +1953,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -1970,11 +1994,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -2042,6 +2082,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -2329,6 +2374,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -2651,6 +2701,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -2851,7 +2906,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -2868,7 +2923,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -2922,7 +2983,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -2975,7 +3042,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -3005,7 +3077,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\\nindex fbff6dbf89f29..459d398167b0e 100644\\n--- a/manifests/install.yaml\\n+++ b/manifests/install.yaml\\n@@ -20474,6 +20474,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -20654,6 +20678,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -21372,6 +21412,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -21383,6 +21430,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -21427,6 +21491,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -21712,6 +21781,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -22034,6 +22108,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\\nindex 85e4c203a91f1..2d2ab382c369f 100644\\n--- a/manifests/namespace-install.yaml\\n+++ b/manifests/namespace-install.yaml\\n@@ -241,6 +241,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -349,6 +373,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -1033,6 +1073,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -1044,6 +1091,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -1088,6 +1152,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -1373,6 +1442,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -1695,6 +1769,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\\nindex 225d68dc45235..d7d05bbdf5de8 100644\\n--- a/reposerver/repository/repository_test.go\\n+++ b/reposerver/repository/repository_test.go\\n@@ -199,7 +199,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\\n \\t}\\n \\n \\t// update this value if we add/remove manifests\\n-\\tconst countOfManifests = 48\\n+\\tconst countOfManifests = 50\\n \\n \\tres1, err := service.GenerateManifest(context.Background(), &q)\\n \\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/6ef7b62a0f67e74b4aac2aee31c98ae49dd95d12\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From 6ef7b62a0f67e74b4aac2aee31c98ae49dd95d12 Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:23:09 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/9552034a80070a93a161bfa330359585f3b85f07\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From 9552034a80070a93a161bfa330359585f3b85f07 Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:23:10 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/bdd889d43969ba738ddd15e1f674d27964048994\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From bdd889d43969ba738ddd15e1f674d27964048994 Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:22:43 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n---\\n cmd/argocd/commands/admin/admin.go | 1 +\\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\\n docs/faq.md | 42 ++++++\\n docs/getting_started.md | 3 +\\n docs/user-guide/commands/argocd_admin.md | 1 +\\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\\n ...ocd-application-controller-deployment.yaml | 5 +\\n ...cd-application-controller-statefulset.yaml | 5 +\\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\\n manifests/base/redis/kustomization.yaml | 2 +\\n .../argocd-repo-server-deployment.yaml | 5 +\\n .../base/server/argocd-server-deployment.yaml | 5 +\\n manifests/core-install.yaml | 74 ++++++++++\\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\\n .../ha/base/redis-ha/chart/upstream.yaml | 122 +++++++++------\\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\\n .../overlays/deployment-initContainers.yaml | 16 ++\\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\\n manifests/ha/install.yaml | 139 ++++++++++++++----\\n manifests/ha/namespace-install.yaml | 139 ++++++++++++++----\\n manifests/install.yaml | 79 ++++++++++\\n manifests/namespace-install.yaml | 79 ++++++++++\\n reposerver/repository/repository_test.go | 2 +-\\n 27 files changed, 883 insertions(+), 116 deletions(-)\\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n\\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\\nindex 49c81e4da4bfe..73f93deb898c9 100644\\n--- a/cmd/argocd/commands/admin/admin.go\\n+++ b/cmd/argocd/commands/admin/admin.go\\n@@ -141,6 +141,7 @@ $ argocd admin initial-password reset\\n \\tcommand.AddCommand(NewDashboardCommand(clientOpts))\\n \\tcommand.AddCommand(NewNotificationsCommand())\\n \\tcommand.AddCommand(NewInitialPasswordCommand())\\n+\\tcommand.AddCommand(NewRedisInitialPasswordCommand())\\n \\n \\tcommand.Flags().StringVar(&cmdutil.LogFormat, \\\"logformat\\\", \\\"text\\\", \\\"Set the logging format. One of: text|json\\\")\\n \\tcommand.Flags().StringVar(&cmdutil.LogLevel, \\\"loglevel\\\", \\\"info\\\", \\\"Set the logging level. One of: debug|info|warn|error\\\")\\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\\nnew file mode 100644\\nindex 0000000000000..8fa1e70ad890e\\n--- /dev/null\\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\\n@@ -0,0 +1,98 @@\\n+package admin\\n+\\n+import (\\n+\\t\\\"context\\\"\\n+\\t\\\"crypto/rand\\\"\\n+\\t\\\"fmt\\\"\\n+\\t\\\"math/big\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\\\"\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/cli\\\"\\n+\\tapierr \\\"k8s.io/apimachinery/pkg/api/errors\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/errors\\\"\\n+\\tmetav1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\tv1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\t\\\"k8s.io/client-go/kubernetes\\\"\\n+\\t\\\"k8s.io/client-go/tools/clientcmd\\\"\\n+\\n+\\t\\\"github.com/spf13/cobra\\\"\\n+\\tcorev1 \\\"k8s.io/api/core/v1\\\"\\n+)\\n+\\n+const defaulRedisInitialPasswordSecretName = \\\"argocd-redis\\\"\\n+const defaultResisInitialPasswordKey = \\\"auth\\\"\\n+\\n+func generateRandomPassword() (string, error) {\\n+\\tconst initialPasswordLength = 16\\n+\\tconst letters = \\\"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\\\"\\n+\\trandBytes := make([]byte, initialPasswordLength)\\n+\\tfor i := 0; i < initialPasswordLength; i++ {\\n+\\t\\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\\n+\\t\\tif err != nil {\\n+\\t\\t\\treturn \\\"\\\", err\\n+\\t\\t}\\n+\\t\\trandBytes[i] = letters[num.Int64()]\\n+\\t}\\n+\\tinitialPassword := string(randBytes)\\n+\\treturn initialPassword, nil\\n+}\\n+\\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\\n+func NewRedisInitialPasswordCommand() *cobra.Command {\\n+\\tvar (\\n+\\t\\tclientConfig clientcmd.ClientConfig\\n+\\t)\\n+\\tvar command = cobra.Command{\\n+\\t\\tUse: \\\"redis-initial-password\\\",\\n+\\t\\tShort: \\\"Ensure the Redis password exists, creating a new one if necessary.\\\",\\n+\\t\\tRun: func(c *cobra.Command, args []string) {\\n+\\t\\t\\tnamespace, _, err := clientConfig.Namespace()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\\n+\\t\\t\\tredisInitialPasswordKey := defaultResisInitialPasswordKey\\n+\\t\\t\\tfmt.Printf(\\\"Checking for initial Redis password in secret %s/%s at key %s. \\\\n\\\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\\n+\\n+\\t\\t\\tconfig, err := clientConfig.ClientConfig()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\\n+\\n+\\t\\t\\tkubeClientset := kubernetes.NewForConfigOrDie(config)\\n+\\n+\\t\\t\\trandomPassword, err := generateRandomPassword()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tdata := map[string][]byte{\\n+\\t\\t\\t\\tredisInitialPasswordKey: []byte(randomPassword),\\n+\\t\\t\\t}\\n+\\t\\t\\tsecret := &corev1.Secret{\\n+\\t\\t\\t\\tObjectMeta: metav1.ObjectMeta{\\n+\\t\\t\\t\\t\\tName: redisInitialPasswordSecretName,\\n+\\t\\t\\t\\t\\tNamespace: namespace,\\n+\\t\\t\\t\\t},\\n+\\t\\t\\t\\tData: data,\\n+\\t\\t\\t\\tType: corev1.SecretTypeOpaque,\\n+\\t\\t\\t}\\n+\\t\\t\\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\\n+\\t\\t\\tif err != nil && !apierr.IsAlreadyExists(err) {\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\n+\\t\\t\\tfmt.Println(\\\"Argo CD Redis secret state confirmed: secret name argocd-redis.\\\")\\n+\\t\\t\\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\\n+\\t\\t\\t\\tfmt.Println(\\\"Password secret is configured properly.\\\")\\n+\\t\\t\\t} else {\\n+\\t\\t\\t\\terr := fmt.Errorf(\\\"key %s doesn't exist in secret %s. \\\\n\\\", redisInitialPasswordKey, redisInitialPasswordSecretName)\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\t\\t},\\n+\\t}\\n+\\n+\\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\\n+\\n+\\treturn &command\\n+}\\ndiff --git a/docs/faq.md b/docs/faq.md\\nindex 83bdf8d7d38b5..5ce6ca134ff1b 100644\\n--- a/docs/faq.md\\n+++ b/docs/faq.md\\n@@ -268,3 +268,45 @@ The most common instance of this error is with `env:` fields for `containers`.\\n \\n !!! note \\\"Dynamic applications\\\"\\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\\n+\\n+## How to rotate Redis secret?\\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \\n+```bash\\n+kubectl delete secret argocd-redis -n <argocd namesapce>\\n+```\\n+* If you are running Redis in HA mode, restart Redis in HA.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\\n+kubectl rollout restart statefulset argocd-redis-ha-server\\n+```\\n+* If you are running Redis in non-HA mode, restart Redis.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis\\n+```\\n+* Restart other components.\\n+```bash\\n+kubectl rollout restart deployment argocd-server argocd-repo-server\\n+kubectl rollout restart statefulset argocd-application-controller\\n+```\\n+\\n+## How to turn off Redis auth if users really want to?\\n+\\n+Argo CD default installation is now configured automatically enable Redis authentication. \\n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\\n+\\n+* You need to have your own Redis installation.\\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\\n+ * When HA Redis is used:\\n+ * kubectl delete deployment argocd-redis-ha-haproxy\\n+ * kubectl delete statefulset argocd-redis-ha-server\\n+ * When non-HA Redis is used:\\n+ * kubectl delete deployment argocd-redis\\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\\n+ * Deployment: argocd-repo-server:\\n+ * Deployment: argocd-server\\n+ * StatefulSet: argocd-application-controller\\n+ \\n+## How do I provide my own Redis credentials?\\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+You can config your secret provider to generate Kubernetes secret accordingly.\\n\\\\ No newline at end of file\\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\\nindex d81bd08897ad8..c4438b14705d0 100644\\n--- a/docs/getting_started.md\\n+++ b/docs/getting_started.md\\n@@ -38,6 +38,9 @@ Do one of:\\n \\n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\\n \\n+!!! note\\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+\\n ## 2. Download Argo CD CLI\\n \\n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\\nindex 7966e5a3cb9b1..6f8587e68db4e 100644\\n--- a/docs/user-guide/commands/argocd_admin.md\\n+++ b/docs/user-guide/commands/argocd_admin.md\\n@@ -139,6 +139,7 @@ $ argocd admin initial-password reset\\n * [argocd admin initial-password](argocd_admin_initial-password.md)\\t - Prints initial password to log in to Argo CD for the first time\\n * [argocd admin notifications](argocd_admin_notifications.md)\\t - Set of CLI commands that helps manage notifications settings\\n * [argocd admin proj](argocd_admin_proj.md)\\t - Manage projects configuration\\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\\t - Ensure the Redis password exists, creating a new one if necessary.\\n * [argocd admin repo](argocd_admin_repo.md)\\t - Manage repositories configuration\\n * [argocd admin settings](argocd_admin_settings.md)\\t - Provides set of commands for settings validation and troubleshooting\\n \\ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\nnew file mode 100644\\nindex 0000000000000..85e56195758dd\\n--- /dev/null\\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n@@ -0,0 +1,67 @@\\n+# `argocd admin redis-initial-password` Command Reference\\n+\\n+## argocd admin redis-initial-password\\n+\\n+Ensure the Redis password exists, creating a new one if necessary.\\n+\\n+```\\n+argocd admin redis-initial-password [flags]\\n+```\\n+\\n+### Options\\n+\\n+```\\n+ --as string Username to impersonate for the operation\\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\\n+ --as-uid string UID to impersonate for the operation\\n+ --certificate-authority string Path to a cert file for the certificate authority\\n+ --client-certificate string Path to a client certificate file for TLS\\n+ --client-key string Path to a client key file for TLS\\n+ --cluster string The name of the kubeconfig cluster to use\\n+ --context string The name of the kubeconfig context to use\\n+ --disable-compression If true, opt-out of response compression for all requests to the server\\n+ -h, --help help for redis-initial-password\\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\\n+ -n, --namespace string If present, the namespace scope for this CLI request\\n+ --password string Password for basic authentication to the API server\\n+ --proxy-url string If provided, this URL will be used to connect via proxy\\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \\\"0\\\")\\n+ --server string The address and port of the Kubernetes API server\\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\\n+ --token string Bearer token for authentication to the API server\\n+ --user string The name of the kubeconfig user to use\\n+ --username string Username for basic authentication to the API server\\n+```\\n+\\n+### Options inherited from parent commands\\n+\\n+```\\n+ --auth-token string Authentication token\\n+ --client-crt string Client certificate file\\n+ --client-crt-key string Client certificate key file\\n+ --config string Path to Argo CD config (default \\\"/home/user/.config/argocd/config\\\")\\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-application-controller\\\")\\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\\n+ --insecure Skip server certificate and domain verification\\n+ --kube-context string Directs the command to the given kube-context\\n+ --logformat string Set the logging format. One of: text|json (default \\\"text\\\")\\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \\\"info\\\")\\n+ --plaintext Disable TLS\\n+ --port-forward Connect to a random argocd-server port using port forwarding\\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis-ha-haproxy\\\")\\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis\\\")\\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-repo-server\\\")\\n+ --server-crt string Server certificate file\\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-server\\\")\\n+```\\n+\\n+### SEE ALSO\\n+\\n+* [argocd admin](argocd_admin.md)\\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\\n+\\ndiff --git a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\nindex 68dd75de2f47f..815e4123d05e3 100644\\n--- a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\n+++ b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\n@@ -20,6 +20,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\nindex 7b6302a09c449..2219f5f9b4731 100644\\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n@@ -21,6 +21,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\\nindex bcbe729ac6d00..c591db0d0aa4a 100644\\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\\n@@ -15,6 +15,23 @@ spec:\\n labels:\\n app.kubernetes.io/name: argocd-redis\\n spec:\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -30,6 +47,13 @@ spec:\\n - \\\"\\\"\\n - \\\"--appendonly\\\"\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n ports:\\n - containerPort: 6379\\n securityContext:\\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\\nnew file mode 100644\\nindex 0000000000000..a7a33f48a4c11\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-role.yaml\\n@@ -0,0 +1,23 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\\nnew file mode 100644\\nindex 0000000000000..f396914dffdca\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\\n@@ -0,0 +1,15 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+ - kind: ServiceAccount\\n+ name: argocd-redis\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\\nindex 4a0b64c4da6a8..f13b17e134234 100644\\n--- a/manifests/base/redis/kustomization.yaml\\n+++ b/manifests/base/redis/kustomization.yaml\\n@@ -6,3 +6,5 @@ resources:\\n - argocd-redis-sa.yaml\\n - argocd-redis-service.yaml\\n - argocd-redis-network-policy.yaml\\n+- argocd-redis-role.yaml\\n+- argocd-redis-rolebinding.yaml\\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\nindex 907bc80a34e56..7093acd27702a 100644\\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n@@ -24,6 +24,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\\nindex 0ebeb70e08531..1107323b2e3b9 100644\\n--- a/manifests/base/server/argocd-server-deployment.yaml\\n+++ b/manifests/base/server/argocd-server-deployment.yaml\\n@@ -23,6 +23,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\\nindex 5f68a58863233..a3ff38a1684e0 100644\\n--- a/manifests/core-install.yaml\\n+++ b/manifests/core-install.yaml\\n@@ -20652,6 +20652,30 @@ rules:\\n - watch\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRole\\n metadata:\\n labels:\\n@@ -20704,6 +20728,22 @@ subjects:\\n name: argocd-applicationset-controller\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRoleBinding\\n metadata:\\n labels:\\n@@ -21115,6 +21155,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -21126,6 +21173,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -21170,6 +21234,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -21481,6 +21550,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\\nindex 9e5e9273942da..25a568b2620d4 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\\n@@ -1,6 +1,6 @@\\n dependencies:\\n - name: redis-ha\\n repository: https://dandydeveloper.github.io/charts\\n- version: 4.22.3\\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\\n-generated: \\\"2022-11-02T16:57:25.047025473-07:00\\\"\\n+ version: 4.26.6\\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\\n+generated: \\\"2024-04-10T11:02:32.957812-07:00\\\"\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\\nindex bdcde75a60727..618eecda6ddcc 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\\n@@ -1,4 +1,4 @@\\n dependencies:\\n - name: redis-ha\\n- version: 4.22.3\\n+ version: 4.26.6\\n repository: https://dandydeveloper.github.io/charts\\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\\nindex e78ed94856d91..3aeabcbf53f64 100644\\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\\n@@ -9,8 +9,10 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\\n apiVersion: v1\\n@@ -21,7 +23,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\\n@@ -33,7 +35,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis.conf: |\\n@@ -50,6 +52,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n \\n sentinel.conf: |\\n dir \\\"/data\\\"\\n@@ -59,6 +63,7 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n \\n init.sh: |\\n echo \\\"$(date) Start...\\\"\\n@@ -82,7 +87,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -191,9 +196,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -226,7 +231,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -345,7 +350,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -454,9 +459,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -489,7 +494,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -554,9 +559,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -564,9 +569,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -576,9 +581,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -591,6 +596,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -674,6 +680,8 @@ data:\\n mode tcp\\n option tcp-check\\n tcp-check connect\\n+ tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n+ tcp-check expect string +OK\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send info\\\\ replication\\\\r\\\\n\\n@@ -730,6 +738,7 @@ data:\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -766,12 +775,13 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -784,6 +794,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -816,7 +827,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n rules:\\n - apiGroups:\\n - \\\"\\\"\\n@@ -835,7 +846,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n rules:\\n - apiGroups:\\n@@ -855,7 +866,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n subjects:\\n - kind: ServiceAccount\\n name: argocd-redis-ha\\n@@ -874,7 +885,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n subjects:\\n - kind: ServiceAccount\\n@@ -894,9 +905,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -924,9 +934,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -954,9 +963,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -984,7 +992,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n spec:\\n type: ClusterIP\\n@@ -1012,7 +1020,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n annotations:\\n spec:\\n@@ -1040,7 +1048,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n spec:\\n strategy:\\n type: RollingUpdate\\n@@ -1056,12 +1064,11 @@ spec:\\n labels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n annotations:\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n prometheus.io/path: \\\"/metrics\\\"\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n spec:\\n # Needed when using unmodified rbac-setup.yml\\n \\n@@ -1081,11 +1088,10 @@ spec:\\n matchLabels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n topologyKey: kubernetes.io/hostname\\n initContainers:\\n - name: config-init\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1109,7 +1115,7 @@ spec:\\n mountPath: /data\\n containers:\\n - name: haproxy\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n securityContext: \\n allowPrivilegeEscalation: false\\n@@ -1119,6 +1125,12 @@ spec:\\n runAsNonRoot: true\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n httpGet:\\n path: /healthz\\n@@ -1167,7 +1179,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n {}\\n spec:\\n@@ -1183,7 +1195,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n release: argocd\\n app: redis-ha\\n@@ -1207,7 +1219,7 @@ spec:\\n automountServiceAccountToken: false\\n initContainers:\\n - name: config-init\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1231,6 +1243,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n volumeMounts:\\n - name: config\\n mountPath: /readonly-config\\n@@ -1241,12 +1258,12 @@ spec:\\n \\n containers:\\n - name: redis\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n- - redis-server\\n+ - redis-server\\n args:\\n- - /data/conf/redis.conf\\n+ - /data/conf/redis.conf\\n securityContext: \\n allowPrivilegeEscalation: false\\n capabilities:\\n@@ -1256,6 +1273,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1298,7 +1321,7 @@ spec:\\n - /bin/sh\\n - /readonly-config/trigger-failover-if-master.sh\\n - name: sentinel\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - redis-sentinel\\n@@ -1313,6 +1336,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1349,7 +1378,7 @@ spec:\\n {}\\n \\n - name: split-brain-fix\\n- image: redis:7.0.15-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - sh\\n@@ -1371,6 +1400,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n resources:\\n {}\\n volumeMounts:\\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\\nindex c15def91ece21..9ba9fa918d34c 100644\\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\\n@@ -1,4 +1,7 @@\\n redis-ha:\\n+ auth: true\\n+ authKey: auth\\n+ existingSecret: argocd-redis\\n persistentVolume:\\n enabled: false\\n redis:\\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\\nindex bf0c6c3dff255..0da9beb9930e8 100644\\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\\n@@ -20,7 +20,7 @@ patches:\\n kind: ConfigMap\\n name: argocd-redis-ha-configmap\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n version: v1\\n group: \\\"\\\"\\n@@ -34,28 +34,28 @@ patches:\\n kind: ServiceAccount\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: RoleBinding\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n@@ -294,3 +294,15 @@ patches:\\n kind: StatefulSet\\n name: argocd-redis-ha-server\\n path: overlays/statefulset-containers-securityContext.yaml\\n+- target:\\n+ group: rbac.authorization.k8s.io\\n+ version: v1\\n+ kind: Role\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/haproxy-role.yaml\\n+- target:\\n+ group: apps\\n+ version: v1\\n+ kind: Deployment\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/deployment-initContainers.yaml\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\nnew file mode 100644\\nindex 0000000000000..8e6ea2754a9fa\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n@@ -0,0 +1,16 @@\\n+- op: add\\n+ path: /spec/template/spec/initContainers/0\\n+ value:\\n+ name: secret-init\\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\nnew file mode 100644\\nindex 0000000000000..b74a48006a977\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n@@ -0,0 +1,20 @@\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\\nindex a2fc369bae16e..2f98ce67fd987 100644\\n--- a/manifests/ha/install.yaml\\n+++ b/manifests/ha/install.yaml\\n@@ -20546,6 +20546,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -20776,6 +20778,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -21220,7 +21236,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -21329,9 +21345,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -21364,7 +21380,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -21429,9 +21445,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -21439,9 +21455,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -21451,9 +21467,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -21466,6 +21482,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -21508,9 +21525,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -21573,7 +21591,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -21682,9 +21700,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -21717,7 +21735,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -21825,6 +21843,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -21833,10 +21853,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -21876,6 +21898,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -21888,6 +21911,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -22076,8 +22100,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22102,8 +22124,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22128,8 +22148,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22646,7 +22664,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n prometheus.io/path: /metrics\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n@@ -22662,7 +22680,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -22697,11 +22721,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -22769,6 +22809,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -23080,6 +23125,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -23426,6 +23476,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -23668,7 +23723,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -23685,7 +23740,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -23739,7 +23800,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -23792,7 +23859,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -23822,7 +23894,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\\nindex 491f46191b41c..aa7dbd74637ff 100644\\n--- a/manifests/ha/namespace-install.yaml\\n+++ b/manifests/ha/namespace-install.yaml\\n@@ -43,6 +43,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -273,6 +275,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -505,7 +521,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -614,9 +630,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -649,7 +665,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -714,9 +730,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -724,9 +740,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -736,9 +752,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -751,6 +767,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -793,9 +810,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -858,7 +876,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -967,9 +985,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -1002,7 +1020,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -1110,6 +1128,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -1118,10 +1138,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -1161,6 +1183,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1173,6 +1196,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1361,8 +1385,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1387,8 +1409,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1413,8 +1433,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1931,7 +1949,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n prometheus.io/path: /metrics\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n@@ -1947,7 +1965,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -1982,11 +2006,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -2054,6 +2094,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -2365,6 +2410,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -2711,6 +2761,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -2953,7 +3008,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -2970,7 +3025,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -3024,7 +3085,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.15-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -3077,7 +3144,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -3107,7 +3179,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.15-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\\nindex 2d6755a7682bf..05db343fc7a15 100644\\n--- a/manifests/install.yaml\\n+++ b/manifests/install.yaml\\n@@ -20744,6 +20744,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -21013,6 +21037,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -21760,6 +21800,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -21771,6 +21818,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -21815,6 +21879,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -22124,6 +22193,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -22470,6 +22544,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\\nindex d26dd1ef18011..974aae54e1ce6 100644\\n--- a/manifests/namespace-install.yaml\\n+++ b/manifests/namespace-install.yaml\\n@@ -241,6 +241,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -349,6 +373,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -1045,6 +1085,13 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n@@ -1056,6 +1103,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -1100,6 +1164,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -1409,6 +1478,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -1755,6 +1829,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\\nindex b27c88dc2b7e0..74a842bcb6faa 100644\\n--- a/reposerver/repository/repository_test.go\\n+++ b/reposerver/repository/repository_test.go\\n@@ -199,7 +199,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\\n \\t}\\n \\n \\t// update this value if we add/remove manifests\\n-\\tconst countOfManifests = 48\\n+\\tconst countOfManifests = 50\\n \\n \\tres1, err := service.GenerateManifest(context.Background(), &q)\\n \\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/f1a449e83ee73f8f14d441563b6a31b504f8d8b0\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\",\n \"diff_code\": \"From f1a449e83ee73f8f14d441563b6a31b504f8d8b0 Mon Sep 17 00:00:00 2001\\nFrom: Leonardo Luz Almeida <leoluz@users.noreply.github.com>\\nDate: Tue, 21 May 2024 09:22:43 -0400\\nSubject: [PATCH] Merge pull request from GHSA-9766-5277-j5hr\\n\\n* fix: Enable Redis authentication in the default installation\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\n\\n* chore: fix git_test unit test\\n\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\n\\n---------\\n\\nSigned-off-by: May Zhang <may_zhang@intuit.com>\\nSigned-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>\\nCo-authored-by: May Zhang <may_zhang@intuit.com>\\n---\\n cmd/argocd/commands/admin/admin.go | 1 +\\n .../commands/admin/redis_initial_password.go | 98 ++++++++++++\\n docs/faq.md | 42 ++++++\\n docs/getting_started.md | 3 +\\n docs/user-guide/commands/argocd_admin.md | 1 +\\n .../argocd_admin_redis-initial-password.md | 67 +++++++++\\n ...ocd-application-controller-deployment.yaml | 5 +\\n ...cd-application-controller-statefulset.yaml | 5 +\\n .../base/redis/argocd-redis-deployment.yaml | 24 +++\\n manifests/base/redis/argocd-redis-role.yaml | 23 +++\\n .../base/redis/argocd-redis-rolebinding.yaml | 15 ++\\n manifests/base/redis/kustomization.yaml | 2 +\\n .../argocd-repo-server-deployment.yaml | 5 +\\n .../base/server/argocd-server-deployment.yaml | 5 +\\n manifests/core-install.yaml | 76 +++++++++-\\n .../ha/base/redis-ha/chart/requirements.lock | 6 +-\\n .../ha/base/redis-ha/chart/requirements.yaml | 2 +-\\n .../ha/base/redis-ha/chart/upstream.yaml | 122 +++++++++------\\n manifests/ha/base/redis-ha/chart/values.yaml | 3 +\\n manifests/ha/base/redis-ha/kustomization.yaml | 22 ++-\\n .../overlays/deployment-initContainers.yaml | 16 ++\\n .../base/redis-ha/overlays/haproxy-role.yaml | 20 +++\\n manifests/ha/install.yaml | 139 ++++++++++++++----\\n manifests/ha/namespace-install.yaml | 139 ++++++++++++++----\\n manifests/install.yaml | 81 +++++++++-\\n manifests/namespace-install.yaml | 81 +++++++++-\\n reposerver/repository/repository_test.go | 2 +-\\n 27 files changed, 886 insertions(+), 119 deletions(-)\\n create mode 100644 cmd/argocd/commands/admin/redis_initial_password.go\\n create mode 100644 docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n create mode 100644 manifests/base/redis/argocd-redis-role.yaml\\n create mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n create mode 100644 manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n\\ndiff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go\\nindex 01a07e3021fc9..9c56b066d552c 100644\\n--- a/cmd/argocd/commands/admin/admin.go\\n+++ b/cmd/argocd/commands/admin/admin.go\\n@@ -66,6 +66,7 @@ $ argocd admin initial-password reset\\n \\tcommand.AddCommand(NewDashboardCommand(clientOpts))\\n \\tcommand.AddCommand(NewNotificationsCommand())\\n \\tcommand.AddCommand(NewInitialPasswordCommand())\\n+\\tcommand.AddCommand(NewRedisInitialPasswordCommand())\\n \\n \\tcommand.Flags().StringVar(&cmdutil.LogFormat, \\\"logformat\\\", \\\"text\\\", \\\"Set the logging format. One of: text|json\\\")\\n \\tcommand.Flags().StringVar(&cmdutil.LogLevel, \\\"loglevel\\\", \\\"info\\\", \\\"Set the logging level. One of: debug|info|warn|error\\\")\\ndiff --git a/cmd/argocd/commands/admin/redis_initial_password.go b/cmd/argocd/commands/admin/redis_initial_password.go\\nnew file mode 100644\\nindex 0000000000000..8fa1e70ad890e\\n--- /dev/null\\n+++ b/cmd/argocd/commands/admin/redis_initial_password.go\\n@@ -0,0 +1,98 @@\\n+package admin\\n+\\n+import (\\n+\\t\\\"context\\\"\\n+\\t\\\"crypto/rand\\\"\\n+\\t\\\"fmt\\\"\\n+\\t\\\"math/big\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1\\\"\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/cli\\\"\\n+\\tapierr \\\"k8s.io/apimachinery/pkg/api/errors\\\"\\n+\\n+\\t\\\"github.com/argoproj/argo-cd/v2/util/errors\\\"\\n+\\tmetav1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\tv1 \\\"k8s.io/apimachinery/pkg/apis/meta/v1\\\"\\n+\\t\\\"k8s.io/client-go/kubernetes\\\"\\n+\\t\\\"k8s.io/client-go/tools/clientcmd\\\"\\n+\\n+\\t\\\"github.com/spf13/cobra\\\"\\n+\\tcorev1 \\\"k8s.io/api/core/v1\\\"\\n+)\\n+\\n+const defaulRedisInitialPasswordSecretName = \\\"argocd-redis\\\"\\n+const defaultResisInitialPasswordKey = \\\"auth\\\"\\n+\\n+func generateRandomPassword() (string, error) {\\n+\\tconst initialPasswordLength = 16\\n+\\tconst letters = \\\"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-\\\"\\n+\\trandBytes := make([]byte, initialPasswordLength)\\n+\\tfor i := 0; i < initialPasswordLength; i++ {\\n+\\t\\tnum, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))\\n+\\t\\tif err != nil {\\n+\\t\\t\\treturn \\\"\\\", err\\n+\\t\\t}\\n+\\t\\trandBytes[i] = letters[num.Int64()]\\n+\\t}\\n+\\tinitialPassword := string(randBytes)\\n+\\treturn initialPassword, nil\\n+}\\n+\\n+// NewRedisInitialPasswordCommand defines a new command to ensure Argo CD Redis password secret exists.\\n+func NewRedisInitialPasswordCommand() *cobra.Command {\\n+\\tvar (\\n+\\t\\tclientConfig clientcmd.ClientConfig\\n+\\t)\\n+\\tvar command = cobra.Command{\\n+\\t\\tUse: \\\"redis-initial-password\\\",\\n+\\t\\tShort: \\\"Ensure the Redis password exists, creating a new one if necessary.\\\",\\n+\\t\\tRun: func(c *cobra.Command, args []string) {\\n+\\t\\t\\tnamespace, _, err := clientConfig.Namespace()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tredisInitialPasswordSecretName := defaulRedisInitialPasswordSecretName\\n+\\t\\t\\tredisInitialPasswordKey := defaultResisInitialPasswordKey\\n+\\t\\t\\tfmt.Printf(\\\"Checking for initial Redis password in secret %s/%s at key %s. \\\\n\\\", namespace, redisInitialPasswordSecretName, redisInitialPasswordKey)\\n+\\n+\\t\\t\\tconfig, err := clientConfig.ClientConfig()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\terrors.CheckError(v1alpha1.SetK8SConfigDefaults(config))\\n+\\n+\\t\\t\\tkubeClientset := kubernetes.NewForConfigOrDie(config)\\n+\\n+\\t\\t\\trandomPassword, err := generateRandomPassword()\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tdata := map[string][]byte{\\n+\\t\\t\\t\\tredisInitialPasswordKey: []byte(randomPassword),\\n+\\t\\t\\t}\\n+\\t\\t\\tsecret := &corev1.Secret{\\n+\\t\\t\\t\\tObjectMeta: metav1.ObjectMeta{\\n+\\t\\t\\t\\t\\tName: redisInitialPasswordSecretName,\\n+\\t\\t\\t\\t\\tNamespace: namespace,\\n+\\t\\t\\t\\t},\\n+\\t\\t\\t\\tData: data,\\n+\\t\\t\\t\\tType: corev1.SecretTypeOpaque,\\n+\\t\\t\\t}\\n+\\t\\t\\t_, err = kubeClientset.CoreV1().Secrets(namespace).Create(context.Background(), secret, metav1.CreateOptions{})\\n+\\t\\t\\tif err != nil && !apierr.IsAlreadyExists(err) {\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\n+\\t\\t\\tfmt.Println(\\\"Argo CD Redis secret state confirmed: secret name argocd-redis.\\\")\\n+\\t\\t\\tsecret, err = kubeClientset.CoreV1().Secrets(namespace).Get(context.Background(), redisInitialPasswordSecretName, v1.GetOptions{})\\n+\\t\\t\\terrors.CheckError(err)\\n+\\n+\\t\\t\\tif _, ok := secret.Data[redisInitialPasswordKey]; ok {\\n+\\t\\t\\t\\tfmt.Println(\\\"Password secret is configured properly.\\\")\\n+\\t\\t\\t} else {\\n+\\t\\t\\t\\terr := fmt.Errorf(\\\"key %s doesn't exist in secret %s. \\\\n\\\", redisInitialPasswordKey, redisInitialPasswordSecretName)\\n+\\t\\t\\t\\terrors.CheckError(err)\\n+\\t\\t\\t}\\n+\\t\\t},\\n+\\t}\\n+\\n+\\tclientConfig = cli.AddKubectlFlagsToCmd(&command)\\n+\\n+\\treturn &command\\n+}\\ndiff --git a/docs/faq.md b/docs/faq.md\\nindex 83bdf8d7d38b5..5ce6ca134ff1b 100644\\n--- a/docs/faq.md\\n+++ b/docs/faq.md\\n@@ -268,3 +268,45 @@ The most common instance of this error is with `env:` fields for `containers`.\\n \\n !!! note \\\"Dynamic applications\\\"\\n It's possible that your application is being generated by a tool in which case the duplication might not be evident within the scope of a single file. If you have trouble debugging this problem, consider filing a ticket to the owner of the generator tool asking them to improve its validation and error reporting.\\n+\\n+## How to rotate Redis secret?\\n+* Delete `argocd-redis` secret in the namespace where Argo CD is installed. \\n+```bash\\n+kubectl delete secret argocd-redis -n <argocd namesapce>\\n+```\\n+* If you are running Redis in HA mode, restart Redis in HA.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis-ha-haproxy\\n+kubectl rollout restart statefulset argocd-redis-ha-server\\n+```\\n+* If you are running Redis in non-HA mode, restart Redis.\\n+```bash\\n+kubectl rollout restart deployment argocd-redis\\n+```\\n+* Restart other components.\\n+```bash\\n+kubectl rollout restart deployment argocd-server argocd-repo-server\\n+kubectl rollout restart statefulset argocd-application-controller\\n+```\\n+\\n+## How to turn off Redis auth if users really want to?\\n+\\n+Argo CD default installation is now configured automatically enable Redis authentication. \\n+If for some reason authenticated Redis does not work for you and you want to use non-authenticated Redis, here are the steps:\\n+\\n+* You need to have your own Redis installation.\\n+* Configure Argo CD to use your own Redis instance. See this [doc](https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/) for the Argo CD configuration.\\n+* If you already installed Redis shipped with Argo CD, you also need to clean up the existing components:\\n+ * When HA Redis is used:\\n+ * kubectl delete deployment argocd-redis-ha-haproxy\\n+ * kubectl delete statefulset argocd-redis-ha-server\\n+ * When non-HA Redis is used:\\n+ * kubectl delete deployment argocd-redis\\n+* Remove environment variable `REDIS_PASSWORD` from the following manifests\\n+ * Deployment: argocd-repo-server:\\n+ * Deployment: argocd-server\\n+ * StatefulSet: argocd-application-controller\\n+ \\n+## How do I provide my own Redis credentials?\\n+The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+You can config your secret provider to generate Kubernetes secret accordingly.\\n\\\\ No newline at end of file\\ndiff --git a/docs/getting_started.md b/docs/getting_started.md\\nindex 68d9f8f9e8872..4afe4add47267 100644\\n--- a/docs/getting_started.md\\n+++ b/docs/getting_started.md\\n@@ -40,6 +40,9 @@ Do one of:\\n \\n Use `argocd login --core` to [configure](./user-guide/commands/argocd_login.md) CLI access and skip steps 3-5.\\n \\n+!!! note\\n+ This default installation for Redis is using password authentication. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.\\n+\\n ## 2. Download Argo CD CLI\\n \\n Download the latest Argo CD version from [https://github.com/argoproj/argo-cd/releases/latest](https://github.com/argoproj/argo-cd/releases/latest). More detailed installation instructions can be found via the [CLI installation documentation](cli_installation.md).\\ndiff --git a/docs/user-guide/commands/argocd_admin.md b/docs/user-guide/commands/argocd_admin.md\\nindex 4375c7f2e3cae..0aa338f1570e2 100644\\n--- a/docs/user-guide/commands/argocd_admin.md\\n+++ b/docs/user-guide/commands/argocd_admin.md\\n@@ -64,6 +64,7 @@ $ argocd admin initial-password reset\\n * [argocd admin initial-password](argocd_admin_initial-password.md)\\t - Prints initial password to log in to Argo CD for the first time\\n * [argocd admin notifications](argocd_admin_notifications.md)\\t - Set of CLI commands that helps manage notifications settings\\n * [argocd admin proj](argocd_admin_proj.md)\\t - Manage projects configuration\\n+* [argocd admin redis-initial-password](argocd_admin_redis-initial-password.md)\\t - Ensure the Redis password exists, creating a new one if necessary.\\n * [argocd admin repo](argocd_admin_repo.md)\\t - Manage repositories configuration\\n * [argocd admin settings](argocd_admin_settings.md)\\t - Provides set of commands for settings validation and troubleshooting\\n \\ndiff --git a/docs/user-guide/commands/argocd_admin_redis-initial-password.md b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\nnew file mode 100644\\nindex 0000000000000..85e56195758dd\\n--- /dev/null\\n+++ b/docs/user-guide/commands/argocd_admin_redis-initial-password.md\\n@@ -0,0 +1,67 @@\\n+# `argocd admin redis-initial-password` Command Reference\\n+\\n+## argocd admin redis-initial-password\\n+\\n+Ensure the Redis password exists, creating a new one if necessary.\\n+\\n+```\\n+argocd admin redis-initial-password [flags]\\n+```\\n+\\n+### Options\\n+\\n+```\\n+ --as string Username to impersonate for the operation\\n+ --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.\\n+ --as-uid string UID to impersonate for the operation\\n+ --certificate-authority string Path to a cert file for the certificate authority\\n+ --client-certificate string Path to a client certificate file for TLS\\n+ --client-key string Path to a client key file for TLS\\n+ --cluster string The name of the kubeconfig cluster to use\\n+ --context string The name of the kubeconfig context to use\\n+ --disable-compression If true, opt-out of response compression for all requests to the server\\n+ -h, --help help for redis-initial-password\\n+ --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure\\n+ --kubeconfig string Path to a kube config. Only required if out-of-cluster\\n+ -n, --namespace string If present, the namespace scope for this CLI request\\n+ --password string Password for basic authentication to the API server\\n+ --proxy-url string If provided, this URL will be used to connect via proxy\\n+ --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default \\\"0\\\")\\n+ --server string The address and port of the Kubernetes API server\\n+ --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.\\n+ --token string Bearer token for authentication to the API server\\n+ --user string The name of the kubeconfig user to use\\n+ --username string Username for basic authentication to the API server\\n+```\\n+\\n+### Options inherited from parent commands\\n+\\n+```\\n+ --auth-token string Authentication token\\n+ --client-crt string Client certificate file\\n+ --client-crt-key string Client certificate key file\\n+ --config string Path to Argo CD config (default \\\"/home/user/.config/argocd/config\\\")\\n+ --controller-name string Name of the Argo CD Application controller; set this or the ARGOCD_APPLICATION_CONTROLLER_NAME environment variable when the controller's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-application-controller\\\")\\n+ --core If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server\\n+ --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2.\\n+ --grpc-web-root-path string Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.\\n+ -H, --header strings Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)\\n+ --http-retry-max int Maximum number of retries to establish http connection to Argo CD server\\n+ --insecure Skip server certificate and domain verification\\n+ --kube-context string Directs the command to the given kube-context\\n+ --logformat string Set the logging format. One of: text|json (default \\\"text\\\")\\n+ --loglevel string Set the logging level. One of: debug|info|warn|error (default \\\"info\\\")\\n+ --plaintext Disable TLS\\n+ --port-forward Connect to a random argocd-server port using port forwarding\\n+ --port-forward-namespace string Namespace name which should be used for port forwarding\\n+ --redis-haproxy-name string Name of the Redis HA Proxy; set this or the ARGOCD_REDIS_HAPROXY_NAME environment variable when the HA Proxy's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis-ha-haproxy\\\")\\n+ --redis-name string Name of the Redis deployment; set this or the ARGOCD_REDIS_NAME environment variable when the Redis's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-redis\\\")\\n+ --repo-server-name string Name of the Argo CD Repo server; set this or the ARGOCD_REPO_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-repo-server\\\")\\n+ --server-crt string Server certificate file\\n+ --server-name string Name of the Argo CD API server; set this or the ARGOCD_SERVER_NAME environment variable when the server's name label differs from the default, for example when installing via the Helm chart (default \\\"argocd-server\\\")\\n+```\\n+\\n+### SEE ALSO\\n+\\n+* [argocd admin](argocd_admin.md)\\t - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access\\n+\\ndiff --git a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\nindex 68dd75de2f47f..815e4123d05e3 100644\\n--- a/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\n+++ b/manifests/base/application-controller-deployment/argocd-application-controller-deployment.yaml\\n@@ -20,6 +20,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\nindex 7b6302a09c449..2219f5f9b4731 100644\\n--- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n+++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml\\n@@ -21,6 +21,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml\\nindex 6fc776785185f..a2951694ed7d7 100644\\n--- a/manifests/base/redis/argocd-redis-deployment.yaml\\n+++ b/manifests/base/redis/argocd-redis-deployment.yaml\\n@@ -15,6 +15,23 @@ spec:\\n labels:\\n app.kubernetes.io/name: argocd-redis\\n spec:\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -30,6 +47,13 @@ spec:\\n - \\\"\\\"\\n - \\\"--appendonly\\\"\\n - \\\"no\\\"\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n ports:\\n - containerPort: 6379\\n securityContext:\\ndiff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml\\nnew file mode 100644\\nindex 0000000000000..a7a33f48a4c11\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-role.yaml\\n@@ -0,0 +1,23 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+ - apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml\\nnew file mode 100644\\nindex 0000000000000..f396914dffdca\\n--- /dev/null\\n+++ b/manifests/base/redis/argocd-redis-rolebinding.yaml\\n@@ -0,0 +1,15 @@\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+ - kind: ServiceAccount\\n+ name: argocd-redis\\n\\\\ No newline at end of file\\ndiff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml\\nindex 4a0b64c4da6a8..f13b17e134234 100644\\n--- a/manifests/base/redis/kustomization.yaml\\n+++ b/manifests/base/redis/kustomization.yaml\\n@@ -6,3 +6,5 @@ resources:\\n - argocd-redis-sa.yaml\\n - argocd-redis-service.yaml\\n - argocd-redis-network-policy.yaml\\n+- argocd-redis-role.yaml\\n+- argocd-redis-rolebinding.yaml\\ndiff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\nindex 2c30c8ad1d71b..971b7a21c2151 100644\\n--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml\\n@@ -24,6 +24,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml\\nindex 0ebeb70e08531..1107323b2e3b9 100644\\n--- a/manifests/base/server/argocd-server-deployment.yaml\\n+++ b/manifests/base/server/argocd-server-deployment.yaml\\n@@ -23,6 +23,11 @@ spec:\\n args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\ndiff --git a/manifests/core-install.yaml b/manifests/core-install.yaml\\nindex 30db6ed76f6a1..b34db579534db 100644\\n--- a/manifests/core-install.yaml\\n+++ b/manifests/core-install.yaml\\n@@ -20816,6 +20816,30 @@ rules:\\n - watch\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRole\\n metadata:\\n labels:\\n@@ -20868,6 +20892,22 @@ subjects:\\n name: argocd-applicationset-controller\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n kind: ClusterRoleBinding\\n metadata:\\n labels:\\n@@ -21279,7 +21319,14 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n- image: redis:7.0.14-alpine\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n ports:\\n@@ -21290,6 +21337,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -21334,6 +21398,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -21651,6 +21720,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock\\nindex 9e5e9273942da..25a568b2620d4 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.lock\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.lock\\n@@ -1,6 +1,6 @@\\n dependencies:\\n - name: redis-ha\\n repository: https://dandydeveloper.github.io/charts\\n- version: 4.22.3\\n-digest: sha256:ae773caf65b172bdd2216072c03ba76ef3c0383dbd1e2478934a67b9455f6a2e\\n-generated: \\\"2022-11-02T16:57:25.047025473-07:00\\\"\\n+ version: 4.26.6\\n+digest: sha256:c363f48ea8339c4bdb7c8a2cca62aa487b69d0a52a6fe6267fbbbbc07e468abd\\n+generated: \\\"2024-04-10T11:02:32.957812-07:00\\\"\\ndiff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml\\nindex bdcde75a60727..618eecda6ddcc 100644\\n--- a/manifests/ha/base/redis-ha/chart/requirements.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/requirements.yaml\\n@@ -1,4 +1,4 @@\\n dependencies:\\n - name: redis-ha\\n- version: 4.22.3\\n+ version: 4.26.6\\n repository: https://dandydeveloper.github.io/charts\\ndiff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml\\nindex 1d0e4b3c247f8..3aeabcbf53f64 100644\\n--- a/manifests/ha/base/redis-ha/chart/upstream.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml\\n@@ -9,8 +9,10 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml\\n apiVersion: v1\\n@@ -21,7 +23,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n ---\\n # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml\\n@@ -33,7 +35,7 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis.conf: |\\n@@ -50,6 +52,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n \\n sentinel.conf: |\\n dir \\\"/data\\\"\\n@@ -59,6 +63,7 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n \\n init.sh: |\\n echo \\\"$(date) Start...\\\"\\n@@ -82,7 +87,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -191,9 +196,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -226,7 +231,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -345,7 +350,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -454,9 +459,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -489,7 +494,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -554,9 +559,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -564,9 +569,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -576,9 +581,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -591,6 +596,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -674,6 +680,8 @@ data:\\n mode tcp\\n option tcp-check\\n tcp-check connect\\n+ tcp-check send \\\"AUTH ${AUTH}\\\"\\\\r\\\\n\\n+ tcp-check expect string +OK\\n tcp-check send PING\\\\r\\\\n\\n tcp-check expect string +PONG\\n tcp-check send info\\\\ replication\\\\r\\\\n\\n@@ -730,6 +738,7 @@ data:\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -766,12 +775,13 @@ metadata:\\n labels:\\n heritage: Helm\\n release: argocd\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n app: argocd-redis-ha\\n data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -784,6 +794,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -816,7 +827,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n rules:\\n - apiGroups:\\n - \\\"\\\"\\n@@ -835,7 +846,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n rules:\\n - apiGroups:\\n@@ -855,7 +866,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n subjects:\\n - kind: ServiceAccount\\n name: argocd-redis-ha\\n@@ -874,7 +885,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n subjects:\\n - kind: ServiceAccount\\n@@ -894,9 +905,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -924,9 +934,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -954,9 +963,8 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n spec:\\n publishNotReadyAddresses: true\\n type: ClusterIP\\n@@ -984,7 +992,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n spec:\\n type: ClusterIP\\n@@ -1012,7 +1020,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n component: argocd-redis-ha-haproxy\\n annotations:\\n spec:\\n@@ -1040,7 +1048,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n spec:\\n strategy:\\n type: RollingUpdate\\n@@ -1056,12 +1064,11 @@ spec:\\n labels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n annotations:\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n prometheus.io/path: \\\"/metrics\\\"\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n spec:\\n # Needed when using unmodified rbac-setup.yml\\n \\n@@ -1081,11 +1088,10 @@ spec:\\n matchLabels:\\n app: redis-ha-haproxy\\n release: argocd\\n- revision: \\\"1\\\"\\n topologyKey: kubernetes.io/hostname\\n initContainers:\\n - name: config-init\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1109,7 +1115,7 @@ spec:\\n mountPath: /data\\n containers:\\n - name: haproxy\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n securityContext: \\n allowPrivilegeEscalation: false\\n@@ -1119,6 +1125,12 @@ spec:\\n runAsNonRoot: true\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n httpGet:\\n path: /healthz\\n@@ -1167,7 +1179,7 @@ metadata:\\n app: redis-ha\\n heritage: \\\"Helm\\\"\\n release: \\\"argocd\\\"\\n- chart: redis-ha-4.22.3\\n+ chart: redis-ha-4.26.6\\n annotations:\\n {}\\n spec:\\n@@ -1183,7 +1195,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n release: argocd\\n app: redis-ha\\n@@ -1207,7 +1219,7 @@ spec:\\n automountServiceAccountToken: false\\n initContainers:\\n - name: config-init\\n- image: redis:7.0.14-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n resources:\\n {}\\n@@ -1231,6 +1243,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n volumeMounts:\\n - name: config\\n mountPath: /readonly-config\\n@@ -1241,12 +1258,12 @@ spec:\\n \\n containers:\\n - name: redis\\n- image: redis:7.0.14-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n- - redis-server\\n+ - redis-server\\n args:\\n- - /data/conf/redis.conf\\n+ - /data/conf/redis.conf\\n securityContext: \\n allowPrivilegeEscalation: false\\n capabilities:\\n@@ -1256,6 +1273,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1298,7 +1321,7 @@ spec:\\n - /bin/sh\\n - /readonly-config/trigger-failover-if-master.sh\\n - name: sentinel\\n- image: redis:7.0.14-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - redis-sentinel\\n@@ -1313,6 +1336,12 @@ spec:\\n runAsUser: 1000\\n seccompProfile:\\n type: RuntimeDefault\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n livenessProbe:\\n initialDelaySeconds: 30\\n periodSeconds: 15\\n@@ -1349,7 +1378,7 @@ spec:\\n {}\\n \\n - name: split-brain-fix\\n- image: redis:7.0.14-alpine\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n command:\\n - sh\\n@@ -1371,6 +1400,11 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ name: argocd-redis\\n+ key: auth\\n resources:\\n {}\\n volumeMounts:\\ndiff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml\\nindex 5606daac34bb3..805f541af850d 100644\\n--- a/manifests/ha/base/redis-ha/chart/values.yaml\\n+++ b/manifests/ha/base/redis-ha/chart/values.yaml\\n@@ -1,4 +1,7 @@\\n redis-ha:\\n+ auth: true\\n+ authKey: auth\\n+ existingSecret: argocd-redis\\n persistentVolume:\\n enabled: false\\n redis:\\ndiff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml\\nindex bf0c6c3dff255..0da9beb9930e8 100644\\n--- a/manifests/ha/base/redis-ha/kustomization.yaml\\n+++ b/manifests/ha/base/redis-ha/kustomization.yaml\\n@@ -20,7 +20,7 @@ patches:\\n kind: ConfigMap\\n name: argocd-redis-ha-configmap\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n version: v1\\n group: \\\"\\\"\\n@@ -34,28 +34,28 @@ patches:\\n kind: ServiceAccount\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: Role\\n name: argocd-redis-ha-haproxy\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n kind: RoleBinding\\n name: argocd-redis-ha\\n namespace: argocd\\n- path: overlays/remove-namespace.yaml \\n+ path: overlays/remove-namespace.yaml\\n - target:\\n group: rbac.authorization.k8s.io\\n version: v1\\n@@ -294,3 +294,15 @@ patches:\\n kind: StatefulSet\\n name: argocd-redis-ha-server\\n path: overlays/statefulset-containers-securityContext.yaml\\n+- target:\\n+ group: rbac.authorization.k8s.io\\n+ version: v1\\n+ kind: Role\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/haproxy-role.yaml\\n+- target:\\n+ group: apps\\n+ version: v1\\n+ kind: Deployment\\n+ name: argocd-redis-ha-haproxy\\n+ path: overlays/deployment-initContainers.yaml\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\nnew file mode 100644\\nindex 0000000000000..8e6ea2754a9fa\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/deployment-initContainers.yaml\\n@@ -0,0 +1,16 @@\\n+- op: add\\n+ path: /spec/template/spec/initContainers/0\\n+ value:\\n+ name: secret-init\\n+ command: [ 'argocd', 'admin', 'redis-initial-password' ]\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\nnew file mode 100644\\nindex 0000000000000..b74a48006a977\\n--- /dev/null\\n+++ b/manifests/ha/base/redis-ha/overlays/haproxy-role.yaml\\n@@ -0,0 +1,20 @@\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ resourceNames:\\n+ - argocd-redis\\n+ verbs:\\n+ - get\\n+- op: add\\n+ path: /rules/0\\n+ value:\\n+ apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n\\\\ No newline at end of file\\ndiff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml\\nindex b13b7c1f2d188..8d2a4d7ce43b9 100644\\n--- a/manifests/ha/install.yaml\\n+++ b/manifests/ha/install.yaml\\n@@ -20710,6 +20710,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -20940,6 +20942,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -21384,7 +21400,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -21493,9 +21509,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -21528,7 +21544,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -21593,9 +21609,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -21603,9 +21619,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -21615,9 +21631,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -21630,6 +21646,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -21672,9 +21689,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -21737,7 +21755,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -21846,9 +21864,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -21881,7 +21899,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -21989,6 +22007,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -21997,10 +22017,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -22040,6 +22062,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -22052,6 +22075,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -22240,8 +22264,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22266,8 +22288,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22292,8 +22312,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -22810,7 +22828,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n prometheus.io/path: /metrics\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n@@ -22826,7 +22844,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -22861,11 +22885,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -22933,6 +22973,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -23250,6 +23295,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -23596,6 +23646,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -23838,7 +23893,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -23855,7 +23910,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.14-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -23909,7 +23970,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.14-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -23962,7 +24029,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.14-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -23992,7 +24064,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.14-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml\\nindex 591ca73e6a9e3..9f557fc1f43d8 100644\\n--- a/manifests/ha/namespace-install.yaml\\n+++ b/manifests/ha/namespace-install.yaml\\n@@ -43,6 +43,8 @@ metadata:\\n app.kubernetes.io/name: argocd-redis-ha\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha\\n+secrets:\\n+- name: argocd-redis\\n ---\\n apiVersion: v1\\n kind: ServiceAccount\\n@@ -273,6 +275,20 @@ metadata:\\n app.kubernetes.io/part-of: argocd\\n name: argocd-redis-ha-haproxy\\n rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n - apiGroups:\\n - \\\"\\\"\\n resources:\\n@@ -505,7 +521,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -614,9 +630,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -649,7 +665,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -714,9 +730,9 @@ data:\\n redis_role() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- ROLE=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n else\\n- ROLE=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n+ ROLE=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep role | sed 's/role://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -724,9 +740,9 @@ data:\\n identify_redis_master() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n else\\n- REDIS_MASTER=$(redis-cli -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n+ REDIS_MASTER=$(redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" info | grep master_host | sed 's/master_host://' | sed 's/\\\\r//')\\n fi\\n set -e\\n }\\n@@ -736,9 +752,9 @@ data:\\n sh /readonly-config/init.sh\\n \\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key\\n else\\n- echo \\\"shutdown\\\" | redis-cli -p \\\"${REDIS_PORT}\\\"\\n+ echo \\\"shutdown\\\" | redis-cli -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\"\\n fi\\n set -e\\n }\\n@@ -751,6 +767,7 @@ data:\\n identify_announce_ip\\n done\\n \\n+ trap \\\"exit 0\\\" TERM\\n while true; do\\n sleep 60\\n \\n@@ -793,9 +810,10 @@ data:\\n decide redis backend to use\\\\n#master\\\\nfrontend ft_redis_master\\\\n bind :6379 \\\\n\\n \\\\ use_backend bk_redis_master\\\\n# Check all redis servers to see if they think\\n they are master\\\\nbackend bk_redis_master\\\\n mode tcp\\\\n option tcp-check\\\\n tcp-check\\n- connect\\\\n tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check\\n- send info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check\\n- send QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n+ connect\\\\n tcp-check send \\\\\\\"AUTH ${AUTH}\\\\\\\"\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n\\n+ \\\\ tcp-check send PING\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +PONG\\\\n tcp-check send\\n+ info\\\\\\\\ replication\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string role:master\\\\n tcp-check send\\n+ QUIT\\\\\\\\r\\\\\\\\n\\\\n tcp-check expect string +OK\\\\n use-server R0 if { srv_is_up(R0)\\n } { nbsrv(check_if_redis_is_master_0) ge 2 }\\\\n server R0 argocd-redis-ha-announce-0:6379\\n check inter 3s fall 1 rise 1\\\\n use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)\\n ge 2 }\\\\n server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise\\n@@ -858,7 +876,7 @@ data:\\n sentinel_get_master() {\\n set +e\\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n+ redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n grep -E '((^\\\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\\\s*$)|(^\\\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)(\\\\.(25[0-5]|2[0-4]\\\\d|1\\\\d\\\\d|[1-9]?\\\\d)){3}))|:)))(%.+)?s*$))'\\n else\\n redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_PORT}\\\" sentinel get-master-addr-by-name \\\"${MASTER_GROUP}\\\" |\\\\\\n@@ -967,9 +985,9 @@ data:\\n redis_ping() {\\n set +e\\n if [ \\\"$REDIS_PORT\\\" -eq 0 ]; then\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key ping\\n else\\n- redis-cli -h \\\"${MASTER}\\\" -p \\\"${REDIS_PORT}\\\" ping\\n+ redis-cli -h \\\"${MASTER}\\\" -a \\\"${AUTH}\\\" --no-auth-warning -p \\\"${REDIS_PORT}\\\" ping\\n fi\\n set -e\\n }\\n@@ -1002,7 +1020,7 @@ data:\\n \\n if [ \\\"$SENTINEL_PORT\\\" -eq 0 ]; then\\n echo \\\" on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})\\\"\\n- if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n+ if redis-cli -h \\\"${SERVICE}\\\" -p \\\"${SENTINEL_TLS_PORT}\\\" --tls --cacert /tls-certs/ca.crt --cert /tls-certs/redis.crt --key /tls-certs/redis.key sentinel failover \\\"${MASTER_GROUP}\\\" | grep -q 'NOGOODSLAVE' ; then\\n echo \\\" $(date) Failover returned with 'NOGOODSLAVE'\\\"\\n echo \\\"Setting defaults for this pod..\\\"\\n setup_defaults\\n@@ -1110,6 +1128,8 @@ data:\\n rdbcompression yes\\n repl-diskless-sync yes\\n save \\\"\\\"\\n+ requirepass replace-default-auth\\n+ masterauth replace-default-auth\\n sentinel.conf: |\\n dir \\\"/data\\\"\\n port 26379\\n@@ -1118,10 +1138,12 @@ data:\\n sentinel failover-timeout argocd 180000\\n maxclients 10000\\n sentinel parallel-syncs argocd 5\\n+ sentinel auth-pass argocd replace-default-auth\\n trigger-failover-if-master.sh: |\\n get_redis_role() {\\n is_master=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n info | grep -c 'role:master' || true\\n@@ -1161,6 +1183,7 @@ data:\\n redis_liveness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1173,6 +1196,7 @@ data:\\n redis_readiness.sh: |\\n response=$(\\n redis-cli \\\\\\n+ -a \\\"${AUTH}\\\" --no-auth-warning \\\\\\n -h localhost \\\\\\n -p 6379 \\\\\\n ping\\n@@ -1361,8 +1385,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1387,8 +1409,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1413,8 +1433,6 @@ spec:\\n apiVersion: v1\\n kind: Service\\n metadata:\\n- annotations:\\n- service.alpha.kubernetes.io/tolerate-unready-endpoints: \\\"true\\\"\\n labels:\\n app.kubernetes.io/component: redis\\n app.kubernetes.io/name: argocd-redis-ha\\n@@ -1931,7 +1949,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae\\n+ checksum/config: e34e8124c38bcfd2f16e75620bbde30158686692b13bc449eecc44c51b207d54\\n prometheus.io/path: /metrics\\n prometheus.io/port: \\\"9101\\\"\\n prometheus.io/scrape: \\\"true\\\"\\n@@ -1947,7 +1965,13 @@ spec:\\n app.kubernetes.io/name: argocd-redis-ha-haproxy\\n topologyKey: kubernetes.io/hostname\\n containers:\\n- - image: haproxy:2.6.14-alpine\\n+ - env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -1982,11 +2006,27 @@ spec:\\n - mountPath: /run/haproxy\\n name: shared-socket\\n initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n - args:\\n - /readonly/haproxy_init.sh\\n command:\\n - sh\\n- image: haproxy:2.6.14-alpine\\n+ image: public.ecr.aws/docker/library/haproxy:2.6.14-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\n@@ -2054,6 +2094,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -2371,6 +2416,11 @@ spec:\\n env:\\n - name: ARGOCD_API_SERVER_REPLICAS\\n value: \\\"2\\\"\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -2717,6 +2767,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n@@ -2959,7 +3014,7 @@ spec:\\n template:\\n metadata:\\n annotations:\\n- checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75\\n+ checksum/init-config: 9d3c019a5ea1fd98ab5cde397d8eecd351da884f15e6ba346c607cb2446c2198\\n labels:\\n app.kubernetes.io/name: argocd-redis-ha\\n spec:\\n@@ -2976,7 +3031,13 @@ spec:\\n - /data/conf/redis.conf\\n command:\\n - redis-server\\n- image: redis:7.0.14-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle:\\n preStop:\\n@@ -3030,7 +3091,13 @@ spec:\\n - /data/conf/sentinel.conf\\n command:\\n - redis-sentinel\\n- image: redis:7.0.14-alpine\\n+ env:\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n lifecycle: {}\\n livenessProbe:\\n@@ -3083,7 +3150,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.14-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: split-brain-fix\\n resources: {}\\n@@ -3113,7 +3185,12 @@ spec:\\n value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4\\n - name: SENTINEL_ID_2\\n value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca\\n- image: redis:7.0.14-alpine\\n+ - name: AUTH\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: public.ecr.aws/docker/library/redis:7.0.15-alpine\\n imagePullPolicy: IfNotPresent\\n name: config-init\\n securityContext:\\ndiff --git a/manifests/install.yaml b/manifests/install.yaml\\nindex 4e803ae379d56..c2871ec4451b4 100644\\n--- a/manifests/install.yaml\\n+++ b/manifests/install.yaml\\n@@ -20908,6 +20908,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -21177,6 +21201,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -21924,7 +21964,14 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n- image: redis:7.0.14-alpine\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n ports:\\n@@ -21935,6 +21982,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -21979,6 +22043,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -22294,6 +22363,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -22640,6 +22714,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml\\nindex 9cb8620aa6232..d64e1db7046b9 100644\\n--- a/manifests/namespace-install.yaml\\n+++ b/manifests/namespace-install.yaml\\n@@ -241,6 +241,30 @@ rules:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: Role\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+rules:\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resourceNames:\\n+ - argocd-redis\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - get\\n+- apiGroups:\\n+ - \\\"\\\"\\n+ resources:\\n+ - secrets\\n+ verbs:\\n+ - create\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: Role\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -349,6 +373,22 @@ subjects:\\n ---\\n apiVersion: rbac.authorization.k8s.io/v1\\n kind: RoleBinding\\n+metadata:\\n+ labels:\\n+ app.kubernetes.io/component: redis\\n+ app.kubernetes.io/name: argocd-redis\\n+ app.kubernetes.io/part-of: argocd\\n+ name: argocd-redis\\n+roleRef:\\n+ apiGroup: rbac.authorization.k8s.io\\n+ kind: Role\\n+ name: argocd-redis\\n+subjects:\\n+- kind: ServiceAccount\\n+ name: argocd-redis\\n+---\\n+apiVersion: rbac.authorization.k8s.io/v1\\n+kind: RoleBinding\\n metadata:\\n labels:\\n app.kubernetes.io/component: server\\n@@ -1045,7 +1085,14 @@ spec:\\n - \\\"\\\"\\n - --appendonly\\n - \\\"no\\\"\\n- image: redis:7.0.14-alpine\\n+ - --requirepass $(REDIS_PASSWORD)\\n+ env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n+ image: redis:7.0.15-alpine\\n imagePullPolicy: Always\\n name: redis\\n ports:\\n@@ -1056,6 +1103,23 @@ spec:\\n drop:\\n - ALL\\n readOnlyRootFilesystem: true\\n+ initContainers:\\n+ - command:\\n+ - argocd\\n+ - admin\\n+ - redis-initial-password\\n+ image: quay.io/argoproj/argocd:latest\\n+ imagePullPolicy: IfNotPresent\\n+ name: secret-init\\n+ securityContext:\\n+ allowPrivilegeEscalation: false\\n+ capabilities:\\n+ drop:\\n+ - ALL\\n+ readOnlyRootFilesystem: true\\n+ runAsNonRoot: true\\n+ seccompProfile:\\n+ type: RuntimeDefault\\n securityContext:\\n runAsNonRoot: true\\n runAsUser: 999\\n@@ -1100,6 +1164,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-repo-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\n valueFrom:\\n configMapKeyRef:\\n@@ -1415,6 +1484,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-server\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_SERVER_INSECURE\\n valueFrom:\\n configMapKeyRef:\\n@@ -1761,6 +1835,11 @@ spec:\\n - args:\\n - /usr/local/bin/argocd-application-controller\\n env:\\n+ - name: REDIS_PASSWORD\\n+ valueFrom:\\n+ secretKeyRef:\\n+ key: auth\\n+ name: argocd-redis\\n - name: ARGOCD_CONTROLLER_REPLICAS\\n value: \\\"1\\\"\\n - name: ARGOCD_RECONCILIATION_TIMEOUT\\ndiff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go\\nindex fe8463f80ea9c..00a348fee21c9 100644\\n--- a/reposerver/repository/repository_test.go\\n+++ b/reposerver/repository/repository_test.go\\n@@ -205,7 +205,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {\\n \\t}\\n \\n \\t// update this value if we add/remove manifests\\n-\\tconst countOfManifests = 48\\n+\\tconst countOfManifests = 50\\n \\n \\tres1, err := service.GenerateManifest(context.Background(), &q)\\n \\n\"\n }\n]","isConversational":false}}},{"rowIdx":1197,"cells":{"CVE_ID":{"kind":"string","value":"CVE-2024-31990"},"category":{"kind":"string","value":"Fixes for Multiple Locations Across Different Branches or Projects"},"patches":{"kind":"list like","value":[{"commit url":"https://github.com/argoproj/argo-cd/commit/c514105af739eebedb9dbe89d8a6dd8dfc30bb2c","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-2gvw-w6fj-7m3c\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>","diff_code":"From c514105af739eebedb9dbe89d8a6dd8dfc30bb2c Mon Sep 17 00:00:00 2001\nFrom: pasha-codefresh <pavel@codefresh.io>\nDate: Mon, 15 Apr 2024 10:20:07 +0300\nSubject: [PATCH] Merge pull request from GHSA-2gvw-w6fj-7m3c\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n---\n .../application/v1alpha1/app_project_types.go | 18 ++\n server/application/application.go | 185 +++++++++---------\n server/application/application_test.go | 118 ++++++++++-\n util/argo/argo.go | 3 +-\n util/session/sessionmanager.go | 2 +-\n 5 files changed, 223 insertions(+), 103 deletions(-)\n\ndiff --git a/pkg/apis/application/v1alpha1/app_project_types.go b/pkg/apis/application/v1alpha1/app_project_types.go\nindex 5243ab7990266..81f95ab624a0d 100644\n--- a/pkg/apis/application/v1alpha1/app_project_types.go\n+++ b/pkg/apis/application/v1alpha1/app_project_types.go\n@@ -17,6 +17,24 @@ import (\n \t\"k8s.io/apimachinery/pkg/runtime/schema\"\n )\n \n+type ErrApplicationNotAllowedToUseProject struct {\n+\tapplication string\n+\tnamespace string\n+\tproject string\n+}\n+\n+func NewErrApplicationNotAllowedToUseProject(application, namespace, project string) error {\n+\treturn &ErrApplicationNotAllowedToUseProject{\n+\t\tapplication: application,\n+\t\tnamespace: namespace,\n+\t\tproject: project,\n+\t}\n+}\n+\n+func (err *ErrApplicationNotAllowedToUseProject) Error() string {\n+\treturn fmt.Sprintf(\"application '%s' in namespace '%s' is not allowed to use project %s\", err.application, err.namespace, err.project)\n+}\n+\n // AppProjectList is list of AppProject resources\n // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\n type AppProjectList struct {\ndiff --git a/server/application/application.go b/server/application/application.go\nindex ec0db45a11f22..5bd47adc359ed 100644\n--- a/server/application/application.go\n+++ b/server/application/application.go\n@@ -151,7 +151,7 @@ func NewServer(\n //\n // If the user does provide a \"project,\" we can respond more specifically. If the user does not have access to the given\n // app name in the given project, we return \"permission denied.\" If the app exists, but the project is different from\n-func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, error) {\n+func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, *appv1.AppProject, error) {\n \tuser := session.Username(ctx)\n \tif user == \"\" {\n \t\tuser = \"Unknown user\"\n@@ -173,7 +173,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t\t// but the app is in a different project\" response. We don't want the user inferring the existence of the\n \t\t\t// app from response time.\n \t\t\t_, _ = getApp()\n-\t\t\treturn nil, permissionDeniedErr\n+\t\t\treturn nil, nil, permissionDeniedErr\n \t\t}\n \t}\n \ta, err := getApp()\n@@ -181,15 +181,15 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\tif apierr.IsNotFound(err) {\n \t\t\tif project != \"\" {\n \t\t\t\t// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.\n-\t\t\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\t\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t\t\t}\n \t\t\t// We don't know if the user was allowed to get the Application, and we don't want to leak information about\n \t\t\t// the Application's existence. Return 403.\n \t\t\tlogCtx.Warn(\"application does not exist\")\n-\t\t\treturn nil, permissionDeniedErr\n+\t\t\treturn nil, nil, permissionDeniedErr\n \t\t}\n \t\tlogCtx.Errorf(\"failed to get application: %s\", err)\n-\t\treturn nil, permissionDeniedErr\n+\t\treturn nil, nil, permissionDeniedErr\n \t}\n \t// Even if we performed an initial RBAC check (because the request was fully parameterized), we still need to\n \t// perform a second RBAC check to ensure that the user has access to the actual Application's project (not just the\n@@ -203,11 +203,11 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t\t// The user specified a project. We would have returned a 404 if the user had access to the app, but the app\n \t\t\t// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.\n \t\t\t// Otherwise, they could infer that the app exists based on the error code.\n-\t\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t\t}\n \t\t// The user didn't specify a project. We always return permission denied for both lack of access and lack of\n \t\t// existence.\n-\t\treturn nil, permissionDeniedErr\n+\t\treturn nil, nil, permissionDeniedErr\n \t}\n \teffectiveProject := \"default\"\n \tif a.Spec.Project != \"\" {\n@@ -220,15 +220,20 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t}).Warnf(\"user tried to %s application in project %s, but the application is in project %s\", action, project, effectiveProject)\n \t\t// The user has access to the app, but the app is in a different project. Return 404, meaning \"app doesn't\n \t\t// exist in that project\".\n-\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t}\n-\treturn a, nil\n+\t// Get the app's associated project, and make sure all project restrictions are enforced.\n+\tproj, err := s.getAppProject(ctx, a, logCtx)\n+\tif err != nil {\n+\t\treturn a, nil, err\n+\t}\n+\treturn a, proj, nil\n }\n \n // getApplicationEnforceRBACInformer uses an informer to get an Application. If the app does not exist, permission is\n // denied, or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\n // information.\n-func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, error) {\n+func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, *appv1.AppProject, error) {\n \tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\n \treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\n \t\treturn s.appLister.Applications(namespaceOrDefault).Get(name)\n@@ -238,7 +243,7 @@ func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action,\n // getApplicationEnforceRBACClient uses a client to get an Application. If the app does not exist, permission is denied,\n // or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\n // information.\n-func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, error) {\n+func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, *appv1.AppProject, error) {\n \tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\n \treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\n \t\tif !s.isNamespaceEnabled(namespaceOrDefault) {\n@@ -322,7 +327,13 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\n \tif q.Validate != nil {\n \t\tvalidate = *q.Validate\n \t}\n-\terr := s.validateAndNormalizeApp(ctx, a, validate)\n+\n+\tproj, err := s.getAppProject(ctx, a, log.WithField(\"application\", a.Name))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n+\terr = s.validateAndNormalizeApp(ctx, a, proj, validate)\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error while validating and normalizing app: %w\", err)\n \t}\n@@ -378,7 +389,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\n \treturn updated, nil\n }\n \n-func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, action func(\n+func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, proj *appv1.AppProject, action func(\n \tclient apiclient.RepoServerServiceClient,\n \trepo *appv1.Repository,\n \thelmRepos []*appv1.Repository,\n@@ -405,13 +416,6 @@ func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, acti\n \tif err != nil {\n \t\treturn fmt.Errorf(\"error getting kustomize settings options: %w\", err)\n \t}\n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn status.Errorf(codes.InvalidArgument, \"application references project %s which does not exist\", a.Spec.Project)\n-\t\t}\n-\t\treturn fmt.Errorf(\"error getting application's project: %w\", err)\n-\t}\n \n \thelmRepos, err := s.db.ListHelmRepositories(ctx)\n \tif err != nil {\n@@ -446,7 +450,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \tif q.Name == nil || *q.Name == \"\" {\n \t\treturn nil, fmt.Errorf(\"invalid request: application name is missing\")\n \t}\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -458,7 +462,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \t}\n \n \tvar manifestInfo *apiclient.ManifestResponse\n-\terr = s.queryRepoServer(ctx, a, func(\n+\terr = s.queryRepoServer(ctx, a, proj, func(\n \t\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\n \t\trevision := source.TargetRevision\n \t\tif q.GetRevision() != \"\" {\n@@ -484,11 +488,6 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \t\t\treturn fmt.Errorf(\"error getting API resources: %w\", err)\n \t\t}\n \n-\t\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\t\tif err != nil {\n-\t\t\treturn fmt.Errorf(\"error getting app project: %w\", err)\n-\t\t}\n-\n \t\tmanifestInfo, err = client.GenerateManifest(ctx, &apiclient.ManifestRequest{\n \t\t\tRepo: repo,\n \t\t\tRevision: revision,\n@@ -551,13 +550,13 @@ func (s *Server) GetManifestsWithFiles(stream application.ApplicationService_Get\n \t\treturn fmt.Errorf(\"invalid request: application name is missing\")\n \t}\n \n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\n \tif err != nil {\n \t\treturn err\n \t}\n \n \tvar manifestInfo *apiclient.ManifestResponse\n-\terr = s.queryRepoServer(ctx, a, func(\n+\terr = s.queryRepoServer(ctx, a, proj, func(\n \t\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\n \n \t\tappInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()\n@@ -668,7 +667,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \t// We must use a client Get instead of an informer Get, because it's common to call Get immediately\n \t// following a Watch (which is not yet powered by an informer), and the Get must reflect what was\n \t// previously seen by the client.\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -699,7 +698,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \n \tif refreshType == appv1.RefreshTypeHard {\n \t\t// force refresh cached application details\n-\t\tif err := s.queryRepoServer(ctx, a, func(\n+\t\tif err := s.queryRepoServer(ctx, a, proj, func(\n \t\t\tclient apiclient.RepoServerServiceClient,\n \t\t\trepo *appv1.Repository,\n \t\t\thelmRepos []*appv1.Repository,\n@@ -751,7 +750,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \n // ListResourceEvents returns a list of event resources\n func (s *Server) ListResourceEvents(ctx context.Context, q *application.ApplicationResourceEventsQuery) (*v1.EventList, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -819,12 +818,12 @@ func (s *Server) validateAndUpdateApp(ctx context.Context, newApp *appv1.Applica\n \ts.projectLock.RLock(newApp.Spec.GetProject())\n \tdefer s.projectLock.RUnlock(newApp.Spec.GetProject())\n \n-\tapp, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \"\")\n+\tapp, proj, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\terr = s.validateAndNormalizeApp(ctx, newApp, validate)\n+\terr = s.validateAndNormalizeApp(ctx, newApp, proj, validate)\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error validating and normalizing app: %w\", err)\n \t}\n@@ -923,7 +922,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\n \tif q.GetSpec() == nil {\n \t\treturn nil, fmt.Errorf(\"error updating application spec: spec is nil in request\")\n \t}\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -942,7 +941,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\n \n // Patch patches an application\n func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchRequest) (*appv1.Application, error) {\n-\tapp, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\tapp, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -985,11 +984,35 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque\n \treturn s.validateAndUpdateApp(ctx, newApp, false, true, rbacpolicy.ActionUpdate, q.GetProject())\n }\n \n+func (s *Server) getAppProject(ctx context.Context, a *appv1.Application, logCtx *log.Entry) (*appv1.AppProject, error) {\n+\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n+\tif err == nil {\n+\t\treturn proj, nil\n+\t}\n+\n+\t// If there's a permission issue or the app doesn't exist, return a vague error to avoid letting the user enumerate project names.\n+\tvagueError := status.Errorf(codes.InvalidArgument, \"app is not allowed in project %q, or the project does not exist\", a.Spec.Project)\n+\n+\tif apierr.IsNotFound(err) {\n+\t\treturn nil, vagueError\n+\t}\n+\n+\tif _, ok := err.(*appv1.ErrApplicationNotAllowedToUseProject); ok {\n+\t\tlogCtx.WithFields(map[string]interface{}{\n+\t\t\t\"project\": a.Spec.Project,\n+\t\t\targocommon.SecurityField: argocommon.SecurityMedium,\n+\t\t}).Warnf(\"error getting app project: %s\", err)\n+\t\treturn nil, vagueError\n+\t}\n+\n+\treturn nil, vagueError\n+}\n+\n // Delete removes an application and all associated resources\n func (s *Server) Delete(ctx context.Context, q *application.ApplicationDeleteRequest) (*application.ApplicationResponse, error) {\n \tappName := q.GetName()\n \tappNs := s.appNamespaceOrDefault(q.GetAppNamespace())\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1144,16 +1167,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati\n \t}\n }\n \n-func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\t// Offer no hint that the project does not exist.\n-\t\t\tlog.Warnf(\"User attempted to create/update application in non-existent project %q\", app.Spec.Project)\n-\t\t\treturn permissionDeniedErr\n-\t\t}\n-\t\treturn fmt.Errorf(\"error getting application's project: %w\", err)\n-\t}\n+func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, validate bool) error {\n \tif app.GetName() == \"\" {\n \t\treturn fmt.Errorf(\"resource name may not be empty\")\n \t}\n@@ -1257,7 +1271,7 @@ func (s *Server) getAppResources(ctx context.Context, a *appv1.Application) (*ap\n }\n \n func (s *Server) getAppLiveResource(ctx context.Context, action string, q *application.ApplicationResourceRequest) (*appv1.ResourceNode, *rest.Config, *appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, nil, nil, err\n \t}\n@@ -1394,7 +1408,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR\n }\n \n func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery) (*appv1.ApplicationTree, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1403,7 +1417,7 @@ func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery\n }\n \n func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application.ApplicationService_WatchResourceTreeServer) error {\n-\t_, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\t_, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn err\n \t}\n@@ -1420,7 +1434,7 @@ func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application\n }\n \n func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.RevisionMetadata, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1430,12 +1444,6 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error getting repository by URL: %w\", err)\n \t}\n-\t// We need to get some information with the project associated to the app,\n-\t// so we'll know whether GPG signatures are enforced.\n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n \tconn, repoClient, err := s.repoClientset.NewRepoServerClient()\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error creating repo server client: %w\", err)\n@@ -1450,7 +1458,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\n \n // RevisionChartDetails returns the helm chart metadata, as fetched from the reposerver\n func (s *Server) RevisionChartDetails(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.ChartDetails, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1481,7 +1489,7 @@ func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) boo\n }\n \n func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1538,7 +1546,7 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.\n \t\t}\n \t}\n \n-\ta, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn err\n \t}\n@@ -1730,19 +1738,11 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio\n \n // Sync syncs an application to its target state\n func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncRequest) (*appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn a, status.Errorf(codes.InvalidArgument, \"application references project %s which does not exist\", a.Spec.Project)\n-\t\t}\n-\t\treturn a, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n \ts.inferResourcesStatusHealth(a)\n \n \tif !proj.Spec.SyncWindows.Matches(a).CanSync(true) {\n@@ -1839,7 +1839,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR\n }\n \n func (s *Server) Rollback(ctx context.Context, rollbackReq *application.ApplicationRollbackRequest) (*appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1898,7 +1898,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat\n }\n \n func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksRequest) (*application.LinksResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1913,7 +1913,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\n \t\treturn nil, fmt.Errorf(\"failed to read application deep links from configmap: %w\", err)\n \t}\n \n-\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a)\n+\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a, proj)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1928,12 +1928,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\n \treturn finalList, nil\n }\n \n-func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n+func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application, proj *appv1.AppProject) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\n \t// sanitize project jwt tokens\n \tproj.Status = appv1.AppProjectStatus{}\n \n@@ -1996,7 +1991,12 @@ func (s *Server) ListResourceLinks(ctx context.Context, req *application.Applica\n \t\treturn nil, err\n \t}\n \n-\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app)\n+\tproj, err := s.getAppProject(ctx, app, log.WithField(\"application\", app.GetName()))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n+\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app, proj)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -2052,7 +2052,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy\n func (s *Server) TerminateOperation(ctx context.Context, termOpReq *application.OperationTerminateRequest) (*application.OperationTerminateResponse, error) {\n \tappName := termOpReq.GetName()\n \tappNs := s.appNamespaceOrDefault(termOpReq.GetAppNamespace())\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -2125,7 +2125,7 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica\n \n func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacRequest string, q *application.ApplicationResourceRequest) (obj *unstructured.Unstructured, res *appv1.ResourceNode, app *appv1.Application, config *rest.Config, err error) {\n \tif q.GetKind() == applicationType.ApplicationKind && q.GetGroup() == applicationType.Group && q.GetName() == q.GetResourceName() {\n-\t\tapp, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\t\tapp, _, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \t\tif err != nil {\n \t\t\treturn nil, nil, nil, nil, err\n \t\t}\n@@ -2221,6 +2221,11 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\n \t\t}\n \t}\n \n+\tproj, err := s.getAppProject(ctx, a, log.WithField(\"application\", a.Name))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n \t// First, make sure all the returned resources are permitted, for each operation.\n \t// Also perform create with dry-runs for all create-operation resources.\n \t// This is performed separately to reduce the risk of only some of the resources being successfully created later.\n@@ -2228,7 +2233,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\n \t// the dry-run for relevant apply/delete operation would have to be invoked as well.\n \tfor _, impactedResource := range newObjects {\n \t\tnewObj := impactedResource.UnstructuredObj\n-\t\terr := s.verifyResourcePermitted(ctx, app, newObj)\n+\t\terr := s.verifyResourcePermitted(ctx, app, proj, newObj)\n \t\tif err != nil {\n \t\t\treturn nil, err\n \t\t}\n@@ -2322,14 +2327,7 @@ func (s *Server) patchResource(ctx context.Context, config *rest.Config, liveObj\n \treturn &application.ApplicationResponse{}, nil\n }\n \n-func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, obj *unstructured.Unstructured) error {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn fmt.Errorf(\"application references project %s which does not exist\", app.Spec.Project)\n-\t\t}\n-\t\treturn fmt.Errorf(\"failed to get project %s: %w\", app.Spec.Project, err)\n-\t}\n+func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, obj *unstructured.Unstructured) error {\n \tpermitted, err := proj.IsResourcePermitted(schema.GroupKind{Group: obj.GroupVersionKind().Group, Kind: obj.GroupVersionKind().Kind}, obj.GetNamespace(), app.Spec.Destination, func(project string) ([]*appv1.Cluster, error) {\n \t\tclusters, err := s.db.GetProjectClusters(context.TODO(), project)\n \t\tif err != nil {\n@@ -2389,16 +2387,11 @@ func splitStatusPatch(patch []byte) ([]byte, []byte, error) {\n }\n \n func (s *Server) GetApplicationSyncWindows(ctx context.Context, q *application.ApplicationSyncWindowsQuery) (*application.ApplicationSyncWindowsResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n \twindows := proj.Spec.SyncWindows.Matches(a)\n \tsync := windows.CanSync(true)\n \ndiff --git a/server/application/application_test.go b/server/application/application_test.go\nindex 51c912ff05109..abbf41ee42e72 100644\n--- a/server/application/application_test.go\n+++ b/server/application/application_test.go\n@@ -1818,7 +1818,7 @@ func TestServer_GetApplicationSyncWindowsState(t *testing.T) {\n \t\tappServer := newTestAppServer(t, testApp)\n \n \t\tactive, err := appServer.GetApplicationSyncWindows(context.Background(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name})\n-\t\tassert.Contains(t, err.Error(), \"not found\")\n+\t\tassert.Contains(t, err.Error(), \"not exist\")\n \t\tassert.Nil(t, active)\n \t})\n }\n@@ -2428,7 +2428,16 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \tt.Run(\"Get application in other namespace when allowed\", func(t *testing.T) {\n \t\ttestApp := newTestApp()\n \t\ttestApp.Namespace = \"argocd-1\"\n-\t\tappServer := newTestAppServer(t, testApp)\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n \t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n \t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n \t\t\tName: pointer.String(\"test-app\"),\n@@ -2439,6 +2448,28 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \t\trequire.Equal(t, \"argocd-1\", app.Namespace)\n \t\trequire.Equal(t, \"test-app\", app.Name)\n \t})\n+\tt.Run(\"Get application in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tAppNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, app)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n \tt.Run(\"Create application in other namespace when allowed\", func(t *testing.T) {\n \t\ttestApp := newTestApp()\n \t\ttestApp.Namespace = \"argocd-1\"\n@@ -2481,7 +2512,7 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \t\t})\n \t\trequire.Error(t, err)\n \t\trequire.Nil(t, app)\n-\t\trequire.ErrorContains(t, err, \"not allowed to use project\")\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n \t})\n \n \tt.Run(\"Create application in other namespace when not allowed by configuration\", func(t *testing.T) {\n@@ -2505,5 +2536,84 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \t\trequire.Nil(t, app)\n \t\trequire.ErrorContains(t, err, \"namespace 'argocd-1' is not permitted\")\n \t})\n-\n+\tt.Run(\"Get application sync window in other namespace when project is allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\n+\t\tassert.NoError(t, err)\n+\t\tassert.Equal(t, 0, len(active.ActiveWindows))\n+\t})\n+\tt.Run(\"Get application sync window in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, active)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Get list of links in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, links)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Get list of links in other namespace when project is allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.NoError(t, err)\n+\t\tassert.Equal(t, 0, len(links.Items))\n+\t})\n }\ndiff --git a/util/argo/argo.go b/util/argo/argo.go\nindex 36e513cf0f534..49862bb64ac39 100644\n--- a/util/argo/argo.go\n+++ b/util/argo/argo.go\n@@ -694,8 +694,7 @@ func GetAppProject(app *argoappv1.Application, projLister applicationsv1.AppProj\n \t\treturn nil, err\n \t}\n \tif !proj.IsAppNamespacePermitted(app, ns) {\n-\t\treturn nil, fmt.Errorf(\"application '%s' in namespace '%s' is not allowed to use project '%s'\",\n-\t\t\tapp.Name, app.Namespace, proj.Name)\n+\t\treturn nil, argoappv1.NewErrApplicationNotAllowedToUseProject(app.Name, app.Namespace, proj.Name)\n \t}\n \treturn proj, nil\n }\ndiff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go\nindex af22ca0f2502e..e13075847c380 100644\n--- a/util/session/sessionmanager.go\n+++ b/util/session/sessionmanager.go\n@@ -312,7 +312,7 @@ func expireOldFailedAttempts(maxAge time.Duration, failures map[string]LoginAtte\n \treturn expiredCount\n }\n \n-// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache. \n+// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache.\n func pickRandomNonAdminLoginFailure(failures map[string]LoginAttempts, username string) *string {\n \tidx := rand.Intn(len(failures) - 1)\n \ti := 0\n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/c5a252c4cc260e240e2074794aedb861d07e9ca5","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-2gvw-w6fj-7m3c\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>","diff_code":"From c5a252c4cc260e240e2074794aedb861d07e9ca5 Mon Sep 17 00:00:00 2001\nFrom: pasha-codefresh <pavel@codefresh.io>\nDate: Mon, 15 Apr 2024 10:20:07 +0300\nSubject: [PATCH] Merge pull request from GHSA-2gvw-w6fj-7m3c\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n---\n .../application/v1alpha1/app_project_types.go | 18 ++\n server/application/application.go | 184 ++++++-------\n server/application/application_test.go | 254 +++++++++++++++++-\n util/argo/argo.go | 3 +-\n 4 files changed, 364 insertions(+), 95 deletions(-)\n\ndiff --git a/pkg/apis/application/v1alpha1/app_project_types.go b/pkg/apis/application/v1alpha1/app_project_types.go\nindex 5243ab7990266..81f95ab624a0d 100644\n--- a/pkg/apis/application/v1alpha1/app_project_types.go\n+++ b/pkg/apis/application/v1alpha1/app_project_types.go\n@@ -17,6 +17,24 @@ import (\n \t\"k8s.io/apimachinery/pkg/runtime/schema\"\n )\n \n+type ErrApplicationNotAllowedToUseProject struct {\n+\tapplication string\n+\tnamespace string\n+\tproject string\n+}\n+\n+func NewErrApplicationNotAllowedToUseProject(application, namespace, project string) error {\n+\treturn &ErrApplicationNotAllowedToUseProject{\n+\t\tapplication: application,\n+\t\tnamespace: namespace,\n+\t\tproject: project,\n+\t}\n+}\n+\n+func (err *ErrApplicationNotAllowedToUseProject) Error() string {\n+\treturn fmt.Sprintf(\"application '%s' in namespace '%s' is not allowed to use project %s\", err.application, err.namespace, err.project)\n+}\n+\n // AppProjectList is list of AppProject resources\n // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\n type AppProjectList struct {\ndiff --git a/server/application/application.go b/server/application/application.go\nindex b1f35a17756aa..24782233b48d7 100644\n--- a/server/application/application.go\n+++ b/server/application/application.go\n@@ -147,7 +147,7 @@ func NewServer(\n //\n // If the user does provide a \"project,\" we can respond more specifically. If the user does not have access to the given\n // app name in the given project, we return \"permission denied.\" If the app exists, but the project is different from\n-func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, error) {\n+func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, *appv1.AppProject, error) {\n \tlogCtx := log.WithFields(map[string]interface{}{\n \t\t\"application\": name,\n \t\t\"namespace\": namespace,\n@@ -164,7 +164,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t\t// but the app is in a different project\" response. We don't want the user inferring the existence of the\n \t\t\t// app from response time.\n \t\t\t_, _ = getApp()\n-\t\t\treturn nil, permissionDeniedErr\n+\t\t\treturn nil, nil, permissionDeniedErr\n \t\t}\n \t}\n \ta, err := getApp()\n@@ -172,15 +172,15 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\tif apierr.IsNotFound(err) {\n \t\t\tif project != \"\" {\n \t\t\t\t// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.\n-\t\t\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\t\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t\t\t}\n \t\t\t// We don't know if the user was allowed to get the Application, and we don't want to leak information about\n \t\t\t// the Application's existence. Return 403.\n \t\t\tlogCtx.Warn(\"application does not exist\")\n-\t\t\treturn nil, permissionDeniedErr\n+\t\t\treturn nil, nil, permissionDeniedErr\n \t\t}\n \t\tlogCtx.Errorf(\"failed to get application: %s\", err)\n-\t\treturn nil, permissionDeniedErr\n+\t\treturn nil, nil, permissionDeniedErr\n \t}\n \t// Even if we performed an initial RBAC check (because the request was fully parameterized), we still need to\n \t// perform a second RBAC check to ensure that the user has access to the actual Application's project (not just the\n@@ -194,11 +194,11 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t\t// The user specified a project. We would have returned a 404 if the user had access to the app, but the app\n \t\t\t// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.\n \t\t\t// Otherwise, they could infer that the app exists based on the error code.\n-\t\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t\t}\n \t\t// The user didn't specify a project. We always return permission denied for both lack of access and lack of\n \t\t// existence.\n-\t\treturn nil, permissionDeniedErr\n+\t\treturn nil, nil, permissionDeniedErr\n \t}\n \teffectiveProject := \"default\"\n \tif a.Spec.Project != \"\" {\n@@ -211,15 +211,20 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t}).Warnf(\"user tried to %s application in project %s, but the application is in project %s\", action, project, effectiveProject)\n \t\t// The user has access to the app, but the app is in a different project. Return 404, meaning \"app doesn't\n \t\t// exist in that project\".\n-\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t}\n-\treturn a, nil\n+\t// Get the app's associated project, and make sure all project restrictions are enforced.\n+\tproj, err := s.getAppProject(ctx, a, logCtx)\n+\tif err != nil {\n+\t\treturn a, nil, err\n+\t}\n+\treturn a, proj, nil\n }\n \n // getApplicationEnforceRBACInformer uses an informer to get an Application. If the app does not exist, permission is\n // denied, or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\n // information.\n-func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, error) {\n+func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, *appv1.AppProject, error) {\n \tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\n \treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\n \t\treturn s.appLister.Applications(namespaceOrDefault).Get(name)\n@@ -229,9 +234,12 @@ func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action,\n // getApplicationEnforceRBACClient uses a client to get an Application. If the app does not exist, permission is denied,\n // or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\n // information.\n-func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, error) {\n+func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, *appv1.AppProject, error) {\n \tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\n \treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\n+\t\tif !s.isNamespaceEnabled(namespaceOrDefault) {\n+\t\t\treturn nil, security.NamespaceNotPermittedError(namespaceOrDefault)\n+\t\t}\n \t\treturn s.appclientset.ArgoprojV1alpha1().Applications(namespaceOrDefault).Get(ctx, name, metav1.GetOptions{\n \t\t\tResourceVersion: resourceVersion,\n \t\t})\n@@ -310,7 +318,13 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\n \tif q.Validate != nil {\n \t\tvalidate = *q.Validate\n \t}\n-\terr := s.validateAndNormalizeApp(ctx, a, validate)\n+\n+\tproj, err := s.getAppProject(ctx, a, log.WithField(\"application\", a.Name))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n+\terr = s.validateAndNormalizeApp(ctx, a, proj, validate)\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error while validating and normalizing app: %w\", err)\n \t}\n@@ -366,7 +380,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\n \treturn updated, nil\n }\n \n-func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, action func(\n+func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, proj *appv1.AppProject, action func(\n \tclient apiclient.RepoServerServiceClient,\n \trepo *appv1.Repository,\n \thelmRepos []*appv1.Repository,\n@@ -393,14 +407,6 @@ func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, acti\n \tif err != nil {\n \t\treturn fmt.Errorf(\"error getting kustomize settings options: %w\", err)\n \t}\n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn status.Errorf(codes.InvalidArgument, \"application references project %s which does not exist\", a.Spec.Project)\n-\t\t}\n-\t\treturn fmt.Errorf(\"error getting application's project: %w\", err)\n-\t}\n-\n \thelmRepos, err := s.db.ListHelmRepositories(ctx)\n \tif err != nil {\n \t\treturn fmt.Errorf(\"error listing helm repositories: %w\", err)\n@@ -434,7 +440,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \tif q.Name == nil || *q.Name == \"\" {\n \t\treturn nil, fmt.Errorf(\"invalid request: application name is missing\")\n \t}\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -446,7 +452,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \t}\n \n \tvar manifestInfo *apiclient.ManifestResponse\n-\terr = s.queryRepoServer(ctx, a, func(\n+\terr = s.queryRepoServer(ctx, a, proj, func(\n \t\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\n \t\trevision := source.TargetRevision\n \t\tif q.GetRevision() != \"\" {\n@@ -532,13 +538,13 @@ func (s *Server) GetManifestsWithFiles(stream application.ApplicationService_Get\n \t\treturn fmt.Errorf(\"invalid request: application name is missing\")\n \t}\n \n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\n \tif err != nil {\n \t\treturn err\n \t}\n \n \tvar manifestInfo *apiclient.ManifestResponse\n-\terr = s.queryRepoServer(ctx, a, func(\n+\terr = s.queryRepoServer(ctx, a, proj, func(\n \t\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\n \n \t\tappInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()\n@@ -640,7 +646,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \t// We must use a client Get instead of an informer Get, because it's common to call Get immediately\n \t// following a Watch (which is not yet powered by an informer), and the Get must reflect what was\n \t// previously seen by the client.\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -671,7 +677,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \n \tif refreshType == appv1.RefreshTypeHard {\n \t\t// force refresh cached application details\n-\t\tif err := s.queryRepoServer(ctx, a, func(\n+\t\tif err := s.queryRepoServer(ctx, a, proj, func(\n \t\t\tclient apiclient.RepoServerServiceClient,\n \t\t\trepo *appv1.Repository,\n \t\t\thelmRepos []*appv1.Repository,\n@@ -723,7 +729,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \n // ListResourceEvents returns a list of event resources\n func (s *Server) ListResourceEvents(ctx context.Context, q *application.ApplicationResourceEventsQuery) (*v1.EventList, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -791,12 +797,12 @@ func (s *Server) validateAndUpdateApp(ctx context.Context, newApp *appv1.Applica\n \ts.projectLock.RLock(newApp.Spec.GetProject())\n \tdefer s.projectLock.RUnlock(newApp.Spec.GetProject())\n \n-\tapp, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \"\")\n+\tapp, proj, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\terr = s.validateAndNormalizeApp(ctx, newApp, validate)\n+\terr = s.validateAndNormalizeApp(ctx, newApp, proj, validate)\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error validating and normalizing app: %w\", err)\n \t}\n@@ -908,7 +914,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\n \tif q.GetSpec() == nil {\n \t\treturn nil, fmt.Errorf(\"error updating application spec: spec is nil in request\")\n \t}\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -927,7 +933,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\n \n // Patch patches an application\n func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchRequest) (*appv1.Application, error) {\n-\tapp, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\tapp, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -970,11 +976,35 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque\n \treturn s.validateAndUpdateApp(ctx, newApp, false, true, rbacpolicy.ActionUpdate, q.GetProject())\n }\n \n+func (s *Server) getAppProject(ctx context.Context, a *appv1.Application, logCtx *log.Entry) (*appv1.AppProject, error) {\n+\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n+\tif err == nil {\n+\t\treturn proj, nil\n+\t}\n+\n+\t// If there's a permission issue or the app doesn't exist, return a vague error to avoid letting the user enumerate project names.\n+\tvagueError := status.Errorf(codes.InvalidArgument, \"app is not allowed in project %q, or the project does not exist\", a.Spec.Project)\n+\n+\tif apierr.IsNotFound(err) {\n+\t\treturn nil, vagueError\n+\t}\n+\n+\tif _, ok := err.(*appv1.ErrApplicationNotAllowedToUseProject); ok {\n+\t\tlogCtx.WithFields(map[string]interface{}{\n+\t\t\t\"project\": a.Spec.Project,\n+\t\t\targocommon.SecurityField: argocommon.SecurityMedium,\n+\t\t}).Warnf(\"error getting app project: %s\", err)\n+\t\treturn nil, vagueError\n+\t}\n+\n+\treturn nil, vagueError\n+}\n+\n // Delete removes an application and all associated resources\n func (s *Server) Delete(ctx context.Context, q *application.ApplicationDeleteRequest) (*application.ApplicationResponse, error) {\n \tappName := q.GetName()\n \tappNs := s.appNamespaceOrDefault(q.GetAppNamespace())\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1129,16 +1159,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati\n \t}\n }\n \n-func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\t// Offer no hint that the project does not exist.\n-\t\t\tlog.Warnf(\"User attempted to create/update application in non-existent project %q\", app.Spec.Project)\n-\t\t\treturn permissionDeniedErr\n-\t\t}\n-\t\treturn fmt.Errorf(\"error getting application's project: %w\", err)\n-\t}\n+func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, validate bool) error {\n \tif app.GetName() == \"\" {\n \t\treturn fmt.Errorf(\"resource name may not be empty\")\n \t}\n@@ -1241,7 +1262,7 @@ func (s *Server) getAppResources(ctx context.Context, a *appv1.Application) (*ap\n }\n \n func (s *Server) getAppLiveResource(ctx context.Context, action string, q *application.ApplicationResourceRequest) (*appv1.ResourceNode, *rest.Config, *appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, nil, nil, err\n \t}\n@@ -1378,7 +1399,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR\n }\n \n func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery) (*appv1.ApplicationTree, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1387,7 +1408,7 @@ func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery\n }\n \n func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application.ApplicationService_WatchResourceTreeServer) error {\n-\t_, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\t_, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn err\n \t}\n@@ -1404,7 +1425,7 @@ func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application\n }\n \n func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.RevisionMetadata, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1414,12 +1435,6 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error getting repository by URL: %w\", err)\n \t}\n-\t// We need to get some information with the project associated to the app,\n-\t// so we'll know whether GPG signatures are enforced.\n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n \tconn, repoClient, err := s.repoClientset.NewRepoServerClient()\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error creating repo server client: %w\", err)\n@@ -1434,7 +1449,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\n \n // RevisionChartDetails returns the helm chart metadata, as fetched from the reposerver\n func (s *Server) RevisionChartDetails(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.ChartDetails, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1465,7 +1480,7 @@ func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) boo\n }\n \n func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1522,7 +1537,7 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.\n \t\t}\n \t}\n \n-\ta, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn err\n \t}\n@@ -1714,19 +1729,11 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio\n \n // Sync syncs an application to its target state\n func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncRequest) (*appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn a, status.Errorf(codes.InvalidArgument, \"application references project %s which does not exist\", a.Spec.Project)\n-\t\t}\n-\t\treturn a, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n \ts.inferResourcesStatusHealth(a)\n \n \tif !proj.Spec.SyncWindows.Matches(a).CanSync(true) {\n@@ -1823,7 +1830,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR\n }\n \n func (s *Server) Rollback(ctx context.Context, rollbackReq *application.ApplicationRollbackRequest) (*appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1882,7 +1889,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat\n }\n \n func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksRequest) (*application.LinksResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1897,7 +1904,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\n \t\treturn nil, fmt.Errorf(\"failed to read application deep links from configmap: %w\", err)\n \t}\n \n-\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a)\n+\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a, proj)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1912,12 +1919,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\n \treturn finalList, nil\n }\n \n-func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n+func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application, proj *appv1.AppProject) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\n \t// sanitize project jwt tokens\n \tproj.Status = appv1.AppProjectStatus{}\n \n@@ -1980,7 +1982,12 @@ func (s *Server) ListResourceLinks(ctx context.Context, req *application.Applica\n \t\treturn nil, err\n \t}\n \n-\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app)\n+\tproj, err := s.getAppProject(ctx, app, log.WithField(\"application\", app.GetName()))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n+\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app, proj)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -2036,7 +2043,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy\n func (s *Server) TerminateOperation(ctx context.Context, termOpReq *application.OperationTerminateRequest) (*application.OperationTerminateResponse, error) {\n \tappName := termOpReq.GetName()\n \tappNs := s.appNamespaceOrDefault(termOpReq.GetAppNamespace())\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -2109,7 +2116,7 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica\n \n func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacRequest string, q *application.ApplicationResourceRequest) (obj *unstructured.Unstructured, res *appv1.ResourceNode, app *appv1.Application, config *rest.Config, err error) {\n \tif q.GetKind() == applicationType.ApplicationKind && q.GetGroup() == applicationType.Group && q.GetName() == q.GetResourceName() {\n-\t\tapp, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\t\tapp, _, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \t\tif err != nil {\n \t\t\treturn nil, nil, nil, nil, err\n \t\t}\n@@ -2205,6 +2212,11 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\n \t\t}\n \t}\n \n+\tproj, err := s.getAppProject(ctx, a, log.WithField(\"application\", a.Name))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n \t// First, make sure all the returned resources are permitted, for each operation.\n \t// Also perform create with dry-runs for all create-operation resources.\n \t// This is performed separately to reduce the risk of only some of the resources being successfully created later.\n@@ -2212,7 +2224,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\n \t// the dry-run for relevant apply/delete operation would have to be invoked as well.\n \tfor _, impactedResource := range newObjects {\n \t\tnewObj := impactedResource.UnstructuredObj\n-\t\terr := s.verifyResourcePermitted(ctx, app, newObj)\n+\t\terr := s.verifyResourcePermitted(ctx, app, proj, newObj)\n \t\tif err != nil {\n \t\t\treturn nil, err\n \t\t}\n@@ -2306,14 +2318,7 @@ func (s *Server) patchResource(ctx context.Context, config *rest.Config, liveObj\n \treturn &application.ApplicationResponse{}, nil\n }\n \n-func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, obj *unstructured.Unstructured) error {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn fmt.Errorf(\"application references project %s which does not exist\", app.Spec.Project)\n-\t\t}\n-\t\treturn fmt.Errorf(\"failed to get project %s: %w\", app.Spec.Project, err)\n-\t}\n+func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, obj *unstructured.Unstructured) error {\n \tpermitted, err := proj.IsResourcePermitted(schema.GroupKind{Group: obj.GroupVersionKind().Group, Kind: obj.GroupVersionKind().Kind}, obj.GetNamespace(), app.Spec.Destination, func(project string) ([]*appv1.Cluster, error) {\n \t\tclusters, err := s.db.GetProjectClusters(context.TODO(), project)\n \t\tif err != nil {\n@@ -2373,16 +2378,11 @@ func splitStatusPatch(patch []byte) ([]byte, []byte, error) {\n }\n \n func (s *Server) GetApplicationSyncWindows(ctx context.Context, q *application.ApplicationSyncWindowsQuery) (*application.ApplicationSyncWindowsResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n \twindows := proj.Spec.SyncWindows.Matches(a)\n \tsync := windows.CanSync(true)\n \ndiff --git a/server/application/application_test.go b/server/application/application_test.go\nindex bb2f2804b53df..21612e96f0ac3 100644\n--- a/server/application/application_test.go\n+++ b/server/application/application_test.go\n@@ -1817,7 +1817,7 @@ func TestServer_GetApplicationSyncWindowsState(t *testing.T) {\n \t\tappServer := newTestAppServer(t, testApp)\n \n \t\tactive, err := appServer.GetApplicationSyncWindows(context.Background(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name})\n-\t\tassert.Contains(t, err.Error(), \"not found\")\n+\t\tassert.Contains(t, err.Error(), \"not exist\")\n \t\tassert.Nil(t, active)\n \t})\n }\n@@ -2364,3 +2364,255 @@ func TestIsApplicationPermitted(t *testing.T) {\n \t\tassert.True(t, permitted)\n \t})\n }\n+\n+func TestAppNamespaceRestrictions(t *testing.T) {\n+\tt.Run(\"List applications in controller namespace\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\tappServer := newTestAppServer(t, testApp)\n+\t\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{})\n+\t\trequire.NoError(t, err)\n+\t\trequire.Len(t, apps.Items, 1)\n+\t})\n+\n+\tt.Run(\"List applications with non-allowed apps existing\", func(t *testing.T) {\n+\t\ttestApp1 := newTestApp()\n+\t\ttestApp1.Namespace = \"argocd-1\"\n+\t\tappServer := newTestAppServer(t, testApp1)\n+\t\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{})\n+\t\trequire.NoError(t, err)\n+\t\trequire.Len(t, apps.Items, 0)\n+\t})\n+\n+\tt.Run(\"List applications with non-allowed apps existing and explicit ns request\", func(t *testing.T) {\n+\t\ttestApp1 := newTestApp()\n+\t\ttestApp2 := newTestApp()\n+\t\ttestApp2.Namespace = \"argocd-1\"\n+\t\tappServer := newTestAppServer(t, testApp1, testApp2)\n+\t\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{AppNamespace: pointer.String(\"argocd-1\")})\n+\t\trequire.NoError(t, err)\n+\t\trequire.Len(t, apps.Items, 0)\n+\t})\n+\n+\tt.Run(\"List applications with allowed apps in other namespaces\", func(t *testing.T) {\n+\t\ttestApp1 := newTestApp()\n+\t\ttestApp1.Namespace = \"argocd-1\"\n+\t\tappServer := newTestAppServer(t, testApp1)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{})\n+\t\trequire.NoError(t, err)\n+\t\trequire.Len(t, apps.Items, 1)\n+\t})\n+\n+\tt.Run(\"Get application in control plane namespace\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\tappServer := newTestAppServer(t, testApp)\n+\t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t})\n+\t\trequire.NoError(t, err)\n+\t\tassert.Equal(t, \"test-app\", app.GetName())\n+\t})\n+\tt.Run(\"Get application in other namespace when forbidden\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\tappServer := newTestAppServer(t, testApp)\n+\t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tAppNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.ErrorContains(t, err, \"permission denied\")\n+\t\trequire.Nil(t, app)\n+\t})\n+\tt.Run(\"Get application in other namespace when allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tAppNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.NoError(t, err)\n+\t\trequire.NotNil(t, app)\n+\t\trequire.Equal(t, \"argocd-1\", app.Namespace)\n+\t\trequire.Equal(t, \"test-app\", app.Name)\n+\t})\n+\tt.Run(\"Get application in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tAppNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, app)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Create application in other namespace when allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapp, err := appServer.Create(context.TODO(), &application.ApplicationCreateRequest{\n+\t\t\tApplication: testApp,\n+\t\t})\n+\t\trequire.NoError(t, err)\n+\t\trequire.NotNil(t, app)\n+\t\tassert.Equal(t, \"test-app\", app.Name)\n+\t\tassert.Equal(t, \"argocd-1\", app.Namespace)\n+\t})\n+\n+\tt.Run(\"Create application in other namespace when not allowed by project\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapp, err := appServer.Create(context.TODO(), &application.ApplicationCreateRequest{\n+\t\t\tApplication: testApp,\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, app)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\n+\tt.Run(\"Create application in other namespace when not allowed by configuration\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-2\"}\n+\t\tapp, err := appServer.Create(context.TODO(), &application.ApplicationCreateRequest{\n+\t\t\tApplication: testApp,\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, app)\n+\t\trequire.ErrorContains(t, err, \"namespace 'argocd-1' is not permitted\")\n+\t})\n+\tt.Run(\"Get application sync window in other namespace when project is allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\n+\t\tassert.NoError(t, err)\n+\t\tassert.Equal(t, 0, len(active.ActiveWindows))\n+\t})\n+\tt.Run(\"Get application sync window in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, active)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Get list of links in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, links)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Get list of links in other namespace when project is allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.NoError(t, err)\n+\t\tassert.Equal(t, 0, len(links.Items))\n+\t})\n+}\ndiff --git a/util/argo/argo.go b/util/argo/argo.go\nindex b32369ea70c48..62405655a7b18 100644\n--- a/util/argo/argo.go\n+++ b/util/argo/argo.go\n@@ -689,8 +689,7 @@ func GetAppProject(app *argoappv1.Application, projLister applicationsv1.AppProj\n \t\treturn nil, err\n \t}\n \tif !proj.IsAppNamespacePermitted(app, ns) {\n-\t\treturn nil, fmt.Errorf(\"application '%s' in namespace '%s' is not allowed to use project '%s'\",\n-\t\t\tapp.Name, app.Namespace, proj.Name)\n+\t\treturn nil, argoappv1.NewErrApplicationNotAllowedToUseProject(app.Name, app.Namespace, proj.Name)\n \t}\n \treturn proj, nil\n }\n"},{"commit url":"https://github.com/argoproj/argo-cd/commit/e0ff56d89fbd7d066e9c862b30337f6520f13f17","owner":"argoproj","repo_name":"argo-cd","commit_message":"Merge pull request from GHSA-2gvw-w6fj-7m3c\n\n* sec: validate a project before execute an action\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n\n* sec: validate a project before execute an action\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n\n---------\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>","diff_code":"From e0ff56d89fbd7d066e9c862b30337f6520f13f17 Mon Sep 17 00:00:00 2001\nFrom: pasha-codefresh <pavel@codefresh.io>\nDate: Mon, 15 Apr 2024 10:20:08 +0300\nSubject: [PATCH] Merge pull request from GHSA-2gvw-w6fj-7m3c\n\n* sec: validate a project before execute an action\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n\n* sec: validate a project before execute an action\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n\n---------\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\n---\n .../application/v1alpha1/app_project_types.go | 18 ++\n server/application/application.go | 185 +++++++++---------\n server/application/application_test.go | 118 ++++++++++-\n util/argo/argo.go | 3 +-\n util/session/sessionmanager.go | 2 +-\n 5 files changed, 223 insertions(+), 103 deletions(-)\n\ndiff --git a/pkg/apis/application/v1alpha1/app_project_types.go b/pkg/apis/application/v1alpha1/app_project_types.go\nindex 5243ab7990266..81f95ab624a0d 100644\n--- a/pkg/apis/application/v1alpha1/app_project_types.go\n+++ b/pkg/apis/application/v1alpha1/app_project_types.go\n@@ -17,6 +17,24 @@ import (\n \t\"k8s.io/apimachinery/pkg/runtime/schema\"\n )\n \n+type ErrApplicationNotAllowedToUseProject struct {\n+\tapplication string\n+\tnamespace string\n+\tproject string\n+}\n+\n+func NewErrApplicationNotAllowedToUseProject(application, namespace, project string) error {\n+\treturn &ErrApplicationNotAllowedToUseProject{\n+\t\tapplication: application,\n+\t\tnamespace: namespace,\n+\t\tproject: project,\n+\t}\n+}\n+\n+func (err *ErrApplicationNotAllowedToUseProject) Error() string {\n+\treturn fmt.Sprintf(\"application '%s' in namespace '%s' is not allowed to use project %s\", err.application, err.namespace, err.project)\n+}\n+\n // AppProjectList is list of AppProject resources\n // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\n type AppProjectList struct {\ndiff --git a/server/application/application.go b/server/application/application.go\nindex 36daf3ee5d1f5..13689d4cd9dc2 100644\n--- a/server/application/application.go\n+++ b/server/application/application.go\n@@ -148,7 +148,7 @@ func NewServer(\n //\n // If the user does provide a \"project,\" we can respond more specifically. If the user does not have access to the given\n // app name in the given project, we return \"permission denied.\" If the app exists, but the project is different from\n-func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, error) {\n+func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, *appv1.AppProject, error) {\n \tlogCtx := log.WithFields(map[string]interface{}{\n \t\t\"application\": name,\n \t\t\"namespace\": namespace,\n@@ -165,7 +165,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t\t// but the app is in a different project\" response. We don't want the user inferring the existence of the\n \t\t\t// app from response time.\n \t\t\t_, _ = getApp()\n-\t\t\treturn nil, permissionDeniedErr\n+\t\t\treturn nil, nil, permissionDeniedErr\n \t\t}\n \t}\n \ta, err := getApp()\n@@ -173,15 +173,15 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\tif apierr.IsNotFound(err) {\n \t\t\tif project != \"\" {\n \t\t\t\t// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.\n-\t\t\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\t\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t\t\t}\n \t\t\t// We don't know if the user was allowed to get the Application, and we don't want to leak information about\n \t\t\t// the Application's existence. Return 403.\n \t\t\tlogCtx.Warn(\"application does not exist\")\n-\t\t\treturn nil, permissionDeniedErr\n+\t\t\treturn nil, nil, permissionDeniedErr\n \t\t}\n \t\tlogCtx.Errorf(\"failed to get application: %s\", err)\n-\t\treturn nil, permissionDeniedErr\n+\t\treturn nil, nil, permissionDeniedErr\n \t}\n \t// Even if we performed an initial RBAC check (because the request was fully parameterized), we still need to\n \t// perform a second RBAC check to ensure that the user has access to the actual Application's project (not just the\n@@ -195,11 +195,11 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t\t// The user specified a project. We would have returned a 404 if the user had access to the app, but the app\n \t\t\t// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.\n \t\t\t// Otherwise, they could infer that the app exists based on the error code.\n-\t\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t\t}\n \t\t// The user didn't specify a project. We always return permission denied for both lack of access and lack of\n \t\t// existence.\n-\t\treturn nil, permissionDeniedErr\n+\t\treturn nil, nil, permissionDeniedErr\n \t}\n \teffectiveProject := \"default\"\n \tif a.Spec.Project != \"\" {\n@@ -212,15 +212,20 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\n \t\t}).Warnf(\"user tried to %s application in project %s, but the application is in project %s\", action, project, effectiveProject)\n \t\t// The user has access to the app, but the app is in a different project. Return 404, meaning \"app doesn't\n \t\t// exist in that project\".\n-\t\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n+\t\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \"argoproj.io\", Resource: \"applications\"}, name).Error())\n \t}\n-\treturn a, nil\n+\t// Get the app's associated project, and make sure all project restrictions are enforced.\n+\tproj, err := s.getAppProject(ctx, a, logCtx)\n+\tif err != nil {\n+\t\treturn a, nil, err\n+\t}\n+\treturn a, proj, nil\n }\n \n // getApplicationEnforceRBACInformer uses an informer to get an Application. If the app does not exist, permission is\n // denied, or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\n // information.\n-func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, error) {\n+func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, *appv1.AppProject, error) {\n \tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\n \treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\n \t\treturn s.appLister.Applications(namespaceOrDefault).Get(name)\n@@ -230,7 +235,7 @@ func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action,\n // getApplicationEnforceRBACClient uses a client to get an Application. If the app does not exist, permission is denied,\n // or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\n // information.\n-func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, error) {\n+func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, *appv1.AppProject, error) {\n \tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\n \treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\n \t\tif !s.isNamespaceEnabled(namespaceOrDefault) {\n@@ -314,7 +319,13 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\n \tif q.Validate != nil {\n \t\tvalidate = *q.Validate\n \t}\n-\terr := s.validateAndNormalizeApp(ctx, a, validate)\n+\n+\tproj, err := s.getAppProject(ctx, a, log.WithField(\"application\", a.Name))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n+\terr = s.validateAndNormalizeApp(ctx, a, proj, validate)\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error while validating and normalizing app: %w\", err)\n \t}\n@@ -370,7 +381,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\n \treturn updated, nil\n }\n \n-func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, action func(\n+func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, proj *appv1.AppProject, action func(\n \tclient apiclient.RepoServerServiceClient,\n \trepo *appv1.Repository,\n \thelmRepos []*appv1.Repository,\n@@ -397,13 +408,6 @@ func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, acti\n \tif err != nil {\n \t\treturn fmt.Errorf(\"error getting kustomize settings options: %w\", err)\n \t}\n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn status.Errorf(codes.InvalidArgument, \"application references project %s which does not exist\", a.Spec.Project)\n-\t\t}\n-\t\treturn fmt.Errorf(\"error getting application's project: %w\", err)\n-\t}\n \n \thelmRepos, err := s.db.ListHelmRepositories(ctx)\n \tif err != nil {\n@@ -438,7 +442,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \tif q.Name == nil || *q.Name == \"\" {\n \t\treturn nil, fmt.Errorf(\"invalid request: application name is missing\")\n \t}\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -450,7 +454,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \t}\n \n \tvar manifestInfo *apiclient.ManifestResponse\n-\terr = s.queryRepoServer(ctx, a, func(\n+\terr = s.queryRepoServer(ctx, a, proj, func(\n \t\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\n \t\trevision := source.TargetRevision\n \t\tif q.GetRevision() != \"\" {\n@@ -476,11 +480,6 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\n \t\t\treturn fmt.Errorf(\"error getting API resources: %w\", err)\n \t\t}\n \n-\t\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\t\tif err != nil {\n-\t\t\treturn fmt.Errorf(\"error getting app project: %w\", err)\n-\t\t}\n-\n \t\tmanifestInfo, err = client.GenerateManifest(ctx, &apiclient.ManifestRequest{\n \t\t\tRepo: repo,\n \t\t\tRevision: revision,\n@@ -543,13 +542,13 @@ func (s *Server) GetManifestsWithFiles(stream application.ApplicationService_Get\n \t\treturn fmt.Errorf(\"invalid request: application name is missing\")\n \t}\n \n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\n \tif err != nil {\n \t\treturn err\n \t}\n \n \tvar manifestInfo *apiclient.ManifestResponse\n-\terr = s.queryRepoServer(ctx, a, func(\n+\terr = s.queryRepoServer(ctx, a, proj, func(\n \t\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\n \n \t\tappInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()\n@@ -660,7 +659,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \t// We must use a client Get instead of an informer Get, because it's common to call Get immediately\n \t// following a Watch (which is not yet powered by an informer), and the Get must reflect what was\n \t// previously seen by the client.\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -691,7 +690,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \n \tif refreshType == appv1.RefreshTypeHard {\n \t\t// force refresh cached application details\n-\t\tif err := s.queryRepoServer(ctx, a, func(\n+\t\tif err := s.queryRepoServer(ctx, a, proj, func(\n \t\t\tclient apiclient.RepoServerServiceClient,\n \t\t\trepo *appv1.Repository,\n \t\t\thelmRepos []*appv1.Repository,\n@@ -743,7 +742,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\n \n // ListResourceEvents returns a list of event resources\n func (s *Server) ListResourceEvents(ctx context.Context, q *application.ApplicationResourceEventsQuery) (*v1.EventList, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -811,12 +810,12 @@ func (s *Server) validateAndUpdateApp(ctx context.Context, newApp *appv1.Applica\n \ts.projectLock.RLock(newApp.Spec.GetProject())\n \tdefer s.projectLock.RUnlock(newApp.Spec.GetProject())\n \n-\tapp, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \"\")\n+\tapp, proj, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\terr = s.validateAndNormalizeApp(ctx, newApp, validate)\n+\terr = s.validateAndNormalizeApp(ctx, newApp, proj, validate)\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error validating and normalizing app: %w\", err)\n \t}\n@@ -915,7 +914,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\n \tif q.GetSpec() == nil {\n \t\treturn nil, fmt.Errorf(\"error updating application spec: spec is nil in request\")\n \t}\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -934,7 +933,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\n \n // Patch patches an application\n func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchRequest) (*appv1.Application, error) {\n-\tapp, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\tapp, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -977,11 +976,35 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque\n \treturn s.validateAndUpdateApp(ctx, newApp, false, true, rbacpolicy.ActionUpdate, q.GetProject())\n }\n \n+func (s *Server) getAppProject(ctx context.Context, a *appv1.Application, logCtx *log.Entry) (*appv1.AppProject, error) {\n+\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n+\tif err == nil {\n+\t\treturn proj, nil\n+\t}\n+\n+\t// If there's a permission issue or the app doesn't exist, return a vague error to avoid letting the user enumerate project names.\n+\tvagueError := status.Errorf(codes.InvalidArgument, \"app is not allowed in project %q, or the project does not exist\", a.Spec.Project)\n+\n+\tif apierr.IsNotFound(err) {\n+\t\treturn nil, vagueError\n+\t}\n+\n+\tif _, ok := err.(*appv1.ErrApplicationNotAllowedToUseProject); ok {\n+\t\tlogCtx.WithFields(map[string]interface{}{\n+\t\t\t\"project\": a.Spec.Project,\n+\t\t\targocommon.SecurityField: argocommon.SecurityMedium,\n+\t\t}).Warnf(\"error getting app project: %s\", err)\n+\t\treturn nil, vagueError\n+\t}\n+\n+\treturn nil, vagueError\n+}\n+\n // Delete removes an application and all associated resources\n func (s *Server) Delete(ctx context.Context, q *application.ApplicationDeleteRequest) (*application.ApplicationResponse, error) {\n \tappName := q.GetName()\n \tappNs := s.appNamespaceOrDefault(q.GetAppNamespace())\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1136,16 +1159,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati\n \t}\n }\n \n-func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\t// Offer no hint that the project does not exist.\n-\t\t\tlog.Warnf(\"User attempted to create/update application in non-existent project %q\", app.Spec.Project)\n-\t\t\treturn permissionDeniedErr\n-\t\t}\n-\t\treturn fmt.Errorf(\"error getting application's project: %w\", err)\n-\t}\n+func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, validate bool) error {\n \tif app.GetName() == \"\" {\n \t\treturn fmt.Errorf(\"resource name may not be empty\")\n \t}\n@@ -1249,7 +1263,7 @@ func (s *Server) getAppResources(ctx context.Context, a *appv1.Application) (*ap\n }\n \n func (s *Server) getAppLiveResource(ctx context.Context, action string, q *application.ApplicationResourceRequest) (*appv1.ResourceNode, *rest.Config, *appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, nil, nil, err\n \t}\n@@ -1386,7 +1400,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR\n }\n \n func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery) (*appv1.ApplicationTree, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1395,7 +1409,7 @@ func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery\n }\n \n func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application.ApplicationService_WatchResourceTreeServer) error {\n-\t_, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\t_, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn err\n \t}\n@@ -1412,7 +1426,7 @@ func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application\n }\n \n func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.RevisionMetadata, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1422,12 +1436,6 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error getting repository by URL: %w\", err)\n \t}\n-\t// We need to get some information with the project associated to the app,\n-\t// so we'll know whether GPG signatures are enforced.\n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n \tconn, repoClient, err := s.repoClientset.NewRepoServerClient()\n \tif err != nil {\n \t\treturn nil, fmt.Errorf(\"error creating repo server client: %w\", err)\n@@ -1442,7 +1450,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\n \n // RevisionChartDetails returns the helm chart metadata, as fetched from the reposerver\n func (s *Server) RevisionChartDetails(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.ChartDetails, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1473,7 +1481,7 @@ func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) boo\n }\n \n func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1530,7 +1538,7 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.\n \t\t}\n \t}\n \n-\ta, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\ta, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \tif err != nil {\n \t\treturn err\n \t}\n@@ -1722,19 +1730,11 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio\n \n // Sync syncs an application to its target state\n func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncRequest) (*appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn a, status.Errorf(codes.InvalidArgument, \"application references project %s which does not exist\", a.Spec.Project)\n-\t\t}\n-\t\treturn a, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n \ts.inferResourcesStatusHealth(a)\n \n \tif !proj.Spec.SyncWindows.Matches(a).CanSync(true) {\n@@ -1831,7 +1831,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR\n }\n \n func (s *Server) Rollback(ctx context.Context, rollbackReq *application.ApplicationRollbackRequest) (*appv1.Application, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1890,7 +1890,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat\n }\n \n func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksRequest) (*application.LinksResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1905,7 +1905,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\n \t\treturn nil, fmt.Errorf(\"failed to read application deep links from configmap: %w\", err)\n \t}\n \n-\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a)\n+\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a, proj)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -1920,12 +1920,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\n \treturn finalList, nil\n }\n \n-func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n+func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application, proj *appv1.AppProject) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\n \t// sanitize project jwt tokens\n \tproj.Status = appv1.AppProjectStatus{}\n \n@@ -1988,7 +1983,12 @@ func (s *Server) ListResourceLinks(ctx context.Context, req *application.Applica\n \t\treturn nil, err\n \t}\n \n-\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app)\n+\tproj, err := s.getAppProject(ctx, app, log.WithField(\"application\", app.GetName()))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n+\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app, proj)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -2044,7 +2044,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy\n func (s *Server) TerminateOperation(ctx context.Context, termOpReq *application.OperationTerminateRequest) (*application.OperationTerminateResponse, error) {\n \tappName := termOpReq.GetName()\n \tappNs := s.appNamespaceOrDefault(termOpReq.GetAppNamespace())\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \"\")\n+\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n@@ -2117,7 +2117,7 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica\n \n func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacRequest string, q *application.ApplicationResourceRequest) (obj *unstructured.Unstructured, res *appv1.ResourceNode, app *appv1.Application, config *rest.Config, err error) {\n \tif q.GetKind() == applicationType.ApplicationKind && q.GetGroup() == applicationType.Group && q.GetName() == q.GetResourceName() {\n-\t\tapp, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\n+\t\tapp, _, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\n \t\tif err != nil {\n \t\t\treturn nil, nil, nil, nil, err\n \t\t}\n@@ -2213,6 +2213,11 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\n \t\t}\n \t}\n \n+\tproj, err := s.getAppProject(ctx, a, log.WithField(\"application\", a.Name))\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\n \t// First, make sure all the returned resources are permitted, for each operation.\n \t// Also perform create with dry-runs for all create-operation resources.\n \t// This is performed separately to reduce the risk of only some of the resources being successfully created later.\n@@ -2220,7 +2225,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\n \t// the dry-run for relevant apply/delete operation would have to be invoked as well.\n \tfor _, impactedResource := range newObjects {\n \t\tnewObj := impactedResource.UnstructuredObj\n-\t\terr := s.verifyResourcePermitted(ctx, app, newObj)\n+\t\terr := s.verifyResourcePermitted(ctx, app, proj, newObj)\n \t\tif err != nil {\n \t\t\treturn nil, err\n \t\t}\n@@ -2314,14 +2319,7 @@ func (s *Server) patchResource(ctx context.Context, config *rest.Config, liveObj\n \treturn &application.ApplicationResponse{}, nil\n }\n \n-func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, obj *unstructured.Unstructured) error {\n-\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\tif apierr.IsNotFound(err) {\n-\t\t\treturn fmt.Errorf(\"application references project %s which does not exist\", app.Spec.Project)\n-\t\t}\n-\t\treturn fmt.Errorf(\"failed to get project %s: %w\", app.Spec.Project, err)\n-\t}\n+func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, obj *unstructured.Unstructured) error {\n \tpermitted, err := proj.IsResourcePermitted(schema.GroupKind{Group: obj.GroupVersionKind().Group, Kind: obj.GroupVersionKind().Kind}, obj.GetNamespace(), app.Spec.Destination, func(project string) ([]*appv1.Cluster, error) {\n \t\tclusters, err := s.db.GetProjectClusters(context.TODO(), project)\n \t\tif err != nil {\n@@ -2381,16 +2379,11 @@ func splitStatusPatch(patch []byte) ([]byte, []byte, error) {\n }\n \n func (s *Server) GetApplicationSyncWindows(ctx context.Context, q *application.ApplicationSyncWindowsQuery) (*application.ApplicationSyncWindowsResponse, error) {\n-\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n+\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \"\")\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \n-\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\n-\tif err != nil {\n-\t\treturn nil, fmt.Errorf(\"error getting app project: %w\", err)\n-\t}\n-\n \twindows := proj.Spec.SyncWindows.Matches(a)\n \tsync := windows.CanSync(true)\n \ndiff --git a/server/application/application_test.go b/server/application/application_test.go\nindex 8e5cb59cd4263..03e38cf14c79e 100644\n--- a/server/application/application_test.go\n+++ b/server/application/application_test.go\n@@ -1818,7 +1818,7 @@ func TestServer_GetApplicationSyncWindowsState(t *testing.T) {\n \t\tappServer := newTestAppServer(t, testApp)\n \n \t\tactive, err := appServer.GetApplicationSyncWindows(context.Background(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name})\n-\t\tassert.Contains(t, err.Error(), \"not found\")\n+\t\tassert.Contains(t, err.Error(), \"not exist\")\n \t\tassert.Nil(t, active)\n \t})\n }\n@@ -2428,7 +2428,16 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \tt.Run(\"Get application in other namespace when allowed\", func(t *testing.T) {\n \t\ttestApp := newTestApp()\n \t\ttestApp.Namespace = \"argocd-1\"\n-\t\tappServer := newTestAppServer(t, testApp)\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n \t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n \t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n \t\t\tName: pointer.String(\"test-app\"),\n@@ -2439,6 +2448,28 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \t\trequire.Equal(t, \"argocd-1\", app.Namespace)\n \t\trequire.Equal(t, \"test-app\", app.Name)\n \t})\n+\tt.Run(\"Get application in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tAppNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, app)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n \tt.Run(\"Create application in other namespace when allowed\", func(t *testing.T) {\n \t\ttestApp := newTestApp()\n \t\ttestApp.Namespace = \"argocd-1\"\n@@ -2481,7 +2512,7 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \t\t})\n \t\trequire.Error(t, err)\n \t\trequire.Nil(t, app)\n-\t\trequire.ErrorContains(t, err, \"not allowed to use project\")\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n \t})\n \n \tt.Run(\"Create application in other namespace when not allowed by configuration\", func(t *testing.T) {\n@@ -2505,5 +2536,84 @@ func TestAppNamespaceRestrictions(t *testing.T) {\n \t\trequire.Nil(t, app)\n \t\trequire.ErrorContains(t, err, \"namespace 'argocd-1' is not permitted\")\n \t})\n-\n+\tt.Run(\"Get application sync window in other namespace when project is allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\n+\t\tassert.NoError(t, err)\n+\t\tassert.Equal(t, 0, len(active.ActiveWindows))\n+\t})\n+\tt.Run(\"Get application sync window in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, active)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Get list of links in other namespace when project is not allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-2\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.Error(t, err)\n+\t\trequire.Nil(t, links)\n+\t\trequire.ErrorContains(t, err, \"app is not allowed in project\")\n+\t})\n+\tt.Run(\"Get list of links in other namespace when project is allowed\", func(t *testing.T) {\n+\t\ttestApp := newTestApp()\n+\t\ttestApp.Namespace = \"argocd-1\"\n+\t\ttestApp.Spec.Project = \"other-ns\"\n+\t\totherNsProj := &appsv1.AppProject{\n+\t\t\tObjectMeta: metav1.ObjectMeta{Name: \"other-ns\", Namespace: \"default\"},\n+\t\t\tSpec: appsv1.AppProjectSpec{\n+\t\t\t\tSourceRepos: []string{\"*\"},\n+\t\t\t\tDestinations: []appsv1.ApplicationDestination{{Server: \"*\", Namespace: \"*\"}},\n+\t\t\t\tSourceNamespaces: []string{\"argocd-1\"},\n+\t\t\t},\n+\t\t}\n+\t\tappServer := newTestAppServer(t, testApp, otherNsProj)\n+\t\tappServer.enabledNamespaces = []string{\"argocd-1\"}\n+\t\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\n+\t\t\tName: pointer.String(\"test-app\"),\n+\t\t\tNamespace: pointer.String(\"argocd-1\"),\n+\t\t})\n+\t\trequire.NoError(t, err)\n+\t\tassert.Equal(t, 0, len(links.Items))\n+\t})\n }\ndiff --git a/util/argo/argo.go b/util/argo/argo.go\nindex 36e513cf0f534..49862bb64ac39 100644\n--- a/util/argo/argo.go\n+++ b/util/argo/argo.go\n@@ -694,8 +694,7 @@ func GetAppProject(app *argoappv1.Application, projLister applicationsv1.AppProj\n \t\treturn nil, err\n \t}\n \tif !proj.IsAppNamespacePermitted(app, ns) {\n-\t\treturn nil, fmt.Errorf(\"application '%s' in namespace '%s' is not allowed to use project '%s'\",\n-\t\t\tapp.Name, app.Namespace, proj.Name)\n+\t\treturn nil, argoappv1.NewErrApplicationNotAllowedToUseProject(app.Name, app.Namespace, proj.Name)\n \t}\n \treturn proj, nil\n }\ndiff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go\nindex af22ca0f2502e..e13075847c380 100644\n--- a/util/session/sessionmanager.go\n+++ b/util/session/sessionmanager.go\n@@ -312,7 +312,7 @@ func expireOldFailedAttempts(maxAge time.Duration, failures map[string]LoginAtte\n \treturn expiredCount\n }\n \n-// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache. \n+// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache.\n func pickRandomNonAdminLoginFailure(failures map[string]LoginAttempts, username string) *string {\n \tidx := rand.Intn(len(failures) - 1)\n \ti := 0\n"}],"string":"[\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/c514105af739eebedb9dbe89d8a6dd8dfc30bb2c\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-2gvw-w6fj-7m3c\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\",\n \"diff_code\": \"From c514105af739eebedb9dbe89d8a6dd8dfc30bb2c Mon Sep 17 00:00:00 2001\\nFrom: pasha-codefresh <pavel@codefresh.io>\\nDate: Mon, 15 Apr 2024 10:20:07 +0300\\nSubject: [PATCH] Merge pull request from GHSA-2gvw-w6fj-7m3c\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n---\\n .../application/v1alpha1/app_project_types.go | 18 ++\\n server/application/application.go | 185 +++++++++---------\\n server/application/application_test.go | 118 ++++++++++-\\n util/argo/argo.go | 3 +-\\n util/session/sessionmanager.go | 2 +-\\n 5 files changed, 223 insertions(+), 103 deletions(-)\\n\\ndiff --git a/pkg/apis/application/v1alpha1/app_project_types.go b/pkg/apis/application/v1alpha1/app_project_types.go\\nindex 5243ab7990266..81f95ab624a0d 100644\\n--- a/pkg/apis/application/v1alpha1/app_project_types.go\\n+++ b/pkg/apis/application/v1alpha1/app_project_types.go\\n@@ -17,6 +17,24 @@ import (\\n \\t\\\"k8s.io/apimachinery/pkg/runtime/schema\\\"\\n )\\n \\n+type ErrApplicationNotAllowedToUseProject struct {\\n+\\tapplication string\\n+\\tnamespace string\\n+\\tproject string\\n+}\\n+\\n+func NewErrApplicationNotAllowedToUseProject(application, namespace, project string) error {\\n+\\treturn &ErrApplicationNotAllowedToUseProject{\\n+\\t\\tapplication: application,\\n+\\t\\tnamespace: namespace,\\n+\\t\\tproject: project,\\n+\\t}\\n+}\\n+\\n+func (err *ErrApplicationNotAllowedToUseProject) Error() string {\\n+\\treturn fmt.Sprintf(\\\"application '%s' in namespace '%s' is not allowed to use project %s\\\", err.application, err.namespace, err.project)\\n+}\\n+\\n // AppProjectList is list of AppProject resources\\n // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\\n type AppProjectList struct {\\ndiff --git a/server/application/application.go b/server/application/application.go\\nindex ec0db45a11f22..5bd47adc359ed 100644\\n--- a/server/application/application.go\\n+++ b/server/application/application.go\\n@@ -151,7 +151,7 @@ func NewServer(\\n //\\n // If the user does provide a \\\"project,\\\" we can respond more specifically. If the user does not have access to the given\\n // app name in the given project, we return \\\"permission denied.\\\" If the app exists, but the project is different from\\n-func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, error) {\\n+func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, *appv1.AppProject, error) {\\n \\tuser := session.Username(ctx)\\n \\tif user == \\\"\\\" {\\n \\t\\tuser = \\\"Unknown user\\\"\\n@@ -173,7 +173,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t\\t// but the app is in a different project\\\" response. We don't want the user inferring the existence of the\\n \\t\\t\\t// app from response time.\\n \\t\\t\\t_, _ = getApp()\\n-\\t\\t\\treturn nil, permissionDeniedErr\\n+\\t\\t\\treturn nil, nil, permissionDeniedErr\\n \\t\\t}\\n \\t}\\n \\ta, err := getApp()\\n@@ -181,15 +181,15 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\tif apierr.IsNotFound(err) {\\n \\t\\t\\tif project != \\\"\\\" {\\n \\t\\t\\t\\t// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.\\n-\\t\\t\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\t\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t\\t\\t}\\n \\t\\t\\t// We don't know if the user was allowed to get the Application, and we don't want to leak information about\\n \\t\\t\\t// the Application's existence. Return 403.\\n \\t\\t\\tlogCtx.Warn(\\\"application does not exist\\\")\\n-\\t\\t\\treturn nil, permissionDeniedErr\\n+\\t\\t\\treturn nil, nil, permissionDeniedErr\\n \\t\\t}\\n \\t\\tlogCtx.Errorf(\\\"failed to get application: %s\\\", err)\\n-\\t\\treturn nil, permissionDeniedErr\\n+\\t\\treturn nil, nil, permissionDeniedErr\\n \\t}\\n \\t// Even if we performed an initial RBAC check (because the request was fully parameterized), we still need to\\n \\t// perform a second RBAC check to ensure that the user has access to the actual Application's project (not just the\\n@@ -203,11 +203,11 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t\\t// The user specified a project. We would have returned a 404 if the user had access to the app, but the app\\n \\t\\t\\t// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.\\n \\t\\t\\t// Otherwise, they could infer that the app exists based on the error code.\\n-\\t\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t\\t}\\n \\t\\t// The user didn't specify a project. We always return permission denied for both lack of access and lack of\\n \\t\\t// existence.\\n-\\t\\treturn nil, permissionDeniedErr\\n+\\t\\treturn nil, nil, permissionDeniedErr\\n \\t}\\n \\teffectiveProject := \\\"default\\\"\\n \\tif a.Spec.Project != \\\"\\\" {\\n@@ -220,15 +220,20 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t}).Warnf(\\\"user tried to %s application in project %s, but the application is in project %s\\\", action, project, effectiveProject)\\n \\t\\t// The user has access to the app, but the app is in a different project. Return 404, meaning \\\"app doesn't\\n \\t\\t// exist in that project\\\".\\n-\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t}\\n-\\treturn a, nil\\n+\\t// Get the app's associated project, and make sure all project restrictions are enforced.\\n+\\tproj, err := s.getAppProject(ctx, a, logCtx)\\n+\\tif err != nil {\\n+\\t\\treturn a, nil, err\\n+\\t}\\n+\\treturn a, proj, nil\\n }\\n \\n // getApplicationEnforceRBACInformer uses an informer to get an Application. If the app does not exist, permission is\\n // denied, or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\\n // information.\\n-func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, error) {\\n+func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, *appv1.AppProject, error) {\\n \\tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\\n \\treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\\n \\t\\treturn s.appLister.Applications(namespaceOrDefault).Get(name)\\n@@ -238,7 +243,7 @@ func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action,\\n // getApplicationEnforceRBACClient uses a client to get an Application. If the app does not exist, permission is denied,\\n // or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\\n // information.\\n-func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, error) {\\n+func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, *appv1.AppProject, error) {\\n \\tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\\n \\treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\\n \\t\\tif !s.isNamespaceEnabled(namespaceOrDefault) {\\n@@ -322,7 +327,13 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\\n \\tif q.Validate != nil {\\n \\t\\tvalidate = *q.Validate\\n \\t}\\n-\\terr := s.validateAndNormalizeApp(ctx, a, validate)\\n+\\n+\\tproj, err := s.getAppProject(ctx, a, log.WithField(\\\"application\\\", a.Name))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n+\\terr = s.validateAndNormalizeApp(ctx, a, proj, validate)\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error while validating and normalizing app: %w\\\", err)\\n \\t}\\n@@ -378,7 +389,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\\n \\treturn updated, nil\\n }\\n \\n-func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, action func(\\n+func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, proj *appv1.AppProject, action func(\\n \\tclient apiclient.RepoServerServiceClient,\\n \\trepo *appv1.Repository,\\n \\thelmRepos []*appv1.Repository,\\n@@ -405,13 +416,6 @@ func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, acti\\n \\tif err != nil {\\n \\t\\treturn fmt.Errorf(\\\"error getting kustomize settings options: %w\\\", err)\\n \\t}\\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn status.Errorf(codes.InvalidArgument, \\\"application references project %s which does not exist\\\", a.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"error getting application's project: %w\\\", err)\\n-\\t}\\n \\n \\thelmRepos, err := s.db.ListHelmRepositories(ctx)\\n \\tif err != nil {\\n@@ -446,7 +450,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\tif q.Name == nil || *q.Name == \\\"\\\" {\\n \\t\\treturn nil, fmt.Errorf(\\\"invalid request: application name is missing\\\")\\n \\t}\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -458,7 +462,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\t}\\n \\n \\tvar manifestInfo *apiclient.ManifestResponse\\n-\\terr = s.queryRepoServer(ctx, a, func(\\n+\\terr = s.queryRepoServer(ctx, a, proj, func(\\n \\t\\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\\n \\t\\trevision := source.TargetRevision\\n \\t\\tif q.GetRevision() != \\\"\\\" {\\n@@ -484,11 +488,6 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\t\\t\\treturn fmt.Errorf(\\\"error getting API resources: %w\\\", err)\\n \\t\\t}\\n \\n-\\t\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\t\\tif err != nil {\\n-\\t\\t\\treturn fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t\\t}\\n-\\n \\t\\tmanifestInfo, err = client.GenerateManifest(ctx, &apiclient.ManifestRequest{\\n \\t\\t\\tRepo: repo,\\n \\t\\t\\tRevision: revision,\\n@@ -551,13 +550,13 @@ func (s *Server) GetManifestsWithFiles(stream application.ApplicationService_Get\\n \\t\\treturn fmt.Errorf(\\\"invalid request: application name is missing\\\")\\n \\t}\\n \\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n \\n \\tvar manifestInfo *apiclient.ManifestResponse\\n-\\terr = s.queryRepoServer(ctx, a, func(\\n+\\terr = s.queryRepoServer(ctx, a, proj, func(\\n \\t\\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\\n \\n \\t\\tappInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()\\n@@ -668,7 +667,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\t// We must use a client Get instead of an informer Get, because it's common to call Get immediately\\n \\t// following a Watch (which is not yet powered by an informer), and the Get must reflect what was\\n \\t// previously seen by the client.\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -699,7 +698,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\n \\tif refreshType == appv1.RefreshTypeHard {\\n \\t\\t// force refresh cached application details\\n-\\t\\tif err := s.queryRepoServer(ctx, a, func(\\n+\\t\\tif err := s.queryRepoServer(ctx, a, proj, func(\\n \\t\\t\\tclient apiclient.RepoServerServiceClient,\\n \\t\\t\\trepo *appv1.Repository,\\n \\t\\t\\thelmRepos []*appv1.Repository,\\n@@ -751,7 +750,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\n // ListResourceEvents returns a list of event resources\\n func (s *Server) ListResourceEvents(ctx context.Context, q *application.ApplicationResourceEventsQuery) (*v1.EventList, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -819,12 +818,12 @@ func (s *Server) validateAndUpdateApp(ctx context.Context, newApp *appv1.Applica\\n \\ts.projectLock.RLock(newApp.Spec.GetProject())\\n \\tdefer s.projectLock.RUnlock(newApp.Spec.GetProject())\\n \\n-\\tapp, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \\\"\\\")\\n+\\tapp, proj, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\terr = s.validateAndNormalizeApp(ctx, newApp, validate)\\n+\\terr = s.validateAndNormalizeApp(ctx, newApp, proj, validate)\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error validating and normalizing app: %w\\\", err)\\n \\t}\\n@@ -923,7 +922,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\\n \\tif q.GetSpec() == nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error updating application spec: spec is nil in request\\\")\\n \\t}\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -942,7 +941,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\\n \\n // Patch patches an application\\n func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchRequest) (*appv1.Application, error) {\\n-\\tapp, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\tapp, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -985,11 +984,35 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque\\n \\treturn s.validateAndUpdateApp(ctx, newApp, false, true, rbacpolicy.ActionUpdate, q.GetProject())\\n }\\n \\n+func (s *Server) getAppProject(ctx context.Context, a *appv1.Application, logCtx *log.Entry) (*appv1.AppProject, error) {\\n+\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n+\\tif err == nil {\\n+\\t\\treturn proj, nil\\n+\\t}\\n+\\n+\\t// If there's a permission issue or the app doesn't exist, return a vague error to avoid letting the user enumerate project names.\\n+\\tvagueError := status.Errorf(codes.InvalidArgument, \\\"app is not allowed in project %q, or the project does not exist\\\", a.Spec.Project)\\n+\\n+\\tif apierr.IsNotFound(err) {\\n+\\t\\treturn nil, vagueError\\n+\\t}\\n+\\n+\\tif _, ok := err.(*appv1.ErrApplicationNotAllowedToUseProject); ok {\\n+\\t\\tlogCtx.WithFields(map[string]interface{}{\\n+\\t\\t\\t\\\"project\\\": a.Spec.Project,\\n+\\t\\t\\targocommon.SecurityField: argocommon.SecurityMedium,\\n+\\t\\t}).Warnf(\\\"error getting app project: %s\\\", err)\\n+\\t\\treturn nil, vagueError\\n+\\t}\\n+\\n+\\treturn nil, vagueError\\n+}\\n+\\n // Delete removes an application and all associated resources\\n func (s *Server) Delete(ctx context.Context, q *application.ApplicationDeleteRequest) (*application.ApplicationResponse, error) {\\n \\tappName := q.GetName()\\n \\tappNs := s.appNamespaceOrDefault(q.GetAppNamespace())\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1144,16 +1167,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati\\n \\t}\\n }\\n \\n-func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\t// Offer no hint that the project does not exist.\\n-\\t\\t\\tlog.Warnf(\\\"User attempted to create/update application in non-existent project %q\\\", app.Spec.Project)\\n-\\t\\t\\treturn permissionDeniedErr\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"error getting application's project: %w\\\", err)\\n-\\t}\\n+func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, validate bool) error {\\n \\tif app.GetName() == \\\"\\\" {\\n \\t\\treturn fmt.Errorf(\\\"resource name may not be empty\\\")\\n \\t}\\n@@ -1257,7 +1271,7 @@ func (s *Server) getAppResources(ctx context.Context, a *appv1.Application) (*ap\\n }\\n \\n func (s *Server) getAppLiveResource(ctx context.Context, action string, q *application.ApplicationResourceRequest) (*appv1.ResourceNode, *rest.Config, *appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, nil, nil, err\\n \\t}\\n@@ -1394,7 +1408,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR\\n }\\n \\n func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery) (*appv1.ApplicationTree, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1403,7 +1417,7 @@ func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery\\n }\\n \\n func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application.ApplicationService_WatchResourceTreeServer) error {\\n-\\t_, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\t_, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n@@ -1420,7 +1434,7 @@ func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application\\n }\\n \\n func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.RevisionMetadata, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1430,12 +1444,6 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error getting repository by URL: %w\\\", err)\\n \\t}\\n-\\t// We need to get some information with the project associated to the app,\\n-\\t// so we'll know whether GPG signatures are enforced.\\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n \\tconn, repoClient, err := s.repoClientset.NewRepoServerClient()\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error creating repo server client: %w\\\", err)\\n@@ -1450,7 +1458,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\\n \\n // RevisionChartDetails returns the helm chart metadata, as fetched from the reposerver\\n func (s *Server) RevisionChartDetails(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.ChartDetails, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1481,7 +1489,7 @@ func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) boo\\n }\\n \\n func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1538,7 +1546,7 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.\\n \\t\\t}\\n \\t}\\n \\n-\\ta, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n@@ -1730,19 +1738,11 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio\\n \\n // Sync syncs an application to its target state\\n func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncRequest) (*appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn a, status.Errorf(codes.InvalidArgument, \\\"application references project %s which does not exist\\\", a.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn a, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n \\ts.inferResourcesStatusHealth(a)\\n \\n \\tif !proj.Spec.SyncWindows.Matches(a).CanSync(true) {\\n@@ -1839,7 +1839,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR\\n }\\n \\n func (s *Server) Rollback(ctx context.Context, rollbackReq *application.ApplicationRollbackRequest) (*appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1898,7 +1898,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat\\n }\\n \\n func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksRequest) (*application.LinksResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1913,7 +1913,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\\n \\t\\treturn nil, fmt.Errorf(\\\"failed to read application deep links from configmap: %w\\\", err)\\n \\t}\\n \\n-\\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a)\\n+\\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a, proj)\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1928,12 +1928,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\\n \\treturn finalList, nil\\n }\\n \\n-func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n+func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application, proj *appv1.AppProject) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\\n \\t// sanitize project jwt tokens\\n \\tproj.Status = appv1.AppProjectStatus{}\\n \\n@@ -1996,7 +1991,12 @@ func (s *Server) ListResourceLinks(ctx context.Context, req *application.Applica\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app)\\n+\\tproj, err := s.getAppProject(ctx, app, log.WithField(\\\"application\\\", app.GetName()))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n+\\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app, proj)\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -2052,7 +2052,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy\\n func (s *Server) TerminateOperation(ctx context.Context, termOpReq *application.OperationTerminateRequest) (*application.OperationTerminateResponse, error) {\\n \\tappName := termOpReq.GetName()\\n \\tappNs := s.appNamespaceOrDefault(termOpReq.GetAppNamespace())\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -2125,7 +2125,7 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica\\n \\n func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacRequest string, q *application.ApplicationResourceRequest) (obj *unstructured.Unstructured, res *appv1.ResourceNode, app *appv1.Application, config *rest.Config, err error) {\\n \\tif q.GetKind() == applicationType.ApplicationKind && q.GetGroup() == applicationType.Group && q.GetName() == q.GetResourceName() {\\n-\\t\\tapp, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\t\\tapp, _, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\t\\tif err != nil {\\n \\t\\t\\treturn nil, nil, nil, nil, err\\n \\t\\t}\\n@@ -2221,6 +2221,11 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\\n \\t\\t}\\n \\t}\\n \\n+\\tproj, err := s.getAppProject(ctx, a, log.WithField(\\\"application\\\", a.Name))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n \\t// First, make sure all the returned resources are permitted, for each operation.\\n \\t// Also perform create with dry-runs for all create-operation resources.\\n \\t// This is performed separately to reduce the risk of only some of the resources being successfully created later.\\n@@ -2228,7 +2233,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\\n \\t// the dry-run for relevant apply/delete operation would have to be invoked as well.\\n \\tfor _, impactedResource := range newObjects {\\n \\t\\tnewObj := impactedResource.UnstructuredObj\\n-\\t\\terr := s.verifyResourcePermitted(ctx, app, newObj)\\n+\\t\\terr := s.verifyResourcePermitted(ctx, app, proj, newObj)\\n \\t\\tif err != nil {\\n \\t\\t\\treturn nil, err\\n \\t\\t}\\n@@ -2322,14 +2327,7 @@ func (s *Server) patchResource(ctx context.Context, config *rest.Config, liveObj\\n \\treturn &application.ApplicationResponse{}, nil\\n }\\n \\n-func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, obj *unstructured.Unstructured) error {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn fmt.Errorf(\\\"application references project %s which does not exist\\\", app.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"failed to get project %s: %w\\\", app.Spec.Project, err)\\n-\\t}\\n+func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, obj *unstructured.Unstructured) error {\\n \\tpermitted, err := proj.IsResourcePermitted(schema.GroupKind{Group: obj.GroupVersionKind().Group, Kind: obj.GroupVersionKind().Kind}, obj.GetNamespace(), app.Spec.Destination, func(project string) ([]*appv1.Cluster, error) {\\n \\t\\tclusters, err := s.db.GetProjectClusters(context.TODO(), project)\\n \\t\\tif err != nil {\\n@@ -2389,16 +2387,11 @@ func splitStatusPatch(patch []byte) ([]byte, []byte, error) {\\n }\\n \\n func (s *Server) GetApplicationSyncWindows(ctx context.Context, q *application.ApplicationSyncWindowsQuery) (*application.ApplicationSyncWindowsResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n \\twindows := proj.Spec.SyncWindows.Matches(a)\\n \\tsync := windows.CanSync(true)\\n \\ndiff --git a/server/application/application_test.go b/server/application/application_test.go\\nindex 51c912ff05109..abbf41ee42e72 100644\\n--- a/server/application/application_test.go\\n+++ b/server/application/application_test.go\\n@@ -1818,7 +1818,7 @@ func TestServer_GetApplicationSyncWindowsState(t *testing.T) {\\n \\t\\tappServer := newTestAppServer(t, testApp)\\n \\n \\t\\tactive, err := appServer.GetApplicationSyncWindows(context.Background(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name})\\n-\\t\\tassert.Contains(t, err.Error(), \\\"not found\\\")\\n+\\t\\tassert.Contains(t, err.Error(), \\\"not exist\\\")\\n \\t\\tassert.Nil(t, active)\\n \\t})\\n }\\n@@ -2428,7 +2428,16 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\tt.Run(\\\"Get application in other namespace when allowed\\\", func(t *testing.T) {\\n \\t\\ttestApp := newTestApp()\\n \\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n-\\t\\tappServer := newTestAppServer(t, testApp)\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n \\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n \\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n \\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n@@ -2439,6 +2448,28 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\t\\trequire.Equal(t, \\\"argocd-1\\\", app.Namespace)\\n \\t\\trequire.Equal(t, \\\"test-app\\\", app.Name)\\n \\t})\\n+\\tt.Run(\\\"Get application in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tAppNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, app)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n \\tt.Run(\\\"Create application in other namespace when allowed\\\", func(t *testing.T) {\\n \\t\\ttestApp := newTestApp()\\n \\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n@@ -2481,7 +2512,7 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\t\\t})\\n \\t\\trequire.Error(t, err)\\n \\t\\trequire.Nil(t, app)\\n-\\t\\trequire.ErrorContains(t, err, \\\"not allowed to use project\\\")\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n \\t})\\n \\n \\tt.Run(\\\"Create application in other namespace when not allowed by configuration\\\", func(t *testing.T) {\\n@@ -2505,5 +2536,84 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\t\\trequire.Nil(t, app)\\n \\t\\trequire.ErrorContains(t, err, \\\"namespace 'argocd-1' is not permitted\\\")\\n \\t})\\n-\\n+\\tt.Run(\\\"Get application sync window in other namespace when project is allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\\n+\\t\\tassert.NoError(t, err)\\n+\\t\\tassert.Equal(t, 0, len(active.ActiveWindows))\\n+\\t})\\n+\\tt.Run(\\\"Get application sync window in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, active)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get list of links in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, links)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get list of links in other namespace when project is allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\tassert.Equal(t, 0, len(links.Items))\\n+\\t})\\n }\\ndiff --git a/util/argo/argo.go b/util/argo/argo.go\\nindex 36e513cf0f534..49862bb64ac39 100644\\n--- a/util/argo/argo.go\\n+++ b/util/argo/argo.go\\n@@ -694,8 +694,7 @@ func GetAppProject(app *argoappv1.Application, projLister applicationsv1.AppProj\\n \\t\\treturn nil, err\\n \\t}\\n \\tif !proj.IsAppNamespacePermitted(app, ns) {\\n-\\t\\treturn nil, fmt.Errorf(\\\"application '%s' in namespace '%s' is not allowed to use project '%s'\\\",\\n-\\t\\t\\tapp.Name, app.Namespace, proj.Name)\\n+\\t\\treturn nil, argoappv1.NewErrApplicationNotAllowedToUseProject(app.Name, app.Namespace, proj.Name)\\n \\t}\\n \\treturn proj, nil\\n }\\ndiff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go\\nindex af22ca0f2502e..e13075847c380 100644\\n--- a/util/session/sessionmanager.go\\n+++ b/util/session/sessionmanager.go\\n@@ -312,7 +312,7 @@ func expireOldFailedAttempts(maxAge time.Duration, failures map[string]LoginAtte\\n \\treturn expiredCount\\n }\\n \\n-// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache. \\n+// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache.\\n func pickRandomNonAdminLoginFailure(failures map[string]LoginAttempts, username string) *string {\\n \\tidx := rand.Intn(len(failures) - 1)\\n \\ti := 0\\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/c5a252c4cc260e240e2074794aedb861d07e9ca5\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-2gvw-w6fj-7m3c\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\",\n \"diff_code\": \"From c5a252c4cc260e240e2074794aedb861d07e9ca5 Mon Sep 17 00:00:00 2001\\nFrom: pasha-codefresh <pavel@codefresh.io>\\nDate: Mon, 15 Apr 2024 10:20:07 +0300\\nSubject: [PATCH] Merge pull request from GHSA-2gvw-w6fj-7m3c\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n---\\n .../application/v1alpha1/app_project_types.go | 18 ++\\n server/application/application.go | 184 ++++++-------\\n server/application/application_test.go | 254 +++++++++++++++++-\\n util/argo/argo.go | 3 +-\\n 4 files changed, 364 insertions(+), 95 deletions(-)\\n\\ndiff --git a/pkg/apis/application/v1alpha1/app_project_types.go b/pkg/apis/application/v1alpha1/app_project_types.go\\nindex 5243ab7990266..81f95ab624a0d 100644\\n--- a/pkg/apis/application/v1alpha1/app_project_types.go\\n+++ b/pkg/apis/application/v1alpha1/app_project_types.go\\n@@ -17,6 +17,24 @@ import (\\n \\t\\\"k8s.io/apimachinery/pkg/runtime/schema\\\"\\n )\\n \\n+type ErrApplicationNotAllowedToUseProject struct {\\n+\\tapplication string\\n+\\tnamespace string\\n+\\tproject string\\n+}\\n+\\n+func NewErrApplicationNotAllowedToUseProject(application, namespace, project string) error {\\n+\\treturn &ErrApplicationNotAllowedToUseProject{\\n+\\t\\tapplication: application,\\n+\\t\\tnamespace: namespace,\\n+\\t\\tproject: project,\\n+\\t}\\n+}\\n+\\n+func (err *ErrApplicationNotAllowedToUseProject) Error() string {\\n+\\treturn fmt.Sprintf(\\\"application '%s' in namespace '%s' is not allowed to use project %s\\\", err.application, err.namespace, err.project)\\n+}\\n+\\n // AppProjectList is list of AppProject resources\\n // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\\n type AppProjectList struct {\\ndiff --git a/server/application/application.go b/server/application/application.go\\nindex b1f35a17756aa..24782233b48d7 100644\\n--- a/server/application/application.go\\n+++ b/server/application/application.go\\n@@ -147,7 +147,7 @@ func NewServer(\\n //\\n // If the user does provide a \\\"project,\\\" we can respond more specifically. If the user does not have access to the given\\n // app name in the given project, we return \\\"permission denied.\\\" If the app exists, but the project is different from\\n-func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, error) {\\n+func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, *appv1.AppProject, error) {\\n \\tlogCtx := log.WithFields(map[string]interface{}{\\n \\t\\t\\\"application\\\": name,\\n \\t\\t\\\"namespace\\\": namespace,\\n@@ -164,7 +164,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t\\t// but the app is in a different project\\\" response. We don't want the user inferring the existence of the\\n \\t\\t\\t// app from response time.\\n \\t\\t\\t_, _ = getApp()\\n-\\t\\t\\treturn nil, permissionDeniedErr\\n+\\t\\t\\treturn nil, nil, permissionDeniedErr\\n \\t\\t}\\n \\t}\\n \\ta, err := getApp()\\n@@ -172,15 +172,15 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\tif apierr.IsNotFound(err) {\\n \\t\\t\\tif project != \\\"\\\" {\\n \\t\\t\\t\\t// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.\\n-\\t\\t\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\t\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t\\t\\t}\\n \\t\\t\\t// We don't know if the user was allowed to get the Application, and we don't want to leak information about\\n \\t\\t\\t// the Application's existence. Return 403.\\n \\t\\t\\tlogCtx.Warn(\\\"application does not exist\\\")\\n-\\t\\t\\treturn nil, permissionDeniedErr\\n+\\t\\t\\treturn nil, nil, permissionDeniedErr\\n \\t\\t}\\n \\t\\tlogCtx.Errorf(\\\"failed to get application: %s\\\", err)\\n-\\t\\treturn nil, permissionDeniedErr\\n+\\t\\treturn nil, nil, permissionDeniedErr\\n \\t}\\n \\t// Even if we performed an initial RBAC check (because the request was fully parameterized), we still need to\\n \\t// perform a second RBAC check to ensure that the user has access to the actual Application's project (not just the\\n@@ -194,11 +194,11 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t\\t// The user specified a project. We would have returned a 404 if the user had access to the app, but the app\\n \\t\\t\\t// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.\\n \\t\\t\\t// Otherwise, they could infer that the app exists based on the error code.\\n-\\t\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t\\t}\\n \\t\\t// The user didn't specify a project. We always return permission denied for both lack of access and lack of\\n \\t\\t// existence.\\n-\\t\\treturn nil, permissionDeniedErr\\n+\\t\\treturn nil, nil, permissionDeniedErr\\n \\t}\\n \\teffectiveProject := \\\"default\\\"\\n \\tif a.Spec.Project != \\\"\\\" {\\n@@ -211,15 +211,20 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t}).Warnf(\\\"user tried to %s application in project %s, but the application is in project %s\\\", action, project, effectiveProject)\\n \\t\\t// The user has access to the app, but the app is in a different project. Return 404, meaning \\\"app doesn't\\n \\t\\t// exist in that project\\\".\\n-\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t}\\n-\\treturn a, nil\\n+\\t// Get the app's associated project, and make sure all project restrictions are enforced.\\n+\\tproj, err := s.getAppProject(ctx, a, logCtx)\\n+\\tif err != nil {\\n+\\t\\treturn a, nil, err\\n+\\t}\\n+\\treturn a, proj, nil\\n }\\n \\n // getApplicationEnforceRBACInformer uses an informer to get an Application. If the app does not exist, permission is\\n // denied, or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\\n // information.\\n-func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, error) {\\n+func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, *appv1.AppProject, error) {\\n \\tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\\n \\treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\\n \\t\\treturn s.appLister.Applications(namespaceOrDefault).Get(name)\\n@@ -229,9 +234,12 @@ func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action,\\n // getApplicationEnforceRBACClient uses a client to get an Application. If the app does not exist, permission is denied,\\n // or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\\n // information.\\n-func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, error) {\\n+func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, *appv1.AppProject, error) {\\n \\tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\\n \\treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\\n+\\t\\tif !s.isNamespaceEnabled(namespaceOrDefault) {\\n+\\t\\t\\treturn nil, security.NamespaceNotPermittedError(namespaceOrDefault)\\n+\\t\\t}\\n \\t\\treturn s.appclientset.ArgoprojV1alpha1().Applications(namespaceOrDefault).Get(ctx, name, metav1.GetOptions{\\n \\t\\t\\tResourceVersion: resourceVersion,\\n \\t\\t})\\n@@ -310,7 +318,13 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\\n \\tif q.Validate != nil {\\n \\t\\tvalidate = *q.Validate\\n \\t}\\n-\\terr := s.validateAndNormalizeApp(ctx, a, validate)\\n+\\n+\\tproj, err := s.getAppProject(ctx, a, log.WithField(\\\"application\\\", a.Name))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n+\\terr = s.validateAndNormalizeApp(ctx, a, proj, validate)\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error while validating and normalizing app: %w\\\", err)\\n \\t}\\n@@ -366,7 +380,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\\n \\treturn updated, nil\\n }\\n \\n-func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, action func(\\n+func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, proj *appv1.AppProject, action func(\\n \\tclient apiclient.RepoServerServiceClient,\\n \\trepo *appv1.Repository,\\n \\thelmRepos []*appv1.Repository,\\n@@ -393,14 +407,6 @@ func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, acti\\n \\tif err != nil {\\n \\t\\treturn fmt.Errorf(\\\"error getting kustomize settings options: %w\\\", err)\\n \\t}\\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn status.Errorf(codes.InvalidArgument, \\\"application references project %s which does not exist\\\", a.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"error getting application's project: %w\\\", err)\\n-\\t}\\n-\\n \\thelmRepos, err := s.db.ListHelmRepositories(ctx)\\n \\tif err != nil {\\n \\t\\treturn fmt.Errorf(\\\"error listing helm repositories: %w\\\", err)\\n@@ -434,7 +440,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\tif q.Name == nil || *q.Name == \\\"\\\" {\\n \\t\\treturn nil, fmt.Errorf(\\\"invalid request: application name is missing\\\")\\n \\t}\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -446,7 +452,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\t}\\n \\n \\tvar manifestInfo *apiclient.ManifestResponse\\n-\\terr = s.queryRepoServer(ctx, a, func(\\n+\\terr = s.queryRepoServer(ctx, a, proj, func(\\n \\t\\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\\n \\t\\trevision := source.TargetRevision\\n \\t\\tif q.GetRevision() != \\\"\\\" {\\n@@ -532,13 +538,13 @@ func (s *Server) GetManifestsWithFiles(stream application.ApplicationService_Get\\n \\t\\treturn fmt.Errorf(\\\"invalid request: application name is missing\\\")\\n \\t}\\n \\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n \\n \\tvar manifestInfo *apiclient.ManifestResponse\\n-\\terr = s.queryRepoServer(ctx, a, func(\\n+\\terr = s.queryRepoServer(ctx, a, proj, func(\\n \\t\\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\\n \\n \\t\\tappInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()\\n@@ -640,7 +646,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\t// We must use a client Get instead of an informer Get, because it's common to call Get immediately\\n \\t// following a Watch (which is not yet powered by an informer), and the Get must reflect what was\\n \\t// previously seen by the client.\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -671,7 +677,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\n \\tif refreshType == appv1.RefreshTypeHard {\\n \\t\\t// force refresh cached application details\\n-\\t\\tif err := s.queryRepoServer(ctx, a, func(\\n+\\t\\tif err := s.queryRepoServer(ctx, a, proj, func(\\n \\t\\t\\tclient apiclient.RepoServerServiceClient,\\n \\t\\t\\trepo *appv1.Repository,\\n \\t\\t\\thelmRepos []*appv1.Repository,\\n@@ -723,7 +729,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\n // ListResourceEvents returns a list of event resources\\n func (s *Server) ListResourceEvents(ctx context.Context, q *application.ApplicationResourceEventsQuery) (*v1.EventList, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -791,12 +797,12 @@ func (s *Server) validateAndUpdateApp(ctx context.Context, newApp *appv1.Applica\\n \\ts.projectLock.RLock(newApp.Spec.GetProject())\\n \\tdefer s.projectLock.RUnlock(newApp.Spec.GetProject())\\n \\n-\\tapp, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \\\"\\\")\\n+\\tapp, proj, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\terr = s.validateAndNormalizeApp(ctx, newApp, validate)\\n+\\terr = s.validateAndNormalizeApp(ctx, newApp, proj, validate)\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error validating and normalizing app: %w\\\", err)\\n \\t}\\n@@ -908,7 +914,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\\n \\tif q.GetSpec() == nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error updating application spec: spec is nil in request\\\")\\n \\t}\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -927,7 +933,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\\n \\n // Patch patches an application\\n func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchRequest) (*appv1.Application, error) {\\n-\\tapp, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\tapp, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -970,11 +976,35 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque\\n \\treturn s.validateAndUpdateApp(ctx, newApp, false, true, rbacpolicy.ActionUpdate, q.GetProject())\\n }\\n \\n+func (s *Server) getAppProject(ctx context.Context, a *appv1.Application, logCtx *log.Entry) (*appv1.AppProject, error) {\\n+\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n+\\tif err == nil {\\n+\\t\\treturn proj, nil\\n+\\t}\\n+\\n+\\t// If there's a permission issue or the app doesn't exist, return a vague error to avoid letting the user enumerate project names.\\n+\\tvagueError := status.Errorf(codes.InvalidArgument, \\\"app is not allowed in project %q, or the project does not exist\\\", a.Spec.Project)\\n+\\n+\\tif apierr.IsNotFound(err) {\\n+\\t\\treturn nil, vagueError\\n+\\t}\\n+\\n+\\tif _, ok := err.(*appv1.ErrApplicationNotAllowedToUseProject); ok {\\n+\\t\\tlogCtx.WithFields(map[string]interface{}{\\n+\\t\\t\\t\\\"project\\\": a.Spec.Project,\\n+\\t\\t\\targocommon.SecurityField: argocommon.SecurityMedium,\\n+\\t\\t}).Warnf(\\\"error getting app project: %s\\\", err)\\n+\\t\\treturn nil, vagueError\\n+\\t}\\n+\\n+\\treturn nil, vagueError\\n+}\\n+\\n // Delete removes an application and all associated resources\\n func (s *Server) Delete(ctx context.Context, q *application.ApplicationDeleteRequest) (*application.ApplicationResponse, error) {\\n \\tappName := q.GetName()\\n \\tappNs := s.appNamespaceOrDefault(q.GetAppNamespace())\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1129,16 +1159,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati\\n \\t}\\n }\\n \\n-func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\t// Offer no hint that the project does not exist.\\n-\\t\\t\\tlog.Warnf(\\\"User attempted to create/update application in non-existent project %q\\\", app.Spec.Project)\\n-\\t\\t\\treturn permissionDeniedErr\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"error getting application's project: %w\\\", err)\\n-\\t}\\n+func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, validate bool) error {\\n \\tif app.GetName() == \\\"\\\" {\\n \\t\\treturn fmt.Errorf(\\\"resource name may not be empty\\\")\\n \\t}\\n@@ -1241,7 +1262,7 @@ func (s *Server) getAppResources(ctx context.Context, a *appv1.Application) (*ap\\n }\\n \\n func (s *Server) getAppLiveResource(ctx context.Context, action string, q *application.ApplicationResourceRequest) (*appv1.ResourceNode, *rest.Config, *appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, nil, nil, err\\n \\t}\\n@@ -1378,7 +1399,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR\\n }\\n \\n func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery) (*appv1.ApplicationTree, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1387,7 +1408,7 @@ func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery\\n }\\n \\n func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application.ApplicationService_WatchResourceTreeServer) error {\\n-\\t_, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\t_, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n@@ -1404,7 +1425,7 @@ func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application\\n }\\n \\n func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.RevisionMetadata, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1414,12 +1435,6 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error getting repository by URL: %w\\\", err)\\n \\t}\\n-\\t// We need to get some information with the project associated to the app,\\n-\\t// so we'll know whether GPG signatures are enforced.\\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n \\tconn, repoClient, err := s.repoClientset.NewRepoServerClient()\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error creating repo server client: %w\\\", err)\\n@@ -1434,7 +1449,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\\n \\n // RevisionChartDetails returns the helm chart metadata, as fetched from the reposerver\\n func (s *Server) RevisionChartDetails(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.ChartDetails, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1465,7 +1480,7 @@ func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) boo\\n }\\n \\n func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1522,7 +1537,7 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.\\n \\t\\t}\\n \\t}\\n \\n-\\ta, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n@@ -1714,19 +1729,11 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio\\n \\n // Sync syncs an application to its target state\\n func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncRequest) (*appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn a, status.Errorf(codes.InvalidArgument, \\\"application references project %s which does not exist\\\", a.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn a, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n \\ts.inferResourcesStatusHealth(a)\\n \\n \\tif !proj.Spec.SyncWindows.Matches(a).CanSync(true) {\\n@@ -1823,7 +1830,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR\\n }\\n \\n func (s *Server) Rollback(ctx context.Context, rollbackReq *application.ApplicationRollbackRequest) (*appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1882,7 +1889,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat\\n }\\n \\n func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksRequest) (*application.LinksResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1897,7 +1904,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\\n \\t\\treturn nil, fmt.Errorf(\\\"failed to read application deep links from configmap: %w\\\", err)\\n \\t}\\n \\n-\\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a)\\n+\\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a, proj)\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1912,12 +1919,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\\n \\treturn finalList, nil\\n }\\n \\n-func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n+func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application, proj *appv1.AppProject) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\\n \\t// sanitize project jwt tokens\\n \\tproj.Status = appv1.AppProjectStatus{}\\n \\n@@ -1980,7 +1982,12 @@ func (s *Server) ListResourceLinks(ctx context.Context, req *application.Applica\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app)\\n+\\tproj, err := s.getAppProject(ctx, app, log.WithField(\\\"application\\\", app.GetName()))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n+\\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app, proj)\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -2036,7 +2043,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy\\n func (s *Server) TerminateOperation(ctx context.Context, termOpReq *application.OperationTerminateRequest) (*application.OperationTerminateResponse, error) {\\n \\tappName := termOpReq.GetName()\\n \\tappNs := s.appNamespaceOrDefault(termOpReq.GetAppNamespace())\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -2109,7 +2116,7 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica\\n \\n func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacRequest string, q *application.ApplicationResourceRequest) (obj *unstructured.Unstructured, res *appv1.ResourceNode, app *appv1.Application, config *rest.Config, err error) {\\n \\tif q.GetKind() == applicationType.ApplicationKind && q.GetGroup() == applicationType.Group && q.GetName() == q.GetResourceName() {\\n-\\t\\tapp, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\t\\tapp, _, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\t\\tif err != nil {\\n \\t\\t\\treturn nil, nil, nil, nil, err\\n \\t\\t}\\n@@ -2205,6 +2212,11 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\\n \\t\\t}\\n \\t}\\n \\n+\\tproj, err := s.getAppProject(ctx, a, log.WithField(\\\"application\\\", a.Name))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n \\t// First, make sure all the returned resources are permitted, for each operation.\\n \\t// Also perform create with dry-runs for all create-operation resources.\\n \\t// This is performed separately to reduce the risk of only some of the resources being successfully created later.\\n@@ -2212,7 +2224,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\\n \\t// the dry-run for relevant apply/delete operation would have to be invoked as well.\\n \\tfor _, impactedResource := range newObjects {\\n \\t\\tnewObj := impactedResource.UnstructuredObj\\n-\\t\\terr := s.verifyResourcePermitted(ctx, app, newObj)\\n+\\t\\terr := s.verifyResourcePermitted(ctx, app, proj, newObj)\\n \\t\\tif err != nil {\\n \\t\\t\\treturn nil, err\\n \\t\\t}\\n@@ -2306,14 +2318,7 @@ func (s *Server) patchResource(ctx context.Context, config *rest.Config, liveObj\\n \\treturn &application.ApplicationResponse{}, nil\\n }\\n \\n-func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, obj *unstructured.Unstructured) error {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn fmt.Errorf(\\\"application references project %s which does not exist\\\", app.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"failed to get project %s: %w\\\", app.Spec.Project, err)\\n-\\t}\\n+func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, obj *unstructured.Unstructured) error {\\n \\tpermitted, err := proj.IsResourcePermitted(schema.GroupKind{Group: obj.GroupVersionKind().Group, Kind: obj.GroupVersionKind().Kind}, obj.GetNamespace(), app.Spec.Destination, func(project string) ([]*appv1.Cluster, error) {\\n \\t\\tclusters, err := s.db.GetProjectClusters(context.TODO(), project)\\n \\t\\tif err != nil {\\n@@ -2373,16 +2378,11 @@ func splitStatusPatch(patch []byte) ([]byte, []byte, error) {\\n }\\n \\n func (s *Server) GetApplicationSyncWindows(ctx context.Context, q *application.ApplicationSyncWindowsQuery) (*application.ApplicationSyncWindowsResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n \\twindows := proj.Spec.SyncWindows.Matches(a)\\n \\tsync := windows.CanSync(true)\\n \\ndiff --git a/server/application/application_test.go b/server/application/application_test.go\\nindex bb2f2804b53df..21612e96f0ac3 100644\\n--- a/server/application/application_test.go\\n+++ b/server/application/application_test.go\\n@@ -1817,7 +1817,7 @@ func TestServer_GetApplicationSyncWindowsState(t *testing.T) {\\n \\t\\tappServer := newTestAppServer(t, testApp)\\n \\n \\t\\tactive, err := appServer.GetApplicationSyncWindows(context.Background(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name})\\n-\\t\\tassert.Contains(t, err.Error(), \\\"not found\\\")\\n+\\t\\tassert.Contains(t, err.Error(), \\\"not exist\\\")\\n \\t\\tassert.Nil(t, active)\\n \\t})\\n }\\n@@ -2364,3 +2364,255 @@ func TestIsApplicationPermitted(t *testing.T) {\\n \\t\\tassert.True(t, permitted)\\n \\t})\\n }\\n+\\n+func TestAppNamespaceRestrictions(t *testing.T) {\\n+\\tt.Run(\\\"List applications in controller namespace\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\tappServer := newTestAppServer(t, testApp)\\n+\\t\\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\trequire.Len(t, apps.Items, 1)\\n+\\t})\\n+\\n+\\tt.Run(\\\"List applications with non-allowed apps existing\\\", func(t *testing.T) {\\n+\\t\\ttestApp1 := newTestApp()\\n+\\t\\ttestApp1.Namespace = \\\"argocd-1\\\"\\n+\\t\\tappServer := newTestAppServer(t, testApp1)\\n+\\t\\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\trequire.Len(t, apps.Items, 0)\\n+\\t})\\n+\\n+\\tt.Run(\\\"List applications with non-allowed apps existing and explicit ns request\\\", func(t *testing.T) {\\n+\\t\\ttestApp1 := newTestApp()\\n+\\t\\ttestApp2 := newTestApp()\\n+\\t\\ttestApp2.Namespace = \\\"argocd-1\\\"\\n+\\t\\tappServer := newTestAppServer(t, testApp1, testApp2)\\n+\\t\\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{AppNamespace: pointer.String(\\\"argocd-1\\\")})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\trequire.Len(t, apps.Items, 0)\\n+\\t})\\n+\\n+\\tt.Run(\\\"List applications with allowed apps in other namespaces\\\", func(t *testing.T) {\\n+\\t\\ttestApp1 := newTestApp()\\n+\\t\\ttestApp1.Namespace = \\\"argocd-1\\\"\\n+\\t\\tappServer := newTestAppServer(t, testApp1)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapps, err := appServer.List(context.TODO(), &application.ApplicationQuery{})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\trequire.Len(t, apps.Items, 1)\\n+\\t})\\n+\\n+\\tt.Run(\\\"Get application in control plane namespace\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\tappServer := newTestAppServer(t, testApp)\\n+\\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\tassert.Equal(t, \\\"test-app\\\", app.GetName())\\n+\\t})\\n+\\tt.Run(\\\"Get application in other namespace when forbidden\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\tappServer := newTestAppServer(t, testApp)\\n+\\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tAppNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.ErrorContains(t, err, \\\"permission denied\\\")\\n+\\t\\trequire.Nil(t, app)\\n+\\t})\\n+\\tt.Run(\\\"Get application in other namespace when allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tAppNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\trequire.NotNil(t, app)\\n+\\t\\trequire.Equal(t, \\\"argocd-1\\\", app.Namespace)\\n+\\t\\trequire.Equal(t, \\\"test-app\\\", app.Name)\\n+\\t})\\n+\\tt.Run(\\\"Get application in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tAppNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, app)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Create application in other namespace when allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapp, err := appServer.Create(context.TODO(), &application.ApplicationCreateRequest{\\n+\\t\\t\\tApplication: testApp,\\n+\\t\\t})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\trequire.NotNil(t, app)\\n+\\t\\tassert.Equal(t, \\\"test-app\\\", app.Name)\\n+\\t\\tassert.Equal(t, \\\"argocd-1\\\", app.Namespace)\\n+\\t})\\n+\\n+\\tt.Run(\\\"Create application in other namespace when not allowed by project\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapp, err := appServer.Create(context.TODO(), &application.ApplicationCreateRequest{\\n+\\t\\t\\tApplication: testApp,\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, app)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\n+\\tt.Run(\\\"Create application in other namespace when not allowed by configuration\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-2\\\"}\\n+\\t\\tapp, err := appServer.Create(context.TODO(), &application.ApplicationCreateRequest{\\n+\\t\\t\\tApplication: testApp,\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, app)\\n+\\t\\trequire.ErrorContains(t, err, \\\"namespace 'argocd-1' is not permitted\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get application sync window in other namespace when project is allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\\n+\\t\\tassert.NoError(t, err)\\n+\\t\\tassert.Equal(t, 0, len(active.ActiveWindows))\\n+\\t})\\n+\\tt.Run(\\\"Get application sync window in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, active)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get list of links in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, links)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get list of links in other namespace when project is allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\tassert.Equal(t, 0, len(links.Items))\\n+\\t})\\n+}\\ndiff --git a/util/argo/argo.go b/util/argo/argo.go\\nindex b32369ea70c48..62405655a7b18 100644\\n--- a/util/argo/argo.go\\n+++ b/util/argo/argo.go\\n@@ -689,8 +689,7 @@ func GetAppProject(app *argoappv1.Application, projLister applicationsv1.AppProj\\n \\t\\treturn nil, err\\n \\t}\\n \\tif !proj.IsAppNamespacePermitted(app, ns) {\\n-\\t\\treturn nil, fmt.Errorf(\\\"application '%s' in namespace '%s' is not allowed to use project '%s'\\\",\\n-\\t\\t\\tapp.Name, app.Namespace, proj.Name)\\n+\\t\\treturn nil, argoappv1.NewErrApplicationNotAllowedToUseProject(app.Name, app.Namespace, proj.Name)\\n \\t}\\n \\treturn proj, nil\\n }\\n\"\n },\n {\n \"commit url\": \"https://github.com/argoproj/argo-cd/commit/e0ff56d89fbd7d066e9c862b30337f6520f13f17\",\n \"owner\": \"argoproj\",\n \"repo_name\": \"argo-cd\",\n \"commit_message\": \"Merge pull request from GHSA-2gvw-w6fj-7m3c\\n\\n* sec: validate a project before execute an action\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n\\n* sec: validate a project before execute an action\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n\\n---------\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\",\n \"diff_code\": \"From e0ff56d89fbd7d066e9c862b30337f6520f13f17 Mon Sep 17 00:00:00 2001\\nFrom: pasha-codefresh <pavel@codefresh.io>\\nDate: Mon, 15 Apr 2024 10:20:08 +0300\\nSubject: [PATCH] Merge pull request from GHSA-2gvw-w6fj-7m3c\\n\\n* sec: validate a project before execute an action\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n\\n* sec: validate a project before execute an action\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n\\n---------\\n\\nSigned-off-by: pashakostohrys <pavel@codefresh.io>\\n---\\n .../application/v1alpha1/app_project_types.go | 18 ++\\n server/application/application.go | 185 +++++++++---------\\n server/application/application_test.go | 118 ++++++++++-\\n util/argo/argo.go | 3 +-\\n util/session/sessionmanager.go | 2 +-\\n 5 files changed, 223 insertions(+), 103 deletions(-)\\n\\ndiff --git a/pkg/apis/application/v1alpha1/app_project_types.go b/pkg/apis/application/v1alpha1/app_project_types.go\\nindex 5243ab7990266..81f95ab624a0d 100644\\n--- a/pkg/apis/application/v1alpha1/app_project_types.go\\n+++ b/pkg/apis/application/v1alpha1/app_project_types.go\\n@@ -17,6 +17,24 @@ import (\\n \\t\\\"k8s.io/apimachinery/pkg/runtime/schema\\\"\\n )\\n \\n+type ErrApplicationNotAllowedToUseProject struct {\\n+\\tapplication string\\n+\\tnamespace string\\n+\\tproject string\\n+}\\n+\\n+func NewErrApplicationNotAllowedToUseProject(application, namespace, project string) error {\\n+\\treturn &ErrApplicationNotAllowedToUseProject{\\n+\\t\\tapplication: application,\\n+\\t\\tnamespace: namespace,\\n+\\t\\tproject: project,\\n+\\t}\\n+}\\n+\\n+func (err *ErrApplicationNotAllowedToUseProject) Error() string {\\n+\\treturn fmt.Sprintf(\\\"application '%s' in namespace '%s' is not allowed to use project %s\\\", err.application, err.namespace, err.project)\\n+}\\n+\\n // AppProjectList is list of AppProject resources\\n // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\\n type AppProjectList struct {\\ndiff --git a/server/application/application.go b/server/application/application.go\\nindex 36daf3ee5d1f5..13689d4cd9dc2 100644\\n--- a/server/application/application.go\\n+++ b/server/application/application.go\\n@@ -148,7 +148,7 @@ func NewServer(\\n //\\n // If the user does provide a \\\"project,\\\" we can respond more specifically. If the user does not have access to the given\\n // app name in the given project, we return \\\"permission denied.\\\" If the app exists, but the project is different from\\n-func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, error) {\\n+func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespace, name string, getApp func() (*appv1.Application, error)) (*appv1.Application, *appv1.AppProject, error) {\\n \\tlogCtx := log.WithFields(map[string]interface{}{\\n \\t\\t\\\"application\\\": name,\\n \\t\\t\\\"namespace\\\": namespace,\\n@@ -165,7 +165,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t\\t// but the app is in a different project\\\" response. We don't want the user inferring the existence of the\\n \\t\\t\\t// app from response time.\\n \\t\\t\\t_, _ = getApp()\\n-\\t\\t\\treturn nil, permissionDeniedErr\\n+\\t\\t\\treturn nil, nil, permissionDeniedErr\\n \\t\\t}\\n \\t}\\n \\ta, err := getApp()\\n@@ -173,15 +173,15 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\tif apierr.IsNotFound(err) {\\n \\t\\t\\tif project != \\\"\\\" {\\n \\t\\t\\t\\t// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.\\n-\\t\\t\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\t\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t\\t\\t}\\n \\t\\t\\t// We don't know if the user was allowed to get the Application, and we don't want to leak information about\\n \\t\\t\\t// the Application's existence. Return 403.\\n \\t\\t\\tlogCtx.Warn(\\\"application does not exist\\\")\\n-\\t\\t\\treturn nil, permissionDeniedErr\\n+\\t\\t\\treturn nil, nil, permissionDeniedErr\\n \\t\\t}\\n \\t\\tlogCtx.Errorf(\\\"failed to get application: %s\\\", err)\\n-\\t\\treturn nil, permissionDeniedErr\\n+\\t\\treturn nil, nil, permissionDeniedErr\\n \\t}\\n \\t// Even if we performed an initial RBAC check (because the request was fully parameterized), we still need to\\n \\t// perform a second RBAC check to ensure that the user has access to the actual Application's project (not just the\\n@@ -195,11 +195,11 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t\\t// The user specified a project. We would have returned a 404 if the user had access to the app, but the app\\n \\t\\t\\t// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.\\n \\t\\t\\t// Otherwise, they could infer that the app exists based on the error code.\\n-\\t\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t\\t}\\n \\t\\t// The user didn't specify a project. We always return permission denied for both lack of access and lack of\\n \\t\\t// existence.\\n-\\t\\treturn nil, permissionDeniedErr\\n+\\t\\treturn nil, nil, permissionDeniedErr\\n \\t}\\n \\teffectiveProject := \\\"default\\\"\\n \\tif a.Spec.Project != \\\"\\\" {\\n@@ -212,15 +212,20 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa\\n \\t\\t}).Warnf(\\\"user tried to %s application in project %s, but the application is in project %s\\\", action, project, effectiveProject)\\n \\t\\t// The user has access to the app, but the app is in a different project. Return 404, meaning \\\"app doesn't\\n \\t\\t// exist in that project\\\".\\n-\\t\\treturn nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n+\\t\\treturn nil, nil, status.Errorf(codes.NotFound, apierr.NewNotFound(schema.GroupResource{Group: \\\"argoproj.io\\\", Resource: \\\"applications\\\"}, name).Error())\\n \\t}\\n-\\treturn a, nil\\n+\\t// Get the app's associated project, and make sure all project restrictions are enforced.\\n+\\tproj, err := s.getAppProject(ctx, a, logCtx)\\n+\\tif err != nil {\\n+\\t\\treturn a, nil, err\\n+\\t}\\n+\\treturn a, proj, nil\\n }\\n \\n // getApplicationEnforceRBACInformer uses an informer to get an Application. If the app does not exist, permission is\\n // denied, or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\\n // information.\\n-func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, error) {\\n+func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action, project, namespace, name string) (*appv1.Application, *appv1.AppProject, error) {\\n \\tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\\n \\treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\\n \\t\\treturn s.appLister.Applications(namespaceOrDefault).Get(name)\\n@@ -230,7 +235,7 @@ func (s *Server) getApplicationEnforceRBACInformer(ctx context.Context, action,\\n // getApplicationEnforceRBACClient uses a client to get an Application. If the app does not exist, permission is denied,\\n // or any other error occurs when getting the app, we return a permission denied error to obscure any sensitive\\n // information.\\n-func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, error) {\\n+func (s *Server) getApplicationEnforceRBACClient(ctx context.Context, action, project, namespace, name, resourceVersion string) (*appv1.Application, *appv1.AppProject, error) {\\n \\tnamespaceOrDefault := s.appNamespaceOrDefault(namespace)\\n \\treturn s.getAppEnforceRBAC(ctx, action, project, namespaceOrDefault, name, func() (*appv1.Application, error) {\\n \\t\\tif !s.isNamespaceEnabled(namespaceOrDefault) {\\n@@ -314,7 +319,13 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\\n \\tif q.Validate != nil {\\n \\t\\tvalidate = *q.Validate\\n \\t}\\n-\\terr := s.validateAndNormalizeApp(ctx, a, validate)\\n+\\n+\\tproj, err := s.getAppProject(ctx, a, log.WithField(\\\"application\\\", a.Name))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n+\\terr = s.validateAndNormalizeApp(ctx, a, proj, validate)\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error while validating and normalizing app: %w\\\", err)\\n \\t}\\n@@ -370,7 +381,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq\\n \\treturn updated, nil\\n }\\n \\n-func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, action func(\\n+func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, proj *appv1.AppProject, action func(\\n \\tclient apiclient.RepoServerServiceClient,\\n \\trepo *appv1.Repository,\\n \\thelmRepos []*appv1.Repository,\\n@@ -397,13 +408,6 @@ func (s *Server) queryRepoServer(ctx context.Context, a *appv1.Application, acti\\n \\tif err != nil {\\n \\t\\treturn fmt.Errorf(\\\"error getting kustomize settings options: %w\\\", err)\\n \\t}\\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn status.Errorf(codes.InvalidArgument, \\\"application references project %s which does not exist\\\", a.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"error getting application's project: %w\\\", err)\\n-\\t}\\n \\n \\thelmRepos, err := s.db.ListHelmRepositories(ctx)\\n \\tif err != nil {\\n@@ -438,7 +442,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\tif q.Name == nil || *q.Name == \\\"\\\" {\\n \\t\\treturn nil, fmt.Errorf(\\\"invalid request: application name is missing\\\")\\n \\t}\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -450,7 +454,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\t}\\n \\n \\tvar manifestInfo *apiclient.ManifestResponse\\n-\\terr = s.queryRepoServer(ctx, a, func(\\n+\\terr = s.queryRepoServer(ctx, a, proj, func(\\n \\t\\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\\n \\t\\trevision := source.TargetRevision\\n \\t\\tif q.GetRevision() != \\\"\\\" {\\n@@ -476,11 +480,6 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan\\n \\t\\t\\treturn fmt.Errorf(\\\"error getting API resources: %w\\\", err)\\n \\t\\t}\\n \\n-\\t\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\t\\tif err != nil {\\n-\\t\\t\\treturn fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t\\t}\\n-\\n \\t\\tmanifestInfo, err = client.GenerateManifest(ctx, &apiclient.ManifestRequest{\\n \\t\\t\\tRepo: repo,\\n \\t\\t\\tRevision: revision,\\n@@ -543,13 +542,13 @@ func (s *Server) GetManifestsWithFiles(stream application.ApplicationService_Get\\n \\t\\treturn fmt.Errorf(\\\"invalid request: application name is missing\\\")\\n \\t}\\n \\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, query.GetProject(), query.GetAppNamespace(), query.GetName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n \\n \\tvar manifestInfo *apiclient.ManifestResponse\\n-\\terr = s.queryRepoServer(ctx, a, func(\\n+\\terr = s.queryRepoServer(ctx, a, proj, func(\\n \\t\\tclient apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {\\n \\n \\t\\tappInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()\\n@@ -660,7 +659,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\t// We must use a client Get instead of an informer Get, because it's common to call Get immediately\\n \\t// following a Watch (which is not yet powered by an informer), and the Get must reflect what was\\n \\t// previously seen by the client.\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, project, appNs, appName, q.GetResourceVersion())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -691,7 +690,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\n \\tif refreshType == appv1.RefreshTypeHard {\\n \\t\\t// force refresh cached application details\\n-\\t\\tif err := s.queryRepoServer(ctx, a, func(\\n+\\t\\tif err := s.queryRepoServer(ctx, a, proj, func(\\n \\t\\t\\tclient apiclient.RepoServerServiceClient,\\n \\t\\t\\trepo *appv1.Repository,\\n \\t\\t\\thelmRepos []*appv1.Repository,\\n@@ -743,7 +742,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app\\n \\n // ListResourceEvents returns a list of event resources\\n func (s *Server) ListResourceEvents(ctx context.Context, q *application.ApplicationResourceEventsQuery) (*v1.EventList, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -811,12 +810,12 @@ func (s *Server) validateAndUpdateApp(ctx context.Context, newApp *appv1.Applica\\n \\ts.projectLock.RLock(newApp.Spec.GetProject())\\n \\tdefer s.projectLock.RUnlock(newApp.Spec.GetProject())\\n \\n-\\tapp, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \\\"\\\")\\n+\\tapp, proj, err := s.getApplicationEnforceRBACClient(ctx, action, currentProject, newApp.Namespace, newApp.Name, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\terr = s.validateAndNormalizeApp(ctx, newApp, validate)\\n+\\terr = s.validateAndNormalizeApp(ctx, newApp, proj, validate)\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error validating and normalizing app: %w\\\", err)\\n \\t}\\n@@ -915,7 +914,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\\n \\tif q.GetSpec() == nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error updating application spec: spec is nil in request\\\")\\n \\t}\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionUpdate, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -934,7 +933,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat\\n \\n // Patch patches an application\\n func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchRequest) (*appv1.Application, error) {\\n-\\tapp, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\tapp, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -977,11 +976,35 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque\\n \\treturn s.validateAndUpdateApp(ctx, newApp, false, true, rbacpolicy.ActionUpdate, q.GetProject())\\n }\\n \\n+func (s *Server) getAppProject(ctx context.Context, a *appv1.Application, logCtx *log.Entry) (*appv1.AppProject, error) {\\n+\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n+\\tif err == nil {\\n+\\t\\treturn proj, nil\\n+\\t}\\n+\\n+\\t// If there's a permission issue or the app doesn't exist, return a vague error to avoid letting the user enumerate project names.\\n+\\tvagueError := status.Errorf(codes.InvalidArgument, \\\"app is not allowed in project %q, or the project does not exist\\\", a.Spec.Project)\\n+\\n+\\tif apierr.IsNotFound(err) {\\n+\\t\\treturn nil, vagueError\\n+\\t}\\n+\\n+\\tif _, ok := err.(*appv1.ErrApplicationNotAllowedToUseProject); ok {\\n+\\t\\tlogCtx.WithFields(map[string]interface{}{\\n+\\t\\t\\t\\\"project\\\": a.Spec.Project,\\n+\\t\\t\\targocommon.SecurityField: argocommon.SecurityMedium,\\n+\\t\\t}).Warnf(\\\"error getting app project: %s\\\", err)\\n+\\t\\treturn nil, vagueError\\n+\\t}\\n+\\n+\\treturn nil, vagueError\\n+}\\n+\\n // Delete removes an application and all associated resources\\n func (s *Server) Delete(ctx context.Context, q *application.ApplicationDeleteRequest) (*application.ApplicationResponse, error) {\\n \\tappName := q.GetName()\\n \\tappNs := s.appNamespaceOrDefault(q.GetAppNamespace())\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), appNs, appName, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1136,16 +1159,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati\\n \\t}\\n }\\n \\n-func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\t// Offer no hint that the project does not exist.\\n-\\t\\t\\tlog.Warnf(\\\"User attempted to create/update application in non-existent project %q\\\", app.Spec.Project)\\n-\\t\\t\\treturn permissionDeniedErr\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"error getting application's project: %w\\\", err)\\n-\\t}\\n+func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, validate bool) error {\\n \\tif app.GetName() == \\\"\\\" {\\n \\t\\treturn fmt.Errorf(\\\"resource name may not be empty\\\")\\n \\t}\\n@@ -1249,7 +1263,7 @@ func (s *Server) getAppResources(ctx context.Context, a *appv1.Application) (*ap\\n }\\n \\n func (s *Server) getAppLiveResource(ctx context.Context, action string, q *application.ApplicationResourceRequest) (*appv1.ResourceNode, *rest.Config, *appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, action, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, nil, nil, err\\n \\t}\\n@@ -1386,7 +1400,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR\\n }\\n \\n func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery) (*appv1.ApplicationTree, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1395,7 +1409,7 @@ func (s *Server) ResourceTree(ctx context.Context, q *application.ResourcesQuery\\n }\\n \\n func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application.ApplicationService_WatchResourceTreeServer) error {\\n-\\t_, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\t_, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n@@ -1412,7 +1426,7 @@ func (s *Server) WatchResourceTree(q *application.ResourcesQuery, ws application\\n }\\n \\n func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.RevisionMetadata, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1422,12 +1436,6 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error getting repository by URL: %w\\\", err)\\n \\t}\\n-\\t// We need to get some information with the project associated to the app,\\n-\\t// so we'll know whether GPG signatures are enforced.\\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n \\tconn, repoClient, err := s.repoClientset.NewRepoServerClient()\\n \\tif err != nil {\\n \\t\\treturn nil, fmt.Errorf(\\\"error creating repo server client: %w\\\", err)\\n@@ -1442,7 +1450,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe\\n \\n // RevisionChartDetails returns the helm chart metadata, as fetched from the reposerver\\n func (s *Server) RevisionChartDetails(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.ChartDetails, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1473,7 +1481,7 @@ func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) boo\\n }\\n \\n func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetApplicationName())\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1530,7 +1538,7 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.\\n \\t\\t}\\n \\t}\\n \\n-\\ta, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\ta, _, err := s.getApplicationEnforceRBACInformer(ws.Context(), rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\tif err != nil {\\n \\t\\treturn err\\n \\t}\\n@@ -1722,19 +1730,11 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio\\n \\n // Sync syncs an application to its target state\\n func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncRequest) (*appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, syncReq.GetProject(), syncReq.GetAppNamespace(), syncReq.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn a, status.Errorf(codes.InvalidArgument, \\\"application references project %s which does not exist\\\", a.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn a, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n \\ts.inferResourcesStatusHealth(a)\\n \\n \\tif !proj.Spec.SyncWindows.Matches(a).CanSync(true) {\\n@@ -1831,7 +1831,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR\\n }\\n \\n func (s *Server) Rollback(ctx context.Context, rollbackReq *application.ApplicationRollbackRequest) (*appv1.Application, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, rollbackReq.GetProject(), rollbackReq.GetAppNamespace(), rollbackReq.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1890,7 +1890,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat\\n }\\n \\n func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksRequest) (*application.LinksResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, req.GetProject(), req.GetNamespace(), req.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1905,7 +1905,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\\n \\t\\treturn nil, fmt.Errorf(\\\"failed to read application deep links from configmap: %w\\\", err)\\n \\t}\\n \\n-\\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a)\\n+\\tclstObj, _, err := s.getObjectsForDeepLinks(ctx, a, proj)\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -1920,12 +1920,7 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq\\n \\treturn finalList, nil\\n }\\n \\n-func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n+func (s *Server) getObjectsForDeepLinks(ctx context.Context, app *appv1.Application, proj *appv1.AppProject) (cluster *unstructured.Unstructured, project *unstructured.Unstructured, err error) {\\n \\t// sanitize project jwt tokens\\n \\tproj.Status = appv1.AppProjectStatus{}\\n \\n@@ -1988,7 +1983,12 @@ func (s *Server) ListResourceLinks(ctx context.Context, req *application.Applica\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app)\\n+\\tproj, err := s.getAppProject(ctx, app, log.WithField(\\\"application\\\", app.GetName()))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n+\\tclstObj, projObj, err := s.getObjectsForDeepLinks(ctx, app, proj)\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -2044,7 +2044,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy\\n func (s *Server) TerminateOperation(ctx context.Context, termOpReq *application.OperationTerminateRequest) (*application.OperationTerminateResponse, error) {\\n \\tappName := termOpReq.GetName()\\n \\tappNs := s.appNamespaceOrDefault(termOpReq.GetAppNamespace())\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \\\"\\\")\\n+\\ta, _, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionSync, termOpReq.GetProject(), appNs, appName, \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n@@ -2117,7 +2117,7 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica\\n \\n func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacRequest string, q *application.ApplicationResourceRequest) (obj *unstructured.Unstructured, res *appv1.ResourceNode, app *appv1.Application, config *rest.Config, err error) {\\n \\tif q.GetKind() == applicationType.ApplicationKind && q.GetGroup() == applicationType.Group && q.GetName() == q.GetResourceName() {\\n-\\t\\tapp, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n+\\t\\tapp, _, err = s.getApplicationEnforceRBACInformer(ctx, rbacRequest, q.GetProject(), q.GetAppNamespace(), q.GetName())\\n \\t\\tif err != nil {\\n \\t\\t\\treturn nil, nil, nil, nil, err\\n \\t\\t}\\n@@ -2213,6 +2213,11 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\\n \\t\\t}\\n \\t}\\n \\n+\\tproj, err := s.getAppProject(ctx, a, log.WithField(\\\"application\\\", a.Name))\\n+\\tif err != nil {\\n+\\t\\treturn nil, err\\n+\\t}\\n+\\n \\t// First, make sure all the returned resources are permitted, for each operation.\\n \\t// Also perform create with dry-runs for all create-operation resources.\\n \\t// This is performed separately to reduce the risk of only some of the resources being successfully created later.\\n@@ -2220,7 +2225,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA\\n \\t// the dry-run for relevant apply/delete operation would have to be invoked as well.\\n \\tfor _, impactedResource := range newObjects {\\n \\t\\tnewObj := impactedResource.UnstructuredObj\\n-\\t\\terr := s.verifyResourcePermitted(ctx, app, newObj)\\n+\\t\\terr := s.verifyResourcePermitted(ctx, app, proj, newObj)\\n \\t\\tif err != nil {\\n \\t\\t\\treturn nil, err\\n \\t\\t}\\n@@ -2314,14 +2319,7 @@ func (s *Server) patchResource(ctx context.Context, config *rest.Config, liveObj\\n \\treturn &application.ApplicationResponse{}, nil\\n }\\n \\n-func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, obj *unstructured.Unstructured) error {\\n-\\tproj, err := argo.GetAppProject(app, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\tif apierr.IsNotFound(err) {\\n-\\t\\t\\treturn fmt.Errorf(\\\"application references project %s which does not exist\\\", app.Spec.Project)\\n-\\t\\t}\\n-\\t\\treturn fmt.Errorf(\\\"failed to get project %s: %w\\\", app.Spec.Project, err)\\n-\\t}\\n+func (s *Server) verifyResourcePermitted(ctx context.Context, app *appv1.Application, proj *appv1.AppProject, obj *unstructured.Unstructured) error {\\n \\tpermitted, err := proj.IsResourcePermitted(schema.GroupKind{Group: obj.GroupVersionKind().Group, Kind: obj.GroupVersionKind().Kind}, obj.GetNamespace(), app.Spec.Destination, func(project string) ([]*appv1.Cluster, error) {\\n \\t\\tclusters, err := s.db.GetProjectClusters(context.TODO(), project)\\n \\t\\tif err != nil {\\n@@ -2381,16 +2379,11 @@ func splitStatusPatch(patch []byte) ([]byte, []byte, error) {\\n }\\n \\n func (s *Server) GetApplicationSyncWindows(ctx context.Context, q *application.ApplicationSyncWindowsQuery) (*application.ApplicationSyncWindowsResponse, error) {\\n-\\ta, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n+\\ta, proj, err := s.getApplicationEnforceRBACClient(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName(), \\\"\\\")\\n \\tif err != nil {\\n \\t\\treturn nil, err\\n \\t}\\n \\n-\\tproj, err := argo.GetAppProject(a, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx)\\n-\\tif err != nil {\\n-\\t\\treturn nil, fmt.Errorf(\\\"error getting app project: %w\\\", err)\\n-\\t}\\n-\\n \\twindows := proj.Spec.SyncWindows.Matches(a)\\n \\tsync := windows.CanSync(true)\\n \\ndiff --git a/server/application/application_test.go b/server/application/application_test.go\\nindex 8e5cb59cd4263..03e38cf14c79e 100644\\n--- a/server/application/application_test.go\\n+++ b/server/application/application_test.go\\n@@ -1818,7 +1818,7 @@ func TestServer_GetApplicationSyncWindowsState(t *testing.T) {\\n \\t\\tappServer := newTestAppServer(t, testApp)\\n \\n \\t\\tactive, err := appServer.GetApplicationSyncWindows(context.Background(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name})\\n-\\t\\tassert.Contains(t, err.Error(), \\\"not found\\\")\\n+\\t\\tassert.Contains(t, err.Error(), \\\"not exist\\\")\\n \\t\\tassert.Nil(t, active)\\n \\t})\\n }\\n@@ -2428,7 +2428,16 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\tt.Run(\\\"Get application in other namespace when allowed\\\", func(t *testing.T) {\\n \\t\\ttestApp := newTestApp()\\n \\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n-\\t\\tappServer := newTestAppServer(t, testApp)\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n \\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n \\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n \\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n@@ -2439,6 +2448,28 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\t\\trequire.Equal(t, \\\"argocd-1\\\", app.Namespace)\\n \\t\\trequire.Equal(t, \\\"test-app\\\", app.Name)\\n \\t})\\n+\\tt.Run(\\\"Get application in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tapp, err := appServer.Get(context.TODO(), &application.ApplicationQuery{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tAppNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, app)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n \\tt.Run(\\\"Create application in other namespace when allowed\\\", func(t *testing.T) {\\n \\t\\ttestApp := newTestApp()\\n \\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n@@ -2481,7 +2512,7 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\t\\t})\\n \\t\\trequire.Error(t, err)\\n \\t\\trequire.Nil(t, app)\\n-\\t\\trequire.ErrorContains(t, err, \\\"not allowed to use project\\\")\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n \\t})\\n \\n \\tt.Run(\\\"Create application in other namespace when not allowed by configuration\\\", func(t *testing.T) {\\n@@ -2505,5 +2536,84 @@ func TestAppNamespaceRestrictions(t *testing.T) {\\n \\t\\trequire.Nil(t, app)\\n \\t\\trequire.ErrorContains(t, err, \\\"namespace 'argocd-1' is not permitted\\\")\\n \\t})\\n-\\n+\\tt.Run(\\\"Get application sync window in other namespace when project is allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\\n+\\t\\tassert.NoError(t, err)\\n+\\t\\tassert.Equal(t, 0, len(active.ActiveWindows))\\n+\\t})\\n+\\tt.Run(\\\"Get application sync window in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tactive, err := appServer.GetApplicationSyncWindows(context.TODO(), &application.ApplicationSyncWindowsQuery{Name: &testApp.Name, AppNamespace: &testApp.Namespace})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, active)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get list of links in other namespace when project is not allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-2\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.Error(t, err)\\n+\\t\\trequire.Nil(t, links)\\n+\\t\\trequire.ErrorContains(t, err, \\\"app is not allowed in project\\\")\\n+\\t})\\n+\\tt.Run(\\\"Get list of links in other namespace when project is allowed\\\", func(t *testing.T) {\\n+\\t\\ttestApp := newTestApp()\\n+\\t\\ttestApp.Namespace = \\\"argocd-1\\\"\\n+\\t\\ttestApp.Spec.Project = \\\"other-ns\\\"\\n+\\t\\totherNsProj := &appsv1.AppProject{\\n+\\t\\t\\tObjectMeta: metav1.ObjectMeta{Name: \\\"other-ns\\\", Namespace: \\\"default\\\"},\\n+\\t\\t\\tSpec: appsv1.AppProjectSpec{\\n+\\t\\t\\t\\tSourceRepos: []string{\\\"*\\\"},\\n+\\t\\t\\t\\tDestinations: []appsv1.ApplicationDestination{{Server: \\\"*\\\", Namespace: \\\"*\\\"}},\\n+\\t\\t\\t\\tSourceNamespaces: []string{\\\"argocd-1\\\"},\\n+\\t\\t\\t},\\n+\\t\\t}\\n+\\t\\tappServer := newTestAppServer(t, testApp, otherNsProj)\\n+\\t\\tappServer.enabledNamespaces = []string{\\\"argocd-1\\\"}\\n+\\t\\tlinks, err := appServer.ListLinks(context.TODO(), &application.ListAppLinksRequest{\\n+\\t\\t\\tName: pointer.String(\\\"test-app\\\"),\\n+\\t\\t\\tNamespace: pointer.String(\\\"argocd-1\\\"),\\n+\\t\\t})\\n+\\t\\trequire.NoError(t, err)\\n+\\t\\tassert.Equal(t, 0, len(links.Items))\\n+\\t})\\n }\\ndiff --git a/util/argo/argo.go b/util/argo/argo.go\\nindex 36e513cf0f534..49862bb64ac39 100644\\n--- a/util/argo/argo.go\\n+++ b/util/argo/argo.go\\n@@ -694,8 +694,7 @@ func GetAppProject(app *argoappv1.Application, projLister applicationsv1.AppProj\\n \\t\\treturn nil, err\\n \\t}\\n \\tif !proj.IsAppNamespacePermitted(app, ns) {\\n-\\t\\treturn nil, fmt.Errorf(\\\"application '%s' in namespace '%s' is not allowed to use project '%s'\\\",\\n-\\t\\t\\tapp.Name, app.Namespace, proj.Name)\\n+\\t\\treturn nil, argoappv1.NewErrApplicationNotAllowedToUseProject(app.Name, app.Namespace, proj.Name)\\n \\t}\\n \\treturn proj, nil\\n }\\ndiff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go\\nindex af22ca0f2502e..e13075847c380 100644\\n--- a/util/session/sessionmanager.go\\n+++ b/util/session/sessionmanager.go\\n@@ -312,7 +312,7 @@ func expireOldFailedAttempts(maxAge time.Duration, failures map[string]LoginAtte\\n \\treturn expiredCount\\n }\\n \\n-// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache. \\n+// Protect admin user from login attempt reset caused by attempts to overflow cache in a brute force attack. Instead remove random non-admin to make room in cache.\\n func pickRandomNonAdminLoginFailure(failures map[string]LoginAttempts, username string) *string {\\n \\tidx := rand.Intn(len(failures) - 1)\\n \\ti := 0\\n\"\n }\n]","isConversational":false}}},{"rowIdx":1198,"cells":{"CVE_ID":{"kind":"string","value":"CVE-2024-31995"},"category":{"kind":"string","value":"Fix and Documentation Updates"},"patches":{"kind":"list like","value":[{"commit url":"https://github.com/digitalbazaar/zcap/commit/261eea040109b6e25159c88d8ed49d3c37f8fcfe","owner":"digitalbazaar","repo_name":"zcap","commit_message":"Fix chain-depth-2 zcap invocation expiry check.","diff_code":"From 261eea040109b6e25159c88d8ed49d3c37f8fcfe Mon Sep 17 00:00:00 2001\nFrom: Dave Longley <dlongley@digitalbazaar.com>\nDate: Fri, 29 Mar 2024 15:04:30 -0400\nSubject: [PATCH] Fix chain-depth-2 zcap invocation expiry check.\n\n---\n CHANGELOG.md | 7 +\n lib/CapabilityInvocation.js | 19 +++\n lib/CapabilityProofPurpose.js | 6 +-\n lib/utils.js | 7 +-\n tests/test-common.js | 254 ++++++++++++++++++++++++++++++++--\n 5 files changed, 275 insertions(+), 18 deletions(-)\n\ndiff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 9b1162c..5e32a36 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,5 +1,12 @@\n # @digitalbazaar/zcap ChangeLog\n \n+## 9.0.1 - 2024-mm-dd\n+\n+### Fixed\n+- Ensure that when invoking a capability with a chain depth of 2, i.e.,\n+ it is delegated directly from the root capability, that `expires`\n+ is properly checked against the current date or other `date` param.\n+\n ## 9.0.0 - 2022-10-25\n \n ### Changed\ndiff --git a/lib/CapabilityInvocation.js b/lib/CapabilityInvocation.js\nindex 194c6b8..530ef3b 100644\n--- a/lib/CapabilityInvocation.js\n+++ b/lib/CapabilityInvocation.js\n@@ -308,6 +308,25 @@ export class CapabilityInvocation extends CapabilityProofPurpose {\n throw error;\n }\n \n+ // if capability is delegated, verify that it has not expired\n+ if(capability.parentCapability) {\n+ // verify expiration dates\n+ // expires date has been previously validated, so just parse it\n+ const currentCapabilityExpirationTime = Date.parse(capability.expires);\n+\n+ // use `utils.compareTime` to allow for allow for clock drift because\n+ // we are comparing against `currentDate`\n+ const {date, maxClockSkew} = this;\n+ const currentDate = (date && new Date(date)) || new Date();\n+ if(utils.compareTime({\n+ t1: currentDate.getTime(),\n+ t2: currentCapabilityExpirationTime,\n+ maxClockSkew\n+ }) > 0) {\n+ throw new Error('The invoked capability has expired.');\n+ }\n+ }\n+\n // run base level validation checks\n const result = await this._runBaseProofValidation({proof, validateOptions});\n if(!result.valid) {\ndiff --git a/lib/CapabilityProofPurpose.js b/lib/CapabilityProofPurpose.js\nindex 82d05e2..f3bf177 100644\n--- a/lib/CapabilityProofPurpose.js\n+++ b/lib/CapabilityProofPurpose.js\n@@ -1,5 +1,5 @@\n /*!\n- * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.\n+ * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.\n */\n import jsigs from 'jsonld-signatures';\n import * as utils from './utils.js';\n@@ -317,7 +317,7 @@ export class CapabilityProofPurpose extends ControllerProofPurpose {\n * @param {Function} options.documentLoader - A configured jsonld\n * documentLoader.\n *\n- * @returns {object} {verified, error}.\n+ * @returns {object} An object with `{verified, error}`.\n */\n async _verifyCapabilityChain({\n CapabilityDelegation,\n@@ -446,7 +446,7 @@ export class CapabilityProofPurpose extends ControllerProofPurpose {\n // we are comparing against `currentDate`\n if(utils.compareTime({\n t1: currentDate.getTime(),\n- t2: currentCapabilityExpirationTime,\n+ t2: parentExpirationTime,\n maxClockSkew\n }) > 0) {\n throw new Error(\ndiff --git a/lib/utils.js b/lib/utils.js\nindex a8da6a7..47c5280 100644\n--- a/lib/utils.js\n+++ b/lib/utils.js\n@@ -1,5 +1,5 @@\n /*!\n- * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.\n+ * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.\n */\n import {\n MAX_CHAIN_LENGTH, ZCAP_CONTEXT_URL, ZCAP_ROOT_PREFIX\n@@ -316,7 +316,7 @@ export function computeCapabilityChain({\n * @param {number} [options.maxChainLength=10] - The maximum length of the\n * capability delegation chain (this is inclusive of `capability` itself).\n *\n- * @returns {Promise<object>} {dereferencedChain}.\n+ * @returns {Promise<object>} Resolves to `{dereferencedChain}`.\n */\n export async function dereferenceCapabilityChain({\n capability, getRootCapability, maxChainLength = MAX_CHAIN_LENGTH\n@@ -522,8 +522,7 @@ export function checkCapability({capability, expectRoot}) {\n `\"${ZCAP_CONTEXT_URL}\".`);\n }\n if(capability.expires !== undefined) {\n- throw new Error(\n- 'Root capability must not have an \"expires\" field.');\n+ throw new Error('Root capability must not have an \"expires\" field.');\n }\n } else {\n if(!((Array.isArray(context) && context[0] === ZCAP_CONTEXT_URL))) {\ndiff --git a/tests/test-common.js b/tests/test-common.js\nindex c5913ad..0fd4859 100644\n--- a/tests/test-common.js\n+++ b/tests/test-common.js\n@@ -1,5 +1,5 @@\n /*!\n- * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.\n+ * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.\n */\n \n import chai from 'chai';\n@@ -2115,9 +2115,244 @@ describe('zcap', () => {\n expect(result.verified).to.be.true;\n });\n \n- it('should fail invoking a capability with `expires` ' +\n+ it('should fail invoking a chain depth 2 capability with `expires` ' +\n 'and `date` parameter in the past', async () => {\n const rootCapability = {...capabilities.root.beta};\n+ rootCapability.id = 'urn:uuid:dada0e4d-bc52-4530-ac7f-4973eb8013e9';\n+ addToLoader({doc: rootCapability});\n+\n+ // alice delegates to bob a capability is already expired\n+ let expires = new Date();\n+ expires.setHours(expires.getHours() - 50);\n+ expires = expires.toISOString();\n+ const bobZcap = await _delegate({\n+ newCapability: {\n+ '@context': ZCAP_CONTEXT_URL,\n+ id: uuid(),\n+ controller: bob.id(),\n+ parentCapability: rootCapability.id,\n+ invocationTarget: rootCapability.invocationTarget,\n+ expires\n+ },\n+ purposeOptions: {\n+ // do not validate locally to allow expired zcap to be delegated\n+ _skipLocalValidationForTesting: true\n+ },\n+ parentCapability: rootCapability,\n+ delegator: alice\n+ });\n+\n+ // bob invokes\n+ const doc = clone(mock.exampleDoc);\n+ const invocation = await _invoke({\n+ doc, invoker: bob, capability: bobZcap, capabilityAction: 'read'\n+ });\n+ // pass current time as 20 hours ago\n+ const date = new Date();\n+ date.setHours(date.getHours() - 20);\n+ const result = await _verifyInvocation({\n+ invocation, purposeOptions: {\n+ expectedAction: 'read',\n+ expectedRootCapability: rootCapability.id,\n+ expectedTarget: rootCapability.invocationTarget,\n+ date\n+ }\n+ });\n+ expect(result).to.exist;\n+ expect(result.verified).to.be.false;\n+ should.exist(result.error);\n+ result.error.name.should.equal('VerificationError');\n+ const [error] = result.error.errors;\n+ error.message.should.equal('The invoked capability has expired.');\n+ });\n+\n+ it('should fail invoking a chain depth 2 capability with `expires` ' +\n+ 'and `date` parameter in the future', async () => {\n+ const rootCapability = {...capabilities.root.beta};\n+ rootCapability.id = 'urn:zcap:1d0cd622-2e0a-4686-b0d7-bd71cc27db04';\n+ addToLoader({doc: rootCapability});\n+\n+ // alice delegates to bob a capability that is presently valid\n+ let expires = new Date();\n+ expires.setHours(expires.getHours() + 50);\n+ expires = expires.toISOString();\n+ const bobZcap = await _delegate({\n+ newCapability: {\n+ '@context': ZCAP_CONTEXT_URL,\n+ id: uuid(),\n+ controller: bob.id(),\n+ parentCapability: rootCapability.id,\n+ invocationTarget: rootCapability.invocationTarget,\n+ expires\n+ },\n+ parentCapability: rootCapability,\n+ delegator: alice\n+ });\n+\n+ // bob invokes\n+ const doc = clone(mock.exampleDoc);\n+ const invocation = await _invoke({\n+ doc, invoker: bob, capability: bobZcap, capabilityAction: 'read'\n+ });\n+ // the capability will have expired in 100 hours, so pass that future\n+ // time in as the verification date to trigger an error\n+ const date = new Date();\n+ date.setHours(date.getHours() + 100);\n+ const result = await _verifyInvocation({\n+ invocation, purposeOptions: {\n+ expectedAction: 'read',\n+ expectedRootCapability: rootCapability.id,\n+ expectedTarget: rootCapability.invocationTarget,\n+ suite: new Ed25519Signature2020(),\n+ date,\n+ }\n+ });\n+ expect(result).to.exist;\n+ expect(result.verified).to.be.false;\n+ should.exist(result.error);\n+ result.error.name.should.equal('VerificationError');\n+ const [error] = result.error.errors;\n+ error.message.should.equal('The invoked capability has expired.');\n+ });\n+\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\n+ 'and `date` parameter in the past', async () => {\n+ const rootCapability = {...capabilities.root.beta};\n+ rootCapability.id = 'urn:zcap:59bcb98b-a7ee-4ba7-8629-8b52329bc506';\n+ addToLoader({doc: rootCapability});\n+\n+ // alice delegates to bob a capability has not yet expired\n+ let expires = new Date();\n+ expires.setHours(expires.getHours() + 50);\n+ expires = expires.toISOString();\n+ const bobZcap = await _delegate({\n+ newCapability: {\n+ '@context': ZCAP_CONTEXT_URL,\n+ id: uuid(),\n+ controller: bob.id(),\n+ parentCapability: rootCapability.id,\n+ invocationTarget: rootCapability.invocationTarget,\n+ expires\n+ },\n+ parentCapability: rootCapability,\n+ delegator: alice\n+ });\n+\n+ // bob delegates to carol a capability that has already expired\n+ expires = new Date();\n+ expires.setHours(expires.getHours() - 50);\n+ expires = expires.toISOString();\n+ const carolZcap = await _delegate({\n+ newCapability: {\n+ '@context': ZCAP_CONTEXT_URL,\n+ id: uuid(),\n+ controller: carol.id(),\n+ parentCapability: bobZcap.id,\n+ invocationTarget: bobZcap.invocationTarget,\n+ expires\n+ },\n+ purposeOptions: {\n+ // do not validate locally to allow expired zcap to be delegated\n+ _skipLocalValidationForTesting: true\n+ },\n+ parentCapability: bobZcap,\n+ delegator: bob\n+ });\n+\n+ // carol invokes\n+ const doc = clone(mock.exampleDoc);\n+ const invocation = await _invoke({\n+ doc, invoker: carol, capability: carolZcap, capabilityAction: 'read'\n+ });\n+ // pass current time as 20 hours ago\n+ const date = new Date();\n+ date.setHours(date.getHours() - 20);\n+ const result = await _verifyInvocation({\n+ invocation, purposeOptions: {\n+ expectedAction: 'read',\n+ expectedRootCapability: rootCapability.id,\n+ expectedTarget: rootCapability.invocationTarget,\n+ date\n+ }\n+ });\n+ expect(result).to.exist;\n+ expect(result.verified).to.be.false;\n+ should.exist(result.error);\n+ result.error.name.should.equal('VerificationError');\n+ const [error] = result.error.errors;\n+ error.message.should.equal('The invoked capability has expired.');\n+ });\n+\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\n+ 'and `date` parameter in the future', async () => {\n+ const rootCapability = {...capabilities.root.beta};\n+ rootCapability.id = 'urn:zcap:80a8de39-df68-4fd8-ba78-4d65a27b2009';\n+ addToLoader({doc: rootCapability});\n+\n+ // alice delegates to bob a capability that is presently valid\n+ let expires = new Date();\n+ expires.setHours(expires.getHours() + 50);\n+ expires = expires.toISOString();\n+ const bobZcap = await _delegate({\n+ newCapability: {\n+ '@context': ZCAP_CONTEXT_URL,\n+ id: uuid(),\n+ controller: bob.id(),\n+ parentCapability: rootCapability.id,\n+ invocationTarget: rootCapability.invocationTarget,\n+ expires\n+ },\n+ parentCapability: rootCapability,\n+ delegator: alice\n+ });\n+\n+ // bob delegates to carol with an attenuated (shorter) expiration date\n+ expires = new Date();\n+ expires.setHours(expires.getHours() + 25);\n+ expires = expires.toISOString();\n+ const carolZcap = await _delegate({\n+ newCapability: {\n+ '@context': ZCAP_CONTEXT_URL,\n+ id: uuid(),\n+ controller: carol.id(),\n+ parentCapability: bobZcap.id,\n+ invocationTarget: bobZcap.invocationTarget,\n+ expires\n+ },\n+ parentCapability: bobZcap,\n+ delegator: bob\n+ });\n+\n+ // carol invokes\n+ const doc = clone(mock.exampleDoc);\n+ const invocation = await _invoke({\n+ doc, invoker: carol, capability: carolZcap, capabilityAction: 'read'\n+ });\n+ // the capability will have expired in 30 hours, which is before\n+ // bob's zcap's expiry but after carol's -- so pass that future\n+ // time in as the verification date to trigger an error\n+ const date = new Date();\n+ date.setHours(date.getHours() + 30);\n+ const result = await _verifyInvocation({\n+ invocation, purposeOptions: {\n+ expectedAction: 'read',\n+ expectedRootCapability: rootCapability.id,\n+ expectedTarget: rootCapability.invocationTarget,\n+ suite: new Ed25519Signature2020(),\n+ date,\n+ }\n+ });\n+ expect(result).to.exist;\n+ expect(result.verified).to.be.false;\n+ should.exist(result.error);\n+ result.error.name.should.equal('VerificationError');\n+ const [error] = result.error.errors;\n+ error.message.should.equal('The invoked capability has expired.');\n+ });\n+\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\n+ 'and `date` parameter in the chain in the past', async () => {\n+ const rootCapability = {...capabilities.root.beta};\n rootCapability.id = 'urn:zcap:142b0b4a-c664-4288-84e6-be0a59b6efa4';\n addToLoader({doc: rootCapability});\n \n@@ -2165,7 +2400,7 @@ describe('zcap', () => {\n const invocation = await _invoke({\n doc, invoker: carol, capability: carolZcap, capabilityAction: 'read'\n });\n- // the capability was also expired 20 hours ago\n+ // pass current time as 20 hours ago\n const date = new Date();\n date.setHours(date.getHours() - 20);\n const result = await _verifyInvocation({\n@@ -2185,8 +2420,8 @@ describe('zcap', () => {\n 'A capability in the delegation chain has expired.');\n });\n \n- it('should fail invoking a capability with `expires` ' +\n- 'and `date` parameter in the future', async () => {\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\n+ 'and `date` parameter in the chain in the future', async () => {\n const rootCapability = {...capabilities.root.beta};\n rootCapability.id = 'urn:zcap:bcbcde5e-d64a-4f46-a76e-daf52f63f702';\n addToLoader({doc: rootCapability});\n@@ -2636,8 +2871,7 @@ describe('zcap', () => {\n should.exist(result.error);\n result.error.name.should.equal('VerificationError');\n const [error] = result.error.errors;\n- error.message.should.equal(\n- 'A capability in the delegation chain has expired.');\n+ error.message.should.equal('The invoked capability has expired.');\n });\n \n it('should fail invoking a capability with second delegated ' +\n@@ -2700,8 +2934,7 @@ describe('zcap', () => {\n should.exist(result.error);\n result.error.errors.should.have.length(1);\n const [error] = result.error.errors;\n- error.message.should.contain(\n- 'capability in the delegation chain has expired');\n+ error.message.should.equal('The invoked capability has expired.');\n });\n \n it('should fail invoking a capability with ' +\n@@ -2895,8 +3128,7 @@ describe('zcap', () => {\n should.exist(result.error);\n result.error.name.should.equal('VerificationError');\n const [error] = result.error.errors;\n- error.message.should.equal(\n- 'A capability in the delegation chain has expired.');\n+ error.message.should.equal('The invoked capability has expired.');\n });\n }); // end Expiration date\n \n"},{"commit url":"https://github.com/digitalbazaar/zcap/commit/55f8549c80124b85dfb0f3dcf83f2c63f42532e5","owner":"digitalbazaar","repo_name":"zcap","commit_message":"Express expectation of node >= 18.","diff_code":"From 55f8549c80124b85dfb0f3dcf83f2c63f42532e5 Mon Sep 17 00:00:00 2001\nFrom: Dave Longley <dlongley@digitalbazaar.com>\nDate: Fri, 29 Mar 2024 15:12:12 -0400\nSubject: [PATCH] Express expectation of node >= 18.\n\n---\n package.json | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/package.json b/package.json\nindex 71ecaa0..1527cfb 100644\n--- a/package.json\n+++ b/package.json\n@@ -63,7 +63,7 @@\n ]\n },\n \"engines\": {\n- \"node\": \">=14\"\n+ \"node\": \">=18\"\n },\n \"keywords\": [\n \"Authorization Capability\",\n"}],"string":"[\n {\n \"commit url\": \"https://github.com/digitalbazaar/zcap/commit/261eea040109b6e25159c88d8ed49d3c37f8fcfe\",\n \"owner\": \"digitalbazaar\",\n \"repo_name\": \"zcap\",\n \"commit_message\": \"Fix chain-depth-2 zcap invocation expiry check.\",\n \"diff_code\": \"From 261eea040109b6e25159c88d8ed49d3c37f8fcfe Mon Sep 17 00:00:00 2001\\nFrom: Dave Longley <dlongley@digitalbazaar.com>\\nDate: Fri, 29 Mar 2024 15:04:30 -0400\\nSubject: [PATCH] Fix chain-depth-2 zcap invocation expiry check.\\n\\n---\\n CHANGELOG.md | 7 +\\n lib/CapabilityInvocation.js | 19 +++\\n lib/CapabilityProofPurpose.js | 6 +-\\n lib/utils.js | 7 +-\\n tests/test-common.js | 254 ++++++++++++++++++++++++++++++++--\\n 5 files changed, 275 insertions(+), 18 deletions(-)\\n\\ndiff --git a/CHANGELOG.md b/CHANGELOG.md\\nindex 9b1162c..5e32a36 100644\\n--- a/CHANGELOG.md\\n+++ b/CHANGELOG.md\\n@@ -1,5 +1,12 @@\\n # @digitalbazaar/zcap ChangeLog\\n \\n+## 9.0.1 - 2024-mm-dd\\n+\\n+### Fixed\\n+- Ensure that when invoking a capability with a chain depth of 2, i.e.,\\n+ it is delegated directly from the root capability, that `expires`\\n+ is properly checked against the current date or other `date` param.\\n+\\n ## 9.0.0 - 2022-10-25\\n \\n ### Changed\\ndiff --git a/lib/CapabilityInvocation.js b/lib/CapabilityInvocation.js\\nindex 194c6b8..530ef3b 100644\\n--- a/lib/CapabilityInvocation.js\\n+++ b/lib/CapabilityInvocation.js\\n@@ -308,6 +308,25 @@ export class CapabilityInvocation extends CapabilityProofPurpose {\\n throw error;\\n }\\n \\n+ // if capability is delegated, verify that it has not expired\\n+ if(capability.parentCapability) {\\n+ // verify expiration dates\\n+ // expires date has been previously validated, so just parse it\\n+ const currentCapabilityExpirationTime = Date.parse(capability.expires);\\n+\\n+ // use `utils.compareTime` to allow for allow for clock drift because\\n+ // we are comparing against `currentDate`\\n+ const {date, maxClockSkew} = this;\\n+ const currentDate = (date && new Date(date)) || new Date();\\n+ if(utils.compareTime({\\n+ t1: currentDate.getTime(),\\n+ t2: currentCapabilityExpirationTime,\\n+ maxClockSkew\\n+ }) > 0) {\\n+ throw new Error('The invoked capability has expired.');\\n+ }\\n+ }\\n+\\n // run base level validation checks\\n const result = await this._runBaseProofValidation({proof, validateOptions});\\n if(!result.valid) {\\ndiff --git a/lib/CapabilityProofPurpose.js b/lib/CapabilityProofPurpose.js\\nindex 82d05e2..f3bf177 100644\\n--- a/lib/CapabilityProofPurpose.js\\n+++ b/lib/CapabilityProofPurpose.js\\n@@ -1,5 +1,5 @@\\n /*!\\n- * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.\\n+ * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.\\n */\\n import jsigs from 'jsonld-signatures';\\n import * as utils from './utils.js';\\n@@ -317,7 +317,7 @@ export class CapabilityProofPurpose extends ControllerProofPurpose {\\n * @param {Function} options.documentLoader - A configured jsonld\\n * documentLoader.\\n *\\n- * @returns {object} {verified, error}.\\n+ * @returns {object} An object with `{verified, error}`.\\n */\\n async _verifyCapabilityChain({\\n CapabilityDelegation,\\n@@ -446,7 +446,7 @@ export class CapabilityProofPurpose extends ControllerProofPurpose {\\n // we are comparing against `currentDate`\\n if(utils.compareTime({\\n t1: currentDate.getTime(),\\n- t2: currentCapabilityExpirationTime,\\n+ t2: parentExpirationTime,\\n maxClockSkew\\n }) > 0) {\\n throw new Error(\\ndiff --git a/lib/utils.js b/lib/utils.js\\nindex a8da6a7..47c5280 100644\\n--- a/lib/utils.js\\n+++ b/lib/utils.js\\n@@ -1,5 +1,5 @@\\n /*!\\n- * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.\\n+ * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.\\n */\\n import {\\n MAX_CHAIN_LENGTH, ZCAP_CONTEXT_URL, ZCAP_ROOT_PREFIX\\n@@ -316,7 +316,7 @@ export function computeCapabilityChain({\\n * @param {number} [options.maxChainLength=10] - The maximum length of the\\n * capability delegation chain (this is inclusive of `capability` itself).\\n *\\n- * @returns {Promise<object>} {dereferencedChain}.\\n+ * @returns {Promise<object>} Resolves to `{dereferencedChain}`.\\n */\\n export async function dereferenceCapabilityChain({\\n capability, getRootCapability, maxChainLength = MAX_CHAIN_LENGTH\\n@@ -522,8 +522,7 @@ export function checkCapability({capability, expectRoot}) {\\n `\\\"${ZCAP_CONTEXT_URL}\\\".`);\\n }\\n if(capability.expires !== undefined) {\\n- throw new Error(\\n- 'Root capability must not have an \\\"expires\\\" field.');\\n+ throw new Error('Root capability must not have an \\\"expires\\\" field.');\\n }\\n } else {\\n if(!((Array.isArray(context) && context[0] === ZCAP_CONTEXT_URL))) {\\ndiff --git a/tests/test-common.js b/tests/test-common.js\\nindex c5913ad..0fd4859 100644\\n--- a/tests/test-common.js\\n+++ b/tests/test-common.js\\n@@ -1,5 +1,5 @@\\n /*!\\n- * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.\\n+ * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.\\n */\\n \\n import chai from 'chai';\\n@@ -2115,9 +2115,244 @@ describe('zcap', () => {\\n expect(result.verified).to.be.true;\\n });\\n \\n- it('should fail invoking a capability with `expires` ' +\\n+ it('should fail invoking a chain depth 2 capability with `expires` ' +\\n 'and `date` parameter in the past', async () => {\\n const rootCapability = {...capabilities.root.beta};\\n+ rootCapability.id = 'urn:uuid:dada0e4d-bc52-4530-ac7f-4973eb8013e9';\\n+ addToLoader({doc: rootCapability});\\n+\\n+ // alice delegates to bob a capability is already expired\\n+ let expires = new Date();\\n+ expires.setHours(expires.getHours() - 50);\\n+ expires = expires.toISOString();\\n+ const bobZcap = await _delegate({\\n+ newCapability: {\\n+ '@context': ZCAP_CONTEXT_URL,\\n+ id: uuid(),\\n+ controller: bob.id(),\\n+ parentCapability: rootCapability.id,\\n+ invocationTarget: rootCapability.invocationTarget,\\n+ expires\\n+ },\\n+ purposeOptions: {\\n+ // do not validate locally to allow expired zcap to be delegated\\n+ _skipLocalValidationForTesting: true\\n+ },\\n+ parentCapability: rootCapability,\\n+ delegator: alice\\n+ });\\n+\\n+ // bob invokes\\n+ const doc = clone(mock.exampleDoc);\\n+ const invocation = await _invoke({\\n+ doc, invoker: bob, capability: bobZcap, capabilityAction: 'read'\\n+ });\\n+ // pass current time as 20 hours ago\\n+ const date = new Date();\\n+ date.setHours(date.getHours() - 20);\\n+ const result = await _verifyInvocation({\\n+ invocation, purposeOptions: {\\n+ expectedAction: 'read',\\n+ expectedRootCapability: rootCapability.id,\\n+ expectedTarget: rootCapability.invocationTarget,\\n+ date\\n+ }\\n+ });\\n+ expect(result).to.exist;\\n+ expect(result.verified).to.be.false;\\n+ should.exist(result.error);\\n+ result.error.name.should.equal('VerificationError');\\n+ const [error] = result.error.errors;\\n+ error.message.should.equal('The invoked capability has expired.');\\n+ });\\n+\\n+ it('should fail invoking a chain depth 2 capability with `expires` ' +\\n+ 'and `date` parameter in the future', async () => {\\n+ const rootCapability = {...capabilities.root.beta};\\n+ rootCapability.id = 'urn:zcap:1d0cd622-2e0a-4686-b0d7-bd71cc27db04';\\n+ addToLoader({doc: rootCapability});\\n+\\n+ // alice delegates to bob a capability that is presently valid\\n+ let expires = new Date();\\n+ expires.setHours(expires.getHours() + 50);\\n+ expires = expires.toISOString();\\n+ const bobZcap = await _delegate({\\n+ newCapability: {\\n+ '@context': ZCAP_CONTEXT_URL,\\n+ id: uuid(),\\n+ controller: bob.id(),\\n+ parentCapability: rootCapability.id,\\n+ invocationTarget: rootCapability.invocationTarget,\\n+ expires\\n+ },\\n+ parentCapability: rootCapability,\\n+ delegator: alice\\n+ });\\n+\\n+ // bob invokes\\n+ const doc = clone(mock.exampleDoc);\\n+ const invocation = await _invoke({\\n+ doc, invoker: bob, capability: bobZcap, capabilityAction: 'read'\\n+ });\\n+ // the capability will have expired in 100 hours, so pass that future\\n+ // time in as the verification date to trigger an error\\n+ const date = new Date();\\n+ date.setHours(date.getHours() + 100);\\n+ const result = await _verifyInvocation({\\n+ invocation, purposeOptions: {\\n+ expectedAction: 'read',\\n+ expectedRootCapability: rootCapability.id,\\n+ expectedTarget: rootCapability.invocationTarget,\\n+ suite: new Ed25519Signature2020(),\\n+ date,\\n+ }\\n+ });\\n+ expect(result).to.exist;\\n+ expect(result.verified).to.be.false;\\n+ should.exist(result.error);\\n+ result.error.name.should.equal('VerificationError');\\n+ const [error] = result.error.errors;\\n+ error.message.should.equal('The invoked capability has expired.');\\n+ });\\n+\\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\\n+ 'and `date` parameter in the past', async () => {\\n+ const rootCapability = {...capabilities.root.beta};\\n+ rootCapability.id = 'urn:zcap:59bcb98b-a7ee-4ba7-8629-8b52329bc506';\\n+ addToLoader({doc: rootCapability});\\n+\\n+ // alice delegates to bob a capability has not yet expired\\n+ let expires = new Date();\\n+ expires.setHours(expires.getHours() + 50);\\n+ expires = expires.toISOString();\\n+ const bobZcap = await _delegate({\\n+ newCapability: {\\n+ '@context': ZCAP_CONTEXT_URL,\\n+ id: uuid(),\\n+ controller: bob.id(),\\n+ parentCapability: rootCapability.id,\\n+ invocationTarget: rootCapability.invocationTarget,\\n+ expires\\n+ },\\n+ parentCapability: rootCapability,\\n+ delegator: alice\\n+ });\\n+\\n+ // bob delegates to carol a capability that has already expired\\n+ expires = new Date();\\n+ expires.setHours(expires.getHours() - 50);\\n+ expires = expires.toISOString();\\n+ const carolZcap = await _delegate({\\n+ newCapability: {\\n+ '@context': ZCAP_CONTEXT_URL,\\n+ id: uuid(),\\n+ controller: carol.id(),\\n+ parentCapability: bobZcap.id,\\n+ invocationTarget: bobZcap.invocationTarget,\\n+ expires\\n+ },\\n+ purposeOptions: {\\n+ // do not validate locally to allow expired zcap to be delegated\\n+ _skipLocalValidationForTesting: true\\n+ },\\n+ parentCapability: bobZcap,\\n+ delegator: bob\\n+ });\\n+\\n+ // carol invokes\\n+ const doc = clone(mock.exampleDoc);\\n+ const invocation = await _invoke({\\n+ doc, invoker: carol, capability: carolZcap, capabilityAction: 'read'\\n+ });\\n+ // pass current time as 20 hours ago\\n+ const date = new Date();\\n+ date.setHours(date.getHours() - 20);\\n+ const result = await _verifyInvocation({\\n+ invocation, purposeOptions: {\\n+ expectedAction: 'read',\\n+ expectedRootCapability: rootCapability.id,\\n+ expectedTarget: rootCapability.invocationTarget,\\n+ date\\n+ }\\n+ });\\n+ expect(result).to.exist;\\n+ expect(result.verified).to.be.false;\\n+ should.exist(result.error);\\n+ result.error.name.should.equal('VerificationError');\\n+ const [error] = result.error.errors;\\n+ error.message.should.equal('The invoked capability has expired.');\\n+ });\\n+\\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\\n+ 'and `date` parameter in the future', async () => {\\n+ const rootCapability = {...capabilities.root.beta};\\n+ rootCapability.id = 'urn:zcap:80a8de39-df68-4fd8-ba78-4d65a27b2009';\\n+ addToLoader({doc: rootCapability});\\n+\\n+ // alice delegates to bob a capability that is presently valid\\n+ let expires = new Date();\\n+ expires.setHours(expires.getHours() + 50);\\n+ expires = expires.toISOString();\\n+ const bobZcap = await _delegate({\\n+ newCapability: {\\n+ '@context': ZCAP_CONTEXT_URL,\\n+ id: uuid(),\\n+ controller: bob.id(),\\n+ parentCapability: rootCapability.id,\\n+ invocationTarget: rootCapability.invocationTarget,\\n+ expires\\n+ },\\n+ parentCapability: rootCapability,\\n+ delegator: alice\\n+ });\\n+\\n+ // bob delegates to carol with an attenuated (shorter) expiration date\\n+ expires = new Date();\\n+ expires.setHours(expires.getHours() + 25);\\n+ expires = expires.toISOString();\\n+ const carolZcap = await _delegate({\\n+ newCapability: {\\n+ '@context': ZCAP_CONTEXT_URL,\\n+ id: uuid(),\\n+ controller: carol.id(),\\n+ parentCapability: bobZcap.id,\\n+ invocationTarget: bobZcap.invocationTarget,\\n+ expires\\n+ },\\n+ parentCapability: bobZcap,\\n+ delegator: bob\\n+ });\\n+\\n+ // carol invokes\\n+ const doc = clone(mock.exampleDoc);\\n+ const invocation = await _invoke({\\n+ doc, invoker: carol, capability: carolZcap, capabilityAction: 'read'\\n+ });\\n+ // the capability will have expired in 30 hours, which is before\\n+ // bob's zcap's expiry but after carol's -- so pass that future\\n+ // time in as the verification date to trigger an error\\n+ const date = new Date();\\n+ date.setHours(date.getHours() + 30);\\n+ const result = await _verifyInvocation({\\n+ invocation, purposeOptions: {\\n+ expectedAction: 'read',\\n+ expectedRootCapability: rootCapability.id,\\n+ expectedTarget: rootCapability.invocationTarget,\\n+ suite: new Ed25519Signature2020(),\\n+ date,\\n+ }\\n+ });\\n+ expect(result).to.exist;\\n+ expect(result.verified).to.be.false;\\n+ should.exist(result.error);\\n+ result.error.name.should.equal('VerificationError');\\n+ const [error] = result.error.errors;\\n+ error.message.should.equal('The invoked capability has expired.');\\n+ });\\n+\\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\\n+ 'and `date` parameter in the chain in the past', async () => {\\n+ const rootCapability = {...capabilities.root.beta};\\n rootCapability.id = 'urn:zcap:142b0b4a-c664-4288-84e6-be0a59b6efa4';\\n addToLoader({doc: rootCapability});\\n \\n@@ -2165,7 +2400,7 @@ describe('zcap', () => {\\n const invocation = await _invoke({\\n doc, invoker: carol, capability: carolZcap, capabilityAction: 'read'\\n });\\n- // the capability was also expired 20 hours ago\\n+ // pass current time as 20 hours ago\\n const date = new Date();\\n date.setHours(date.getHours() - 20);\\n const result = await _verifyInvocation({\\n@@ -2185,8 +2420,8 @@ describe('zcap', () => {\\n 'A capability in the delegation chain has expired.');\\n });\\n \\n- it('should fail invoking a capability with `expires` ' +\\n- 'and `date` parameter in the future', async () => {\\n+ it('should fail invoking a chain depth 3 capability with `expires` ' +\\n+ 'and `date` parameter in the chain in the future', async () => {\\n const rootCapability = {...capabilities.root.beta};\\n rootCapability.id = 'urn:zcap:bcbcde5e-d64a-4f46-a76e-daf52f63f702';\\n addToLoader({doc: rootCapability});\\n@@ -2636,8 +2871,7 @@ describe('zcap', () => {\\n should.exist(result.error);\\n result.error.name.should.equal('VerificationError');\\n const [error] = result.error.errors;\\n- error.message.should.equal(\\n- 'A capability in the delegation chain has expired.');\\n+ error.message.should.equal('The invoked capability has expired.');\\n });\\n \\n it('should fail invoking a capability with second delegated ' +\\n@@ -2700,8 +2934,7 @@ describe('zcap', () => {\\n should.exist(result.error);\\n result.error.errors.should.have.length(1);\\n const [error] = result.error.errors;\\n- error.message.should.contain(\\n- 'capability in the delegation chain has expired');\\n+ error.message.should.equal('The invoked capability has expired.');\\n });\\n \\n it('should fail invoking a capability with ' +\\n@@ -2895,8 +3128,7 @@ describe('zcap', () => {\\n should.exist(result.error);\\n result.error.name.should.equal('VerificationError');\\n const [error] = result.error.errors;\\n- error.message.should.equal(\\n- 'A capability in the delegation chain has expired.');\\n+ error.message.should.equal('The invoked capability has expired.');\\n });\\n }); // end Expiration date\\n \\n\"\n },\n {\n \"commit url\": \"https://github.com/digitalbazaar/zcap/commit/55f8549c80124b85dfb0f3dcf83f2c63f42532e5\",\n \"owner\": \"digitalbazaar\",\n \"repo_name\": \"zcap\",\n \"commit_message\": \"Express expectation of node >= 18.\",\n \"diff_code\": \"From 55f8549c80124b85dfb0f3dcf83f2c63f42532e5 Mon Sep 17 00:00:00 2001\\nFrom: Dave Longley <dlongley@digitalbazaar.com>\\nDate: Fri, 29 Mar 2024 15:12:12 -0400\\nSubject: [PATCH] Express expectation of node >= 18.\\n\\n---\\n package.json | 2 +-\\n 1 file changed, 1 insertion(+), 1 deletion(-)\\n\\ndiff --git a/package.json b/package.json\\nindex 71ecaa0..1527cfb 100644\\n--- a/package.json\\n+++ b/package.json\\n@@ -63,7 +63,7 @@\\n ]\\n },\\n \\\"engines\\\": {\\n- \\\"node\\\": \\\">=14\\\"\\n+ \\\"node\\\": \\\">=18\\\"\\n },\\n \\\"keywords\\\": [\\n \\\"Authorization Capability\\\",\\n\"\n }\n]","isConversational":false}}},{"rowIdx":1199,"cells":{"CVE_ID":{"kind":"string","value":"CVE-2024-31996"},"category":{"kind":"string","value":"Fixes for Multiple Locations Across Different Branches or Projects"},"patches":{"kind":"list like","value":[{"commit url":"https://github.com/xwiki/xwiki-commons/commit/b0805160ec7b01ee12417e79cb384e60ae4817aa","owner":"xwiki","repo_name":"xwiki-commons","commit_message":"XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\n\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)","diff_code":"From b0805160ec7b01ee12417e79cb384e60ae4817aa Mon Sep 17 00:00:00 2001\nFrom: Pierre Jeanjean <pierre.jeanjean@xwiki.com>\nDate: Fri, 20 Oct 2023 17:01:41 +0200\nSubject: [PATCH] XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\n\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)\n---\n .../org/xwiki/velocity/tools/EscapeTool.java | 27 +++++++++++++++++++\n .../xwiki/velocity/tools/EscapeToolTest.java | 8 ++++++\n 2 files changed, 35 insertions(+)\n\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\nindex 60ffb3463f..3fe2f17098 100644\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\n@@ -30,6 +30,8 @@\n import org.apache.commons.codec.net.QCodec;\n import org.apache.commons.codec.net.QuotedPrintableCodec;\n import org.apache.commons.text.StringEscapeUtils;\n+import org.apache.commons.text.translate.CharSequenceTranslator;\n+import org.apache.commons.text.translate.LookupTranslator;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n import org.xwiki.xml.XMLUtils;\n@@ -66,6 +68,13 @@ public class EscapeTool extends org.apache.velocity.tools.generic.EscapeTool\n /** And sign. */\n private static final String AND = \"&\";\n \n+ private static final CharSequenceTranslator XWIKI_ESCAPE_HTML4 = StringEscapeUtils.ESCAPE_HTML4.with(\n+ new LookupTranslator(Map.ofEntries(\n+ Map.entry(\"{\", \"{\"),\n+ Map.entry(\"}\", \"}\")\n+ ))\n+ );\n+\n /**\n * Change the default key defined in {@link org.apache.velocity.tools.generic.EscapeTool}.\n */\n@@ -74,6 +83,24 @@ public EscapeTool()\n setKey(DEFAULT_KEY);\n }\n \n+ /**\n+ * Escapes the HTML special characters in a <code>String</code> using HTML entities. This overrides the base\n+ * implementation from Velocity in order to also escape characters potentially harmful in the context of XWiki,\n+ * such as curly brackets.\n+ *\n+ * @param content the string to escape, may be {@code null}\n+ * @return a new escaped {@code String}, {@code null} if {@code null} input\n+ */\n+ @Override\n+ public String html(Object content)\n+ {\n+ if (content == null)\n+ {\n+ return null;\n+ }\n+ return XWIKI_ESCAPE_HTML4.translate(String.valueOf(content));\n+ }\n+\n /**\n * Escapes the XML special characters in a <code>String</code> using numerical XML entities. This overrides the base\n * implementation from Velocity, which is over-zealous and escapes any non-ASCII character. Since XWiki works with\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\nindex 523cc78a5d..456ceb5e75 100644\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\n@@ -259,4 +259,12 @@ void velocity()\n {\n assertEquals(\"one${escapetool.h}${escapetool.h}two\", this.tool.velocity(\"one##two\")); \n }\n+\n+ @Test\n+ void html()\n+ {\n+ assertEquals(\"<script>alert("Hello, &lt;World&gt;!");</script>{{\"\n+ + \"/html}}\",\n+ this.tool.html(\"<script>alert(\\\"Hello, <World>!\\\");</script>{{/html}}\"));\n+ }\n }\n"},{"commit url":"https://github.com/xwiki/xwiki-commons/commit/b94142e2a66ec32e89eacab67c3da8d91f5ef93a","owner":"xwiki","repo_name":"xwiki-commons","commit_message":"XCOMMONS-2828: Support curly braces in `EscapeTool.html()`","diff_code":"From b94142e2a66ec32e89eacab67c3da8d91f5ef93a Mon Sep 17 00:00:00 2001\nFrom: Pierre Jeanjean <pierre.jeanjean@xwiki.com>\nDate: Fri, 20 Oct 2023 17:01:41 +0200\nSubject: [PATCH] XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\n\n---\n .../org/xwiki/velocity/tools/EscapeTool.java | 27 +++++++++++++++++++\n .../xwiki/velocity/tools/EscapeToolTest.java | 8 ++++++\n 2 files changed, 35 insertions(+)\n\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\nindex 60ffb3463f..3fe2f17098 100644\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\n@@ -30,6 +30,8 @@\n import org.apache.commons.codec.net.QCodec;\n import org.apache.commons.codec.net.QuotedPrintableCodec;\n import org.apache.commons.text.StringEscapeUtils;\n+import org.apache.commons.text.translate.CharSequenceTranslator;\n+import org.apache.commons.text.translate.LookupTranslator;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n import org.xwiki.xml.XMLUtils;\n@@ -66,6 +68,13 @@ public class EscapeTool extends org.apache.velocity.tools.generic.EscapeTool\n /** And sign. */\n private static final String AND = \"&\";\n \n+ private static final CharSequenceTranslator XWIKI_ESCAPE_HTML4 = StringEscapeUtils.ESCAPE_HTML4.with(\n+ new LookupTranslator(Map.ofEntries(\n+ Map.entry(\"{\", \"{\"),\n+ Map.entry(\"}\", \"}\")\n+ ))\n+ );\n+\n /**\n * Change the default key defined in {@link org.apache.velocity.tools.generic.EscapeTool}.\n */\n@@ -74,6 +83,24 @@ public EscapeTool()\n setKey(DEFAULT_KEY);\n }\n \n+ /**\n+ * Escapes the HTML special characters in a <code>String</code> using HTML entities. This overrides the base\n+ * implementation from Velocity in order to also escape characters potentially harmful in the context of XWiki,\n+ * such as curly brackets.\n+ *\n+ * @param content the string to escape, may be {@code null}\n+ * @return a new escaped {@code String}, {@code null} if {@code null} input\n+ */\n+ @Override\n+ public String html(Object content)\n+ {\n+ if (content == null)\n+ {\n+ return null;\n+ }\n+ return XWIKI_ESCAPE_HTML4.translate(String.valueOf(content));\n+ }\n+\n /**\n * Escapes the XML special characters in a <code>String</code> using numerical XML entities. This overrides the base\n * implementation from Velocity, which is over-zealous and escapes any non-ASCII character. Since XWiki works with\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\nindex 523cc78a5d..456ceb5e75 100644\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\n@@ -259,4 +259,12 @@ void velocity()\n {\n assertEquals(\"one${escapetool.h}${escapetool.h}two\", this.tool.velocity(\"one##two\")); \n }\n+\n+ @Test\n+ void html()\n+ {\n+ assertEquals(\"<script>alert("Hello, &lt;World&gt;!");</script>{{\"\n+ + \"/html}}\",\n+ this.tool.html(\"<script>alert(\\\"Hello, <World>!\\\");</script>{{/html}}\"));\n+ }\n }\n"},{"commit url":"https://github.com/xwiki/xwiki-commons/commit/ed7ff515a2436a1c6dcbd0c6ca0c41e434d58915","owner":"xwiki","repo_name":"xwiki-commons","commit_message":"XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\n\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)","diff_code":"From ed7ff515a2436a1c6dcbd0c6ca0c41e434d58915 Mon Sep 17 00:00:00 2001\nFrom: Pierre Jeanjean <pierre.jeanjean@xwiki.com>\nDate: Fri, 20 Oct 2023 17:01:41 +0200\nSubject: [PATCH] XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\n\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)\n---\n .../org/xwiki/velocity/tools/EscapeTool.java | 27 +++++++++++++++++++\n .../xwiki/velocity/tools/EscapeToolTest.java | 8 ++++++\n 2 files changed, 35 insertions(+)\n\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\nindex 60ffb3463f..3fe2f17098 100644\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\n@@ -30,6 +30,8 @@\n import org.apache.commons.codec.net.QCodec;\n import org.apache.commons.codec.net.QuotedPrintableCodec;\n import org.apache.commons.text.StringEscapeUtils;\n+import org.apache.commons.text.translate.CharSequenceTranslator;\n+import org.apache.commons.text.translate.LookupTranslator;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n import org.xwiki.xml.XMLUtils;\n@@ -66,6 +68,13 @@ public class EscapeTool extends org.apache.velocity.tools.generic.EscapeTool\n /** And sign. */\n private static final String AND = \"&\";\n \n+ private static final CharSequenceTranslator XWIKI_ESCAPE_HTML4 = StringEscapeUtils.ESCAPE_HTML4.with(\n+ new LookupTranslator(Map.ofEntries(\n+ Map.entry(\"{\", \"{\"),\n+ Map.entry(\"}\", \"}\")\n+ ))\n+ );\n+\n /**\n * Change the default key defined in {@link org.apache.velocity.tools.generic.EscapeTool}.\n */\n@@ -74,6 +83,24 @@ public EscapeTool()\n setKey(DEFAULT_KEY);\n }\n \n+ /**\n+ * Escapes the HTML special characters in a <code>String</code> using HTML entities. This overrides the base\n+ * implementation from Velocity in order to also escape characters potentially harmful in the context of XWiki,\n+ * such as curly brackets.\n+ *\n+ * @param content the string to escape, may be {@code null}\n+ * @return a new escaped {@code String}, {@code null} if {@code null} input\n+ */\n+ @Override\n+ public String html(Object content)\n+ {\n+ if (content == null)\n+ {\n+ return null;\n+ }\n+ return XWIKI_ESCAPE_HTML4.translate(String.valueOf(content));\n+ }\n+\n /**\n * Escapes the XML special characters in a <code>String</code> using numerical XML entities. This overrides the base\n * implementation from Velocity, which is over-zealous and escapes any non-ASCII character. Since XWiki works with\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\nindex 523cc78a5d..456ceb5e75 100644\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\n@@ -259,4 +259,12 @@ void velocity()\n {\n assertEquals(\"one${escapetool.h}${escapetool.h}two\", this.tool.velocity(\"one##two\")); \n }\n+\n+ @Test\n+ void html()\n+ {\n+ assertEquals(\"<script>alert("Hello, &lt;World&gt;!");</script>{{\"\n+ + \"/html}}\",\n+ this.tool.html(\"<script>alert(\\\"Hello, <World>!\\\");</script>{{/html}}\"));\n+ }\n }\n"}],"string":"[\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-commons/commit/b0805160ec7b01ee12417e79cb384e60ae4817aa\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-commons\",\n \"commit_message\": \"XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\\n\\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)\",\n \"diff_code\": \"From b0805160ec7b01ee12417e79cb384e60ae4817aa Mon Sep 17 00:00:00 2001\\nFrom: Pierre Jeanjean <pierre.jeanjean@xwiki.com>\\nDate: Fri, 20 Oct 2023 17:01:41 +0200\\nSubject: [PATCH] XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\\n\\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)\\n---\\n .../org/xwiki/velocity/tools/EscapeTool.java | 27 +++++++++++++++++++\\n .../xwiki/velocity/tools/EscapeToolTest.java | 8 ++++++\\n 2 files changed, 35 insertions(+)\\n\\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\nindex 60ffb3463f..3fe2f17098 100644\\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\n@@ -30,6 +30,8 @@\\n import org.apache.commons.codec.net.QCodec;\\n import org.apache.commons.codec.net.QuotedPrintableCodec;\\n import org.apache.commons.text.StringEscapeUtils;\\n+import org.apache.commons.text.translate.CharSequenceTranslator;\\n+import org.apache.commons.text.translate.LookupTranslator;\\n import org.slf4j.Logger;\\n import org.slf4j.LoggerFactory;\\n import org.xwiki.xml.XMLUtils;\\n@@ -66,6 +68,13 @@ public class EscapeTool extends org.apache.velocity.tools.generic.EscapeTool\\n /** And sign. */\\n private static final String AND = \\\"&\\\";\\n \\n+ private static final CharSequenceTranslator XWIKI_ESCAPE_HTML4 = StringEscapeUtils.ESCAPE_HTML4.with(\\n+ new LookupTranslator(Map.ofEntries(\\n+ Map.entry(\\\"{\\\", \\\"{\\\"),\\n+ Map.entry(\\\"}\\\", \\\"}\\\")\\n+ ))\\n+ );\\n+\\n /**\\n * Change the default key defined in {@link org.apache.velocity.tools.generic.EscapeTool}.\\n */\\n@@ -74,6 +83,24 @@ public EscapeTool()\\n setKey(DEFAULT_KEY);\\n }\\n \\n+ /**\\n+ * Escapes the HTML special characters in a <code>String</code> using HTML entities. This overrides the base\\n+ * implementation from Velocity in order to also escape characters potentially harmful in the context of XWiki,\\n+ * such as curly brackets.\\n+ *\\n+ * @param content the string to escape, may be {@code null}\\n+ * @return a new escaped {@code String}, {@code null} if {@code null} input\\n+ */\\n+ @Override\\n+ public String html(Object content)\\n+ {\\n+ if (content == null)\\n+ {\\n+ return null;\\n+ }\\n+ return XWIKI_ESCAPE_HTML4.translate(String.valueOf(content));\\n+ }\\n+\\n /**\\n * Escapes the XML special characters in a <code>String</code> using numerical XML entities. This overrides the base\\n * implementation from Velocity, which is over-zealous and escapes any non-ASCII character. Since XWiki works with\\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\nindex 523cc78a5d..456ceb5e75 100644\\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\n@@ -259,4 +259,12 @@ void velocity()\\n {\\n assertEquals(\\\"one${escapetool.h}${escapetool.h}two\\\", this.tool.velocity(\\\"one##two\\\")); \\n }\\n+\\n+ @Test\\n+ void html()\\n+ {\\n+ assertEquals(\\\"<script>alert("Hello, &lt;World&gt;!");</script>{{\\\"\\n+ + \\\"/html}}\\\",\\n+ this.tool.html(\\\"<script>alert(\\\\\\\"Hello, <World>!\\\\\\\");</script>{{/html}}\\\"));\\n+ }\\n }\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-commons/commit/b94142e2a66ec32e89eacab67c3da8d91f5ef93a\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-commons\",\n \"commit_message\": \"XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\",\n \"diff_code\": \"From b94142e2a66ec32e89eacab67c3da8d91f5ef93a Mon Sep 17 00:00:00 2001\\nFrom: Pierre Jeanjean <pierre.jeanjean@xwiki.com>\\nDate: Fri, 20 Oct 2023 17:01:41 +0200\\nSubject: [PATCH] XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\\n\\n---\\n .../org/xwiki/velocity/tools/EscapeTool.java | 27 +++++++++++++++++++\\n .../xwiki/velocity/tools/EscapeToolTest.java | 8 ++++++\\n 2 files changed, 35 insertions(+)\\n\\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\nindex 60ffb3463f..3fe2f17098 100644\\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\n@@ -30,6 +30,8 @@\\n import org.apache.commons.codec.net.QCodec;\\n import org.apache.commons.codec.net.QuotedPrintableCodec;\\n import org.apache.commons.text.StringEscapeUtils;\\n+import org.apache.commons.text.translate.CharSequenceTranslator;\\n+import org.apache.commons.text.translate.LookupTranslator;\\n import org.slf4j.Logger;\\n import org.slf4j.LoggerFactory;\\n import org.xwiki.xml.XMLUtils;\\n@@ -66,6 +68,13 @@ public class EscapeTool extends org.apache.velocity.tools.generic.EscapeTool\\n /** And sign. */\\n private static final String AND = \\\"&\\\";\\n \\n+ private static final CharSequenceTranslator XWIKI_ESCAPE_HTML4 = StringEscapeUtils.ESCAPE_HTML4.with(\\n+ new LookupTranslator(Map.ofEntries(\\n+ Map.entry(\\\"{\\\", \\\"{\\\"),\\n+ Map.entry(\\\"}\\\", \\\"}\\\")\\n+ ))\\n+ );\\n+\\n /**\\n * Change the default key defined in {@link org.apache.velocity.tools.generic.EscapeTool}.\\n */\\n@@ -74,6 +83,24 @@ public EscapeTool()\\n setKey(DEFAULT_KEY);\\n }\\n \\n+ /**\\n+ * Escapes the HTML special characters in a <code>String</code> using HTML entities. This overrides the base\\n+ * implementation from Velocity in order to also escape characters potentially harmful in the context of XWiki,\\n+ * such as curly brackets.\\n+ *\\n+ * @param content the string to escape, may be {@code null}\\n+ * @return a new escaped {@code String}, {@code null} if {@code null} input\\n+ */\\n+ @Override\\n+ public String html(Object content)\\n+ {\\n+ if (content == null)\\n+ {\\n+ return null;\\n+ }\\n+ return XWIKI_ESCAPE_HTML4.translate(String.valueOf(content));\\n+ }\\n+\\n /**\\n * Escapes the XML special characters in a <code>String</code> using numerical XML entities. This overrides the base\\n * implementation from Velocity, which is over-zealous and escapes any non-ASCII character. Since XWiki works with\\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\nindex 523cc78a5d..456ceb5e75 100644\\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\n@@ -259,4 +259,12 @@ void velocity()\\n {\\n assertEquals(\\\"one${escapetool.h}${escapetool.h}two\\\", this.tool.velocity(\\\"one##two\\\")); \\n }\\n+\\n+ @Test\\n+ void html()\\n+ {\\n+ assertEquals(\\\"<script>alert("Hello, &lt;World&gt;!");</script>{{\\\"\\n+ + \\\"/html}}\\\",\\n+ this.tool.html(\\\"<script>alert(\\\\\\\"Hello, <World>!\\\\\\\");</script>{{/html}}\\\"));\\n+ }\\n }\\n\"\n },\n {\n \"commit url\": \"https://github.com/xwiki/xwiki-commons/commit/ed7ff515a2436a1c6dcbd0c6ca0c41e434d58915\",\n \"owner\": \"xwiki\",\n \"repo_name\": \"xwiki-commons\",\n \"commit_message\": \"XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\\n\\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)\",\n \"diff_code\": \"From ed7ff515a2436a1c6dcbd0c6ca0c41e434d58915 Mon Sep 17 00:00:00 2001\\nFrom: Pierre Jeanjean <pierre.jeanjean@xwiki.com>\\nDate: Fri, 20 Oct 2023 17:01:41 +0200\\nSubject: [PATCH] XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\\n\\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef93a)\\n---\\n .../org/xwiki/velocity/tools/EscapeTool.java | 27 +++++++++++++++++++\\n .../xwiki/velocity/tools/EscapeToolTest.java | 8 ++++++\\n 2 files changed, 35 insertions(+)\\n\\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\nindex 60ffb3463f..3fe2f17098 100644\\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/tools/EscapeTool.java\\n@@ -30,6 +30,8 @@\\n import org.apache.commons.codec.net.QCodec;\\n import org.apache.commons.codec.net.QuotedPrintableCodec;\\n import org.apache.commons.text.StringEscapeUtils;\\n+import org.apache.commons.text.translate.CharSequenceTranslator;\\n+import org.apache.commons.text.translate.LookupTranslator;\\n import org.slf4j.Logger;\\n import org.slf4j.LoggerFactory;\\n import org.xwiki.xml.XMLUtils;\\n@@ -66,6 +68,13 @@ public class EscapeTool extends org.apache.velocity.tools.generic.EscapeTool\\n /** And sign. */\\n private static final String AND = \\\"&\\\";\\n \\n+ private static final CharSequenceTranslator XWIKI_ESCAPE_HTML4 = StringEscapeUtils.ESCAPE_HTML4.with(\\n+ new LookupTranslator(Map.ofEntries(\\n+ Map.entry(\\\"{\\\", \\\"{\\\"),\\n+ Map.entry(\\\"}\\\", \\\"}\\\")\\n+ ))\\n+ );\\n+\\n /**\\n * Change the default key defined in {@link org.apache.velocity.tools.generic.EscapeTool}.\\n */\\n@@ -74,6 +83,24 @@ public EscapeTool()\\n setKey(DEFAULT_KEY);\\n }\\n \\n+ /**\\n+ * Escapes the HTML special characters in a <code>String</code> using HTML entities. This overrides the base\\n+ * implementation from Velocity in order to also escape characters potentially harmful in the context of XWiki,\\n+ * such as curly brackets.\\n+ *\\n+ * @param content the string to escape, may be {@code null}\\n+ * @return a new escaped {@code String}, {@code null} if {@code null} input\\n+ */\\n+ @Override\\n+ public String html(Object content)\\n+ {\\n+ if (content == null)\\n+ {\\n+ return null;\\n+ }\\n+ return XWIKI_ESCAPE_HTML4.translate(String.valueOf(content));\\n+ }\\n+\\n /**\\n * Escapes the XML special characters in a <code>String</code> using numerical XML entities. This overrides the base\\n * implementation from Velocity, which is over-zealous and escapes any non-ASCII character. Since XWiki works with\\ndiff --git a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\nindex 523cc78a5d..456ceb5e75 100644\\n--- a/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\n+++ b/xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/tools/EscapeToolTest.java\\n@@ -259,4 +259,12 @@ void velocity()\\n {\\n assertEquals(\\\"one${escapetool.h}${escapetool.h}two\\\", this.tool.velocity(\\\"one##two\\\")); \\n }\\n+\\n+ @Test\\n+ void html()\\n+ {\\n+ assertEquals(\\\"<script>alert("Hello, &lt;World&gt;!");</script>{{\\\"\\n+ + \\\"/html}}\\\",\\n+ this.tool.html(\\\"<script>alert(\\\\\\\"Hello, <World>!\\\\\\\");</script>{{/html}}\\\"));\\n+ }\\n }\\n\"\n }\n]","isConversational":false}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":11,"numItemsPerPage":100,"numTotalItems":1581,"offset":1100,"length":100}},"jwt":"eyJhbGciOiJFZERTQSIsImtpZCI6IjVHZDBvd0g5MTM2eDZjc1FvbE1zcktNWUZoRVFoUm5PVVVybEpjOUhaUEEifQ.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc4OTY1NjA1NywianRpIjoiMjQ4ZmFmMTEtMmRkYi00NzA0LTkyN2QtNzhiYjU2YTk0NjhmIiwic3ViIjoiL2RhdGFzZXRzL1hTZWMtTGFiL011bHRpUGF0Y2giLCJleHAiOjE3ODk2NTk2NTcsImlzcyI6Imh0dHBzOi8vaHVnZ2luZ2ZhY2UuY28ifQ.qgWpudH_3y31Jy7Tjz5Jy3H2Vn4-I-STzKLaJiO2c6kbw88BEKIAzlDztoKbATJGXxic6prWU1rJQzF_91BaAQ","displayUrls":true,"splitSizeSummaries":[{"config":"default","split":"train","numRows":1581,"numBytesParquet":109722822}]},"discussionsStats":{"closed":0,"open":1,"total":1},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[],"user":[]}}">
CVE_ID stringlengths 13 16 | category stringclasses 32
values | patches listlengths 1 20 |
|---|---|---|
CVE-2024-21669 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/hyperledger/aries-cloudagent-python/commit/0b01ffffc0789205ac990292f97238614c9fd293",
"owner": "hyperledger",
"repo_name": "aries-cloudagent-python",
"commit_message": "Merge pull request #2615 from dbluhm/fix/presentation-result-verification\n\nfix: report presen... |
CVE-2024-22191 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/avo-hq/avo/commit/51bb80b181cd8e31744bdc4e7f9b501c81172347",
"owner": "avo-hq",
"repo_name": "avo",
"commit_message": "security: sanitize key_value field content (#2357)",
"diff_code": "From 51bb80b181cd8e31744bdc4e7f9b501c81172347 Mon Sep 17 00:00:00 2001\nFr... |
CVE-2024-22194 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/Cyber-Domain-Ontology/CDO-Utility-Local-UUID/commit/9e78f7cb1075728d0aafc918514f32a1392cd235",
"owner": "Cyber-Domain-Ontology",
"repo_name": "CDO-Utility-Local-UUID",
"commit_message": "Merge pull request #3 from Cyber-Domain-Ontology/fix_command_in_top_srcdir_ca... |
CVE-2024-22211 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/FreeRDP/FreeRDP/commit/939e922936e9c3ae8fc204968645e5e7563a2fff",
"owner": "FreeRDP",
"repo_name": "FreeRDP",
"commit_message": "[codec,planar] check resolution for overflow\n\nIf the codec resolution is too large return an error as the internal\nbuffers would oth... |
CVE-2024-22411 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/avo-hq/avo/commit/51bb80b181cd8e31744bdc4e7f9b501c81172347",
"owner": "avo-hq",
"repo_name": "avo",
"commit_message": "security: sanitize key_value field content (#2357)",
"diff_code": "From 51bb80b181cd8e31744bdc4e7f9b501c81172347 Mon Sep 17 00:00:00 2001\nFr... |
CVE-2024-22416 | Incomplete Fixes | [
{
"commit url": "https://github.com/pyload/pyload/commit/1374c824271cb7e927740664d06d2e577624ca3e",
"owner": "pyload",
"repo_name": "pyload",
"commit_message": "fix GHSA-pgpj-v85q-h5fm security advisory (2)",
"diff_code": "From 1374c824271cb7e927740664d06d2e577624ca3e Mon Sep 17 00:00:00 2001\nF... |
CVE-2024-22423 | Incomplete Fixes | [
{
"commit url": "https://github.com/yt-dlp/yt-dlp/commit/de015e930747165dbb8fcd360f8775fd973b7d6e",
"owner": "yt-dlp",
"repo_name": "yt-dlp",
"commit_message": "[core] Prevent RCE when using `--exec` with `%q` (CVE-2023-40581)\n\nThe shell escape function is now using `\"\"` instead of `\\\"`. `util... |
CVE-2024-23328 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/dataease/dataease/commit/4128adf5fc4592b55fa1722a53b178967545d46a",
"owner": "dataease",
"repo_name": "dataease",
"commit_message": " fix: 限制 mysql 非法参数",
"diff_code": "From 4128adf5fc4592b55fa1722a53b178967545d46a Mon Sep 17 00:00:00 2001\nFrom: taojinlong <j... |
CVE-2024-23345 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/nautobot/nautobot/commit/17effcbe84a72150c82b138565c311bbee357e80",
"owner": "nautobot",
"repo_name": "nautobot",
"commit_message": "Sanitize `render_markdown()` output with `nh3` library (#5133)\n\n* Fix GHSA-v4xv-795h-rv4h.\r\n\r\n* Renumber change fragments\r\n... |
CVE-2024-23634 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/geoserver/geoserver/commit/5d6af2f8ba9ad7dffae59575504a867159698772",
"owner": "geoserver",
"repo_name": "geoserver",
"commit_message": "[GEOS-11213] Improve REST external upload method unzipping",
"diff_code": "From 5d6af2f8ba9ad7dffae59575504a867159698772 Mo... |
CVE-2024-23638 | Fix and Documentation Updates | [
{
"commit url": "https://github.com/squid-cache/squid/commit/290ae202883ac28a48867079c2fb34c40efd382b",
"owner": "squid-cache",
"repo_name": "squid",
"commit_message": "Just close after a write(2) response sending error (#1582)\n\n FATAL: assertion failed: Http1Server.cc:322: \"rep\"\n\n2015 comm... |
CVE-2024-23642 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/geoserver/geoserver/commit/1b1835afbb9c282d1840786259aeda81c1d22b00",
"owner": "geoserver",
"repo_name": "geoserver",
"commit_message": "[GEOS-11152] Improve handling special characters in the Simple SVG Renderer (#7299)",
"diff_code": "From 1b1835afbb9c282d18... |
CVE-2024-23644 | Incomplete Fixes | [
{
"commit url": "https://github.com/trillium-rs/trillium/commit/16a42b3f8378a3fa4e61ece3e3e37e6a530df51d",
"owner": "trillium-rs",
"repo_name": "trillium",
"commit_message": "fix(security): allow all tchar in header names",
"diff_code": "From 16a42b3f8378a3fa4e61ece3e3e37e6a530df51d Mon Sep 17 0... |
CVE-2024-23645 | Incomplete Fixes | [
{
"commit url": "https://github.com/glpi-project/glpi/commit/6cf265936c4f6edf7dea7c78b12e46d75b94d9b0",
"owner": "glpi-project",
"repo_name": "glpi",
"commit_message": "Encode special chars in stats forms/links",
"diff_code": "From 6cf265936c4f6edf7dea7c78b12e46d75b94d9b0 Mon Sep 17 00:00:00 200... |
CVE-2024-23679 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/enonic/xp/commit/0189975691e9e6407a9fee87006f730e84f734ff",
"owner": "enonic",
"repo_name": "xp",
"commit_message": "Invalidate old session after login #9253",
"diff_code": "From 0189975691e9e6407a9fee87006f730e84f734ff Mon Sep 17 00:00:00 2001\nFrom: Bradnits... |
CVE-2024-23818 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/geoserver/geoserver/commit/4557a832eed19ec18b9753cb97e8aa85269741d2",
"owner": "geoserver",
"repo_name": "geoserver",
"commit_message": "[GEOS-11153] Improve handling special characters in the WMS OpenLayers Format (#7194)\n\nCo-authored-by: Steve Ikeoka <steve.ik... |
CVE-2024-23819 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/geoserver/geoserver/commit/6f04adbdc6c289f5cb815b1462a6bd790e3fb6ef",
"owner": "geoserver",
"repo_name": "geoserver",
"commit_message": "[GEOS-11154] Improve handling special characters in the MapML HTML Page",
"diff_code": "From 6f04adbdc6c289f5cb815b1462a6bd... |
CVE-2024-23835 | Incomplete Fixes | [
{
"commit url": "https://github.com/OISF/suricata/commit/86de7cffa7e8f06fe9d600127e7dabe89c7e81dd",
"owner": "OISF",
"repo_name": "suricata",
"commit_message": "pgsql: parse only PDU when type is unknown\n\nA next PDU may already be in the slice to parse.\nDo not skip its parsing, ie do not use rest... |
CVE-2024-23836 | Fixes for Multiple Locations Across Different Branches or Projects; Incomplete Fixes | [
{
"commit url": "https://github.com/OISF/suricata/commit/18841a58da71e735ddf4e52cbfa6989755ecbeb7",
"owner": "OISF",
"repo_name": "suricata",
"commit_message": "http1: remove transactions from their list\n\ninstead of keeping a NULL pointer in an array\n\nTicket: #5921\n\n(cherry picked from commit ... |
CVE-2024-23945 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/apache/hive/commit/7638cb1a3b07713cc490aa2909a37037f89e08b4",
"owner": "apache",
"repo_name": "hive",
"commit_message": "Refactor Some Code. (#4887). (Ayush Saxena, reviewed by Denys Kuzmenko)",
"diff_code": "From 7638cb1a3b07713cc490aa2909a37037f89e08b4 Mon S... |
CVE-2024-24539 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/fusionpbx/fusionpbx/commit/ee202cd61dc9a79fb2d634b1ad21ff2416d531cb",
"owner": "fusionpbx",
"repo_name": "fusionpbx",
"commit_message": "Security - validate session",
"diff_code": "From ee202cd61dc9a79fb2d634b1ad21ff2416d531cb Mon Sep 17 00:00:00 2001\nFrom: F... |
CVE-2024-24762 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/tiangolo/fastapi/commit/9d34ad0ee8a0dfbbcce06f76c2d5d851085024fc",
"owner": "tiangolo",
"repo_name": "fastapi",
"commit_message": "Merge pull request from GHSA-qf9m-vfgh-m389",
"diff_code": "From 9d34ad0ee8a0dfbbcce06f76c2d5d851085024fc Mon Sep 17 00:00:00 200... |
CVE-2024-24806 | Incomplete Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/libuv/libuv/commit/0f2d7e784a256b54b2385043438848047bc2a629",
"owner": "libuv",
"repo_name": "libuv",
"commit_message": "fix: always zero-terminate idna output\n\nFixes: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6",
"diff_code": "Fro... |
CVE-2024-24823 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/Graylog2/graylog2-server/commit/1596b749db86368ba476662f23a0f0c5ec2b5097",
"owner": "Graylog2",
"repo_name": "graylog2-server",
"commit_message": "Merge pull request from GHSA-3xf8-g8gr-g7rh\n\nAlways create a brand-new session for an authentication attempt by\nig... |
CVE-2024-24824 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/Graylog2/graylog2-server/commit/75ef2b8d60e7d67f859b79fe712c8ae7b2e861d8",
"owner": "Graylog2",
"repo_name": "graylog2-server",
"commit_message": "Restrict classes allowed for cluster config and event types (#18165) (#18179)\n\n* Restrict classes allowed for clust... |
CVE-2024-25109 | Incomplete Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/miraheze/ManageWiki/commit/2ef0f50880d7695ca2874dc8dd515b2b9bbb02e5",
"owner": "miraheze",
"repo_name": "ManageWiki",
"commit_message": "Escape some more interface messages",
"diff_code": "From 2ef0f50880d7695ca2874dc8dd515b2b9bbb02e5 Mon Sep 17 00:00:00 2001\... |
CVE-2024-2511 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/openssl/openssl/commit/e9d7083e241670332e0443da0f0d4ffb52829f08",
"owner": "openssl",
"repo_name": "openssl",
"commit_message": "Fix unconstrained session cache growth in TLSv1.3\n\nIn TLSv1.3 we create a new session object for each ticket that we send.\nWe do thi... |
CVE-2024-25117 | Bug-Introducing Fixes | [
{
"commit url": "https://github.com/dompdf/php-svg-lib/commit/732faa9fb4309221e2bd9b2fda5de44f947133aa",
"owner": "dompdf",
"repo_name": "php-svg-lib",
"commit_message": "Remove invalid condition around image href validation",
"diff_code": "From 732faa9fb4309221e2bd9b2fda5de44f947133aa Mon Sep 1... |
CVE-2024-25126 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/rack/rack/commit/6efb2ceea003c4b195815a614e00438cbd543462",
"owner": "rack",
"repo_name": "rack",
"commit_message": "Avoid 2nd degree polynomial regexp in MediaType",
"diff_code": "From 6efb2ceea003c4b195815a614e00438cbd543462 Mon Sep 17 00:00:00 2001\nFrom: J... |
CVE-2024-25344 | Incomplete Fixes | [
{
"commit url": "https://github.com/itflow-org/itflow/commit/432488eca3998c5be6b6b9e8f8ba01f54bc12378",
"owner": "itflow-org",
"repo_name": "itflow",
"commit_message": "Require CSRF token to edit Stripe settings - thanks to @stehled",
"diff_code": "From 432488eca3998c5be6b6b9e8f8ba01f54bc12378 M... |
CVE-2024-25638 | Fix and Documentation Updates | [
{
"commit url": "https://github.com/dnsjava/dnsjava/commit/2073a0cdea2c560465f7ac0cc56f202e6fc39705",
"owner": "dnsjava",
"repo_name": "dnsjava",
"commit_message": "CVE-2024-25638: Message normalization",
"diff_code": "From 2073a0cdea2c560465f7ac0cc56f202e6fc39705 Mon Sep 17 00:00:00 2001\nFrom:... |
CVE-2024-25715 | Multi-Location Fixes | [
{
"commit url": "https://github.com/babelouest/glewlwyd/commit/59239381a88c505ab38fe64fdd92f846defa5754",
"owner": "babelouest",
"repo_name": "glewlwyd",
"commit_message": "Fix PKCE downgrade and open redirection issues\n\nThanks to Pieter Philippaerts",
"diff_code": "From 59239381a88c505ab38fe6... |
CVE-2024-25737 | Bug-Introducing Fixes | [
{
"commit url": "https://github.com/vufind-org/vufind/commit/345d00f7d7f1c581f46742effdac70e803b3847b",
"owner": "vufind-org",
"repo_name": "vufind",
"commit_message": "Restrict hostnames for cover proxy. (#3385)",
"diff_code": "From 345d00f7d7f1c581f46742effdac70e803b3847b Mon Sep 17 00:00:00 2... |
CVE-2024-26134 | Incomplete Fixes | [
{
"commit url": "https://github.com/agronholm/cbor2/commit/387755eacf0be35591a478d3c67fe10618a6d542",
"owner": "agronholm",
"repo_name": "cbor2",
"commit_message": "Fixed MemoryError when decoding large definite strings (#204)\n\nAlso fixed a return value check in `CBORTag_hash()`.",
"diff_code"... |
CVE-2024-26141 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/rack/rack/commit/4849132bef471adb21131980df745f4bb84de2d9",
"owner": "rack",
"repo_name": "rack",
"commit_message": "Return an empty array when ranges are too large\n\nIf the sum of the requested ranges is larger than the file itself,\nreturn an empty array. In ot... |
CVE-2024-26143 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/rails/rails/commit/4c83b331092a79d58e4adffe4be5f250fa5782cc",
"owner": "rails",
"repo_name": "rails",
"commit_message": "fix XSS vulnerability when using translation\n\n[CVE-2024-26143]",
"diff_code": "From 4c83b331092a79d58e4adffe4be5f250fa5782cc Mon Sep 17 0... |
CVE-2024-26144 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/rails/rails/commit/723f54566023e91060a67b03353e7c03e7436433",
"owner": "rails",
"repo_name": "rails",
"commit_message": "Merge pull request #48869 from brunoprietog/disable-session-active-storage-proxy-controllers\n\nDisable session in ActiveStorage blobs and repr... |
CVE-2024-26146 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/rack/rack/commit/30b8e39a578b25d4bdcc082c1c52c6f164b59716",
"owner": "rack",
"repo_name": "rack",
"commit_message": "Fixing ReDoS in header parsing\n\nThanks svalkanov\n\n[CVE-2024-26146]",
"diff_code": "From 30b8e39a578b25d4bdcc082c1c52c6f164b59716 Mon Sep 17... |
CVE-2024-26150 | Incomplete Fixes | [
{
"commit url": "https://github.com/backstage/backstage/commit/1ad2b1b61ebb430051f7d804b0cc7ebfe7922b6f",
"owner": "backstage",
"repo_name": "backstage",
"commit_message": "chore: return the original input path, and add a test\n\nSigned-off-by: blam <ben@blam.sh>",
"diff_code": "From 1ad2b1b61eb... |
CVE-2024-26256 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/libarchive/libarchive/commit/eb7939b24a681a04648a59cdebd386b1e9dc9237",
"owner": "libarchive",
"repo_name": "libarchive",
"commit_message": "fix: OOB in rar e8 filter (#2135)\n\nThis patch fixes an out-of-bound error in rar e8 filter.",
"diff_code": "From eb79... |
CVE-2024-27088 | Incomplete Fixes | [
{
"commit url": "https://github.com/medikoo/es5-ext/commit/3551cdd7b2db08b1632841f819d008757d28e8e2",
"owner": "medikoo",
"repo_name": "es5-ext",
"commit_message": "fix: Do not rely on problematic regex\n\nAddresses #201",
"diff_code": "From 3551cdd7b2db08b1632841f819d008757d28e8e2 Mon Sep 17 00... |
CVE-2024-27094 | Incomplete Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/commit/2d081f24cac1a867f6f73d512f2022e1fa987854",
"owner": "OpenZeppelin",
"repo_name": "openzeppelin-contracts-upgradeable",
"commit_message": "Transpile dc44c9f1",
"diff_code": "From 2d081f24cac1a867f6f73d512f2... |
CVE-2024-27285 | Workaround and Formal Fix | [
{
"commit url": "https://github.com/lsegal/yard/commit/2069e2bf08293bda2fcc78f7d0698af6354054be",
"owner": "lsegal",
"repo_name": "yard",
"commit_message": "Merge pull request from GHSA-8mq4-9jjh-9xrc\n\nPatch XSS and Open-Redirect in frames.erb",
"diff_code": "From d78fc393d603c4fc35975969296ed... |
CVE-2024-27294 | Incomplete Fixes | [
{
"commit url": "https://github.com/danielparks/puppet-golang/commit/1d0865b24071cb1c00d2fd8cb755d444e6e8f888",
"owner": "danielparks",
"repo_name": "puppet-golang",
"commit_message": "Security: ignore file ownership when extracting Go\n\nCertain Go tarballs specified that some files, such as the `g... |
CVE-2024-27298 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/parse-community/parse-server/commit/a6e654943536932904a69b51e513507fcf90a504",
"owner": "parse-community",
"repo_name": "parse-server",
"commit_message": "fix: Improve PostgreSQL injection detection; fixes security vulnerability [GHSA-6927-3vr9-fxf2](https://githu... |
CVE-2024-27300 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/thorsten/phpMyFAQ/commit/09336b0ff0e0a04aa0c97c5975651af4769d2459",
"owner": "thorsten",
"repo_name": "phpMyFAQ",
"commit_message": "fix: added missing conversion to HTML entities",
"diff_code": "From 09336b0ff0e0a04aa0c97c5975651af4769d2459 Mon Sep 17 00:00:0... |
CVE-2024-27304 | Incomplete Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/jackc/pgproto3/commit/945c2126f6db8f3bea7eeebe307c01fe92bca007",
"owner": "jackc",
"repo_name": "pgproto3",
"commit_message": "Backport fixes from pgx v5\n\nCheck for overflow on uint16 sizes in pgproto3\n\nDo not allow protocol messages larger than ~1GB\n\nThe Po... |
CVE-2024-27307 | Bug-Introducing Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/jsonata-js/jsonata/commit/1d579dbe99c19fbe509f5ba2c6db7959b0d456d1",
"owner": "jsonata-js",
"repo_name": "jsonata",
"commit_message": "Prevent writing to the object prototype or constructor (v1 port) (#681)\n\n* Prevent access to __proto__\r\n\r\nSigned-off-by: an... |
CVE-2024-27917 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/shopware/shopware/commit/7d9cb03225efca5f97e69b800d8747598dd15ce3",
"owner": "shopware",
"repo_name": "shopware",
"commit_message": "NEXT-34113 - Clear cookies on 404 pages",
"diff_code": "From 7d9cb03225efca5f97e69b800d8747598dd15ce3 Mon Sep 17 00:00:00 2001\... |
CVE-2024-27918 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/coder/coder/commit/1171ce7add017481d28441575024209ac160ecb0",
"owner": "coder",
"repo_name": "coder",
"commit_message": "Merge pull request from GHSA-7cc2-r658-7xpf\n\nThis fixes a vulnerability with the `CODER_OIDC_EMAIL_DOMAIN` option,\nwhere users with a supers... |
CVE-2024-27933 | Multi-Location Fixes | [
{
"commit url": "https://github.com/denoland/deno/commit/55fac9f5ead6d30996400e8597c969b675c5a22b",
"owner": "denoland",
"repo_name": "deno",
"commit_message": "fix(node): child_process IPC on Windows (#21597)\n\nThis PR implements the child_process IPC pipe between parent and child.\r\nThe implemen... |
CVE-2024-28109 | Incomplete Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/veraPDF/veraPDF-library/commit/614ffa477a2cf0819e4b0df1ab133610e0da25fb",
"owner": "veraPDF",
"repo_name": "veraPDF-library",
"commit_message": "Set secure parameter for xslt transformation",
"diff_code": "From 614ffa477a2cf0819e4b0df1ab133610e0da25fb Mon Sep ... |
CVE-2024-28176 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/panva/jose/commit/02a65794f7873cdaf12e81e80ad076fcdc4a9314",
"owner": "panva",
"repo_name": "jose",
"commit_message": "fix: add a maxOutputLength option to zlib inflate",
"diff_code": "From 02a65794f7873cdaf12e81e80ad076fcdc4a9314 Mon Sep 17 00:00:00 2001\nFro... |
CVE-2024-28179 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/jupyterhub/jupyter-server-proxy/commit/764e499f61a87641916a7a427d4c4b1ac3f321a9",
"owner": "jupyterhub",
"repo_name": "jupyter-server-proxy",
"commit_message": "Merge pull request from GHSA-w3vc-fx9p-wp4v\n\nCheck authentication when websockets open",
"diff_co... |
CVE-2024-28180 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/go-jose/go-jose/commit/0dd4dd541c665fb292d664f77604ba694726f298",
"owner": "go-jose",
"repo_name": "go-jose",
"commit_message": "v2: backport decompression limit fix (#109)\n\nBackport from #107.",
"diff_code": "From 0dd4dd541c665fb292d664f77604ba694726f298 Mo... |
CVE-2024-28182 | Incomplete Fixes | [
{
"commit url": "https://github.com/nghttp2/nghttp2/commit/00201ecd8f982da3b67d4f6868af72a1b03b14e0",
"owner": "nghttp2",
"repo_name": "nghttp2",
"commit_message": "Limit CONTINUATION frames following an incoming HEADER frame",
"diff_code": "From 00201ecd8f982da3b67d4f6868af72a1b03b14e0 Mon Sep ... |
CVE-2024-28183 | Incomplete Fixes; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/espressif/esp-idf/commit/3305cb4d235182067936f8e940e6db174e25b4b2",
"owner": "espressif",
"repo_name": "esp-idf",
"commit_message": "fix(ota): additional checks for secure version in anti-rollback case\n\nSome additional checks related to secure version of the app... |
CVE-2024-28190 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/contao/contao/commit/878d28dbe0f408740555d6fc8b634bd3f8febfce",
"owner": "contao",
"repo_name": "contao",
"commit_message": "Merge pull request from GHSA-v24p-7p4j-qvvf\n\n* Encode file names in tooltips and titles\n\n* Allow HTML in help texts\n\n* Remove ampersa... |
CVE-2024-28191 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/contao/contao/commit/388859dcf110ca70e0fae68a2a5579ab6a702919",
"owner": "contao",
"repo_name": "contao",
"commit_message": "Merge pull request from GHSA-747v-52c4-8vj8\n\n# Conflicts:\n#\tcore-bundle/src/String/SimpleTokenParser.php\n#\tcore-bundle/tests/Contao/I... |
CVE-2024-28234 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/contao/contao/commit/55b995d8d35da0d36bc6a22c53fe6423ab0c4ae2",
"owner": "contao",
"repo_name": "contao",
"commit_message": "Merge pull request from GHSA-j55w-hjpj-825g\n\n* harden BBCode parsing\n\n* Apply suggestions from code review\n\nCo-authored-by: Martin Au... |
CVE-2024-28235 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/contao/contao/commit/73a2770e2d3535ec9f1b03d54be00e56ebb8ff16",
"owner": "contao",
"repo_name": "contao",
"commit_message": "Merge pull request from GHSA-9jh5-qf84-x6pr\n\n* Ensure confidential headers are not leaked to external URIs when crawling\n\n* CS\n\n-----... |
CVE-2024-28860 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/cilium/cilium/commit/311fbce5280491cddceab178d83b06fa23688c72",
"owner": "cilium",
"repo_name": "cilium",
"commit_message": "ipsec: fix per-node-pair-key computation\n\nThis commit ensures that\n\n- each time we compute a per-node-pair-key we create an empty slice... |
CVE-2024-29022 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/dasgarner/xibo-cms/commit/a81044e6ccdd92cc967e34c125bd8162432e51bc",
"owner": "dasgarner",
"repo_name": "xibo-cms",
"commit_message": "Sessions: Add sanitization in getIp() and disable output of session ID in session grid.",
"diff_code": "From a81044e6ccdd92cc... |
CVE-2024-29023 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/dasgarner/xibo-cms/commit/a81044e6ccdd92cc967e34c125bd8162432e51bc",
"owner": "dasgarner",
"repo_name": "xibo-cms",
"commit_message": "Sessions: Add sanitization in getIp() and disable output of session ID in session grid.",
"diff_code": "From a81044e6ccdd92cc... |
CVE-2024-29027 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/parse-community/parse-server/commit/5ae6d6a36d75c4511029f0ba5673ae4b2999179b",
"owner": "parse-community",
"repo_name": "parse-server",
"commit_message": "fix: Server crashes on invalid Cloud Function or Cloud Job name; fixes security vulnerability [GHSA-6hh7-46r2... |
CVE-2024-29036 | Fix and Documentation Updates | [
{
"commit url": "https://github.com/saleor/auth-sdk/commit/56db13407aa35d00b85ec2df042692edd4aea9da",
"owner": "saleor",
"repo_name": "auth-sdk",
"commit_message": "Update README",
"diff_code": "From 56db13407aa35d00b85ec2df042692edd4aea9da Mon Sep 17 00:00:00 2001\nFrom: Michal Miszczyszyn <mic... |
CVE-2024-29041 | Workaround and Formal Fix | [
{
"commit url": "https://github.com/expressjs/express/commit/0867302ddbde0e9463d0564fea5861feb708c2dd",
"owner": "expressjs",
"repo_name": "express",
"commit_message": "Prevent open redirect allow list bypass due to encodeurl\n\nCo-authored-by: Jon Church <me@jonchurch.com>",
"diff_code": "From ... |
CVE-2024-29042 | Incomplete Fixes | [
{
"commit url": "https://github.com/franciscop/translate/commit/7a2bf8b9f05f7c45c09683973ef4d8e995804aa4",
"owner": "franciscop",
"repo_name": "translate",
"commit_message": "Made the usage options much simpler so that there's no chance of writing runtime vulnerabilities",
"diff_code": "From 7a2... |
CVE-2024-29180 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132",
"owner": "webpack",
"repo_name": "webpack-dev-middleware",
"commit_message": "fix(security): do not allow to read files above (#1779)",
"diff_code": "From 189c4ac7d2344ec132a4689e... |
CVE-2024-29187 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/wixtoolset/wix/commit/75a8c75d4e02ea219008dc5af7d03869291d61f7",
"owner": "wixtoolset",
"repo_name": "wix",
"commit_message": "Protect elevated working folder from malicious data\n\nWhen running elevated, Burn uses the Windows Temp folder as its working folder\nto... |
CVE-2024-29188 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/wixtoolset/wix/commit/2e5960b575881567a8807e6b8b9c513138b19742",
"owner": "wixtoolset",
"repo_name": "wix",
"commit_message": "Don't follow junctions when recursing directories.\n\nWhen deleting directories recursively, an elevated custom action\nfollowing junctio... |
CVE-2024-29189 | Incomplete Fixes | [
{
"commit url": "https://github.com/ansys/pyansys-geometry/commit/902071701c4f3a8258cbaa46c28dc0a65442d1bc",
"owner": "ansys",
"repo_name": "pyansys-geometry",
"commit_message": "feat: accept bandit advisories in-line for subprocess (#1077)\n\nCo-authored-by: pyansys-ci-bot <pyansys.github.bot@ansys... |
CVE-2024-29199 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/nautobot/nautobot/commit/2fd95c365f8477b26e06d60b999ddd36882d5750",
"owner": "nautobot",
"repo_name": "nautobot",
"commit_message": "[LTM] View authentication and permission fixes (#5465)",
"diff_code": "From 2fd95c365f8477b26e06d60b999ddd36882d5750 Mon Sep 17... |
CVE-2024-29862 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/chirpstack/chirpstack-mqtt-forwarder/commit/4fa9e6eaaec8c3ca49ebfbf6317572671f17700f",
"owner": "chirpstack",
"repo_name": "chirpstack-mqtt-forwarder",
"commit_message": "Fix Kerlink firewall rule security issue.\n\nThis limits accepting incoming TCP packets from ... |
CVE-2024-29888 | Fixes for Multiple Locations Across Different Branches or Projects; Bug-Introducing Fixes | [
{
"commit url": "https://github.com/saleor/saleor/commit/22a1aa3ef0bc54156405f69146788016a7f3f761",
"owner": "saleor",
"repo_name": "saleor",
"commit_message": "Fix tax calculation for Click and Collect option. (#15505)",
"diff_code": "From 22a1aa3ef0bc54156405f69146788016a7f3f761 Mon Sep 17 00... |
CVE-2024-29893 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/argoproj/argo-cd/commit/14f681e3ee7c38731943b98f92277e88a3db109d",
"owner": "argoproj",
"repo_name": "argo-cd",
"commit_message": "Merge pull request from GHSA-jhwx-mhww-rgc3\n\n* sec: limit helm index max size\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>... |
CVE-2024-29895 | Bug-Introducing Fixes | [
{
"commit url": "https://github.com/Cacti/cacti/commit/53e8014d1f082034e0646edc6286cde3800c683d",
"owner": "Cacti",
"repo_name": "cacti",
"commit_message": "Merge pull request from GHSA-cr28-x256-xf5m",
"diff_code": "From 53e8014d1f082034e0646edc6286cde3800c683d Mon Sep 17 00:00:00 2001\nFrom: P... |
CVE-2024-30250 | Incomplete Fixes | [
{
"commit url": "https://github.com/kindspells/astro-shield/commit/1221019306f501bf5fa9bcfb5a23a2321d34ba0a",
"owner": "kindspells",
"repo_name": "astro-shield",
"commit_message": "fix: ensure that allowed scripts are in hashes module\n\nSigned-off-by: Andres Correa Casablanca <andreu@kindspells.dev... |
CVE-2024-30251 | Bug-Introducing Fixes | [
{
"commit url": "https://github.com/aio-libs/aiohttp/commit/7eecdff163ccf029fbb1ddc9de4169d4aaeb6597",
"owner": "aio-libs",
"repo_name": "aiohttp",
"commit_message": "[PR #8332/482e6cdf backport][3.9] Add set_content_disposition test (#8333)\n\n**This is a backport of PR #8332 as merged into master\... |
CVE-2024-30260 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/nodejs/undici/commit/64e3402da4e032e68de46acb52800c9a06aaea3f",
"owner": "nodejs",
"repo_name": "undici",
"commit_message": "Merge pull request from GHSA-m4v8-wqvr-p9f7\n\nSigned-off-by: Matteo Collina <hello@matteocollina.com>",
"diff_code": "From 64e3402da4e... |
CVE-2024-30261 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/nodejs/undici/commit/2b39440bd9ded841c93dd72138f3b1763ae26055",
"owner": "nodejs",
"repo_name": "undici",
"commit_message": "Merge pull request from GHSA-9qxr-qj54-h672\n\nCo-authored-by: uzlopak <aras.abbasi@googlemail.com>\nSigned-off-by: Matteo Collina <hello@m... |
CVE-2024-30265 | Fixes for Multiple Locations Across Different Branches or Projects; Bug-Introducing Fixes | [
{
"commit url": "https://github.com/voila-dashboards/voila/commit/00d6362c237b6b4d466873535554d6076ead0c52",
"owner": "voila-dashboards",
"repo_name": "voila",
"commit_message": "GHSA-2q59-h24c-w6fg",
"diff_code": "From 00d6362c237b6b4d466873535554d6076ead0c52 Mon Sep 17 00:00:00 2001\nFrom: mar... |
CVE-2024-31207 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/vitejs/vite/commit/011bbca350e447d1b499d242804ce62738c12bc0",
"owner": "vitejs",
"repo_name": "vite",
"commit_message": "fix: port #16250 to v2 (#16254)",
"diff_code": "From 011bbca350e447d1b499d242804ce62738c12bc0 Mon Sep 17 00:00:00 2001\nFrom: =?UTF-8?q?=E7... |
CVE-2024-31209 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/erlef/oidcc/commit/2f304d877c7e0613d6fd952d7feacbf40dbc355c",
"owner": "erlef",
"repo_name": "oidcc",
"commit_message": "Merge pull request from GHSA-mj35-2rgf-cv8p",
"diff_code": "From 2f304d877c7e0613d6fd952d7feacbf40dbc355c Mon Sep 17 00:00:00 2001\nFrom: =... |
CVE-2024-31447 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/shopware/shopware/commit/5cc84ddd817ad0c1d07f9b3c79ab346d50514a77",
"owner": "shopware",
"repo_name": "shopware",
"commit_message": "NEXT-34608 - Improve account logout",
"diff_code": "From 5cc84ddd817ad0c1d07f9b3c79ab346d50514a77 Mon Sep 17 00:00:00 2001\nFro... |
CVE-2024-31461 | Incomplete Fixes | [
{
"commit url": "https://github.com/makeplane/plane/commit/4b0ccea1461b7ca38761dfe0d0f07c2f94425005",
"owner": "makeplane",
"repo_name": "plane",
"commit_message": "fix: jira importer validations (#3323)\n\n* fix: jira importer validations\r\n\r\n* dev: update validation for cloud hostname\r\n\r\n* ... |
CVE-2024-31464 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/9075668a4135cce114ef2a4b72eba3161a9e94c4",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-19948: Bad diff information when xobject is deleted (#2439)\n\n * Ensure to retrieve the xclass even when the xobject ... |
CVE-2024-31465 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/0317a3aa78065e66c86fc725976b06bf7f9b446e",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21474: Improve escaping in XWiki.SearchSuggestSourceSheet\n\n(cherry picked from commit 6a7f19f6424036fce3d703413137add... |
CVE-2024-31981 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/480186f9d2fca880513da8bc5a609674d106cbd3",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21337: Apply PDF templates with the rights of their authors\n\n(cherry picked from commit d28e21a670c69880b951e415dd2dd... |
CVE-2024-31982 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/3c9e4bb04286de94ad24854026a09fa967538e31",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21472: Directly write RSS feed content in Main.DatabaseSearch\n\n* Add a page test\n\n(cherry picked from commit 95bdd6... |
CVE-2024-31983 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/2a9ce88f33663c53c9c63b2ea573f4720ea2efb9",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21411: Improve check of translation document author rights\n\n* Check both author and content author and improve JavaDo... |
CVE-2024-31984 | Fix and Documentation Updates; Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/43c9d551e3c11e9d8f176b556dd33bbe31fc66e0",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21471: Improve escaping in Solr Space Faucet\n\n(cherry picked from commit acba74c149a041345b24dcca52c586f872ba97fb)",
... |
CVE-2024-31985 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/8a92cb4bef7e5f244ae81eed3e64fe9be95827cf",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-20851: Validate CSRF token before running job scheduling actions\n\n* Add a mandatory CSRF token for job management\n* ... |
CVE-2024-31986 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/8a92cb4bef7e5f244ae81eed3e64fe9be95827cf",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-20851: Validate CSRF token before running job scheduling actions\n\n* Add a mandatory CSRF token for job management\n* ... |
CVE-2024-31987 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/3d4dbb41f52d1a6e39835cfb1695ca6668605a39",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21478: Improve rights check of template macros",
"diff_code": "From 3d4dbb41f52d1a6e39835cfb1695ca6668605a39 Mon Se... |
CVE-2024-31988 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-platform/commit/4896712ee6483da623f131be2e618f1f2b79cb8d",
"owner": "xwiki",
"repo_name": "xwiki-platform",
"commit_message": "XWIKI-21424: Use CSRF token in the realtime HTML Converter API\n\n* Add a mandatory CSRF token to use RTFrontend.ConvertHTML\... |
CVE-2024-31989 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/argoproj/argo-cd/commit/2de0ceade243039c120c28374016c04ff9590d1d",
"owner": "argoproj",
"repo_name": "argo-cd",
"commit_message": "Merge pull request from GHSA-9766-5277-j5hr\n\n* fix: Enable Redis authentication in the default installation\n\nSigned-off-by: May Z... |
CVE-2024-31990 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/argoproj/argo-cd/commit/c514105af739eebedb9dbe89d8a6dd8dfc30bb2c",
"owner": "argoproj",
"repo_name": "argo-cd",
"commit_message": "Merge pull request from GHSA-2gvw-w6fj-7m3c\n\nSigned-off-by: pashakostohrys <pavel@codefresh.io>",
"diff_code": "From c514105af7... |
CVE-2024-31995 | Fix and Documentation Updates | [
{
"commit url": "https://github.com/digitalbazaar/zcap/commit/261eea040109b6e25159c88d8ed49d3c37f8fcfe",
"owner": "digitalbazaar",
"repo_name": "zcap",
"commit_message": "Fix chain-depth-2 zcap invocation expiry check.",
"diff_code": "From 261eea040109b6e25159c88d8ed49d3c37f8fcfe Mon Sep 17 00:0... |
CVE-2024-31996 | Fixes for Multiple Locations Across Different Branches or Projects | [
{
"commit url": "https://github.com/xwiki/xwiki-commons/commit/b0805160ec7b01ee12417e79cb384e60ae4817aa",
"owner": "xwiki",
"repo_name": "xwiki-commons",
"commit_message": "XCOMMONS-2828: Support curly braces in `EscapeTool.html()`\n\n(cherry picked from commit b94142e2a66ec32e89eacab67c3da8d91f5ef9... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.