From: <ep...@us...> - 2008-08-15 14:37:22
|
Revision: 8517 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8517&view=rev Author: epsy Date: 2008-08-15 14:37:31 +0000 (Fri, 15 Aug 2008) Log Message: ----------- fixed bugs typos and turtles Modified Paths: -------------- tools/http-auth-server/trunk/config.php tools/http-auth-server/trunk/functions.php tools/http-auth-server/trunk/loginform.php Modified: tools/http-auth-server/trunk/config.php =================================================================== --- tools/http-auth-server/trunk/config.php 2008-08-15 10:16:16 UTC (rev 8516) +++ tools/http-auth-server/trunk/config.php 2008-08-15 14:37:31 UTC (rev 8517) @@ -4,26 +4,28 @@ //database details for checking against, repeat this section to support multiple databases //use $dbs['authority_name']['methods']['method']['host/name/user/passwd/table/userrow'] to set specific DB detailms for specific methods -$dbs['forums']['host'] = ''; -$dbs['forums']['name'] = ''; -$dbs['forums']['user'] = ''; -$dbs['forums']['passwd'] = ''; -$dbs['forums']['table'] = ''; -$dbs['forums']['user_row'] = ''; -$dbs['forums']['methods']['md5']['row'] = ''; -$dbs['forums']['methods']['bmd5']['row'] = ''; -$dbs['forums']['methods']['sha1']['row'] = ''; +$dbs['epsy.teamkilled.net:8080/~epsy']['host'] = 'localhost'; +$dbs['epsy.teamkilled.net:8080/~epsy']['name'] = 'http-auth-test'; +$dbs['epsy.teamkilled.net:8080/~epsy']['user'] = 'root'; +$dbs['epsy.teamkilled.net:8080/~epsy']['passwd'] = 'mycoolzone'; +$dbs['epsy.teamkilled.net:8080/~epsy']['table'] = 'server-users'; +$dbs['epsy.teamkilled.net:8080/~epsy']['user_row'] = 'user'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['md5']['row'] = 'md5'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['bmd5']['row'] = ''; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['sha1']['row'] = ''; // If you want to serve web authentication(not working yet) you will need to create this table with the following fields: -$dbs['forums']['methods']['webform']['table'] = 'armaauth'; -$dbs['forums']['methods']['webform']['authority_row'] = 'authority'; -$dbs['forums']['methods']['webform']['site_key_row'] = 'site_key'; -$dbs['forums']['methods']['webform']['site_key_hash_row'] = 'site_key_hash'; -$dbs['forums']['methods']['webform']['site_key_time_row'] = 'site_key_time'; -$dbs['forums']['methods']['webform']['site_row'] = 'site'; -$dbs['forums']['methods']['webform']['user_key_row'] = 'user_key'; -$dbs['forums']['methods']['webform']['hash_row'] = 'hash_row'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['table'] = 'server-webform'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['authority_row'] = 'authority'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['site_key_row'] = 'site_key'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['site_key_hash_row'] = 'site_key_hash'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['site_key_time_row'] = 'site_key_time'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['site_row'] = 'site'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['user_key_row'] = 'user_key'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['hash_row'] = 'hash_row'; +$dbs['epsy.teamkilled.net:8080/~epsy']['methods']['webform']['siteKeyTimeout'] = 5 * 60; // Time in seconds until a site key is considered expired and can be trashed -$dbs['forums']['validMethods'] = array('bmd5', 'md5', 'sha1'); //hashes which are in the table -$dbs['forums']['params'] = array('prefix' => '', 'suffix' => ''); +$dbs['epsy.teamkilled.net:8080/~epsy']['validMethods'] = array('md5', 'webform'); //hashes which are in the table +$dbs['epsy.teamkilled.net:8080/~epsy']['params'] = array('prefix' => '', 'suffix' => ''); + ?> Modified: tools/http-auth-server/trunk/functions.php =================================================================== --- tools/http-auth-server/trunk/functions.php 2008-08-15 10:16:16 UTC (rev 8516) +++ tools/http-auth-server/trunk/functions.php 2008-08-15 14:37:31 UTC (rev 8517) @@ -106,9 +106,9 @@ function webform_params (&$msg) { global $validMethods, $hashMethod; - if (in_array($_GET['method'], $validMethods)) + if (in_array($_REQUEST['method'], $validMethods)) { - $hashMethod = $_GET['method']; + $hashMethod = $_REQUEST['method']; } //no method? FAIL! @@ -131,12 +131,17 @@ mysql_select_db($realDbDetails['name'], $db); $q = 'INSERT INTO `' . $realDbDetails['table'] . '` - SET `' . $realDbDetails['authority_row'] . '`="' . $host . '", - `' . $realDbDetails['site_row'] . '`="' . $_SERVER['REMOTE_ADDR'] . '", - `' . $realDbDetails['site_key_row'] . '`="' . $key . '", - `' . $realDbDetails['site_key_hash_row'] . '`="' . md5($key) . '", - `' . $realDbDetails['user_key_row'] . '`=""'; // set it later, dont let people use it without the user actually logining in :-P + SET `' . $realDbDetails['authority_row'] . '`="' . $host . '", + `' . $realDbDetails['site_row'] . '`="' . $_SERVER['REMOTE_ADDR'] . '", + `' . $realDbDetails['site_key_row'] . '`="' . $key . '", + `' . $realDbDetails['site_key_hash_row'] . '`="' . md5($key) . '", + `' . $realDbDetails['site_key_time_row'] . '`="' . time() . '", + `' . $realDbDetails['user_key_row'] . '`=""'; // set it later, dont let people use it without the user actually logining in :-P + mysql_query( $q, $db ); + + echo mysql_error(); + return $key; } Modified: tools/http-auth-server/trunk/loginform.php =================================================================== --- tools/http-auth-server/trunk/loginform.php 2008-08-15 10:16:16 UTC (rev 8516) +++ tools/http-auth-server/trunk/loginform.php 2008-08-15 14:37:31 UTC (rev 8517) @@ -85,7 +85,7 @@ $q = mysql_query(' UPDATE `' . $realDbDetails['table'] . '` - SET `' . $realDbDetails['hash_row'] . '`=\'' . . '\' + SET `' . $realDbDetails['hash_row'] . '`=\'' . 'TODO' . '\' '); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |