diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | php | 0 | ||||
| -rwxr-xr-x | php/classes/Response.class.php | 242 | ||||
| -rwxr-xr-x | php/classes/UploadException.class.php | 63 | ||||
| -rw-r--r-- | php/classes/UploadedFile.class.php | 33 | ||||
| -rw-r--r-- | php/grill.php | 17 | ||||
| -rw-r--r-- | php/includes/database.inc.php | 30 | ||||
| -rw-r--r-- | php/includes/settings.inc.php | 118 | ||||
| -rw-r--r-- | php/upload.php | 240 |
9 files changed, 3 insertions, 743 deletions
diff --git a/.gitmodules b/.gitmodules index 595f516..1c43324 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "moe"] path = moe url = https://github.com/pomf/moe +[submodule "php"] + path = php + url = https://github.com/pomf/pomf-php diff --git a/php b/php new file mode 160000 +Subproject 5abbc323d7f64df5fcf16255db79de339dc7256 diff --git a/php/classes/Response.class.php b/php/classes/Response.class.php deleted file mode 100755 index fac7db5..0000000 --- a/php/classes/Response.class.php +++ /dev/null @@ -1,242 +0,0 @@ -<?php -/** - * The Response class is a do-it-all for getting responses out in different - * formats. - * - * @todo Create sub-classes to split and extend this god object. - */ -class Response -{ - /** - * Indicates response type used for routing. - * - * Valid strings are 'csv', 'html', 'json' and 'text'. - * - * @var string $type Response type - */ - private $type; - - /** - * Indicates requested response type. - * - * Valid strings are 'csv', 'html', 'json', 'gyazo' and 'text'. - * - * @param string|null $response_type Response type - */ - public function __construct($response_type = null) - { - switch ($response_type) { - case 'csv': - header('Content-Type: text/csv; charset=UTF-8'); - $this->type = $response_type; - break; - case 'html': - header('Content-Type: text/html; charset=UTF-8'); - $this->type = $response_type; - break; - case 'json': - header('Content-Type: application/json; charset=UTF-8'); - $this->type = $response_type; - break; - case 'gyazo': - // Deprecated API since version 2.0.0, fallback to similar text API - header('Content-Type: text/plain; charset=UTF-8'); - $this->type = 'text'; - break; - case 'text': - header('Content-Type: text/plain; charset=UTF-8'); - $this->type = $response_type; - break; - default: - header('Content-Type: application/json; charset=UTF-8'); - $this->type = 'json'; - $this->error(400, 'Invalid response type. Valid options are: csv, html, json, text.'); - break; - } - } - - /** - * Routes error messages depending on response type. - * - * @param int $code HTTP status code number. - * @param int $desc Descriptive error message. - * @return void - */ - public function error($code, $desc) - { - $response = null; - - switch ($this->type) { - case 'csv': - $response = $this->csvError($desc); - break; - case 'html': - $response = $this->htmlError($code, $desc); - break; - case 'json': - $response = $this->jsonError($code, $desc); - break; - case 'text': - $response = $this->textError($code, $desc); - break; - } - - http_response_code(500); // "500 Internal Server Error" - echo $response; - } - - /** - * Routes success messages depending on response type. - * - * @param mixed[] $files - * @return void - */ - public function send($files) - { - $response = null; - - switch ($this->type) { - case 'csv': - $response = $this->csvSuccess($files); - break; - case 'html': - $response = $this->htmlSuccess($files); - break; - case 'json': - $response = $this->jsonSuccess($files); - break; - case 'text': - $response = $this->textSuccess($files); - break; - } - - http_response_code(200); // "200 OK". Success. - echo $response; - } - - /** - * Indicates with CSV body the request was invalid. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param int $description Descriptive error message. - * @return string Error message in CSV format. - */ - private static function csvError($description) - { - return '"error"'."\r\n"."\"$description\""."\r\n"; - } - - /** - * Indicates with CSV body the request was successful. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param mixed[] $files - * @return string Success message in CSV format. - */ - private static function csvSuccess($files) - { - $result = '"name","url","hash","size"'."\r\n"; - foreach ($files as $file) { - $result .= '"'.$file['name'].'"'.','. - '"'.$file['url'].'"'.','. - '"'.$file['hash'].'"'.','. - '"'.$file['size'].'"'."\r\n"; - } - - return $result; - } - - /** - * Indicates with HTML body the request was invalid. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param int $code HTTP status code number. - * @param int $description Descriptive error message. - * @return string Error message in HTML format. - */ - private static function htmlError($code, $description) - { - return '<p>ERROR: ('.$code.') '.$description.'</p>'; - } - - /** - * Indicates with HTML body the request was successful. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param mixed[] $files - * @return string Success message in HTML format. - */ - private static function htmlSuccess($files) - { - $result = ''; - - foreach ($files as $file) { - $result .= '<a href="'.$file['url'].'">'.$file['url'].'</a><br>'; - } - - return $result; - } - - /** - * Indicates with JSON body the request was invalid. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param int $code HTTP status code number. - * @param int $description Descriptive error message. - * @return string Error message in pretty-printed JSON format. - */ - private static function jsonError($code, $description) - { - return json_encode(array( - 'success' => false, - 'errorcode' => $code, - 'description' => $description, - ), JSON_PRETTY_PRINT); - } - - /** - * Indicates with JSON body the request was successful. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param mixed[] $files - * @return string Success message in pretty-printed JSON format. - */ - private static function jsonSuccess($files) - { - return json_encode(array( - 'success' => true, - 'files' => $files, - ), JSON_PRETTY_PRINT); - } - - /** - * Indicates with plain text body the request was invalid. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param int $code HTTP status code number. - * @param int $description Descriptive error message. - * @return string Error message in plain text format. - */ - private static function text_error($code, $description) - { - return 'ERROR: ('.$code.') '.$description; - } - - /** - * Indicates with plain text body the request was successful. - * - * @deprecated 2.1.0 Will be renamed to camelCase format. - * @param mixed[] $files - * @return string Success message in plain text format. - */ - private static function text_success($files) - { - $result = ''; - - foreach ($files as $file) { - $result .= $file['url']."\n"; - } - - return $result; - } -} diff --git a/php/classes/UploadException.class.php b/php/classes/UploadException.class.php deleted file mode 100755 index 8c9e4f6..0000000 --- a/php/classes/UploadException.class.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php - -/** - * Returns a human readable error description for file upload errors. - * - * @author Dan Brown <danbrown@php.net> - * @author Michiel Thalen - * @copyright Copyright © 1997 - 2016 by the PHP Documentation Group - * @license - * UploadException is licensed under a Creative Commons Attribution 3.0 License - * or later. - * - * Based on a work at - * https://secure.php.net/manual/en/features.file-upload.errors.php#89374. - * - * You should have received a copy of the Creative Commons Attribution 3.0 - * License with this program. If not, see - * <https://creativecommons.org/licenses/by/3.0/>. - */ - - -class UploadException extends Exception -{ - public function __construct($code) - { - $message = $this->codeToMessage($code); - parent::__construct($message, 500); - } - - private function codeToMessage($code) - { - switch ($code) { - case UPLOAD_ERR_INI_SIZE: - $message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini'; - break; - case UPLOAD_ERR_FORM_SIZE: - $message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was '. - 'specified in the HTML form'; - break; - case UPLOAD_ERR_PARTIAL: - $message = 'The uploaded file was only partially uploaded'; - break; - case UPLOAD_ERR_NO_FILE: - $message = 'No file was uploaded'; - break; - case UPLOAD_ERR_NO_TMP_DIR: - $message = 'Missing a temporary folder'; - break; - case UPLOAD_ERR_CANT_WRITE: - $message = 'Failed to write file to disk'; - break; - case UPLOAD_ERR_EXTENSION: - $message = 'File upload stopped by extension'; - break; - - default: - $message = 'Unknown upload error'; - break; - } - - return $message; - } -} diff --git a/php/classes/UploadedFile.class.php b/php/classes/UploadedFile.class.php deleted file mode 100644 index 03b7429..0000000 --- a/php/classes/UploadedFile.class.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php - -class UploadedFile -{ - /* Public attributes */ - public $name; - public $mime; - public $size; - public $tempfile; - public $error; - - /** - * SHA-1 checksum - * - * @deprecated 2.1.0 To be replaced with SHA-256 hashing. - * @var string 40 digit hexadecimal hash (160 bits) - */ - private $sha1; - - /** - * Generates the SHA-1 or returns the cached SHA-1 hash for the file. - * - * @return string|false $sha1 - */ - public function getSha1() - { - if (!$this->sha1) { - $this->sha1 = sha1_file($this->tempfile); - } - - return $this->sha1; - } -} diff --git a/php/grill.php b/php/grill.php deleted file mode 100644 index 5984b12..0000000 --- a/php/grill.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -$images = array( - 'img/2.png', - 'img/3.png', - 'img/4.png', - 'img/5.png', - 'img/6.png', - 'img/7.png', - 'img/8.png', - 'img/9.png', - 'img/10.png', -); - -if (headers_sent() === false) { - header('Location: '.$images[array_rand($images)], true, 303); -} diff --git a/php/includes/database.inc.php b/php/includes/database.inc.php deleted file mode 100644 index 7a1d4f9..0000000 --- a/php/includes/database.inc.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php - -/** - * Prepares a PDO connection between Pomf and a database server. - * - * @copyright Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com> - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -require_once 'settings.inc.php'; - -/* NOTE: we don't have to unref the PDO because we're not long-running */ -$db = new PDO(POMF_DB_CONN, POMF_DB_USER, POMF_DB_PASS); diff --git a/php/includes/settings.inc.php b/php/includes/settings.inc.php deleted file mode 100644 index c984c69..0000000 --- a/php/includes/settings.inc.php +++ /dev/null @@ -1,118 +0,0 @@ -<?php - -/** - * User configurable settings for Pomf. - * - * @copyright Copyright (c) 2013, 2014 Peter Lejeck <peter.lejeck@gmail.com> - * @copyright Copyright (c) 2015 cenci0 <alchimist94@gmail.com> - * @copyright Copyright (c) 2015, 2016 the Pantsu.cat developers - * <hostmaster@pantsu.cat> - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * PDO connection socket - * - * Database connection to use for communication. Currently, MySQL is the only - * DSN prefix supported. - * - * @see http://php.net/manual/en/ref.pdo-mysql.connection.php PHP manual for - * PDO_MYSQL DSN. - * @param string POMF_DB_CONN DSN:host|unix_socket=hostname|path;dbname=database - */ -define('POMF_DB_CONN', 'mysql:unix_socket=/tmp/mysql.sock;dbname=pomf'); - -/** - * PDO database login credentials - */ - -/** @param string POMF_DB_NAME Database username */ -define('POMF_DB_USER', 'pomf'); -/** @param string POMF_DB_PASS Database password */ -define('POMF_DB_PASS', '***'); - -/** - * File system location where to store uploaded files - * - * @param string Path to directory with trailing delimiter - */ -define('POMF_FILES_ROOT', '/mnt/pantsu/http/files/'); - -/** - * Maximum number of iterations while generating a new filename - * - * Pomf uses an algorithm to generate random filenames. Sometimes a file may - * exist under a randomly generated filename, so we count tries and keep trying. - * If this value is exceeded, we give up trying to generate a new filename. - * - * @param int POMF_FILES_RETRIES Number of attempts to retry - */ -define('POMF_FILES_RETRIES', 15); - -/** - * The length of generated filename (without file extension) - * - * @param int POMF_FILES_LENGTH Number of random alphabetical ASCII characters - * to use - */ -define('POMF_FILES_LENGTH', 6); - -/** - * URI to prepend to links for uploaded files - * - * @param string POMF_URL URI with trailing delimiter - */ -define('POMF_URL', 'https://i.pantsu.cat/'); - -/** - * URI for filename generation - * - * @param string characters to be used in generateName() - */ -define('ID_CHARSET', 'abcdefghijklmnopqrstuvwxyz'); - - -/** - * Filtered mime types - * @param string[] $FILTER_MIME allowed/blocked mime types - */ -$FILTER_MIME = array(); -/** - * Filter mode: whitelist (true) or blacklist (false) - * @param bool $FILTER_MODE mime type filter mode - */ -$FILTER_MODE = false; -/** - * Double dot file extensions - * - * Pomf keeps the last file extension for the uploaded file. In other words, an - * uploaded file with `.tar.gz` extension will be given a random filename which - * ends in `.gz` unless configured here to ignore discards for `.tar.gz`. - * - * @param string[] $doubledots Array of double dot file extensions strings - * without the first prefixing dot - */ -$doubledots = array_map('strrev', array( - 'tar.gz', - 'tar.bz', - 'tar.bz2', - 'tar.xz', - 'user.js', -)); diff --git a/php/upload.php b/php/upload.php deleted file mode 100644 index f14a4d3..0000000 --- a/php/upload.php +++ /dev/null @@ -1,240 +0,0 @@ -<?php -session_start(); - -/** - * Handles POST uploads, generates filenames, moves files around and commits - * uploaded metadata to database. - */ - -require_once 'classes/Response.class.php'; -require_once 'classes/UploadException.class.php'; -require_once 'classes/UploadedFile.class.php'; -require_once 'includes/database.inc.php'; - -/** - * Generates a random name for the file, retrying until we get an unused one. - * - * @param UploadedFile $file - * - * @return string - */ -function generateName($file) -{ - global $db; - global $doubledots; - - // We start at N retries, and --N until we give up - $tries = POMF_FILES_RETRIES; - $length = POMF_FILES_LENGTH; - $ext = pathinfo($file->name, PATHINFO_EXTENSION); - - // Check if extension is a double-dot extension and, if true, override $ext - $revname = strrev($file->name); - foreach ($doubledots as $ddot) { - if (stripos($revname, $ddot) === 0) { - $ext = strrev($ddot); - } - } - - do { - // Iterate until we reach the maximum number of retries - if ($tries-- === 0) { - throw new Exception( - 'Gave up trying to find an unused name', - 500 - ); // HTTP status code "500 Internal Server Error" - } - - $chars = ID_CHARSET; - $name = ''; - for ($i = 0; $i < $length; ++$i) { - $name .= $chars[mt_rand(0, strlen($chars))]; - } - - // Add the extension to the file name - if (isset($ext) && $ext !== '') { - $name .= '.'.strip_tags($ext); - } - - // Check if a file with the same name does already exist in the database - $q = $db->prepare('SELECT COUNT(filename) FROM files WHERE filename = (:name)'); - $q->bindValue(':name', $name, PDO::PARAM_STR); - $q->execute(); - $result = $q->fetchColumn(); - // If it does, generate a new name - } while ($result > 0); - - return $name; -} - -/** - * Handles the uploading and db entry for a file. - * - * @param UploadedFile $file - * - * @return array - */ -function uploadFile($file) -{ - global $db; - global $FILTER_MODE; - global $FILTER_MIME; - - // Handle file errors - if ($file->error) { - throw new UploadException($file->error); - } - - // Check if mime type is blocked - if (!empty($FILTER_MIME)) { - if ($FILTER_MODE == true) { //whitelist mode - if (!in_array($file->mime, $FILTER_MIME)) { - throw new UploadException(UPLOAD_ERR_EXTENSION); - } - } else { //blacklist mode - if (in_array($file->mime, $FILTER_MIME)) { - throw new UploadException(UPLOAD_ERR_EXTENSION); - } - } - } - - - // Check if a file with the same hash and size (a file which is the same) - // does already exist in the database; if it does, return the proper link - // and data. PHP deletes the temporary file just uploaded automatically. - $q = $db->prepare('SELECT filename, COUNT(*) AS count FROM files WHERE hash = (:hash) '. - 'AND size = (:size)'); - $q->bindValue(':hash', $file->getSha1(), PDO::PARAM_STR); - $q->bindValue(':size', $file->size, PDO::PARAM_INT); - $q->execute(); - $result = $q->fetch(); - if ($result['count'] > 0) { - return array( - 'hash' => $file->getSha1(), - 'name' => $file->name, - 'url' => POMF_URL.$result['filename'], - 'size' => $file->size, - ); - } - - // Generate a name for the file - $newname = generateName($file); - - // Store the file's full file path in memory - $uploadFile = POMF_FILES_ROOT . $newname; - - // Attempt to move it to the static directory - if (!move_uploaded_file($file->tempfile, $uploadFile)) { - throw new Exception( - 'Failed to move file to destination', - 500 - ); // HTTP status code "500 Internal Server Error" - } - - // Need to change permissions for the new file to make it world readable - if (!chmod($uploadFile, 0644)) { - throw new Exception( - 'Failed to change file permissions', - 500 - ); // HTTP status code "500 Internal Server Error" - } - - // Add it to the database - // 'expire' support is deprecated since version 2.1.0. It may be - // removed in a future release. - if (empty($_SESSION['id'])) { - // Query if user is NOT logged in - $q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, ' . - 'expire, delid) VALUES (:hash, :orig, :name, :size, :date, ' . - ':exp, :del)'); - } else { - // Query if user is logged in (insert user id together with other data) - $q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, ' . - 'expire, delid, user) VALUES (:hash, :orig, :name, :size, :date, ' . - ':exp, :del, :user)'); - $q->bindValue(':user', $_SESSION['id'], PDO::PARAM_INT); - } - - // Common parameters binding - $q->bindValue(':hash', $file->getSha1(), PDO::PARAM_STR); - $q->bindValue(':orig', strip_tags($file->name), PDO::PARAM_STR); - $q->bindValue(':name', $newname, PDO::PARAM_STR); - $q->bindValue(':size', $file->size, PDO::PARAM_INT); - $q->bindValue(':date', date('Y-m-d'), PDO::PARAM_STR); - $q->bindValue(':exp', null, PDO::PARAM_STR); - $q->bindValue(':del', sha1($file->tempfile), PDO::PARAM_STR); - $q->execute(); - - return array( - 'hash' => $file->getSha1(), - 'name' => $file->name, - 'url' => POMF_URL.$newname, - 'size' => $file->size, - ); -} - -/** - * Reorder files array by file. - * - * @param $_FILES - * - * @return array - */ -function diverseArray($files) -{ - $result = array(); - - foreach ($files as $key1 => $value1) { - foreach ($value1 as $key2 => $value2) { - $result[$key2][$key1] = $value2; - } - } - - return $result; -} - -/** - * Reorganize the $_FILES array into something saner. - * - * @param $_FILES - * - * @return array - */ -function refiles($files) -{ - $result = array(); - $files = diverseArray($files); - - foreach ($files as $file) { - $f = new UploadedFile(); - $f->name = $file['name']; - $f->mime = $file['type']; - $f->size = $file['size']; - $f->tempfile = $file['tmp_name']; - $f->error = $file['error']; - // 'expire' doesn't exist neither in $_FILES nor in UploadedFile; - // it was never implemented and has been deprecated since version 2.1.0. - //$f->expire = $file['expire']; - $result[] = $f; - } - - return $result; -} - -$type = isset($_GET['output']) ? $_GET['output'] : 'json'; -$response = new Response($type); - -if (isset($_FILES['files'])) { - $uploads = refiles($_FILES['files']); - - try { - foreach ($uploads as $upload) { - $res[] = uploadFile($upload); - } - $response->send($res); - } catch (Exception $e) { - $response->error($e->getCode(), $e->getMessage()); - } -} else { - $response->error(400, 'No input file(s)'); -} |