Explorar o código

Drobne poprawki

Mariusz Muszyński %!s(int64=8) %!d(string=hai) anos
pai
achega
e846fb92e8

+ 2 - 2
SE/stuff/scripts/secureMysql/getHash.php

@@ -5,12 +5,12 @@ $curDir = dirname(__FILE__);
 if (!preg_match('/(^.*)stuff.*$/', $curDir, $matches)) die('Script location error\n');;
 @require_once $matches[1] .  'se-lib' . DIRECTORY_SEPARATOR . 'bootstrap.php';
 date_default_timezone_set('Europe/Warsaw');
-if (!isset($argv[1])) die("Server name/UD missing\n");
+if (!isset($argv[1])) die("Server name/ID missing\n");
 
 try {
 	$arg = DB::getPDO()->quote($argv[1]);
 	$pass = DB::getPDO()->fetchValue("select `ADMIN_USERNAME_PASSWD` from SES_PROCESY5_A where `ID` = {$arg} or `SERVER_ADDRESS` = {$arg} limit 1");
-	if (!$pass) $pass = "chuj ci w dupe - brak serwera // wygeneruje bledny token";
+	if (!$pass) $pass = "brak serwera - wygeneruje bledny token";
 	Lib::loadClass('Token');
 	$tokenObj = new Token($pass, "JakOnZyjeToMyTezMozemy");
 	$token = readline("Token: ");

+ 1 - 1
SE/stuff/scripts/secureMysql/login.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-mysql -uroot -p$(./getPass.php) 2>/dev/null
+$(./secureLogin.php)

+ 1 - 2
SE/stuff/scripts/secureMysql/getPass.php → SE/stuff/scripts/secureMysql/secureLogin.php

@@ -12,10 +12,9 @@ try {
 	$token = $tokenObj->genToken();
 	error_log($token);
 	$hash = readline();
-	if ($pass = $tokenObj->verify($hash)) echo "{$pass} -D " . Config::getConfFile('default_db')['database'];
+	if ($pass = $tokenObj->verify($hash)) echo "mysql -u" . Config::getConfFile('default_db')['user'] . " -p{$pass} -A -D " . Config::getConfFile('default_db')['database'];
 	else {
 		error_log("This attempt has been logged");
-		echo ".";
 	}
 } catch (Exception $e) {
 	error_log("Unknown error");