Roll back to non-cURL based download.php

Author: Carlgo11

Dockerfile

@@ -17,14 +17,9 @@ COPY --chown=1000:1000 ["composer.json", "robots.txt", "Download.php", "./"]
 RUN composer install --no-dev --no-plugins --no-scripts --no-cache -n -o -v
 RUN rm composer.json
 
-USER ROOT
-WORKDIR /download
-COPY --chown=1000:1000 ["robots.txt", "Download.php", "./"]
-
 FROM webdevops/php-nginx:7.4-alpine AS Run
 WORKDIR /api
 COPY --from=Build --chown=1000:1000 /api /api
-COPY --from=Build --chown=1000:1000 /download /download
 
 ENV FPM_PM_START_SERVERS 2
 ENV FPM_PM_MIN_SPARE_SERVERS 1

Download.php

@@ -1,64 +1,37 @@
 <?php
 
-function download($file_source, $file_target) {
-	$rh = fopen($file_source, 'rb');
-	$wh = fopen($file_target, 'w+b');
-	if (!$rh || !$wh) {
-		return false;
-	}
+use com\carlgo11\tempfiles\datastorage\DataStorage;
 
-	while (!feof($rh)) {
-		if (fwrite($wh, fread($rh, 4096)) === FALSE) {
-			return false;
-		}
-		echo '';
-		flush();
-	}
-
-	fclose($rh);
-	fclose($wh);
-
-	return true;
-}
+require __DIR__ . '/src/com/carlgo11/tempfiles/autoload.php';
 
 function return404() {
 	$notFoundURL = filter_input(INPUT_ENV, 'TMP_404_URL', FILTER_VALIDATE_URL, ['options' => ['default' => 'https://tempfiles.download/download/?404=1']]);
 	header($_SERVER['SERVER_PROTOCOL'] . " 404 File Not Found");
-	header("Location: $notFoundURL");
-	exit;
+	//header("Location: $notFoundURL");
+	//exit;
 }
 
 $url = explode('/', strtoupper($_SERVER['REQUEST_URI']));
 $id = filter_var($url[1]);
 $password = filter_input(INPUT_GET, "p");
 
-# API Download URL
-$downloadURL = filter_input(INPUT_ENV, 'TMP_API_DOWNLOAD_URL', FILTER_VALIDATE_URL, ['options' => ['default' => 'https://api.tempfiles.download/download/?id=%1$s&p=%2$s']]);
-$d_url = sprintf($downloadURL, $id, $password);
-
-$result = download($d_url, "/tmp/$id.tmp");
-if (!$result)
-	return404();
-
-// Execute cURL command and get response data
-$response = json_decode(curl_exec(file_get_contents("/tmp/$id.tmp")));
+$file = DataStorage::getFile($id, $password);
 
-unlink("/tmp/$id.tmp");
+$metadata = $file->getMetaData();
+$content = base64_encode($file->getContent());
 
+if ($file->getMaxViews()) { // max views > 0
+	if ($file->getMaxViews() <= $file->getCurrentViews() + 1) DataStorage::deleteFile($id);
+	else $file->setCurrentViews($file->getCurrentViews() + 1);
+}
 
+// Set headers
+header("Content-Description: File Transfer");
+header("Expires: 0");
+header("Pragma: public");
+header("Content-Type: {$metadata['type']}");
+header("Content-Disposition: inline; filename=\"{$metadata['name']}\"");
+header("Content-Length: {$metadata['size']}");
 
-if ($response->data) {
-
-	// Set headers
-	header("Content-Description: File Transfer");
-	header("Expires: 0");
-	header("Pragma: public");
-	header("Content-Type: {$response->type}");
-	header("Content-Disposition: inline; filename=\"{$response->filename}\"");
-	header("Content-Length: {$response->length}");
-
-	// output file contents
-	echo base64_decode($response->data);
-
-} else return404();
-exit;
+// output file contents
+echo base64_decode($content);

resources/nginx.conf

@@ -12,7 +12,7 @@ server {
 server {
     listen 5393;
     server_name _;
-    root "/download";
+    root "/api/";
     index Download.php;
     rewrite ^/(.*)+$ /Download.php?$1;
 

src/com/carlgo11/tempfiles/datastorage/FileStorage.php

@@ -89,7 +89,7 @@ private function getExpiry(string $id) {
 
 		$file = file_get_contents($conf['file-path'] . $id);
 		$data = json_decode($file, TRUE);
-		if ($data === NULL) return NULL;
+		if ($data === NULL || $data === FALSE) return NULL;
 		return $data['expiry'];
 	}