Expose mtls certificate config params in python and php configuration templates (#22229)

eddiesholl · web-flow · commit 68b0dfe6d16b · 2025-10-28T12:33:05.000+08:00
* Expose mtls config params in python template

* Expose certFile and keyFile configuration items to support mtls in php generated client

* Regenerate of examples
diff --git a/modules/openapi-generator/src/main/resources/php/Configuration.mustache b/modules/openapi-generator/src/main/resources/php/Configuration.mustache
@@ -115,6 +115,20 @@ class Configuration
      */
     protected $tempFolderPath;
 
+    /**
+     * Path to a certificate file, for mTLS
+     *
+     * @var string
+     */
+    protected $certFile;
+
+    /**
+     * Path to a key file, for mTLS
+     *
+     * @var string
+     */
+    protected $keyFile;
+
     /**
      * Constructor
      */
@@ -388,6 +402,49 @@ class Configuration
         return $this->tempFolderPath;
     }
 
+    /**
+     * Sets the certificate file path, for mTLS
+     *
+     * @return $this
+     */
+     public function setCertFile($certFile)
+     {
+        $this->certFile = $certFile;
+        return $this;
+     }
+
+    /**
+     * Gets the certificate file path, for mTLS
+     *
+     * @return string Certificate file path
+     */
+    public function getCertFile()
+    {
+        return $this->certFile;
+    }
+
+    /**
+     * Sets the certificate key path, for mTLS
+     *
+     * @return $this
+     */
+     public function setKeyFile($keyFile)
+     {
+        $this->keyFile = $keyFile;
+        return $this;
+     }
+
+    /**
+     * Gets the certificate key path, for mTLS
+     *
+     * @return string Certificate key path
+     */
+    public function getKeyFile()
+    {
+        return $this->keyFile;
+    }
+    
+
     /**
      * Gets the default configuration instance
      *
diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache
@@ -832,6 +832,14 @@ use {{invokerPackage}}\ObjectSerializer;
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache
@@ -186,6 +186,8 @@ class Configuration:
     :param retries: Number of retries for API requests.
     :param ca_cert_data: verify the peer using concatenated CA certificate data
       in PEM (str) or DER (bytes) format.
+    :param cert_file: the path to a client certificate file, for mTLS.
+    :param key_file: the path to a client key file, for mTLS. 
 
 {{#hasAuthMethods}}
     :Example:
@@ -293,6 +295,8 @@ conf = {{{packageName}}}.Configuration(
         ssl_ca_cert: Optional[str]=None,
         retries: Optional[int] = None,
         ca_cert_data: Optional[Union[str, bytes]] = None,
+        cert_file: Optional[str]=None,
+        key_file: Optional[str]=None,
         *,
         debug: Optional[bool] = None,
     ) -> None:
@@ -381,10 +385,10 @@ conf = {{{packageName}}}.Configuration(
         """Set this to verify the peer using PEM (str) or DER (bytes)
            certificate data.
         """
-        self.cert_file = None
+        self.cert_file = cert_file
         """client certificate file
         """
-        self.key_file = None
+        self.key_file = key_file
         """client key file
         """
         self.assert_hostname = None
diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py
@@ -165,6 +165,8 @@ class Configuration:
     :param retries: Number of retries for API requests.
     :param ca_cert_data: verify the peer using concatenated CA certificate data
       in PEM (str) or DER (bytes) format.
+    :param cert_file: the path to a client certificate file, for mTLS.
+    :param key_file: the path to a client key file, for mTLS. 
 
     :Example:
 
@@ -203,6 +205,8 @@ def __init__(
         ssl_ca_cert: Optional[str]=None,
         retries: Optional[int] = None,
         ca_cert_data: Optional[Union[str, bytes]] = None,
+        cert_file: Optional[str]=None,
+        key_file: Optional[str]=None,
         *,
         debug: Optional[bool] = None,
     ) -> None:
@@ -284,10 +288,10 @@ def __init__(
         """Set this to verify the peer using PEM (str) or DER (bytes)
            certificate data.
         """
-        self.cert_file = None
+        self.cert_file = cert_file
         """client certificate file
         """
-        self.key_file = None
+        self.key_file = key_file
         """client key file
         """
         self.assert_hostname = None
diff --git a/samples/client/echo_api/python/openapi_client/configuration.py b/samples/client/echo_api/python/openapi_client/configuration.py
@@ -165,6 +165,8 @@ class Configuration:
     :param retries: Number of retries for API requests.
     :param ca_cert_data: verify the peer using concatenated CA certificate data
       in PEM (str) or DER (bytes) format.
+    :param cert_file: the path to a client certificate file, for mTLS.
+    :param key_file: the path to a client key file, for mTLS. 
 
     :Example:
 
@@ -203,6 +205,8 @@ def __init__(
         ssl_ca_cert: Optional[str]=None,
         retries: Optional[int] = None,
         ca_cert_data: Optional[Union[str, bytes]] = None,
+        cert_file: Optional[str]=None,
+        key_file: Optional[str]=None,
         *,
         debug: Optional[bool] = None,
     ) -> None:
@@ -284,10 +288,10 @@ def __init__(
         """Set this to verify the peer using PEM (str) or DER (bytes)
            certificate data.
         """
-        self.cert_file = None
+        self.cert_file = cert_file
         """client certificate file
         """
-        self.key_file = None
+        self.key_file = key_file
         """client key file
         """
         self.assert_hostname = None
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -408,6 +408,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -381,6 +381,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -7578,6 +7578,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -413,6 +413,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -3450,6 +3450,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -1162,6 +1162,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -2024,6 +2024,14 @@ protected function createHttpClientOption()
             }
         }
 
+        if ($this->config->getCertFile()) {
+            $options[RequestOptions::CERT] = $this->config->getCertFile();
+        }
+
+        if ($this->config->getKeyFile()) {
+            $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
+        }
+
         return $options;
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -123,6 +123,20 @@ class Configuration
      */
     protected $tempFolderPath;
 
+    /**
+     * Path to a certificate file, for mTLS
+     *
+     * @var string
+     */
+    protected $certFile;
+
+    /**
+     * Path to a key file, for mTLS
+     *
+     * @var string
+     */
+    protected $keyFile;
+
     /**
      * Constructor
      */
@@ -396,6 +410,49 @@ public function getTempFolderPath()
         return $this->tempFolderPath;
     }
 
+    /**
+     * Sets the certificate file path, for mTLS
+     *
+     * @return $this
+     */
+     public function setCertFile($certFile)
+     {
+        $this->certFile = $certFile;
+        return $this;
+     }
+
+    /**
+     * Gets the certificate file path, for mTLS
+     *
+     * @return string Certificate file path
+     */
+    public function getCertFile()
+    {
+        return $this->certFile;
+    }
+
+    /**
+     * Sets the certificate key path, for mTLS
+     *
+     * @return $this
+     */
+     public function setKeyFile($keyFile)
+     {
+        $this->keyFile = $keyFile;
+        return $this;
+     }
+
+    /**
+     * Gets the certificate key path, for mTLS
+     *
+     * @return string Certificate key path
+     */
+    public function getKeyFile()
+    {
+        return $this->keyFile;
+    }
+    
+
     /**
      * Gets the default configuration instance
      *
diff --git a/samples/client/petstore/php/psr-18/lib/Configuration.php b/samples/client/petstore/php/psr-18/lib/Configuration.php
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py
diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,14 @@ use {{invokerPackage}}\ObjectSerializer;`
`832`	`832`	`}`
`833`	`833`	`}`
`834`	`834`
	`835`	`+ if ($this->config->getCertFile()) {`
	`836`	`+ $options[RequestOptions::CERT] = $this->config->getCertFile();`
	`837`	`+ }`
	`838`	`+`
	`839`	`+ if ($this->config->getKeyFile()) {`
	`840`	`+ $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();`
	`841`	`+ }`
	`842`	`+`
`835`	`843`	`return $options;`
`836`	`844`	`}`
`837`	`845`
Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,14 @@ protected function createHttpClientOption()`
`408`	`408`	`}`
`409`	`409`	`}`
`410`	`410`
	`411`	`+ if ($this->config->getCertFile()) {`
	`412`	`+ $options[RequestOptions::CERT] = $this->config->getCertFile();`
	`413`	`+ }`
	`414`	`+`
	`415`	`+ if ($this->config->getKeyFile()) {`
	`416`	`+ $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();`
	`417`	`+ }`
	`418`	`+`
`411`	`419`	`return $options;`
`412`	`420`	`}`
`413`	`421`
Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,14 @@ protected function createHttpClientOption()`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`
	`384`	`+ if ($this->config->getCertFile()) {`
	`385`	`+ $options[RequestOptions::CERT] = $this->config->getCertFile();`
	`386`	`+ }`
	`387`	`+`
	`388`	`+ if ($this->config->getKeyFile()) {`
	`389`	`+ $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();`
	`390`	`+ }`
	`391`	`+`
`384`	`392`	`return $options;`
`385`	`393`	`}`
`386`	`394`
Original file line number	Diff line number	Diff line change
`@@ -7578,6 +7578,14 @@ protected function createHttpClientOption()`
`7578`	`7578`	`}`
`7579`	`7579`	`}`
`7580`	`7580`
	`7581`	`+ if ($this->config->getCertFile()) {`
	`7582`	`+ $options[RequestOptions::CERT] = $this->config->getCertFile();`
	`7583`	`+ }`
	`7584`	`+`
	`7585`	`+ if ($this->config->getKeyFile()) {`
	`7586`	`+ $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();`
	`7587`	`+ }`
	`7588`	`+`
`7581`	`7589`	`return $options;`
`7582`	`7590`	`}`
`7583`	`7591`
Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,14 @@ protected function createHttpClientOption()`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
	`416`	`+ if ($this->config->getCertFile()) {`
	`417`	`+ $options[RequestOptions::CERT] = $this->config->getCertFile();`
	`418`	`+ }`
	`419`	`+`
	`420`	`+ if ($this->config->getKeyFile()) {`
	`421`	`+ $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();`
	`422`	`+ }`
	`423`	`+`
`416`	`424`	`return $options;`
`417`	`425`	`}`
`418`	`426`
Original file line number	Diff line number	Diff line change
`@@ -3450,6 +3450,14 @@ protected function createHttpClientOption()`
`3450`	`3450`	`}`
`3451`	`3451`	`}`
`3452`	`3452`
	`3453`	`+ if ($this->config->getCertFile()) {`
	`3454`	`+ $options[RequestOptions::CERT] = $this->config->getCertFile();`
	`3455`	`+ }`
	`3456`	`+`
	`3457`	`+ if ($this->config->getKeyFile()) {`
	`3458`	`+ $options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();`
	`3459`	`+ }`
	`3460`	`+`
`3453`	`3461`	`return $options;`
`3454`	`3462`	`}`
`3455`	`3463`