From aa767560c673bad47f0a6b46a7bafd5e4f8729bc Mon Sep 17 00:00:00 2001
From: dhaura <dhaurapathirana@gmail.com>
Date: Thu, 4 Jan 2024 12:29:29 +0530
Subject: [PATCH] Add X509CertificateAuthenticationValve into dropins

---
 modules/connectors/pom.xml                    | 23 +++++++++++++++++++
 .../conf/tomcat/catalina-server.xml.j2        |  1 +
 pom.xml                                       |  5 ++++
 3 files changed, 29 insertions(+)

diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
index d2a8884a301..4423daf189c 100644
--- a/modules/connectors/pom.xml
+++ b/modules/connectors/pom.xml
@@ -168,6 +168,29 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>download_x509_valve</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.extension.identity.x509certificate</groupId>
+                                    <artifactId>
+                                        org.wso2.carbon.extension.identity.x509Certificate.valve
+                                    </artifactId>
+                                    <version>${org.wso2.carbon.extension.identity.x509certificate.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/authenticatorCopied/jar
+                                    </outputDirectory>
+                                    <includes>**/*.jar</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2 b/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2
index e32d0405d2a..2dca8ba4971 100644
--- a/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2
+++ b/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2
@@ -106,6 +106,7 @@
                 <Valve className="org.apache.catalina.valves.AccessLogValve" directory="{{http_access_log.directory}}"
                        prefix="{{http_access_log.prefix}}" suffix="{{http_access_log.suffix}}" pattern="{{http_access_log.pattern}}"/>
                 {% endif %}
+                <Valve className="org.wso2.carbon.extension.identity.x509Certificate.valve.X509CertificateAuthenticationValve"/>
                 <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonStuckThreadDetectionValve" threshold="600"/>
                 <Valve className="org.wso2.carbon.tomcat.ext.valves.CompositeValve"/>
 
diff --git a/pom.xml b/pom.xml
index 50062f1c623..0f9b18d83a3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1863,6 +1863,11 @@
                 <artifactId>org.wso2.carbon.extension.identity.x509Certificate.validation.server.feature</artifactId>
                 <version>${org.wso2.carbon.extension.identity.x509certificate.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.extension.identity.x509certificate</groupId>
+                <artifactId>org.wso2.carbon.extension.identity.x509Certificate.valve</artifactId>
+                <version>${org.wso2.carbon.extension.identity.x509certificate.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.conditional.auth.functions</groupId>
                 <artifactId>org.wso2.carbon.identity.conditional.auth.functions.server.feature</artifactId>