diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 021838f..020394a 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -9,6 +9,7 @@ services: - URL=http://localhost:8080/ - MAX_UPLOAD_SIZE=1000 # Security settings + - ADMIN_PASSWORD=test # password for the admin panel. if empty, admin panel is disabled - ALLOWED_SUBNET= #IP address or subnet mask to allow upload to the server - CONTENTCONTROLLERS= # limit uploaded file types - MASTER_DELETE_CODE= # code to delete all files diff --git a/docker-compose.yml b/docker-compose.yml index 0537098..1364b50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: - URL=http://localhost:8080/ - MAX_UPLOAD_SIZE=20 #in MB # Security settings + - ADMIN_PASSWORD= # password for the admin panel. if empty, admin panel is disabled - ALLOWED_SUBNET= #IP address or subnet mask to allow upload to the server - CONTENTCONTROLLERS= # limit uploaded file types - MASTER_DELETE_CODE= # code to delete all files diff --git a/docker/rootfs/start.sh b/docker/rootfs/start.sh index 78a1bf7..5ab7cbf 100644 --- a/docker/rootfs/start.sh +++ b/docker/rootfs/start.sh @@ -60,6 +60,7 @@ _buildConfig() { echo "define('REDIS_CACHING', ${REDIS_CACHING:-true});" echo "define('REDIS_SERVER', '${REDIS_SERVER:-/run/redis/redis.sock}');" echo "define('REDIS_PORT', ${REDIS_PORT:-6379});" + echo "define('ADMIN_PASSWORD', '${ADMIN_PASSWORD:-}');" } # starting redis diff --git a/src/inc/core.php b/src/inc/core.php index 7cf1e7a..85f28eb 100644 --- a/src/inc/core.php +++ b/src/inc/core.php @@ -32,6 +32,25 @@ function architect($u) return renderTemplate('main.html.php',['forbidden'=>$forbidden]); } + // admin logic + if($u[0] == 'admin' && defined('ADMIN_PASSWORD') && ADMIN_PASSWORD != '') + { + session_start(); + if($_REQUEST['password'] && $_REQUEST['password']== ADMIN_PASSWORD) + { + $_SESSION['admin'] = true; + } + if($_SESSION['admin']) + { + if(isset($_REQUEST['logout'])) + { + unset($_SESSION['admin']); + session_destroy(); + } + } + return renderTemplate('admin.html.php'); + } + //check cache if(isset($GLOBALS['redis'])) { @@ -41,6 +60,7 @@ function architect($u) list($cc, $hash) = explode(';', $cache_data); if(defined('LOG_VIEWS') && LOG_VIEWS===true) addToLog("Cache hit: ".getUserIP()." viewed $hash\t".$_SERVER['HTTP_USER_AGENT'], ROOT.DS.'logs/views.log'); + $GLOBALS['redis']->incr("served:$hash"); return (new $cc())->handleHash($hash,$u); } } @@ -162,6 +182,10 @@ function architect($u) { $GLOBALS['redis']->set('cache:byurl:'.implode('/',$u),"$cc;$hash"); addToLog("Caching URL \t".implode('/',$u)."\thash: $hash\tto content controller: $cc"); + if($hash!==true) + $GLOBALS['redis']->incr("served:$hash"); + else //if it's a dynamic image, we count how many times this url was served + $GLOBALS['redis']->incr("served:".implode('/',$u)); } return (new $cc())->handleHash($hash,$u); } diff --git a/src/templates/admin.html.php b/src/templates/admin.html.php new file mode 100644 index 0000000..3290905 --- /dev/null +++ b/src/templates/admin.html.php @@ -0,0 +1,93 @@ + + + + + + + + + + PictShare - the smart CDN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+
+ +
+

Admin Panel

+ +
+
+ + +
+
+ + + +
+ +
+ + + + +
+ +
+ +
+ + + + + + \ No newline at end of file