harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #272 from beardy-unixer/master

Browse Source 
Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.
This commit is contained in:
friendica 2014-01-15 15:42:07 -08:00
commit f27d59a094
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/auth.php
View File

@ -34,6 +34,7 @@ function nuke_session() {
*/ */
function account_verify_password($email,$pass) { function account_verify_password($email,$pass) {
$r = q("select * from account where account_email = '%s'", $r = q("select * from account where account_email = '%s'",
dbesc($email) dbesc($email)
); );
@ -46,7 +47,13 @@ function account_verify_password($email,$pass) {
return $record; return $record;
} }
} }
logger('password failed for ' . $email); $error = 'password failed for ' . $email;
logger($error);
// Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention
$authlog = get_config('system', 'authlog');
if ($authlog)
@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
return null; return null;
} }
@ -186,7 +193,13 @@ else {
} }
if((! $record) || (! count($record))) { if((! $record) || (! count($record))) {
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); $error = 'authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR'];
logger($error);
// Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention
$authlog = get_config('system', 'authlog');
if ($authlog)
@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
notice( t('Login failed.') . EOL ); notice( t('Login failed.') . EOL );
goaway(z_root()); goaway(z_root());
} }

2
mod/dirsearch.php
View File

@ -233,7 +233,7 @@ function dirsearch_content(&$a) {
function list_public_sites() { function list_public_sites() {
$r = q("select * from site where site_access != 0 order by rand()"); $r = q("select * from site where site_access != 0 and site_register !=0 order by rand()");
$ret = array('success' => false); $ret = array('success' => false);
if($r) { if($r) {