From 798a0c4c068ed3185a1d5b8ae49213b7d92f2fbf Mon Sep 17 00:00:00 2001 From: sasha0552 Date: Mon, 2 Sep 2019 03:03:56 +0600 Subject: [PATCH] =?UTF-8?q?[FIX]=20Hibernate=20=D1=83=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B0=20&=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/provider/HibernateDaoProvider.java | 4 +- compat/auth/AuthHandler.php | 80 ------------------- 2 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 compat/auth/AuthHandler.php diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/dao/provider/HibernateDaoProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/dao/provider/HibernateDaoProvider.java index 08dd15ec..04f41ab0 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/dao/provider/HibernateDaoProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/dao/provider/HibernateDaoProvider.java @@ -16,6 +16,7 @@ public class HibernateDaoProvider extends DaoProvider { public String url; public String username; public String password; + public String dialect; public String pool_size; public String hibernateConfig; public boolean parallelHibernateInit; @@ -30,7 +31,8 @@ public void init(LaunchServer server) { .setProperty("hibernate.connection.url", url) .setProperty("hibernate.connection.username", username) .setProperty("hibernate.connection.password", password) - .setProperty("hibernate.connection.pool_size", pool_size); + .setProperty("hibernate.connection.pool_size", pool_size) + .setProperty("hibernate.dialect", dialect); if(hibernateConfig != null) cfg.configure(Paths.get(hibernateConfig).toFile()); userDAO = new HibernateUserDAOImpl(cfg.buildSessionFactory()); diff --git a/compat/auth/AuthHandler.php b/compat/auth/AuthHandler.php deleted file mode 100644 index da1b17ce..00000000 --- a/compat/auth/AuthHandler.php +++ /dev/null @@ -1,80 +0,0 @@ - "dle_users", // Название таблицы - 'usernameColumn' => "name", // Столбец с именами пользователей - 'uuidColumn' => "uuid", // Столбец с uuid - 'accessTokenColumn' => "accessToken", // Столбец с accessToken - 'ServerIDColumn' => "serverID" // Столбец с serverID -]; - -// Не трогать -// Можно повредить скрипт -$AuthHandler = [ - 'type' => filter_input(INPUT_GET, 'type', FILTER_SANITIZE_STRING), - 'username' => filter_input(INPUT_GET, 'username', FILTER_SANITIZE_STRING), - 'uuid' => filter_input(INPUT_GET, 'uuid', FILTER_SANITIZE_STRING), - 'accessToken' => filter_input(INPUT_GET, 'accessToken', FILTER_SANITIZE_STRING), - 'ServerID' => filter_input(INPUT_GET, 'ServerID', FILTER_SANITIZE_STRING), - 'secretKey' => filter_input(INPUT_GET, 'secretKey', FILTER_SANITIZE_STRING) -]; - -if (!isset($AuthHandler['secretKey'])) { - die('Не указан ключ!'); -} - -if ($secretkey != $AuthHandler['secretKey']) { - die('Неверный ключ!'); -} - -if(!$link) { - die('Ошибка подключения к базе данных'); -} - -if(isset($AuthHandler['type'])) { - if($AuthHandler['type'] == "FetchByUUID") { - if(isset($AuthHandler['uuid'])) { - $result = mysqli_query($link, 'SELECT '.$settings['usernameColumn'].','.$settings['accessTokenColumn'].','.$settings['serverID'].' FROM '.$settings['table'].' WHERE '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'" LIMIT 1') or die($link->error); - $row = $result->fetch_assoc(); - mysqli_free_result($result); - mysqli_close($link); - die($row[$settings['usernameColumn']] + ':' + $row[$settings['accessTokenColumn']] + ':' + $row[$settings['serverID']]); - } - if($AuthHandler['type'] == "FetchByUsername") { - if(isset($AuthHandler['uuid'])) { - $result = mysqli_query($link, 'SELECT '.$settings['uuidColumn'].','.$settings['accessTokenColumn'].','.$settings['serverID'].' FROM '.$settings['table'].' WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'" LIMIT 1') or die($link->error); - $row = $result->fetch_assoc(); - mysqli_free_result($result); - mysqli_close($link); - die($row[$settings['uuidColumn']] + ':' + $row[$settings['accessTokenColumn']] + ':' + $row[$settings['serverID']]); - } - - // Обновление строк - - if($AuthHandler['type'] == "SetAccessTokenAndUUID") { - $result = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['accessTokenColumn'].'="'.$AuthHandler['accessToken'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error); - $result1 = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error); - mysqli_close($link); - die('OK'); - } - if($AuthHandler['type'] == "SetServerID") { - $result = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['ServerIDColumn'].'="'.$AuthHandler['serverID'].'" WHERE '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'"') or die($link->error); - mysqli_close($link); - die('OK'); - } - die('FAIL!'); -} else { - die('Type not set!'); -} -?>