From 73c06082f78f6ba79e40bf66c531d5ff99082fee Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Tue, 19 Aug 2008 15:48:57 +0000 Subject: * Added global sql settings 'sql.*' to inter_athena.conf. * Made account, ipban and loginlog use the global sql settings when the hostname is empty. * Commented 'ipban.sql.*' and 'account.sql.*' so they default to the global settings. * Removed deprecated settings 'case_sensitive' and 'add_to_unlimited_account' from in login_athena.conf. * Made inter_athena.conf be imported from login_athena.conf instead of being handled separate. * Changed ipban to get the failed login attempts of an ip from loginlog (respects if loginlog is enabled or not). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13092 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/login/loginlog_sql.c | 110 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 9 deletions(-) (limited to 'src/login/loginlog_sql.c') diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c index 780236679..055594083 100644 --- a/src/login/loginlog_sql.c +++ b/src/login/loginlog_sql.c @@ -9,15 +9,47 @@ #include #include // exit -char log_db_hostname[32] = "127.0.0.1"; -uint16 log_db_port = 3306; -char log_db_username[32] = "ragnarok"; -char log_db_password[32] = "ragnarok"; -char log_db_database[32] = "log"; -char loginlog_table[256] = "loginlog"; +// global sql settings (in ipban_sql.c) +static char global_db_hostname[32] = "127.0.0.1"; +static uint16 global_db_port = 3306; +static char global_db_username[32] = "ragnarok"; +static char global_db_password[32] = "ragnarok"; +static char global_db_database[32] = "ragnarok"; +static char global_codepage[32] = ""; +// local sql settings +static char log_db_hostname[32] = ""; +static uint16 log_db_port = 0; +static char log_db_username[32] = ""; +static char log_db_password[32] = ""; +static char log_db_database[32] = ""; +static char log_codepage[32] = ""; +static char loginlog_table[256] = "loginlog"; + +static Sql* sql_handle = NULL; +static bool enabled = false; + + +// Returns the number of failed login attemps by the ip in the last minutes. +unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes) +{ + unsigned long failures = 0; + + if( !enabled ) + return 0; + + if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `ip` = '%s' AND `rcode` = '1' AND `time` > NOW() - INTERVAL %d MINUTE", + loginlog_table, ip2str(ip,NULL), minutes) )// how many times failed account? in one ip. + Sql_ShowDebug(sql_handle); -Sql* sql_handle; -bool enabled = false; + if( SQL_SUCCESS == Sql_NextRow(sql_handle) ) + { + char* data; + Sql_GetData(sql_handle, 0, &data, NULL); + failures = strtoul(data, NULL, 10); + Sql_FreeResult(sql_handle); + } + return failures; +} /*============================================= @@ -45,15 +77,44 @@ void login_log(uint32 ip, const char* username, int rcode, const char* message) bool loginlog_init(void) { + const char* username; + const char* password; + const char* hostname; + uint16 port; + const char* database; + const char* codepage; + + if( log_db_hostname[0] != '\0' ) + {// local settings + username = log_db_username; + password = log_db_password; + hostname = log_db_hostname; + port = log_db_port; + database = log_db_database; + codepage = log_codepage; + } + else + {// global settings + username = global_db_username; + password = global_db_password; + hostname = global_db_hostname; + port = global_db_port; + database = global_db_database; + codepage = global_codepage; + } + sql_handle = Sql_Malloc(); - if( SQL_ERROR == Sql_Connect(sql_handle, log_db_username, log_db_password, log_db_hostname, log_db_port, log_db_database) ) + if( SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database) ) { Sql_ShowDebug(sql_handle); Sql_Free(sql_handle); exit(EXIT_FAILURE); } + if( codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, codepage) ) + Sql_ShowDebug(sql_handle); + enabled = true; return true; @@ -68,6 +129,34 @@ bool loginlog_final(void) bool loginlog_config_read(const char* key, const char* value) { + const char* signature; + + signature = "sql."; + if( strncmpi(key, signature, strlen(signature)) == 0 ) + { + key += strlen(signature); + if( strcmpi(key, "db_hostname") == 0 ) + safestrncpy(global_db_hostname, value, sizeof(global_db_hostname)); + else + if( strcmpi(key, "db_port") == 0 ) + global_db_port = (uint16)strtoul(value, NULL, 10); + else + if( strcmpi(key, "db_username") == 0 ) + safestrncpy(global_db_username, value, sizeof(global_db_username)); + else + if( strcmpi(key, "db_password") == 0 ) + safestrncpy(global_db_password, value, sizeof(global_db_password)); + else + if( strcmpi(key, "db_database") == 0 ) + safestrncpy(global_db_database, value, sizeof(global_db_database)); + else + if( strcmpi(key, "codepage") == 0 ) + safestrncpy(global_codepage, value, sizeof(global_codepage)); + else + return false;// not found + return true; + } + if( strcmpi(key, "log_db_ip") == 0 ) safestrncpy(log_db_hostname, value, sizeof(log_db_hostname)); else @@ -83,6 +172,9 @@ bool loginlog_config_read(const char* key, const char* value) if( strcmpi(key, "log_db_db") == 0 ) safestrncpy(log_db_database, value, sizeof(log_db_database)); else + if( strcmpi(key, "log_codepage") == 0 ) + safestrncpy(log_codepage, value, sizeof(log_codepage)); + else if( strcmpi(key, "loginlog_db") == 0 ) safestrncpy(loginlog_table, value, sizeof(loginlog_table)); else -- cgit v1.2.3-60-g2f50