Fijxu
/
Uguu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add whitelist mode and fix clipboard glyph

This commit is contained in:
nokonoko 2021-07-03 17:23:16 +02:00
parent 6fb976d738
commit 5e56fb981a
5 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist.json
View File

@ -3,7 +3,7 @@
"allowErrors": false "allowErrors": false
}, },
"dest": "dist", "dest": "dist",
"pkgVersion": "1.1.2", "pkgVersion": "1.2.0",
"banners": [ "banners": [
"banners/malware_scans.swig", "banners/malware_scans.swig",
"banners/donations.swig" "banners/donations.swig"

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "uguu", "name": "uguu",
"version": "1.1.2", "version": "1.2.0",
"description": "Kawaii file host", "description": "Kawaii file host",
"homepage": "https://uguu.se/", "homepage": "https://uguu.se/",
"repository": { "repository": {

2
static/css/uguu.css
View File

@ -232,7 +232,7 @@ nav > ul > li:last-child:after {
color: #891A18; color: #891A18;
} }
button.upload-clipboard-btn { button.upload-clipboard-btn {
height: 16px; height: 32px;
} }
.error#upload-filelist .progress-percent { .error#upload-filelist .progress-percent {
color: #B94A48; color: #B94A48;

16
static/php/includes/settings.inc.php
View File

@ -25,10 +25,14 @@ define('UGUU_DB_USER', 'NULL');
/* @param string UGUU_DB_PASS Database password */ /* @param string UGUU_DB_PASS Database password */
define('UGUU_DB_PASS', 'NULL'); define('UGUU_DB_PASS', 'NULL');
/** Log IP of uploads */ /**
* @param boolean Log IP of uploads
*/
define('LOG_IP', false); define('LOG_IP', false);
/** Dont upload a file already in the DB */ /**
* @param boolean anti-dupe
*/
define('ANTI_DUPE', false); define('ANTI_DUPE', false);
/* /*
@ -78,11 +82,11 @@ define('CONFIG_BLOCKED_EXTENSIONS', serialize(['exe', 'scr', 'com', 'vbs', 'bat'
define('CONFIG_BLOCKED_MIME', serialize(['application/msword', 'text/html', 'application/x-dosexec', 'application/java', 'application/java-archive', 'application/x-executable', 'application/x-mach-binary', 'image/svg+xml'])); define('CONFIG_BLOCKED_MIME', serialize(['application/msword', 'text/html', 'application/x-dosexec', 'application/java', 'application/java-archive', 'application/x-executable', 'application/x-mach-binary', 'image/svg+xml']));
/** /**
* Filter mode: whitelist (true) or blacklist (false). * Whitelist or blacklist mode
* * @param boolean blacklist (false) | whitelist (true)
* @param bool $FILTER_MODE mime type filter mode
*/ */
$FILTER_MODE = false; define('CONFIG_FILTER_MODE', false);
/** /**
* Double dot file extensions. * Double dot file extensions.
* *

39
static/php/upload.php
View File

@ -61,15 +61,34 @@ function generateName($file)
$name .= '.'.$ext; $name .= '.'.$ext;
} }
//Check if MIME is blacklisted // Check if file is whitelisted or blacklisted
if (in_array($type_mime, unserialize(CONFIG_BLOCKED_MIME))) { switch (CONFIG_FILTER_MODE) {
http_response_code(415);
exit(0); case false:
} //check if MIME is blacklisted
//Check if EXT is blacklisted if (in_array($type_mime, unserialize(CONFIG_BLOCKED_MIME))) {
if (in_array($ext, unserialize(CONFIG_BLOCKED_EXTENSIONS))) { http_response_code(415);
http_response_code(415); exit(0);
exit(0); }
//Check if EXT is blacklisted
if (in_array($ext, unserialize(CONFIG_BLOCKED_EXTENSIONS))) {
http_response_code(415);
exit(0);
}
break;
case true:
//Check if MIME is whitelisted
if (!in_array($type_mime, unserialize(CONFIG_BLOCKED_MIME))) {
http_response_code(415);
exit(0);
}
//Check if EXT is whitelisted
if (!in_array($ext, unserialize(CONFIG_BLOCKED_EXTENSIONS))) {
http_response_code(415);
exit(0);
}
break;
} }
// Check if a file with the same name does already exist in the database // Check if a file with the same name does already exist in the database
@ -93,8 +112,6 @@ function generateName($file)
function uploadFile($file) function uploadFile($file)
{ {
global $db; global $db;
global $FILTER_MODE;
global $FILTER_MIME;
// Handle file errors // Handle file errors
if ($file->error) { if ($file->error) {