scratch – Diff between revs 16 and 17

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 16 Rev 17
1 <?php 1 <?php
2   2  
3 ########################################################################### 3 ###########################################################################
4 ## Copyright (C) Wizardry and Steamworks 2017 - License: GNU GPLv3 ## 4 ## Copyright (C) Wizardry and Steamworks 2017 - License: GNU GPLv3 ##
5 ########################################################################### 5 ###########################################################################
6   6  
7 require_once('inc/pseudocrypt.php'); 7 require_once('inc/pseudocrypt.php');
8 require_once('inc/functions.php'); 8 require_once('inc/functions.php');
9 require_once('config.php'); 9 require_once('config.php');
10   10  
11 #### Retrieve uploaded file. 11 #### Retrieve uploaded file.
12 if (!empty($_FILES['file']) and 12 if (!empty($_FILES['file']) and
13 is_uploaded_file($_FILES['file']['tmp_name'])) { 13 is_uploaded_file($_FILES['file']['tmp_name'])) {
14 # Regular multipart/form-data upload. 14 # Regular multipart/form-data upload.
15 $name = $_FILES['file']['name']; 15 $name = $_FILES['file']['name'];
16 $data = file_get_contents($_FILES['file']['tmp_name']); 16 $data = file_get_contents($_FILES['file']['tmp_name']);
17 } else { 17 } else {
18 # Raw POST data. 18 # Raw POST data.
19 $name = urldecode(@$_SERVER['HTTP_X_FILE_NAME']); 19 $name = urldecode(@$_SERVER['HTTP_X_FILE_NAME']);
20 $data = file_get_contents("php://input"); 20 $data = file_get_contents("php://input");
21 } 21 }
22   22  
23 #### Grab the file extension. 23 #### Grab the file extension.
24 $fileExtension = pathinfo($name, PATHINFO_EXTENSION); 24 $fileExtension = pathinfo($name, PATHINFO_EXTENSION);
25   25  
26 #### If the extension is not allowed then change it to a text extension. 26 #### If the extension is not allowed then change it to a text extension.
27 if (!isset($fileExtension) || 27 if (!isset($fileExtension) ||
28 !in_array(strtoupper($fileExtension), 28 !in_array(strtoupper($fileExtension),
29 array_map('strtoupper', $ALLOWED_FILE_EXTENSIONS))) 29 array_map('strtoupper', $ALLOWED_FILE_EXTENSIONS)))
30 $fileExtension = 'txt'; 30 $fileExtension = 'txt';
31 31
32 #### Hash filename. 32 #### Hash filename.
33 $file = strtolower( 33 $file = strtolower(
34 PseudoCrypt::hash( 34 PseudoCrypt::hash(
35 preg_replace( 35 preg_replace(
36 '/\D/', 36 '/\D/',
37 '', 37 '',
38 hash( 38 hash(
39 'sha512', 39 'sha512',
40 $name 40 $name
41 ) 41 )
42 ) 42 )
43 ). '.'. 43 ). '.'.
44 $fileExtension 44 $fileExtension
45 ); 45 );
46   46  
47 #### Build the user path. 47 #### Build the user path.
48 $userPath = join( 48 $userPath = join(
49 DIRECTORY_SEPARATOR, 49 DIRECTORY_SEPARATOR,
50 array( 50 array(
51 $STORE_FOLDER, 51 $STORE_FOLDER,
52 $file 52 $file
53 ) 53 )
54 ); 54 );
55   55  
56 #### Check for path traversals 56 #### Check for path traversals
57 $pathPart = pathinfo($userPath); 57 $pathPart = pathinfo($userPath);
-   58 if (strcasecmp(
58 if (strcasecmp(realpath($pathPart['dirname']), realpath($STORE_FOLDER)) != 0) 59 realpath($pathPart['dirname']), realpath($STORE_FOLDER)) != 0)
59 return; 60 return;
60   61  
61 #### Store the file. 62 #### Store the file.
62 atomized_put_contents($userPath, $data); 63 atomized_put_contents($userPath, $data);
63   64  
64 ### Return the URL to the file. 65 ### Return the URL to the file.
65 header('Content-Type: text/plain; charset=utf-8'); 66 header('Content-Type: text/plain; charset=utf-8');
66 echo sprintf('%s/%s', trim($URL_PATH, '/'), $file); 67 echo sprintf('%s/%s', trim($URL_PATH, '/'), $file);
67   68