owncloud / security

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;

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/Throttle.php

Spacing +4 added lines, -4 removed lines

@@ -79,14 +79,14 @@
      * @param string $ip

      * @throws LoginException

      */

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

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

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

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

-        if($this->dbConnection->getSuspiciousActivityCountForUidIpCombination($uid, $ip) >=

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

+        if ($this->dbConnection->getSuspiciousActivityCountForUidIpCombination($uid, $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))

             );

         }

     }

tests/ThrottleTest.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
             ->will($this->returnValue($lastAttempt));

         $this->dbServiceMock->expects($this->once())

             ->method('getSuspiciousActivityCountForUidIpCombination')

-            ->with('test','192.168.1.1')

+            ->with('test', '192.168.1.1')

             ->will($this->returnValue($attemptCount));

         $this->configMock->expects($this->once())

             ->method('getBruteForceProtectionBanPeriod')

@@ -100,7 +100,7 @@ 
             ->method('getTime')

             ->will($this->returnValue($time));

         $this->expectException('OC\User\LoginException');

-        $this->throttle->applyBruteForcePolicy('test','192.168.1.1');

+        $this->throttle->applyBruteForcePolicy('test', '192.168.1.1');

     }

     public function bruteForceTestData() {

         return [

tests/Db/DbServiceTest.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
         $this->dbService->addFailedLoginAttempt("test1", "192.168.1.1");

         $this->dbService->addFailedLoginAttempt("test1", "192.168.1.1");

         $this->dbService->addFailedLoginAttempt("test2", "192.168.1.1");

-        $this->assertEquals(2, $this->dbService->getSuspiciousActivityCountForUidIpCombination('test1','192.168.1.1'));

+        $this->assertEquals(2, $this->dbService->getSuspiciousActivityCountForUidIpCombination('test1', '192.168.1.1'));

     }

 

     public function testGetLastFailedLoginAttemptTimeForIp() {

@@ -149,7 +149,7 @@ 
         $result = $query->execute()->fetchAll();

         $this->assertSame(2, count($result));

 

-        $this->dbService->deleteSuspiciousAttemptsForUidIpCombination('test1',"192.168.1.1");

+        $this->dbService->deleteSuspiciousAttemptsForUidIpCombination('test1', "192.168.1.1");

         $query = $builder->select('*')->from($this->dbTable)

             ->Where($builder->expr()->eq('ip', $builder->createNamedParameter("192.168.1.1")));

         $result = $query->execute()->fetchAll();