@@ -5,29 +5,29 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Variable { |
| 7 | 7 | |
| 8 | - protected $ip; |
|
| 9 | - protected $input; |
|
| 10 | - protected $dir; |
|
| 11 | - protected $path; |
|
| 12 | - protected $attemps; |
|
| 13 | - protected $permission_code; |
|
| 8 | + protected $ip; |
|
| 9 | + protected $input; |
|
| 10 | + protected $dir; |
|
| 11 | + protected $path; |
|
| 12 | + protected $attemps; |
|
| 13 | + protected $permission_code; |
|
| 14 | 14 | |
| 15 | - /** |
|
| 16 | - * Initializing variable. |
|
| 17 | - * |
|
| 18 | - * @return void |
|
| 19 | - */ |
|
| 20 | - protected function initVar(){ |
|
| 21 | - $this->ip = Request::ip(); |
|
| 22 | - $this->input = Request::input(config('irfa.lockout.input_name')); |
|
| 23 | - $this->dir = config('irfa.lockout.lockout_file_path'); |
|
| 24 | - $this->attemps = config('irfa.lockout.login_attemps'); |
|
| 25 | - $this->path = $this->dir.md5($this->input); |
|
| 26 | - } |
|
| 15 | + /** |
|
| 16 | + * Initializing variable. |
|
| 17 | + * |
|
| 18 | + * @return void |
|
| 19 | + */ |
|
| 20 | + protected function initVar(){ |
|
| 21 | + $this->ip = Request::ip(); |
|
| 22 | + $this->input = Request::input(config('irfa.lockout.input_name')); |
|
| 23 | + $this->dir = config('irfa.lockout.lockout_file_path'); |
|
| 24 | + $this->attemps = config('irfa.lockout.login_attemps'); |
|
| 25 | + $this->path = $this->dir.md5($this->input); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - protected function setPath($username){ |
|
| 29 | - $this->path = $this->dir.md5($username); |
|
| 30 | - $this->input = $username; |
|
| 31 | - } |
|
| 28 | + protected function setPath($username){ |
|
| 29 | + $this->path = $this->dir.md5($username); |
|
| 30 | + $this->input = $username; |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - } |
|
| 34 | 33 | \ No newline at end of file |
| 34 | + } |
|
| 35 | 35 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | * |
| 18 | 18 | * @return void |
| 19 | 19 | */ |
| 20 | - protected function initVar(){ |
|
| 20 | + protected function initVar() { |
|
| 21 | 21 | $this->ip = Request::ip(); |
| 22 | 22 | $this->input = Request::input(config('irfa.lockout.input_name')); |
| 23 | 23 | $this->dir = config('irfa.lockout.lockout_file_path'); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $this->path = $this->dir.md5($this->input); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - protected function setPath($username){ |
|
| 28 | + protected function setPath($username) { |
|
| 29 | 29 | $this->path = $this->dir.md5($username); |
| 30 | 30 | $this->input = $username; |
| 31 | 31 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | public function handle() |
| 45 | 45 | { |
| 46 | 46 | $domain = strtolower(config("app.name")).".com"; |
| 47 | - $this->line('<fg=default>--------------------------------------------'); |
|
| 47 | + $this->line('<fg=default>--------------------------------------------'); |
|
| 48 | 48 | $this->testWrite($domain); |
| 49 | 49 | sleep(1); |
| 50 | 50 | $this->testManualLock($domain); |
@@ -56,45 +56,45 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | private function testWrite($domain){ |
| 58 | 58 | $test = new Testing(); |
| 59 | - if( $test->testWriteEventFailedLogin('lock-test@'.$domain) AND $test->testWritable('lock-test@'.$domain)){ |
|
| 60 | - $this->line('<fg=default>Auto Lock : <fg=green>OK'); |
|
| 59 | + if( $test->testWriteEventFailedLogin('lock-test@'.$domain) AND $test->testWritable('lock-test@'.$domain)){ |
|
| 60 | + $this->line('<fg=default>Auto Lock : <fg=green>OK'); |
|
| 61 | 61 | } elseif(!$test->testWritable('lock-test@'.$domain)){ |
| 62 | 62 | $this->success += 1; |
| 63 | 63 | $this->line('<fg=default>Auto Lock : <fg=yellow>Warning (Permission denied)'); |
| 64 | 64 | } else{ |
| 65 | 65 | $this->error += 1; |
| 66 | - $this->line('<fg=default>Auto Lock : <fg=red>Failed'); |
|
| 66 | + $this->line('<fg=default>Auto Lock : <fg=red>Failed'); |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | private function testManualLock($domain){ |
| 70 | 70 | $test = new Testing(); |
| 71 | - if( $test->testManualLocking('lock-test@'.$domain)){ |
|
| 71 | + if( $test->testManualLocking('lock-test@'.$domain)){ |
|
| 72 | 72 | $this->success += 1; |
| 73 | - $this->line('<fg=default>Manual Lock : <fg=green>OK'); |
|
| 73 | + $this->line('<fg=default>Manual Lock : <fg=green>OK'); |
|
| 74 | 74 | } else{ |
| 75 | 75 | $this->error += 1; |
| 76 | - $this->line('<fg=default>Manual Lock : <fg=red>Failed'); |
|
| 76 | + $this->line('<fg=default>Manual Lock : <fg=red>Failed'); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | private function testUnlock($domain){ |
| 80 | 80 | $test = new Testing(); |
| 81 | - if( $test->testUnlocking('lock-test@'.$domain)){ |
|
| 82 | - $this->success += 1; |
|
| 83 | - $this->line('<fg=default>Unlock Account : <fg=green>OK'); |
|
| 81 | + if( $test->testUnlocking('lock-test@'.$domain)){ |
|
| 82 | + $this->success += 1; |
|
| 83 | + $this->line('<fg=default>Unlock Account : <fg=green>OK'); |
|
| 84 | 84 | } else{ |
| 85 | - $this->error += 1; |
|
| 86 | - $this->line('<fg=default>Unlock Account : <fg=red>Failed'); |
|
| 85 | + $this->error += 1; |
|
| 86 | + $this->line('<fg=default>Unlock Account : <fg=red>Failed'); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | private function testLocked($domain){ |
| 91 | 91 | $test = new Testing(); |
| 92 | - if( $test->testLockLogin('lock-test@'.$domain)){ |
|
| 93 | - $this->success += 1; |
|
| 94 | - $this->line('<fg=default>Try Login with locked account : <fg=green>Account is Locked'); |
|
| 92 | + if( $test->testLockLogin('lock-test@'.$domain)){ |
|
| 93 | + $this->success += 1; |
|
| 94 | + $this->line('<fg=default>Try Login with locked account : <fg=green>Account is Locked'); |
|
| 95 | 95 | } else{ |
| 96 | - $this->error += 1; |
|
| 97 | - $this->line('<fg=default>Try Login with locked account : <fg=red>Account logged in'); |
|
| 96 | + $this->error += 1; |
|
| 97 | + $this->line('<fg=default>Try Login with locked account : <fg=red>Account logged in'); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | class TestingCommands extends Command |
| 12 | 12 | { |
| 13 | - private $error=0; |
|
| 14 | - private $success=0; |
|
| 13 | + private $error = 0; |
|
| 14 | + private $success = 0; |
|
| 15 | 15 | /** |
| 16 | 16 | * The name and signature of the console command. |
| 17 | 17 | * |
@@ -54,45 +54,45 @@ discard block |
||
| 54 | 54 | $this->testUnlock($domain); |
| 55 | 55 | |
| 56 | 56 | } |
| 57 | - private function testWrite($domain){ |
|
| 57 | + private function testWrite($domain) { |
|
| 58 | 58 | $test = new Testing(); |
| 59 | - if( $test->testWriteEventFailedLogin('lock-test@'.$domain) AND $test->testWritable('lock-test@'.$domain)){ |
|
| 59 | + if ($test->testWriteEventFailedLogin('lock-test@'.$domain) AND $test->testWritable('lock-test@'.$domain)) { |
|
| 60 | 60 | $this->line('<fg=default>Auto Lock : <fg=green>OK'); |
| 61 | - } elseif(!$test->testWritable('lock-test@'.$domain)){ |
|
| 61 | + } elseif (!$test->testWritable('lock-test@'.$domain)) { |
|
| 62 | 62 | $this->success += 1; |
| 63 | 63 | $this->line('<fg=default>Auto Lock : <fg=yellow>Warning (Permission denied)'); |
| 64 | - } else{ |
|
| 64 | + } else { |
|
| 65 | 65 | $this->error += 1; |
| 66 | 66 | $this->line('<fg=default>Auto Lock : <fg=red>Failed'); |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | - private function testManualLock($domain){ |
|
| 69 | + private function testManualLock($domain) { |
|
| 70 | 70 | $test = new Testing(); |
| 71 | - if( $test->testManualLocking('lock-test@'.$domain)){ |
|
| 71 | + if ($test->testManualLocking('lock-test@'.$domain)) { |
|
| 72 | 72 | $this->success += 1; |
| 73 | 73 | $this->line('<fg=default>Manual Lock : <fg=green>OK'); |
| 74 | - } else{ |
|
| 74 | + } else { |
|
| 75 | 75 | $this->error += 1; |
| 76 | 76 | $this->line('<fg=default>Manual Lock : <fg=red>Failed'); |
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | - private function testUnlock($domain){ |
|
| 79 | + private function testUnlock($domain) { |
|
| 80 | 80 | $test = new Testing(); |
| 81 | - if( $test->testUnlocking('lock-test@'.$domain)){ |
|
| 81 | + if ($test->testUnlocking('lock-test@'.$domain)) { |
|
| 82 | 82 | $this->success += 1; |
| 83 | 83 | $this->line('<fg=default>Unlock Account : <fg=green>OK'); |
| 84 | - } else{ |
|
| 84 | + } else { |
|
| 85 | 85 | $this->error += 1; |
| 86 | 86 | $this->line('<fg=default>Unlock Account : <fg=red>Failed'); |
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - private function testLocked($domain){ |
|
| 90 | + private function testLocked($domain) { |
|
| 91 | 91 | $test = new Testing(); |
| 92 | - if( $test->testLockLogin('lock-test@'.$domain)){ |
|
| 92 | + if ($test->testLockLogin('lock-test@'.$domain)) { |
|
| 93 | 93 | $this->success += 1; |
| 94 | 94 | $this->line('<fg=default>Try Login with locked account : <fg=green>Account is Locked'); |
| 95 | - } else{ |
|
| 95 | + } else { |
|
| 96 | 96 | $this->error += 1; |
| 97 | 97 | $this->line('<fg=default>Try Login with locked account : <fg=red>Account logged in'); |
| 98 | 98 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | protected function eventFailedLogin($username=null){ |
| 30 | 30 | |
| 31 | 31 | if($username != null){ |
| 32 | - $this->setPath($username); |
|
| 32 | + $this->setPath($username); |
|
| 33 | 33 | } |
| 34 | 34 | if(!File::exists($this->dir)){ |
| 35 | 35 | File::makeDirectory($this->dir, 0755, true); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $content = ['username' => $this->input,'attemps' => $login_fail,'ip' => isset($ip_list)?$ip_list:[$this->ip],'last_attemps' => date("Y-m-d H:i:s",time())]; |
| 56 | 56 | File::put($this->path,json_encode($content)); |
| 57 | 57 | if(File::exists($this->path)){ |
| 58 | - chmod($this->path,0755); |
|
| 58 | + chmod($this->path,0755); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | } |
@@ -84,31 +84,31 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - /** |
|
| 88 | - * Check if user is locked |
|
| 89 | - * |
|
| 90 | - * @param string $username |
|
| 91 | - * @return boolean |
|
| 92 | - */ |
|
| 87 | + /** |
|
| 88 | + * Check if user is locked |
|
| 89 | + * |
|
| 90 | + * @param string $username |
|
| 91 | + * @return boolean |
|
| 92 | + */ |
|
| 93 | 93 | protected function is_locked($username){ |
| 94 | 94 | $this->setPath($username); |
| 95 | 95 | if(File::exists($this->path)) |
| 96 | 96 | { |
| 97 | - $get = json_decode(File::get($this->path)); |
|
| 98 | - if($get->attemps > $this->attemps || $get->attemps == "lock"){ |
|
| 99 | - return true; |
|
| 100 | - } else{ |
|
| 101 | - return false; |
|
| 102 | - } |
|
| 97 | + $get = json_decode(File::get($this->path)); |
|
| 98 | + if($get->attemps > $this->attemps || $get->attemps == "lock"){ |
|
| 99 | + return true; |
|
| 100 | + } else{ |
|
| 101 | + return false; |
|
| 102 | + } |
|
| 103 | 103 | } else{ |
| 104 | 104 | return false; |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
| 109 | - * Show message if failed x attemps |
|
| 110 | - * |
|
| 111 | - * @return string |
|
| 109 | + * Show message if failed x attemps |
|
| 110 | + * |
|
| 111 | + * @return string |
|
| 112 | 112 | */ |
| 113 | 113 | protected function showMessage(){ |
| 114 | 114 | if(Session::has(config('irfa.lockout.message_name'))){ |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | protected function lockLogin($username = null){ |
| 127 | 127 | |
| 128 | 128 | if(php_sapi_name() == "cli" AND $username != null){ |
| 129 | - $this->setPath($username); |
|
| 129 | + $this->setPath($username); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | if(File::exists($this->path)) |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - /** |
|
| 157 | - * Check ip locked |
|
| 158 | - * |
|
| 159 | - * @return boolean |
|
| 160 | - */ |
|
| 156 | + /** |
|
| 157 | + * Check ip locked |
|
| 158 | + * |
|
| 159 | + * @return boolean |
|
| 160 | + */ |
|
| 161 | 161 | private function checkIp($ip_list,$ip){ |
| 162 | 162 | if(collect($ip_list)->contains($ip)){ |
| 163 | 163 | return true; |
@@ -167,11 +167,11 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - /** |
|
| 171 | - * Clear all locked account |
|
| 172 | - * |
|
| 173 | - * @return boolean |
|
| 174 | - */ |
|
| 170 | + /** |
|
| 171 | + * Clear all locked account |
|
| 172 | + * |
|
| 173 | + * @return boolean |
|
| 174 | + */ |
|
| 175 | 175 | public function clear_all(){ |
| 176 | 176 | $file = new Filesystem(); |
| 177 | 177 | if($file->cleanDirectory($this->path)){ |
@@ -181,15 +181,15 @@ discard block |
||
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - /** |
|
| 185 | - * Unlocking account manually. |
|
| 186 | - * |
|
| 187 | - * @param string $username |
|
| 188 | - * @return mixed |
|
| 189 | - */ |
|
| 184 | + /** |
|
| 185 | + * Unlocking account manually. |
|
| 186 | + * |
|
| 187 | + * @param string $username |
|
| 188 | + * @return mixed |
|
| 189 | + */ |
|
| 190 | 190 | public function unlock_account($username){ |
| 191 | 191 | $this->setPath($username); |
| 192 | - if(File::exists($this->path)){ |
|
| 192 | + if(File::exists($this->path)){ |
|
| 193 | 193 | $readf = File::get($this->path); |
| 194 | 194 | File::delete($this->path); |
| 195 | 195 | if(php_sapi_name() == "cli"){ |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | return false; |
| 208 | 208 | } |
| 209 | 209 | } |
| 210 | - } |
|
| 210 | + } |
|
| 211 | 211 | |
| 212 | 212 | /** |
| 213 | 213 | * For Testing |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | */ |
| 217 | 217 | public function test_unlock_account($username){ |
| 218 | 218 | $this->setPath($username); |
| 219 | - if(File::exists($this->path)){ |
|
| 219 | + if(File::exists($this->path)){ |
|
| 220 | 220 | $readf = File::get($this->path); |
| 221 | 221 | File::delete($this->path); |
| 222 | 222 | if(php_sapi_name() == "cli"){ |
@@ -227,12 +227,12 @@ discard block |
||
| 227 | 227 | } |
| 228 | 228 | } else{ |
| 229 | 229 | if(php_sapi_name() == "cli"){ |
| 230 | - return false; |
|
| 230 | + return false; |
|
| 231 | 231 | } else{ |
| 232 | 232 | return false; |
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | - } |
|
| 235 | + } |
|
| 236 | 236 | |
| 237 | 237 | /** |
| 238 | 238 | * Check account with details |
@@ -241,59 +241,59 @@ discard block |
||
| 241 | 241 | * @return boolean |
| 242 | 242 | */ |
| 243 | 243 | public function check_account($username){ |
| 244 | - $this->setPath($username); |
|
| 245 | - if(File::exists($this->path)){ |
|
| 246 | - $readf = File::get($this->path); |
|
| 247 | - if(php_sapi_name() == "cli"){ |
|
| 244 | + $this->setPath($username); |
|
| 245 | + if(File::exists($this->path)){ |
|
| 246 | + $readf = File::get($this->path); |
|
| 247 | + if(php_sapi_name() == "cli"){ |
|
| 248 | 248 | |
| 249 | - return $readf; |
|
| 249 | + return $readf; |
|
| 250 | 250 | |
| 251 | - } else{ |
|
| 252 | - return $readf; |
|
| 253 | - } |
|
| 254 | - } else{ |
|
| 255 | - if(php_sapi_name() == "cli"){ |
|
| 256 | - echo Lang::get('lockoutMessage.user_lock_404')."\n"; |
|
| 257 | - exit(); |
|
| 258 | - } else{ |
|
| 259 | - return false; |
|
| 260 | - } |
|
| 261 | - } |
|
| 251 | + } else{ |
|
| 252 | + return $readf; |
|
| 253 | + } |
|
| 254 | + } else{ |
|
| 255 | + if(php_sapi_name() == "cli"){ |
|
| 256 | + echo Lang::get('lockoutMessage.user_lock_404')."\n"; |
|
| 257 | + exit(); |
|
| 258 | + } else{ |
|
| 259 | + return false; |
|
| 260 | + } |
|
| 261 | + } |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | - /** |
|
| 265 | - * Locking account manually |
|
| 266 | - * |
|
| 267 | - * @param string $username |
|
| 268 | - * @return boolean |
|
| 269 | - */ |
|
| 264 | + /** |
|
| 265 | + * Locking account manually |
|
| 266 | + * |
|
| 267 | + * @param string $username |
|
| 268 | + * @return boolean |
|
| 269 | + */ |
|
| 270 | 270 | public function lock_account($username){ |
| 271 | 271 | $sapi = php_sapi_name() == "cli"?"lock-via-cli":"lock-via-web"; |
| 272 | 272 | $this->setPath($username); |
| 273 | 273 | try{ |
| 274 | - if(!File::exists($this->dir)){ |
|
| 275 | - File::makeDirectory($this->dir, 0755, true); |
|
| 276 | - } |
|
| 277 | - $login_fail = "lock"; |
|
| 274 | + if(!File::exists($this->dir)){ |
|
| 275 | + File::makeDirectory($this->dir, 0755, true); |
|
| 276 | + } |
|
| 277 | + $login_fail = "lock"; |
|
| 278 | 278 | |
| 279 | - $content = ['username' => $this->input,'attemps' => $login_fail,'ip' => isset($ip_list)?$ip_list:[$sapi],'last_attemps' => date("Y-m-d H:i:s",time())]; |
|
| 280 | - File::put($this->path,json_encode($content)); |
|
| 281 | - if(File::exists($this->path)){ |
|
| 279 | + $content = ['username' => $this->input,'attemps' => $login_fail,'ip' => isset($ip_list)?$ip_list:[$sapi],'last_attemps' => date("Y-m-d H:i:s",time())]; |
|
| 280 | + File::put($this->path,json_encode($content)); |
|
| 281 | + if(File::exists($this->path)){ |
|
| 282 | 282 | chmod($this->path,0755); |
| 283 | - } |
|
| 284 | - if(php_sapi_name() == "cli"){ |
|
| 283 | + } |
|
| 284 | + if(php_sapi_name() == "cli"){ |
|
| 285 | 285 | return Lang::get('lockoutMessage.user_lock_success')."\n"; |
| 286 | 286 | |
| 287 | - } else{ |
|
| 288 | - return true; |
|
| 289 | - } |
|
| 290 | - } catch(Exception $e){ |
|
| 291 | - if(php_sapi_name() == "cli"){ |
|
| 287 | + } else{ |
|
| 288 | + return true; |
|
| 289 | + } |
|
| 290 | + } catch(Exception $e){ |
|
| 291 | + if(php_sapi_name() == "cli"){ |
|
| 292 | 292 | return "error"; |
| 293 | 293 | |
| 294 | - } else{ |
|
| 294 | + } else{ |
|
| 295 | 295 | return false; |
| 296 | - } |
|
| 297 | - } |
|
| 296 | + } |
|
| 297 | + } |
|
| 298 | 298 | } |
| 299 | 299 | } |
| 300 | 300 | \ No newline at end of file |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | namespace Irfa\Lockout\Func; |
| 3 | 3 | |
| 4 | 4 | use Log; |
| 5 | -use Illuminate\Support\Facades\Request,File,Lang,Session; |
|
| 5 | +use Illuminate\Support\Facades\Request, File, Lang, Session; |
|
| 6 | 6 | use Illuminate\Filesystem\Filesystem; |
| 7 | 7 | use Symfony\Component\Console\Helper\Table; |
| 8 | 8 | use Irfa\Lockout\Initializing\Variable; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * |
| 17 | 17 | * @return void |
| 18 | 18 | */ |
| 19 | - public function __construct(){ |
|
| 19 | + public function __construct() { |
|
| 20 | 20 | $this->initVar(); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -26,36 +26,36 @@ discard block |
||
| 26 | 26 | * @param string $username |
| 27 | 27 | * @return void |
| 28 | 28 | */ |
| 29 | - protected function eventFailedLogin($username=null){ |
|
| 29 | + protected function eventFailedLogin($username = null) { |
|
| 30 | 30 | |
| 31 | - if($username != null){ |
|
| 31 | + if ($username != null) { |
|
| 32 | 32 | $this->setPath($username); |
| 33 | 33 | } |
| 34 | - if(!File::exists($this->dir)){ |
|
| 34 | + if (!File::exists($this->dir)) { |
|
| 35 | 35 | File::makeDirectory($this->dir, 0755, true); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - if(!File::exists($this->path)) |
|
| 38 | + if (!File::exists($this->path)) |
|
| 39 | 39 | { |
| 40 | 40 | $login_fail = 1; |
| 41 | - } else{ |
|
| 41 | + } else { |
|
| 42 | 42 | |
| 43 | 43 | $get = json_decode(File::get($this->path)); |
| 44 | 44 | $ip_list = $get->ip; |
| 45 | - if(!$this->checkIp($ip_list,$this->ip)){ |
|
| 46 | - array_push($ip_list,$this->ip); |
|
| 45 | + if (!$this->checkIp($ip_list, $this->ip)) { |
|
| 46 | + array_push($ip_list, $this->ip); |
|
| 47 | 47 | } |
| 48 | - if($get->attemps == "lock"){ |
|
| 48 | + if ($get->attemps == "lock") { |
|
| 49 | 49 | $login_fail = "lock"; |
| 50 | - } else{ |
|
| 50 | + } else { |
|
| 51 | 51 | $login_fail = $get->attemps+1; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - $content = ['username' => $this->input,'attemps' => $login_fail,'ip' => isset($ip_list)?$ip_list:[$this->ip],'last_attemps' => date("Y-m-d H:i:s",time())]; |
|
| 56 | - File::put($this->path,json_encode($content)); |
|
| 57 | - if(File::exists($this->path)){ |
|
| 58 | - chmod($this->path,0755); |
|
| 55 | + $content = ['username' => $this->input, 'attemps' => $login_fail, 'ip' => isset($ip_list) ? $ip_list : [$this->ip], 'last_attemps' => date("Y-m-d H:i:s", time())]; |
|
| 56 | + File::put($this->path, json_encode($content)); |
|
| 57 | + if (File::exists($this->path)) { |
|
| 58 | + chmod($this->path, 0755); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param string $rootNamespace |
| 67 | 67 | * @return void |
| 68 | 68 | */ |
| 69 | - protected function eventCleanLockoutAccount(){ |
|
| 69 | + protected function eventCleanLockoutAccount() { |
|
| 70 | 70 | $this->unlock_account($this->input); |
| 71 | 71 | |
| 72 | 72 | } |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | * @param string $middleware |
| 79 | 79 | * @return void |
| 80 | 80 | */ |
| 81 | - protected function logging($middleware="WEB"){ |
|
| 82 | - if(config('irfa.lockout.logging')){ |
|
| 81 | + protected function logging($middleware = "WEB") { |
|
| 82 | + if (config('irfa.lockout.logging')) { |
|
| 83 | 83 | Log::notice($middleware." | Login attemps fail | "."username : ".Request::input(config('irfa.lockout.input_name'))." | ipAddress : ".Request::ip()." | userAgent : ".$_SERVER['HTTP_USER_AGENT'].PHP_EOL); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -90,17 +90,17 @@ discard block |
||
| 90 | 90 | * @param string $username |
| 91 | 91 | * @return boolean |
| 92 | 92 | */ |
| 93 | - protected function is_locked($username){ |
|
| 93 | + protected function is_locked($username) { |
|
| 94 | 94 | $this->setPath($username); |
| 95 | - if(File::exists($this->path)) |
|
| 95 | + if (File::exists($this->path)) |
|
| 96 | 96 | { |
| 97 | 97 | $get = json_decode(File::get($this->path)); |
| 98 | - if($get->attemps > $this->attemps || $get->attemps == "lock"){ |
|
| 98 | + if ($get->attemps > $this->attemps || $get->attemps == "lock") { |
|
| 99 | 99 | return true; |
| 100 | - } else{ |
|
| 100 | + } else { |
|
| 101 | 101 | return false; |
| 102 | 102 | } |
| 103 | - } else{ |
|
| 103 | + } else { |
|
| 104 | 104 | return false; |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return string |
| 112 | 112 | */ |
| 113 | - protected function showMessage(){ |
|
| 114 | - if(Session::has(config('irfa.lockout.message_name'))){ |
|
| 113 | + protected function showMessage() { |
|
| 114 | + if (Session::has(config('irfa.lockout.message_name'))) { |
|
| 115 | 115 | return Session::get(config('irfa.lockout.message_name')); |
| 116 | 116 | } |
| 117 | 117 | |
@@ -123,32 +123,32 @@ discard block |
||
| 123 | 123 | * |
| 124 | 124 | * @return boolean |
| 125 | 125 | */ |
| 126 | - protected function lockLogin($username = null){ |
|
| 126 | + protected function lockLogin($username = null) { |
|
| 127 | 127 | |
| 128 | - if(php_sapi_name() == "cli" AND $username != null){ |
|
| 128 | + if (php_sapi_name() == "cli" AND $username != null) { |
|
| 129 | 129 | $this->setPath($username); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - if(File::exists($this->path)) |
|
| 132 | + if (File::exists($this->path)) |
|
| 133 | 133 | { |
| 134 | 134 | $get = json_decode(File::get($this->path)); |
| 135 | - if($get->attemps == "lock"){ |
|
| 135 | + if ($get->attemps == "lock") { |
|
| 136 | 136 | return true; |
| 137 | 137 | } |
| 138 | - if($get->attemps > $this->attemps){ |
|
| 139 | - if($matchip){ |
|
| 140 | - if($this->checkIp($ip_list,$this->ip)){ |
|
| 138 | + if ($get->attemps > $this->attemps) { |
|
| 139 | + if ($matchip) { |
|
| 140 | + if ($this->checkIp($ip_list, $this->ip)) { |
|
| 141 | 141 | return true; |
| 142 | - } else{ |
|
| 142 | + } else { |
|
| 143 | 143 | return false; |
| 144 | 144 | } |
| 145 | - } else{ |
|
| 145 | + } else { |
|
| 146 | 146 | return true; |
| 147 | 147 | } |
| 148 | - } else{ |
|
| 148 | + } else { |
|
| 149 | 149 | return false; |
| 150 | 150 | } |
| 151 | - } else{ |
|
| 151 | + } else { |
|
| 152 | 152 | return false; |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -158,10 +158,10 @@ discard block |
||
| 158 | 158 | * |
| 159 | 159 | * @return boolean |
| 160 | 160 | */ |
| 161 | - private function checkIp($ip_list,$ip){ |
|
| 162 | - if(collect($ip_list)->contains($ip)){ |
|
| 161 | + private function checkIp($ip_list, $ip) { |
|
| 162 | + if (collect($ip_list)->contains($ip)) { |
|
| 163 | 163 | return true; |
| 164 | - } else{ |
|
| 164 | + } else { |
|
| 165 | 165 | return false; |
| 166 | 166 | } |
| 167 | 167 | |
@@ -172,11 +172,11 @@ discard block |
||
| 172 | 172 | * |
| 173 | 173 | * @return boolean |
| 174 | 174 | */ |
| 175 | - public function clear_all(){ |
|
| 175 | + public function clear_all() { |
|
| 176 | 176 | $file = new Filesystem(); |
| 177 | - if($file->cleanDirectory($this->path)){ |
|
| 177 | + if ($file->cleanDirectory($this->path)) { |
|
| 178 | 178 | return true; |
| 179 | - } else{ |
|
| 179 | + } else { |
|
| 180 | 180 | return false; |
| 181 | 181 | } |
| 182 | 182 | } |
@@ -187,23 +187,23 @@ discard block |
||
| 187 | 187 | * @param string $username |
| 188 | 188 | * @return mixed |
| 189 | 189 | */ |
| 190 | - public function unlock_account($username){ |
|
| 190 | + public function unlock_account($username) { |
|
| 191 | 191 | $this->setPath($username); |
| 192 | - if(File::exists($this->path)){ |
|
| 192 | + if (File::exists($this->path)) { |
|
| 193 | 193 | $readf = File::get($this->path); |
| 194 | 194 | File::delete($this->path); |
| 195 | - if(php_sapi_name() == "cli"){ |
|
| 195 | + if (php_sapi_name() == "cli") { |
|
| 196 | 196 | echo Lang::get('lockoutMessage.user_unlock_success')."\n"; |
| 197 | 197 | return $readf; |
| 198 | 198 | |
| 199 | - } else{ |
|
| 199 | + } else { |
|
| 200 | 200 | return true; |
| 201 | 201 | } |
| 202 | - } else{ |
|
| 203 | - if(php_sapi_name() == "cli"){ |
|
| 202 | + } else { |
|
| 203 | + if (php_sapi_name() == "cli") { |
|
| 204 | 204 | echo Lang::get('lockoutMessage.user_lock_404')."\n"; |
| 205 | 205 | return false; |
| 206 | - } else{ |
|
| 206 | + } else { |
|
| 207 | 207 | return false; |
| 208 | 208 | } |
| 209 | 209 | } |
@@ -214,21 +214,21 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @return boolean or json(if cli) |
| 216 | 216 | */ |
| 217 | - public function test_unlock_account($username){ |
|
| 217 | + public function test_unlock_account($username) { |
|
| 218 | 218 | $this->setPath($username); |
| 219 | - if(File::exists($this->path)){ |
|
| 219 | + if (File::exists($this->path)) { |
|
| 220 | 220 | $readf = File::get($this->path); |
| 221 | 221 | File::delete($this->path); |
| 222 | - if(php_sapi_name() == "cli"){ |
|
| 222 | + if (php_sapi_name() == "cli") { |
|
| 223 | 223 | return true; |
| 224 | 224 | |
| 225 | - } else{ |
|
| 225 | + } else { |
|
| 226 | 226 | return true; |
| 227 | 227 | } |
| 228 | - } else{ |
|
| 229 | - if(php_sapi_name() == "cli"){ |
|
| 228 | + } else { |
|
| 229 | + if (php_sapi_name() == "cli") { |
|
| 230 | 230 | return false; |
| 231 | - } else{ |
|
| 231 | + } else { |
|
| 232 | 232 | return false; |
| 233 | 233 | } |
| 234 | 234 | } |
@@ -240,22 +240,22 @@ discard block |
||
| 240 | 240 | * @param string $username |
| 241 | 241 | * @return boolean |
| 242 | 242 | */ |
| 243 | - public function check_account($username){ |
|
| 243 | + public function check_account($username) { |
|
| 244 | 244 | $this->setPath($username); |
| 245 | - if(File::exists($this->path)){ |
|
| 245 | + if (File::exists($this->path)) { |
|
| 246 | 246 | $readf = File::get($this->path); |
| 247 | - if(php_sapi_name() == "cli"){ |
|
| 247 | + if (php_sapi_name() == "cli") { |
|
| 248 | 248 | |
| 249 | 249 | return $readf; |
| 250 | 250 | |
| 251 | - } else{ |
|
| 251 | + } else { |
|
| 252 | 252 | return $readf; |
| 253 | 253 | } |
| 254 | - } else{ |
|
| 255 | - if(php_sapi_name() == "cli"){ |
|
| 254 | + } else { |
|
| 255 | + if (php_sapi_name() == "cli") { |
|
| 256 | 256 | echo Lang::get('lockoutMessage.user_lock_404')."\n"; |
| 257 | 257 | exit(); |
| 258 | - } else{ |
|
| 258 | + } else { |
|
| 259 | 259 | return false; |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -267,31 +267,31 @@ discard block |
||
| 267 | 267 | * @param string $username |
| 268 | 268 | * @return boolean |
| 269 | 269 | */ |
| 270 | - public function lock_account($username){ |
|
| 271 | - $sapi = php_sapi_name() == "cli"?"lock-via-cli":"lock-via-web"; |
|
| 270 | + public function lock_account($username) { |
|
| 271 | + $sapi = php_sapi_name() == "cli" ? "lock-via-cli" : "lock-via-web"; |
|
| 272 | 272 | $this->setPath($username); |
| 273 | - try{ |
|
| 274 | - if(!File::exists($this->dir)){ |
|
| 273 | + try { |
|
| 274 | + if (!File::exists($this->dir)) { |
|
| 275 | 275 | File::makeDirectory($this->dir, 0755, true); |
| 276 | 276 | } |
| 277 | 277 | $login_fail = "lock"; |
| 278 | 278 | |
| 279 | - $content = ['username' => $this->input,'attemps' => $login_fail,'ip' => isset($ip_list)?$ip_list:[$sapi],'last_attemps' => date("Y-m-d H:i:s",time())]; |
|
| 280 | - File::put($this->path,json_encode($content)); |
|
| 281 | - if(File::exists($this->path)){ |
|
| 282 | - chmod($this->path,0755); |
|
| 279 | + $content = ['username' => $this->input, 'attemps' => $login_fail, 'ip' => isset($ip_list) ? $ip_list : [$sapi], 'last_attemps' => date("Y-m-d H:i:s", time())]; |
|
| 280 | + File::put($this->path, json_encode($content)); |
|
| 281 | + if (File::exists($this->path)) { |
|
| 282 | + chmod($this->path, 0755); |
|
| 283 | 283 | } |
| 284 | - if(php_sapi_name() == "cli"){ |
|
| 284 | + if (php_sapi_name() == "cli") { |
|
| 285 | 285 | return Lang::get('lockoutMessage.user_lock_success')."\n"; |
| 286 | 286 | |
| 287 | - } else{ |
|
| 287 | + } else { |
|
| 288 | 288 | return true; |
| 289 | 289 | } |
| 290 | - } catch(Exception $e){ |
|
| 291 | - if(php_sapi_name() == "cli"){ |
|
| 290 | + } catch (Exception $e) { |
|
| 291 | + if (php_sapi_name() == "cli") { |
|
| 292 | 292 | return "error"; |
| 293 | 293 | |
| 294 | - } else{ |
|
| 294 | + } else { |
|
| 295 | 295 | return false; |
| 296 | 296 | } |
| 297 | 297 | } |
@@ -6,30 +6,30 @@ |
||
| 6 | 6 | use File; |
| 7 | 7 | |
| 8 | 8 | class Testing extends Core { |
| 9 | - public function testWriteEventFailedLogin($username){ |
|
| 9 | + public function testWriteEventFailedLogin($username){ |
|
| 10 | 10 | |
| 11 | - $this->eventFailedLogin($username); |
|
| 11 | + $this->eventFailedLogin($username); |
|
| 12 | 12 | |
| 13 | - $input = $username; |
|
| 14 | - $dir = config('irfa.lockout.lockout_file_path'); |
|
| 15 | - $path = $dir.md5($input); |
|
| 13 | + $input = $username; |
|
| 14 | + $dir = config('irfa.lockout.lockout_file_path'); |
|
| 15 | + $path = $dir.md5($input); |
|
| 16 | 16 | |
| 17 | - if(File::exists($path)) |
|
| 17 | + if(File::exists($path)) |
|
| 18 | 18 | { |
| 19 | - return true; |
|
| 19 | + return true; |
|
| 20 | 20 | } |
| 21 | - return false; |
|
| 21 | + return false; |
|
| 22 | 22 | } |
| 23 | 23 | public function testWritable($username){ |
| 24 | - $input = $username; |
|
| 25 | - $dir = config('irfa.lockout.lockout_file_path'); |
|
| 26 | - $path = $dir.md5($input); |
|
| 24 | + $input = $username; |
|
| 25 | + $dir = config('irfa.lockout.lockout_file_path'); |
|
| 26 | + $path = $dir.md5($input); |
|
| 27 | 27 | |
| 28 | - if(is_writable($path)) |
|
| 28 | + if(is_writable($path)) |
|
| 29 | 29 | { |
| 30 | - return true; |
|
| 30 | + return true; |
|
| 31 | 31 | } |
| 32 | - return false; |
|
| 32 | + return false; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function testManualLocking($username){ |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | use File; |
| 7 | 7 | |
| 8 | 8 | class Testing extends Core { |
| 9 | - public function testWriteEventFailedLogin($username){ |
|
| 9 | + public function testWriteEventFailedLogin($username) { |
|
| 10 | 10 | |
| 11 | 11 | $this->eventFailedLogin($username); |
| 12 | 12 | |
@@ -14,53 +14,53 @@ discard block |
||
| 14 | 14 | $dir = config('irfa.lockout.lockout_file_path'); |
| 15 | 15 | $path = $dir.md5($input); |
| 16 | 16 | |
| 17 | - if(File::exists($path)) |
|
| 17 | + if (File::exists($path)) |
|
| 18 | 18 | { |
| 19 | 19 | return true; |
| 20 | 20 | } |
| 21 | 21 | return false; |
| 22 | 22 | } |
| 23 | - public function testWritable($username){ |
|
| 23 | + public function testWritable($username) { |
|
| 24 | 24 | $input = $username; |
| 25 | 25 | $dir = config('irfa.lockout.lockout_file_path'); |
| 26 | 26 | $path = $dir.md5($input); |
| 27 | 27 | |
| 28 | - if(is_writable($path)) |
|
| 28 | + if (is_writable($path)) |
|
| 29 | 29 | { |
| 30 | 30 | return true; |
| 31 | 31 | } |
| 32 | 32 | return false; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function testManualLocking($username){ |
|
| 35 | + public function testManualLocking($username) { |
|
| 36 | 36 | $input = $username; |
| 37 | 37 | $dir = config('irfa.lockout.lockout_file_path'); |
| 38 | 38 | $path = $dir.md5($input); |
| 39 | 39 | |
| 40 | - if($this->lock_account($username)) |
|
| 40 | + if ($this->lock_account($username)) |
|
| 41 | 41 | { |
| 42 | 42 | return true; |
| 43 | 43 | } |
| 44 | 44 | return false; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function testUnlocking($username){ |
|
| 47 | + public function testUnlocking($username) { |
|
| 48 | 48 | $input = $username; |
| 49 | 49 | $dir = config('irfa.lockout.lockout_file_path'); |
| 50 | 50 | $path = $dir.md5($input); |
| 51 | - $unlock = $this->test_unlock_account($username); |
|
| 52 | - if($unlock) |
|
| 51 | + $unlock = $this->test_unlock_account($username); |
|
| 52 | + if ($unlock) |
|
| 53 | 53 | { |
| 54 | 54 | return true; |
| 55 | 55 | } |
| 56 | 56 | return false; |
| 57 | 57 | } |
| 58 | - public function testLockLogin($username){ |
|
| 58 | + public function testLockLogin($username) { |
|
| 59 | 59 | $input = $username; |
| 60 | 60 | $dir = config('irfa.lockout.lockout_file_path'); |
| 61 | 61 | $path = $dir.md5($input); |
| 62 | - $unlock = $this->lockLogin($username); |
|
| 63 | - if($unlock) |
|
| 62 | + $unlock = $this->lockLogin($username); |
|
| 63 | + if ($unlock) |
|
| 64 | 64 | { |
| 65 | 65 | return true; |
| 66 | 66 | } |
@@ -39,13 +39,13 @@ |
||
| 39 | 39 | \Illuminate\Auth\Events\Authenticated::class, |
| 40 | 40 | CleanLockoutAccount::class |
| 41 | 41 | ); |
| 42 | - if(in_array('api', config('irfa.lockout.protected_middleware_group'))){ |
|
| 42 | + if (in_array('api', config('irfa.lockout.protected_middleware_group'))) { |
|
| 43 | 43 | $router->pushMiddlewareToGroup('api', \Irfa\Lockout\Middleware\ApiLockAccount::class); |
| 44 | 44 | } |
| 45 | - if(in_array('web', config('irfa.lockout.protected_middleware_group'))){ |
|
| 45 | + if (in_array('web', config('irfa.lockout.protected_middleware_group'))) { |
|
| 46 | 46 | $router->pushMiddlewareToGroup('web', \Irfa\Lockout\Middleware\LockAccount::class); |
| 47 | 47 | } |
| 48 | - if(in_array(null, config('irfa.lockout.protected_middleware_group'))){ |
|
| 48 | + if (in_array(null, config('irfa.lockout.protected_middleware_group'))) { |
|
| 49 | 49 | $router->pushMiddlewareToGroup('web', \Irfa\Lockout\Middleware\LockAccount::class); |
| 50 | 50 | } |
| 51 | 51 | |