owncloud / security

tests/SecurityConfigTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     }

 

     /**

-     * @param array $mockedMethods

+     * @param string[] $mockedMethods

      * @return SecurityConfig | \PHPUnit_Framework_MockObject_MockObject

      */

     private function getMockInstance($mockedMethods = []) {

Unused Use Statements +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
  */

 namespace OCA\Security\Tests;

 

-use OCA\Security\SecurityConfig;

-use OCP\IConfig;

+use OCA\Security\SecurityConfig;
+use OCP\IConfig;
 use Test\TestCase;

 class SecurityConfigTest extends TestCase {

     /** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */

lib/Hooks.php

Indentation -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 /**
-
  *
  * @author Semih Serhat Karakaya
  * @copyright Copyright (c) 2016, ITU IT HEAD OFFICE.

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      * @param PasswordValidator $passValidator
      * @param EventDispatcherInterface $dispatcher
      */
-    public function __construct($userManager, $throttle, $request, $passValidator, $dispatcher){
+    public function __construct($userManager, $throttle, $request, $passValidator, $dispatcher) {
         $this->userManager = $userManager;
         $this->throttle = $throttle;
         $this->request = $request;

lib/Throttle.php

Spacing +3 added lines, -3 removed lines

@@ -80,12 +80,12 @@
      */

     public function applyBruteForcePolicy($ip) {

         $banPeriod = $this->config->getBruteForceProtectionBanPeriod();

-        $banUntil = $this->dbConnection->getLastFailedLoginAttemptTimeForIp($ip)+$banPeriod;

-        if($this->dbConnection->getSuspiciousActivityCountForIp($ip) >=

+        $banUntil = $this->dbConnection->getLastFailedLoginAttemptTimeForIp($ip) + $banPeriod;

+        if ($this->dbConnection->getSuspiciousActivityCountForIp($ip) >=

             $this->config->getBruteForceProtectionFailTolerance() &&

             $banUntil > $this->timeFactory->getTime()) {

             throw new LoginException($this->l->t("Too many failed login attempts. Try again in %s minutes.",

-                ceil($banPeriod/60))

+                ceil($banPeriod / 60))

             );

         }

     }

lib/AppInfo/Application.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 $c->query('DbService'),

                 $c->query('SecurityConfig'),

                 $c->query('OCP\IL10N'),

-				$c->query('OCP\AppFramework\Utility\ITimeFactory')

+                $c->query('OCP\AppFramework\Utility\ITimeFactory')

             );

         });

 

templates/settings-admin.php

Braces +12 added lines, -3 removed lines

@@ -46,17 +46,26 @@
 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-upper-lower-case"

-			<?php if ($_['isUpperLowerCaseEnforced']) p("checked");?> >

+			<?php if ($_['isUpperLowerCaseEnforced']) {
+    p("checked");
+}
+?> >

 		<label for="security-enforce-upper-lower-case"><?php p($l->t('Enforce at least one upper and one lower case character on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-numerical-characters"

-			<?php if ($_['isNumericalCharsEnforced']) p("checked");?> >

+			<?php if ($_['isNumericalCharsEnforced']) {
+    p("checked");
+}
+?> >

 		<label for="security-enforce-numerical-characters"><?php p($l->t('Enforce at least one numerical characters on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-special-characters"

-			<?php if ($_['isSpecialCharsEnforced']) p("checked");?> >

+			<?php if ($_['isSpecialCharsEnforced']) {
+    p("checked");
+}
+?> >

 		<label for="security-enforce-special-characters"><?php p($l->t('Enforce at least one special characters on passwords')) ?></label>

 	</div>

 </div>
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
         <input type="number" id="security-bfp-fail-tolerance"  value="<?php p($_['bruteForceProtectionFailTolerance']) ?>"><br>

         <label for="security-bfp-ban-period"><?php p($l->t('Ban for how many seconds?')) ?></label><br>

         <input type="number" id="security-bfp-ban-period" value="<?php p($_['bruteForceProtectionBanPeriod']) ?>"><br>

-        <button id="save-bfp-settings" class="save"><?php p($l->t('Save settings'));?></button>

+        <button id="save-bfp-settings" class="save"><?php p($l->t('Save settings')); ?></button>

 	</div>

 </div>

 <div id="security-password-policy" class="section">

@@ -40,22 +40,22 @@ 
     <div>

 		<label for="security-min-password-length"><?php p($l->t('Determine minimum password length')) ?></label>

 		<input type="number" id="security-min-password-length" min="6" value="<?php p($_['minPasswordLength']) ?>">

-        <button id="save-pass-length" class="save"><?php p($l->t('Save length'));?></button>

+        <button id="save-pass-length" class="save"><?php p($l->t('Save length')); ?></button>

         <span id="security-min-password-length-message" class="msg"></span>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-upper-lower-case"

-			<?php if ($_['isUpperLowerCaseEnforced']) p("checked");?> >

+			<?php if ($_['isUpperLowerCaseEnforced']) p("checked"); ?> >

 		<label for="security-enforce-upper-lower-case"><?php p($l->t('Enforce at least one upper and one lower case character on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-numerical-characters"

-			<?php if ($_['isNumericalCharsEnforced']) p("checked");?> >

+			<?php if ($_['isNumericalCharsEnforced']) p("checked"); ?> >

 		<label for="security-enforce-numerical-characters"><?php p($l->t('Enforce at least one numerical characters on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-special-characters"

-			<?php if ($_['isSpecialCharsEnforced']) p("checked");?> >

+			<?php if ($_['isSpecialCharsEnforced']) p("checked"); ?> >

 		<label for="security-enforce-special-characters"><?php p($l->t('Enforce at least one special characters on passwords')) ?></label>

 	</div>

 </div>
\ No newline at end of file

templates/settings-personal.php

Indentation +5 added lines, -5 removed lines

@@ -25,15 +25,15 @@
 ?>

 <div id="password-policies" class="hidden">

 	<?php print_unescaped(

-		"<p>". $l->t('Passwords must:'). "</p>");?>

+        "<p>". $l->t('Passwords must:'). "</p>");?>

 	<ul class="pass-info">

 		<?php print_unescaped(

-			"<li class='pass-info-element'>". $l->t('be at least %s characters long ', $_['minPasswordLength']). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('be at least %s characters long ', $_['minPasswordLength']). "</li>");?>

 		<?php if ($_['isUpperLowerCaseEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

 		<?php if ($_['isNumericalCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

 		<?php if ($_['isSpecialCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

 	</ul>

 </div>

Spacing +5 added lines, -5 removed lines

@@ -25,15 +25,15 @@
 ?>

 <div id="password-policies" class="hidden">

 	<?php print_unescaped(

-		"<p>". $l->t('Passwords must:'). "</p>");?>

+		"<p>".$l->t('Passwords must:')."</p>"); ?>

 	<ul class="pass-info">

 		<?php print_unescaped(

-			"<li class='pass-info-element'>". $l->t('be at least %s characters long ', $_['minPasswordLength']). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('be at least %s characters long ', $_['minPasswordLength'])."</li>"); ?>

 		<?php if ($_['isUpperLowerCaseEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('contain at least one uppercase letter and at least one lowercase letter ')."</li>"); ?>

 		<?php if ($_['isNumericalCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('contain at least one numerical character')."</li>"); ?>

 		<?php if ($_['isSpecialCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('contain at least one special character')."</li>"); ?>

 	</ul>

 </div>

Braces +15 added lines, -6 removed lines

@@ -29,11 +29,20 @@
 	<ul class="pass-info">

 		<?php print_unescaped(

 			"<li class='pass-info-element'>". $l->t('be at least %s characters long ', $_['minPasswordLength']). "</li>");?>

-		<?php if ($_['isUpperLowerCaseEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

-		<?php if ($_['isNumericalCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

-		<?php if ($_['isSpecialCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

+		<?php if ($_['isUpperLowerCaseEnforced']) {
+    print_unescaped(

+			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");
+}
+?>

+		<?php if ($_['isNumericalCharsEnforced']) {
+    print_unescaped(

+			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");
+}
+?>

+		<?php if ($_['isSpecialCharsEnforced']) {
+    print_unescaped(

+			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");
+}
+?>

 	</ul>

 </div>

lib/Db/DbService.php

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
     /**

      * @param string $uid

      */

-    public function addFailedLoginAttempt($uid, $ip){

+    public function addFailedLoginAttempt($uid, $ip) {

         $builder = $this->connection->getQueryBuilder();

         $builder->insert('failed_login_attempts')

             ->setValue('ip', $builder->createNamedParameter($ip))

@@ -77,7 +77,7 @@ 
      */

     public function getSuspiciousActivityCountForUid($uid) {

         $builder = $this->connection->getQueryBuilder();

-        $thresholdTime = (new \DateTime())->modify("-". $this->config->getBruteForceProtectionTimeThreshold() . "second")->getTimestamp();

+        $thresholdTime = (new \DateTime())->modify("-".$this->config->getBruteForceProtectionTimeThreshold()."second")->getTimestamp();

         $attempts = $builder->selectAlias($builder->createFunction('COUNT(*)'), 'count')

             ->from('failed_login_attempts')

             ->where($builder->expr()->gt('attempted_at', $builder->createNamedParameter($thresholdTime)))

@@ -93,7 +93,7 @@ 
      */

     public function getSuspiciousActivityCountForIp($ip) {

         $builder = $this->connection->getQueryBuilder();

-        $thresholdTime = (new \DateTime())->modify("-". $this->config->getBruteForceProtectionTimeThreshold() . "second")->getTimestamp();

+        $thresholdTime = (new \DateTime())->modify("-".$this->config->getBruteForceProtectionTimeThreshold()."second")->getTimestamp();

         $attempts = $builder->selectAlias($builder->createFunction('COUNT(*)'), 'count')

             ->from('failed_login_attempts')

             ->where($builder->expr()->gt('attempted_at', $builder->createNamedParameter($thresholdTime)))

@@ -109,12 +109,12 @@ 
      */

     public function getLastFailedLoginAttemptTimeForIp($ip) {

         $builder = $this->connection->getQueryBuilder();

-        $thresholdTime = (new \DateTime())->modify("-". $this->config->getBruteForceProtectionTimeThreshold() . "second")->getTimestamp();

+        $thresholdTime = (new \DateTime())->modify("-".$this->config->getBruteForceProtectionTimeThreshold()."second")->getTimestamp();

         $lastAttempt = $builder->select('attempted_at')

             ->from('failed_login_attempts')

             ->where($builder->expr()->gt('attempted_at', $builder->createNamedParameter($thresholdTime)))

             ->andWhere($builder->expr()->eq('ip', $builder->createNamedParameter($ip)))

-            ->orderBy('attempted_at','DESC')

+            ->orderBy('attempted_at', 'DESC')

             ->setMaxResults(1)

             ->execute()

             ->fetch();

@@ -124,7 +124,7 @@ 
     public function deleteSuspiciousAttemptsForIp($ip) {

         $builder = $this->connection->getQueryBuilder();

         $builder->delete('failed_login_attempts')

-            ->where($builder->expr()->eq('ip',$builder->createNamedParameter($ip)))

+            ->where($builder->expr()->eq('ip', $builder->createNamedParameter($ip)))

             ->execute();

     }

 }
\ No newline at end of file