Исправлены проблемы с доступом

[FIX] - Исправлена заявленная ошибка: #11
DevCraftClub · Sep 19, 2023 · 4848efe · 4848efe
1 parent b199609
commit 4848efe
Show file tree

Hide file tree

Showing 60 changed files with 317 additions and 188 deletions.
diff --git a/install_archive.bat b/install_archive.bat
@@ -3,8 +3,8 @@ mkdir temp
 robocopy upload temp /E
 cd temp
 set PATH=%PATH%;%ProgramFiles%\7-Zip\
-7z a -mx0 -r -tzip -aoa maharder_assets.zip *
+7z a -mx0 -r -tzip -aoa dle_api.zip *
 cd ..
-copy /Y temp\maharder_assets.zip install.zip
+copy /Y temp\dle_api.zip install.zip
 rd /s /q temp
 exit;
diff --git a/install_archive.sh b/install_archive.sh
@@ -3,8 +3,8 @@
 mkdir temp
 rsync -avz upload/ temp/
 cd temp
-zip -r maharder_assets.zip *
+zip -r dle_api.zip *
 cd ..
-cp -f temp/maharder_assets.zip install.zip
+cp -f temp/dle_api.zip install.zip
 rm -rf temp
 exit 0
diff --git a/manifest.json b/manifest.json
@@ -1,4 +1,4 @@
 {
-    "version": "160.0.34",
+    "version": "160.0.35",
     "name": "DLE API"
 }
diff --git a/upload/api/includes/functions.php b/upload/api/includes/functions.php
@@ -11,13 +11,13 @@
 include_once DLEPlugins::Check(ENGINE_DIR . '/inc/includes/functions.inc.php');
 include_once DLEPlugins::Check(__DIR__ . '/PDO.class.php');
 include_once DLEPlugins::Check(ENGINE_DIR . '/api/api.class.php');
-$dleapi = json_decode(file_get_contents(DLEPlugins::Check(ENGINE_DIR . '/data/dleapi.json')), true);
-$dle_api = new DLE_API();
+$dleapi      = json_decode(file_get_contents(DLEPlugins::Check(ENGINE_DIR . '/data/dleapi.json')), true);
+$dle_api     = new DLE_API();
 $dle_api->db = $db;
 
 $dbHostPort = explode(':', DBHOST);
-$dbHost = $dbHostPort[0] ?: 'localhost';
-$dbPort = (isset($dbHostPort[1])) ? (int) $dbHostPort[1] : 3306;
+$dbHost     = $dbHostPort[0] ?: 'localhost';
+$dbPort     = (isset($dbHostPort[1])) ? (int) $dbHostPort[1] : 3306;
 
 $connect    = new database($dbHost, $dbPort, DBNAME, DBUSER, DBPASS);
 $DLEprefix  = PREFIX;
@@ -28,6 +28,7 @@
  *
  * @param $value
  * @param $type
+ *
  * @return string
  */
 function getComparer($value, $type = null) : string {
@@ -66,6 +67,7 @@ function getComparer($value, $type = null) : string {
  *
  * @param $key
  * @param $name
+ *
  * @return array|false[]
  */
 function checkAPI($key, $name) : array {
@@ -80,7 +82,12 @@ function checkAPI($key, $name) : array {
 
 	try {
 		if (!empty($key) && !empty($name)) {
-			$keyCheck = $connect->query("SELECT k.id, k.api, k.is_admin, k.active, u.user_id, k.own_only, u.name FROM  {$DLEprefix}_api_keys k, {$USERprefix}_users u WHERE u.user_id = k.user_id and k.api = :key", array('key' => $key));
+			$keyCheck = $connect->query(
+				"SELECT k.id, k.api, k.is_admin, k.active, k.user_id, k.own_only, u.name FROM  {$DLEprefix}_api_keys k, {$USERprefix}_users u WHERE k.api = :key",
+				array('key' => $key)
+			);
+
+			$username = (int) $keyCheck[0]['user_id'] > 0 ? $keyCheck[0]['name'] : 'Гость';
 
 			if (!empty($keyCheck)) {
 				if ($keyCheck[0]['is_admin'] && $keyCheck[0]['active'] === 1) {
@@ -92,15 +99,15 @@ function checkAPI($key, $name) : array {
 						'own'    => [
 							'access'    => true,
 							'user_id'   => $keyCheck[0]['user_id'],
-							'user_name' => $keyCheck[0]['name']
+							'user_name' => $username
 						],
 					);
 				} else {
 
-					$tablesCheck = $connect->query("SELECT * FROM {$DLEprefix}_api_scope
-														WHERE table = :name and key_id = :api", array('name' => $name,
-																									  'api'  => $keyCheck[0]['api']
-					));
+					$tablesCheck = $connect->query(
+						"SELECT * FROM {$DLEprefix}_api_scope das WHERE das.table = :name and das.key_id = :api_id",
+						array('name' => $name, 'api_id' => $keyCheck[0]['id'])
+					);
 
 					if (count($tablesCheck) > 0) {
 						if ($keyCheck[0]['active'] === 1) {
@@ -110,7 +117,7 @@ function checkAPI($key, $name) : array {
 							if ($tablesCheck[0]['delete'] === 1) $antwort['delete'] = true;
 							if ($keyCheck[0]['own_only'] === 1) $antwort['own']['access'] = true;
 							$antwort['own']['user_id']   = $keyCheck[0]['user_id'];
-							$antwort['own']['user_name'] = $keyCheck[0]['name'];
+							$antwort['own']['user_name'] = $username;
 						} else $antwort['error'] = 'API-ключ не активен!';
 					} else $antwort['error'] = 'API-ключ не действителен!';
 				}
@@ -132,6 +139,7 @@ function checkAPI($key, $name) : array {
  *
  * @param $value
  * @param $type
+ *
  * @return bool|float|int|string
  */
 function defType($value, $type = null) : float|bool|int|string {
@@ -149,6 +157,7 @@ function defType($value, $type = null) : float|bool|int|string {
  *
  * @param $text
  * @param $max
+ *
  * @return string
  */
 function checkLength($text, $max) : string {
@@ -162,17 +171,17 @@ class CacheSystem {
 	private string $cachePath;
 	private string $module;
 	private string $id;
-	private mixed $data;
+	private mixed  $data;
 	private string $app;
 
 	/**
 	 * CacheSystem constructor.
 	 *
-	 * @param        $module // Название таблицы
-	 * @param string $id // Идентификационный набор символов
-	 * @param mixed $data // Передаваемые и сохраняемые данные
-	 * @param string $app // Тип кеша
-	 * @param string $path // Путь кеша
+	 * @param              $module    // Название таблицы
+	 * @param    string    $id        // Идентификационный набор символов
+	 * @param    mixed     $data      // Передаваемые и сохраняемые данные
+	 * @param    string    $app       // Тип кеша
+	 * @param    string    $path      // Путь кеша
 	 */
 	public function __construct(string $module, string $id = '', mixed $data = '', string $app = 'api', string $path = ENGINE_DIR . '/cache') {
 		$this->data   = $data;
@@ -184,7 +193,7 @@ public function __construct(string $module, string $id = '', mixed $data = '', s
 	}
 
 	/**
-	 * @param string $cachePath
+	 * @param    string    $cachePath
 	 */
 	public function setCachePath(string $cachePath) : void {
 		if (!mkdir($cachePath) && !is_dir($cachePath)) {
@@ -209,7 +218,7 @@ public function create() : bool|string {
 	 * @return string
 	 */
 	public function get() : string {
-		$file_name = "{$this->app}_{$this->module}_" . md5($this->id) . '.json';
+		$file_name  = "{$this->app}_{$this->module}_" . md5($this->id) . '.json';
 		$cache_file = $this->cachePath . DIRECTORY_SEPARATOR . $file_name;
 		if (file_exists($cache_file)) {
 			$return_data = json_decode(file_get_contents($cache_file), true);
@@ -226,7 +235,7 @@ public function get() : string {
 	/**
 	 * Очищает файлы кеша
 	 *
-	 * @param string $app
+	 * @param    string    $app
 	 */
 	public function clear(string $app = '') : void {
 		$pattern = (empty($app)) ? '*' : $this->app . '_' . $app . '_*';
@@ -241,7 +250,7 @@ public function clear(string $app = '') : void {
 	}
 
 	/**
-	 * @param mixed $data
+	 * @param    mixed    $data
 	 */
 	public function setData(mixed $data) : void {
 		$this->data = $data;
@@ -270,3 +279,13 @@ private function secureData($data, $value) : mixed {
 
 	}
 }
+
+function check_response(mixed $data) : bool {
+	if (is_array($data)) return count($data) > 0;
+	else {
+		if (!empty($data)) {
+			return str_contains($data, '[]');
+		}
+	}
+	return false;
+}
diff --git a/upload/api/routes/admin_logs.php b/upload/api/routes/admin_logs.php
@@ -128,8 +128,8 @@
 			$sql = "SELECT * FROM " . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/admin_sections.php b/upload/api/routes/admin_sections.php
@@ -122,8 +122,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/banned.php b/upload/api/routes/banned.php
@@ -122,8 +122,8 @@
 			$sql = "SELECT * FROM " . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/banners.php b/upload/api/routes/banners.php
@@ -226,8 +226,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/banners_logs.php b/upload/api/routes/banners_logs.php
@@ -100,8 +100,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/banners_rubrics.php b/upload/api/routes/banners_rubrics.php
@@ -100,8 +100,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/category.php b/upload/api/routes/category.php
@@ -261,8 +261,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/comment_rating_log.php b/upload/api/routes/comment_rating_log.php
@@ -114,8 +114,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/comments.php b/upload/api/routes/comments.php
@@ -171,8 +171,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/comments_files.php b/upload/api/routes/comments_files.php
@@ -123,8 +123,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/complaint.php b/upload/api/routes/complaint.php
@@ -144,8 +144,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/email.php b/upload/api/routes/email.php
@@ -100,8 +100,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/files.php b/upload/api/routes/files.php
@@ -158,8 +158,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/flood.php b/upload/api/routes/flood.php
@@ -100,8 +100,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/ignore_list.php b/upload/api/routes/ignore_list.php
@@ -101,8 +101,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/images.php b/upload/api/routes/images.php
@@ -116,8 +116,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/links.php b/upload/api/routes/links.php
@@ -128,8 +128,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {

diff --git a/upload/api/routes/login_log.php b/upload/api/routes/login_log.php
@@ -100,8 +100,8 @@
 			$sql = 'SELECT * FROM ' . PREFIX . "_{$api_name} {$possibleParams} ORDER by {$orderBy} {$sort} {$limit}";
 
 			$getData = new CacheSystem($api_name, $sql);
-			if (empty($getData->get())) {
-				$data = $connect->query($sql);
+			if (check_response($getData->get())) {
+				$data = $connect->query($sql, []);
 				$getData->setData($data);
 				$data = $getData->create();
 			} else {