Check if file storage is successful

Author: Carlgo11

src/com/carlgo11/tempfiles/DataStorage.php

@@ -85,10 +85,11 @@ public static function deleteOldFiles() {
 	 * @param string $id The ID for the file.
 	 * @param string $password Description
 	 * @return mixed Returns the downloaded and decrypted file (object) if successfully downloaded and decrypted, otherwise NULL (boolean).
-	 * @since 2.0
+	 * @throws Exception
 	 * @since 2.3 Add support for AEAD cipher modes.
 	 * @global array $conf Configuration variables.
 	 * @global object $mysql_connection MySQL connection.
+	 * @since 2.0
 	 */
 	public static function getFile(string $id, string $password) {
 		global $conf;
@@ -108,6 +109,7 @@ public static function getFile(string $id, string $password) {
 
 		if ($enc_content !== NULL) {
 			$metadata_string = Encryption::decrypt($enc_filedata, $password, $iv[2], $iv[3]);
+			if($metadata_string === FALSE) throw new Exception("Unable to decrypt file metadata.");
 
 			/** @var array $metadata_array
 			 * Array containing the following: [name, size, type, deletionPassword, views_array[ 0 => currentViews, 1 => maxViews]]

src/com/carlgo11/tempfiles/File.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace com\carlgo11\tempfiles;
+
 class File
 {
 
@@ -85,7 +86,7 @@ public function getContent() {
 	 * @return boolean Returns TRUE if the action was successfully executed, otherwise FALSE.
 	 * @since 2.2
 	 */
-	public function setContent($content) {
+	public function setContent(string $content) {
 		return ($this->_content = $content) === $content;
 	}
 

src/com/carlgo11/tempfiles/api/Upload.php

@@ -51,9 +51,10 @@ function __construct(string $method) {
 				if ($password !== NULL) {
 					if ($fileContent['error'] === 0) {
 						$file->setContent(file_get_contents($fileContent['tmp_name']));
-						if (!($upload = DataStorage::uploadFile($file, $password))) {
+						if (!($upload = DataStorage::uploadFile($file, $password)))
 							throw new Exception("Connection to our database failed.");
-						}
+						if (!DataStorage::getFile($file->getID(), $password) instanceof File)
+							throw new Exception("Unable to verify file integrity.");
 					} else {
 						throw new InvalidArgumentException("Upload failed. Either the file is larger than it's supposed to be or the upload was interrupted.");
 					}