Skip to content

Commit bd0ed65

Browse files
splitbrainsplitbrain
committed
auto code cleanup
1 parent db49f6a commit bd0ed65

23 files changed

+275
-254
lines changed

‎.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: php
22
php:
3-
- "7.3"
4-
- "7.2"
5-
- "7.1"
6-
- "7.0"
7-
- "5.6"
3+
- "7.3"
4+
- "7.2"
5+
- "7.1"
6+
- "7.0"
7+
- "5.6"
88
env:
9-
- DOKUWIKI=master
10-
- DOKUWIKI=stable
9+
- DOKUWIKI=master
10+
- DOKUWIKI=stable
1111
before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
1212
install: sh travis.sh
1313
script: cd _test && ./phpunit.phar --stderr --group plugin_passpolicy

‎_test/helper.test.php

Lines changed: 62 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
23
/**
34
* @group plugin_passpolicy
45
* @group plugins
56
*/
6-
class helper_plugin_passpolicy_test extends DokuWikiTest {
7+
class helper_plugin_passpolicy_test extends DokuWikiTest
8+
{
79

810
protected $pluginsEnabled = array('passpolicy');
911

@@ -22,16 +24,27 @@ class helper_plugin_passpolicy_test extends DokuWikiTest {
2224
* @param bool $noleak
2325
* @return helper_plugin_passpolicy
2426
*/
25-
public function newPolicy($minl, $minp, $lower, $upper, $num, $special, $ucheck, $pron=true, $nocom=true, $noleak=false) {
27+
public function newPolicy(
28+
$minl,
29+
$minp,
30+
$lower,
31+
$upper,
32+
$num,
33+
$special,
34+
$ucheck,
35+
$pron = true,
36+
$nocom = true,
37+
$noleak = false
38+
) {
2639
/** @var helper_plugin_passpolicy $policy */
27-
$policy = plugin_load('helper', 'passpolicy');
28-
$policy->min_pools = $minp;
29-
$policy->min_length = $minl;
30-
$policy->usepools = array(
31-
'lower' => $lower,
32-
'upper' => $upper,
40+
$policy = plugin_load('helper', 'passpolicy');
41+
$policy->min_pools = $minp;
42+
$policy->min_length = $minl;
43+
$policy->usepools = array(
44+
'lower' => $lower,
45+
'upper' => $upper,
3346
'numeric' => $num,
34-
'special' => $special
47+
'special' => $special,
3548
);
3649
$policy->usernamecheck = $ucheck;
3750
$policy->pronouncable = $pron;
@@ -41,30 +54,33 @@ public function newPolicy($minl, $minp, $lower, $upper, $num, $special, $ucheck,
4154
return $policy;
4255
}
4356

44-
public function test_policies() {
57+
public function test_policies()
58+
{
4559
$policy = $this->newPolicy(6, 1, true, true, true, true, 0);
46-
$this->assertTrue($policy->checkPolicy('tested','tested'), '1 pool, no user check '.$policy->error);
47-
$this->assertFalse($policy->checkPolicy('test','tested'), '1 pool, no user check, but too short '.$policy->error);
60+
$this->assertTrue($policy->checkPolicy('tested', 'tested'), '1 pool, no user check ' . $policy->error);
61+
$this->assertFalse($policy->checkPolicy('test', 'tested'),
62+
'1 pool, no user check, but too short ' . $policy->error);
4863
$this->assertEquals(helper_plugin_passpolicy::LENGTH_VIOLATION, $policy->error);
49-
$this->assertTrue($policy->checkPolicy('tested99!','tested'), '1 pool, no user check '.$policy->error);
64+
$this->assertTrue($policy->checkPolicy('tested99!', 'tested'), '1 pool, no user check ' . $policy->error);
5065

5166
$policy = $this->newPolicy(6, 3, true, true, true, true, 0);
52-
$this->assertFalse($policy->checkPolicy('tested','tested'), '3 pools, no user check '.$policy->error);
67+
$this->assertFalse($policy->checkPolicy('tested', 'tested'), '3 pools, no user check ' . $policy->error);
5368
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
54-
$this->assertTrue($policy->checkPolicy('tested99!','tested'), '3 pools, no user check '.$policy->error);
69+
$this->assertTrue($policy->checkPolicy('tested99!', 'tested'), '3 pools, no user check ' . $policy->error);
5570

5671
$policy = $this->newPolicy(6, 1, true, true, true, true, 2);
57-
$this->assertFalse($policy->checkPolicy('tested','tested'), '1 pool, user check '.$policy->error);
72+
$this->assertFalse($policy->checkPolicy('tested', 'tested'), '1 pool, user check ' . $policy->error);
5873
$this->assertEquals(helper_plugin_passpolicy::USERNAME_VIOLATION, $policy->error);
59-
$this->assertFalse($policy->checkPolicy('tested99!','tested'), '1 pool, user check '.$policy->error);
74+
$this->assertFalse($policy->checkPolicy('tested99!', 'tested'), '1 pool, user check ' . $policy->error);
6075
$this->assertEquals(helper_plugin_passpolicy::USERNAME_VIOLATION, $policy->error);
61-
$this->assertFalse($policy->checkPolicy('tested','untested'), '1 pool, user check '.$policy->error);
76+
$this->assertFalse($policy->checkPolicy('tested', 'untested'), '1 pool, user check ' . $policy->error);
6277
$this->assertEquals(helper_plugin_passpolicy::USERNAME_VIOLATION, $policy->error);
63-
$this->assertFalse($policy->checkPolicy('tested99!','comptessa'), '1 pool1, user check '.$policy->error);
78+
$this->assertFalse($policy->checkPolicy('tested99!', 'comptessa'), '1 pool1, user check ' . $policy->error);
6479
$this->assertEquals(helper_plugin_passpolicy::USERNAME_VIOLATION, $policy->error);
6580
}
6681

67-
public function test_nocommon(){
82+
public function test_nocommon()
83+
{
6884
$policy = $this->newPolicy(6, 1, true, true, true, true, 0, true, true);
6985
$this->assertTrue($policy->checkPolicy('bazzel', 'nope'));
7086
$this->assertFalse($policy->checkPolicy('eyphed', 'nope'));
@@ -74,7 +90,8 @@ public function test_nocommon(){
7490
$this->assertTrue($policy->checkPolicy('password', 'nope'));
7591
}
7692

77-
public function test_noleak(){
93+
public function test_noleak()
94+
{
7895
$policy = $this->newPolicy(6, 1, true, true, true, true, 0, false, true, true);
7996
$this->assertTrue($policy->checkPolicy('sadf asfd s as asf a afafaa fadfsa fas', 'nope'));
8097
$this->assertFalse($policy->checkPolicy('qwertzuiop', 'nope'));
@@ -84,45 +101,47 @@ public function test_noleak(){
84101
$this->assertTrue($policy->checkPolicy('qwertzuiop', 'nope'));
85102
}
86103

87-
public function test_minpools(){
104+
public function test_minpools()
105+
{
88106
$policy = $this->newPolicy(3, 0, true, true, true, true, 0);
89-
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"','tester'), '0 required, 4 given '.$policy->error);
90-
$this->assertTrue($policy->checkPolicy('lowerUPPER123','tester'), '0 required, 3 given '.$policy->error);
91-
$this->assertTrue($policy->checkPolicy('lowerUPPER','tester'), '0 required, 2 given '.$policy->error);
92-
$this->assertTrue($policy->checkPolicy('lower','tester'), '0 required, 1 given '.$policy->error);
107+
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"', 'tester'), '0 required, 4 given ' . $policy->error);
108+
$this->assertTrue($policy->checkPolicy('lowerUPPER123', 'tester'), '0 required, 3 given ' . $policy->error);
109+
$this->assertTrue($policy->checkPolicy('lowerUPPER', 'tester'), '0 required, 2 given ' . $policy->error);
110+
$this->assertTrue($policy->checkPolicy('lower', 'tester'), '0 required, 1 given ' . $policy->error);
93111

94112
$policy = $this->newPolicy(3, 1, true, true, true, true, 0);
95-
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"','tester'), '1 required, 4 given '.$policy->error);
96-
$this->assertTrue($policy->checkPolicy('lowerUPPER123','tester'), '1 required, 3 given '.$policy->error);
97-
$this->assertTrue($policy->checkPolicy('lowerUPPER','tester'), '1 required, 2 given '.$policy->error);
98-
$this->assertTrue($policy->checkPolicy('lower','tester'), '1 required, 1 given '.$policy->error);
113+
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"', 'tester'), '1 required, 4 given ' . $policy->error);
114+
$this->assertTrue($policy->checkPolicy('lowerUPPER123', 'tester'), '1 required, 3 given ' . $policy->error);
115+
$this->assertTrue($policy->checkPolicy('lowerUPPER', 'tester'), '1 required, 2 given ' . $policy->error);
116+
$this->assertTrue($policy->checkPolicy('lower', 'tester'), '1 required, 1 given ' . $policy->error);
99117

100118
$policy = $this->newPolicy(3, 2, true, true, true, true, 0);
101-
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"','tester'), '2 required, 4 given '.$policy->error);
102-
$this->assertTrue($policy->checkPolicy('lowerUPPER123','tester'), '2 required, 3 given '.$policy->error);
103-
$this->assertTrue($policy->checkPolicy('lowerUPPER','tester'), '2 required, 2 given '.$policy->error);
104-
$this->assertFalse($policy->checkPolicy('lower','tester'), '2 required, 1 given '.$policy->error);
119+
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"', 'tester'), '2 required, 4 given ' . $policy->error);
120+
$this->assertTrue($policy->checkPolicy('lowerUPPER123', 'tester'), '2 required, 3 given ' . $policy->error);
121+
$this->assertTrue($policy->checkPolicy('lowerUPPER', 'tester'), '2 required, 2 given ' . $policy->error);
122+
$this->assertFalse($policy->checkPolicy('lower', 'tester'), '2 required, 1 given ' . $policy->error);
105123
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
106124

107125
$policy = $this->newPolicy(3, 3, true, true, true, true, 0);
108-
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"','tester'), '3 required, 4 given '.$policy->error);
109-
$this->assertTrue($policy->checkPolicy('lowerUPPER123','tester'), '3 required, 3 given '.$policy->error);
110-
$this->assertFalse($policy->checkPolicy('lowerUPPER','tester'), '3 required, 2 given '.$policy->error);
126+
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"', 'tester'), '3 required, 4 given ' . $policy->error);
127+
$this->assertTrue($policy->checkPolicy('lowerUPPER123', 'tester'), '3 required, 3 given ' . $policy->error);
128+
$this->assertFalse($policy->checkPolicy('lowerUPPER', 'tester'), '3 required, 2 given ' . $policy->error);
111129
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
112-
$this->assertFalse($policy->checkPolicy('lower','tester'), '3 required, 1 given '.$policy->error);
130+
$this->assertFalse($policy->checkPolicy('lower', 'tester'), '3 required, 1 given ' . $policy->error);
113131
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
114132

115133
$policy = $this->newPolicy(3, 4, true, true, true, true, 0);
116-
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"','tester'), '4 required, 4 given '.$policy->error);
117-
$this->assertFalse($policy->checkPolicy('lowerUPPER123','tester'), '4 required, 3 given '.$policy->error);
134+
$this->assertTrue($policy->checkPolicy('lowerUPPER123!"', 'tester'), '4 required, 4 given ' . $policy->error);
135+
$this->assertFalse($policy->checkPolicy('lowerUPPER123', 'tester'), '4 required, 3 given ' . $policy->error);
118136
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
119-
$this->assertFalse($policy->checkPolicy('lowerUPPER','tester'), '4 required, 2 given '.$policy->error);
137+
$this->assertFalse($policy->checkPolicy('lowerUPPER', 'tester'), '4 required, 2 given ' . $policy->error);
120138
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
121-
$this->assertFalse($policy->checkPolicy('lower','tester'), '4 required, 1 given '.$policy->error);
139+
$this->assertFalse($policy->checkPolicy('lower', 'tester'), '4 required, 1 given ' . $policy->error);
122140
$this->assertEquals(helper_plugin_passpolicy::POOL_VIOLATION, $policy->error);
123141
}
124142

125-
public function test_selfcheck() {
143+
public function test_selfcheck()
144+
{
126145
$policy = $this->newPolicy(6, 4, true, true, true, true, 0, true);
127146
$pw1 = $policy->generatePassword('test');
128147
$pw2 = $policy->generatePassword('test');

‎conf/default.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* @author Andreas Gohr <[email protected]>
66
*/
77

8-
$conf['minlen'] = 8;
9-
$conf['pools'] = 'lower,numeric,special';
8+
$conf['minlen'] = 8;
9+
$conf['pools'] = 'lower,numeric,special';
1010
$conf['minpools'] = 2;
11-
$conf['user'] = 1;
11+
$conf['user'] = 1;
1212
$conf['nocommon'] = 1;
1313
$conf['noleaked'] = 1;
1414

‎conf/metadata.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* @author Andreas Gohr <[email protected]>
66
*/
77

8-
$meta['minlen'] = array('numeric', '_min' => 0);
9-
$meta['pools'] = array('multicheckbox', '_choices' => array('lower','upper','numeric','special'));
8+
$meta['minlen'] = array('numeric', '_min' => 0);
9+
$meta['pools'] = array('multicheckbox', '_choices' => array('lower', 'upper', 'numeric', 'special'));
1010
$meta['minpools'] = array('numeric', '_min' => 0, '_max' => 4);
11-
$meta['user'] = array('numeric', '_min' => 0);
11+
$meta['user'] = array('numeric', '_min' => 0);
1212
$meta['nocommon'] = array('onoff');
1313
$meta['noleaked'] = array('onoff');
1414

‎helper.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,10 @@ public function checkPolicy($pass, $username)
181181
if (!empty($this->usepools['lower'])) $matched_pools += (int)preg_match('/[a-z]/', $pass);
182182
if (!empty($this->usepools['upper'])) $matched_pools += (int)preg_match('/[A-Z]/', $pass);
183183
if (!empty($this->usepools['numeric'])) $matched_pools += (int)preg_match('/[0-9]/', $pass);
184-
if (!empty($this->usepools['special'])) $matched_pools += (int)preg_match('/[^A-Za-z0-9]/',
185-
$pass); // we consider everything else special
184+
if (!empty($this->usepools['special'])) {
185+
$matched_pools += (int)preg_match('/[^A-Za-z0-9]/',
186+
$pass);
187+
} // we consider everything else special
186188
if ($matched_pools < $this->min_pools) {
187189
$this->error = helper_plugin_passpolicy::POOL_VIOLATION;
188190
return false;

‎lang/de-informal/lang.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
* @author Felix Müller-Donath <[email protected]>
77
* @author F. Mueller-Donath <[email protected]>
88
*/
9-
$lang['badpasspolicy'] = 'Du musst ein stärkeres Passwort verwenden.';
10-
$lang['length'] = 'Dein Passwort muss mindestens %d Zeichen lang sein.';
11-
$lang['pools'] = 'Dein Passwort benötigt mindestens %d Zeichen der folgenden Zeichentypen: %s.';
12-
$lang['user1'] = 'Dein Passwort darf nicht den Benutzernamen enthalten.';
13-
$lang['user2'] = 'Dein Passwort darf nur %d oder weniger zusammenhängende Buchstaben, die auch in deinem Benutzernamen vorkommen, enthalten.';
14-
$lang['nocommon'] = 'Dein Passwort darf nicht in der Liste der 10.000 beliebtesten Passwörter enthalten sein.';
15-
$lang['js']['strength0'] = 'sehr schwach';
16-
$lang['js']['strength1'] = 'schwach';
17-
$lang['js']['strength2'] = 'annehmbar';
18-
$lang['js']['strength3'] = 'stark';
9+
$lang['badpasspolicy'] = 'Du musst ein stärkeres Passwort verwenden.';
10+
$lang['length'] = 'Dein Passwort muss mindestens %d Zeichen lang sein.';
11+
$lang['pools'] = 'Dein Passwort benötigt mindestens %d Zeichen der folgenden Zeichentypen: %s.';
12+
$lang['user1'] = 'Dein Passwort darf nicht den Benutzernamen enthalten.';
13+
$lang['user2'] = 'Dein Passwort darf nur %d oder weniger zusammenhängende Buchstaben, die auch in deinem Benutzernamen vorkommen, enthalten.';
14+
$lang['nocommon'] = 'Dein Passwort darf nicht in der Liste der 10.000 beliebtesten Passwörter enthalten sein.';
15+
$lang['js']['strength0'] = 'sehr schwach';
16+
$lang['js']['strength1'] = 'schwach';
17+
$lang['js']['strength2'] = 'annehmbar';
18+
$lang['js']['strength3'] = 'stark';

‎lang/de-informal/settings.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
* @author Felix Müller-Donath <[email protected]>
77
* @author F. Mueller-Donath <[email protected]>
88
*/
9-
$lang['minlen'] = 'Mindestlänge für Benutzerpasswörter';
10-
$lang['pools'] = 'Für Passwörter geeignete Schriftzeichen';
11-
$lang['minpools'] = 'Minimale Anzahl der unterschiedlichen Schriftzeichen, die in einem Passwort verwendet werden muss. Darf nicht größer als die Anzahl der oben ausgewählten Zeichen sein.';
12-
$lang['user'] = 'Überprüfen, ob das Passwort mit dem Benutzernamen übereinstimmt. 0 schaltet die Prüfung ab, 1 entspricht der exakten Übereinstimmung. Jede andere Zahl entspricht der Anzahl der zusammenhängenden Zeichen, die sowohl im Benutzernamen als auch im Passwort vorkommen dürfen.';
13-
$lang['nocommon'] = 'Vergleiche Passwort mit einer Liste der 10.000 beliebtesten Passwörter.';
14-
$lang['autotype'] = 'Wie sollen Passwörter generiert werden?';
15-
$lang['autobits'] = 'Minimale Anzahl an Informationsbits zur Generierung eines Passwortes. Je höher die Zahl ist, desto sicherer ist das Passwort aber auch um so schwerer zu merken. Minimum: 24';
16-
$lang['autotype_o_random'] = 'Zufallspasswort';
9+
$lang['minlen'] = 'Mindestlänge für Benutzerpasswörter';
10+
$lang['pools'] = 'Für Passwörter geeignete Schriftzeichen';
11+
$lang['minpools'] = 'Minimale Anzahl der unterschiedlichen Schriftzeichen, die in einem Passwort verwendet werden muss. Darf nicht größer als die Anzahl der oben ausgewählten Zeichen sein.';
12+
$lang['user'] = 'Überprüfen, ob das Passwort mit dem Benutzernamen übereinstimmt. 0 schaltet die Prüfung ab, 1 entspricht der exakten Übereinstimmung. Jede andere Zahl entspricht der Anzahl der zusammenhängenden Zeichen, die sowohl im Benutzernamen als auch im Passwort vorkommen dürfen.';
13+
$lang['nocommon'] = 'Vergleiche Passwort mit einer Liste der 10.000 beliebtesten Passwörter.';
14+
$lang['autotype'] = 'Wie sollen Passwörter generiert werden?';
15+
$lang['autobits'] = 'Minimale Anzahl an Informationsbits zur Generierung eines Passwortes. Je höher die Zahl ist, desto sicherer ist das Passwort aber auch um so schwerer zu merken. Minimum: 24';
16+
$lang['autotype_o_random'] = 'Zufallspasswort';
1717
$lang['autotype_o_pronouncable'] = 'Aussprechbares Passwort';
18-
$lang['autotype_o_phrase'] = 'Passwortsatz aus mehreren Wörtern';
19-
$lang['pools_lower'] = 'Kleinbuchstaben';
20-
$lang['pools_upper'] = 'Großbuchstaben';
21-
$lang['pools_numeric'] = 'Zahlen';
22-
$lang['pools_special'] = 'Sonderzeichen (z.B. !, $, #, %)';
18+
$lang['autotype_o_phrase'] = 'Passwortsatz aus mehreren Wörtern';
19+
$lang['pools_lower'] = 'Kleinbuchstaben';
20+
$lang['pools_upper'] = 'Großbuchstaben';
21+
$lang['pools_numeric'] = 'Zahlen';
22+
$lang['pools_special'] = 'Sonderzeichen (z.B. !, $, #, %)';

‎lang/de/lang.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
* @author liz <[email protected]>
99
* @author F. Mueller-Donath <[email protected]>
1010
*/
11-
$lang['badpasspolicy'] = 'Sie müssen ein stärkeres Passwort verwenden.';
12-
$lang['length'] = 'Ihr Passwort muss mindestens %d Zeichen lang sein.';
13-
$lang['pools'] = 'Ihr Passwort benötigt mindestens %d Zeichen der folgenden Zeichentypen: %s.';
14-
$lang['user1'] = 'Ihr Passwort darf nicht den Benutzernamen enthalten.';
15-
$lang['user2'] = 'Ihr Passwort darf nur %d oder weniger zusammenhängende Buchstaben, die auch in Ihrem Benutzernamen vorkommen, enthalten.';
16-
$lang['nocommon'] = 'Ihr Passwort darf nicht in der Liste der 10.000 beliebtesten Passwörter enthalten sein.';
17-
$lang['js']['strength0'] = 'sehr schwach';
18-
$lang['js']['strength1'] = 'schwach';
19-
$lang['js']['strength2'] = 'annehmbar';
20-
$lang['js']['strength3'] = 'stark';
11+
$lang['badpasspolicy'] = 'Sie müssen ein stärkeres Passwort verwenden.';
12+
$lang['length'] = 'Ihr Passwort muss mindestens %d Zeichen lang sein.';
13+
$lang['pools'] = 'Ihr Passwort benötigt mindestens %d Zeichen der folgenden Zeichentypen: %s.';
14+
$lang['user1'] = 'Ihr Passwort darf nicht den Benutzernamen enthalten.';
15+
$lang['user2'] = 'Ihr Passwort darf nur %d oder weniger zusammenhängende Buchstaben, die auch in Ihrem Benutzernamen vorkommen, enthalten.';
16+
$lang['nocommon'] = 'Ihr Passwort darf nicht in der Liste der 10.000 beliebtesten Passwörter enthalten sein.';
17+
$lang['js']['strength0'] = 'sehr schwach';
18+
$lang['js']['strength1'] = 'schwach';
19+
$lang['js']['strength2'] = 'annehmbar';
20+
$lang['js']['strength3'] = 'stark';

0 commit comments

Comments
 (0)