Implement SSL Support

libasynql/src/poggit/libasynql/mysqli/MysqlCredentials.php

@@ -41,6 +41,9 @@ class MysqlCredentials implements JsonSerializable{
 	private $port;
 	/** @var string $socket */
 	private $socket;
+	/** @var MysqlSslCredentials|null */
+	private $sslCredentials;
+
 
 	/**
 	 * Creates a new {@link MysqlCredentials} instance from an array (e.g. from Config), with the following defaults:
@@ -62,8 +65,15 @@ public static function fromArray(array $array, ?string $defaultSchema = null) :
 		if(!isset($defaultSchema, $array["schema"])){
 			throw new ConfigException("The attribute \"schema\" is missing in the MySQL settings");
 		}
-		return new MysqlCredentials($array["host"] ?? "127.0.0.1", $array["username"] ?? "root",
-			$array["password"] ?? "", $array["schema"] ?? $defaultSchema, $array["port"] ?? 3306, $array["socket"] ?? "");
+		return new MysqlCredentials(
+			$array["host"] ?? "127.0.0.1",
+			$array["username"] ?? "root",
+			$array["password"] ?? "",
+			$array["schema"] ?? $defaultSchema,
+			$array["port"] ?? 3306,
+			$array["socket"] ?? "",
+			isset($array["ssl"]) ? MysqlSslCredentials::fromArray($array["ssl"]) : null
+		);
 	}
 
 	/**
@@ -75,14 +85,16 @@ public static function fromArray(array $array, ?string $defaultSchema = null) :
 	 * @param string $schema
 	 * @param int    $port
 	 * @param string $socket
+	 * @param MysqlSslCredentials|null $sslCredentials
 	 */
-	public function __construct(string $host, string $username, string $password, string $schema, int $port = 3306, string $socket = ""){
+	public function __construct(string $host, string $username, string $password, string $schema, int $port = 3306, string $socket = "", ?MysqlSslCredentials $sslCredentials = null){
 		$this->host = $host;
 		$this->username = $username;
 		$this->password = $password;
 		$this->schema = $schema;
 		$this->port = $port;
 		$this->socket = $socket;
+		$this->sslCredentials = $sslCredentials;
 	}
 
 	/**
@@ -93,7 +105,14 @@ public function __construct(string $host, string $username, string $password, st
 	 * @throws SqlError
 	 */
 	public function newMysqli() : mysqli{
-		$mysqli = @new mysqli($this->host, $this->username, $this->password, $this->schema, $this->port, $this->socket);
+		$mysqli = mysqli_init();
+		if($mysqli === false){
+			throw new SqlError(SqlError::STAGE_CONNECT, "Failed to initialize mysqli");
+		}
+		if($this->sslCredentials !== null){
+			$this->sslCredentials->applyToInstance($mysqli);
+		}
+		@mysqli_real_connect($mysqli, $this->host, $this->username, $this->password, $this->schema, $this->port, $this->socket);
 		if($mysqli->connect_error){
 			throw new SqlError(SqlError::STAGE_CONNECT, $mysqli->connect_error);
 		}
@@ -108,7 +127,7 @@ public function newMysqli() : mysqli{
 	 * @throws SqlError
 	 */
 	public function reconnectMysqli(mysqli $mysqli) : void{
-		@$mysqli->connect($this->host, $this->username, $this->password, $this->schema, $this->port, $this->socket);
+		@mysqli_real_connect($mysqli, $this->host, $this->username, $this->password, $this->schema, $this->port, $this->socket);
 		if($mysqli->connect_error){
 			throw new SqlError(SqlError::STAGE_CONNECT, $mysqli->connect_error);
 		}
@@ -135,7 +154,8 @@ public function __debugInfo(){
 			"password" => str_repeat("*", strlen($this->password)),
 			"schema" => $this->schema,
 			"port" => $this->port,
-			"socket" => $this->socket
+			"socket" => $this->socket,
+			"sslCredentials" => $this->sslCredentials
 		];
 	}
 
@@ -146,7 +166,8 @@ public function jsonSerialize() : array{
 			"password" => $this->password,
 			"schema" => $this->schema,
 			"port" => $this->port,
-			"socket" => $this->socket
+			"socket" => $this->socket,
+			"sslCredentials" => $this->sslCredentials
 		];
 	}
 }

libasynql/src/poggit/libasynql/mysqli/MysqlSslCredentials.php

@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * libasynql
+ *
+ * Copyright (C) 2018 SOFe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare(strict_types=1);
+
+namespace poggit\libasynql\mysqli;
+
+use JsonSerializable;
+use mysqli;
+
+class MysqlSslCredentials implements JsonSerializable{
+	/** @var string $key */
+	private $key;
+	/** @var string $certificate */
+	private $certificate;
+	/** @var string $caCertificate */
+	private $caCertificate;
+	/** @var string $caPath */
+	private $caPath;
+	/** @var string $cipherAlgorithms */
+	private $cipherAlgorithms;
+
+
+	/**
+	 * Creates a new {@link MysqlSslCredentials} instance from an array (e.g. from Config), with empty default values.
+	 * @param array       $array
+	 * @return MysqlSslCredentials
+	 */
+	public static function fromArray(array $array) : MysqlSslCredentials{
+		return new MysqlSslCredentials(
+			$array["key"] ?? "",
+			$array["certificate"] ?? "",
+			$array["ca-certificate"] ?? "",
+			$array["ca-path"] ?? "",
+			$array["cipher-algorithms"] ?? ""
+		);
+	}
+
+	/**
+	 * Constructs a new {@link MysqlSslCredentials} by passing parameters directly.
+	 *
+	 * @param string $key
+	 * @param string $certificate
+	 * @param string $caCertificate
+	 * @param string $caPath
+	 * @param string $cipherAlgorithms
+	 */
+	public function __construct(string $key = "", string $certificate = "", string $caCertificate = "", string $caPath = "", string $cipherAlgorithms = ""){
+		$this->key = $key;
+		$this->certificate = $certificate;
+		$this->caCertificate = $caCertificate;
+		$this->caPath = $caPath;
+		$this->cipherAlgorithms = $cipherAlgorithms;
+	}
+
+	/**
+	 * Sets the SSL credentials for the given {@link mysqli} instance.
+	 *
+	 * @param mysqli $mysqli
+	 */
+	public function applyToInstance(mysqli $mysqli) : void{
+		$mysqli->ssl_set(
+			$this->key,
+			$this->certificate,
+			$this->caCertificate,
+			$this->caPath,
+			$this->cipherAlgorithms
+		);
+	}
+
+	public function jsonSerialize() : array{
+		return [
+			"key" => $this->key,
+			"certificate" => $this->certificate,
+			"caCertificate" => $this->caCertificate,
+			"caPath" => $this->caPath,
+			"cipherAlgorithms" => $this->cipherAlgorithms
+		];
+	}
+}