BookStack Code Mirror - bookstack/blobdiff

diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php

index 60859e324743c059a38ccd69235b85ac11533739..978420f869ede41d480cbe7258f1c6600773e3d5 100644 (file)

--- a/tests/Auth/LdapTest.php

+++ b/tests/Auth/LdapTest.php

@@ -1,12 +1,14 @@

-<?php namespace Tests\Auth;

+<?php

+namespace Tests\Auth;

+

+use BookStack\Auth\Access\Ldap;

use BookStack\Auth\Access\LdapService;

use BookStack\Auth\Role;

-use BookStack\Auth\Access\Ldap;

use BookStack\Auth\User;

+use Illuminate\Testing\TestResponse;

use Mockery\MockInterface;

use Tests\TestCase;

-use Tests\TestResponse;

class LdapTest extends TestCase

{

@@ -18,27 +20,29 @@ class LdapTest extends TestCase

protected $mockUser;

protected $resourceId = 'resource-test';

- public function setUp(): void

+ protected function setUp(): void

{

parent::setUp();

- if (!defined('LDAP_OPT_REFERRALS')) define('LDAP_OPT_REFERRALS', 1);

+ if (!defined('LDAP_OPT_REFERRALS')) {

+ define('LDAP_OPT_REFERRALS', 1);

+ }

config()->set([

- 'auth.method' => 'ldap',

- 'auth.defaults.guard' => 'ldap',

- 'services.ldap.base_dn' => 'dc=ldap,dc=local',

- 'services.ldap.email_attribute' => 'mail',

+ 'auth.method' => 'ldap',

+ 'auth.defaults.guard' => 'ldap',

+ 'services.ldap.base_dn' => 'dc=ldap,dc=local',

+ 'services.ldap.email_attribute' => 'mail',

'services.ldap.display_name_attribute' => 'cn',

- 'services.ldap.id_attribute' => 'uid',

- 'services.ldap.user_to_groups' => false,

- 'services.ldap.version' => '3',

- 'services.ldap.user_filter' => '(&(uid=${user}))',

- 'services.ldap.follow_referrals' => false,

- 'services.ldap.tls_insecure' => false,

- 'services.ldap.thumbnail_attribute' => null,

+ 'services.ldap.id_attribute' => 'uid',

+ 'services.ldap.user_to_groups' => false,

+ 'services.ldap.version' => '3',

+ 'services.ldap.user_filter' => '(&(uid=${user}))',

+ 'services.ldap.follow_referrals' => false,

+ 'services.ldap.tls_insecure' => false,

+ 'services.ldap.thumbnail_attribute' => null,

]);

$this->mockLdap = \Mockery::mock(Ldap::class);

$this->app[Ldap::class] = $this->mockLdap;

- $this->mockUser = factory(User::class)->make();

+ $this->mockUser = User::factory()->make();

}

protected function runFailedAuthLogin()

@@ -91,8 +95,8 @@ class LdapTest extends TestCase

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$resp = $this->mockUserLogin();

@@ -102,19 +106,19 @@ class LdapTest extends TestCase

$resp->assertSee($this->mockUser->name);

$resp = $this->followingRedirects()->mockUserLogin($this->mockUser->email);

- $resp->assertElementExists('#home-default');

+ $this->withHtml($resp)->assertElementExists('#home-default');

$resp->assertSee($this->mockUser->name);

$this->assertDatabaseHas('users', [

- 'email' => $this->mockUser->email,

- 'email_confirmed' => false,

- 'external_auth_id' => $this->mockUser->name

+ 'email' => $this->mockUser->email,

+ 'email_confirmed' => false,

+ 'external_auth_id' => $this->mockUser->name,

]);

}

public function test_email_domain_restriction_active_on_new_ldap_login()

{

$this->setSettings([

- 'registration-restrict' => 'testing.com'

+ 'registration-restrict' => 'testing.com',

]);

$this->commonLdapMocks(1, 1, 2, 4, 2);

@@ -122,15 +126,14 @@ class LdapTest extends TestCase

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$resp = $this->mockUserLogin();

$resp->assertRedirect('/login');

$this->followRedirects($resp)->assertSee('Please enter an email to use for this account.');

-

$email = '[email protected]';

$resp = $this->mockUserLogin($email);

$resp->assertRedirect('/login');

@@ -147,9 +150,9 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'cn' => [$this->mockUser->name],

- 'dn' => $ldapDn,

- 'mail' => [$this->mockUser->email]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => $ldapDn,

+ 'mail' => [$this->mockUser->email],

]]);

$resp = $this->mockUserLogin();

@@ -167,13 +170,12 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'cn' => [$this->mockUser->name],

- 'dn' => $ldapDn,

+ 'cn' => [$this->mockUser->name],

+ 'dn' => $ldapDn,

'my_custom_id' => ['cooluser456'],

- 'mail' => [$this->mockUser->email]

+ 'mail' => [$this->mockUser->email],

]]);

-

$resp = $this->mockUserLogin();

$resp->assertRedirect('/');

$this->followRedirects($resp)->assertSee($this->mockUser->name);

@@ -187,8 +189,8 @@ class LdapTest extends TestCase

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$this->mockLdap->shouldReceive('bind')->times(2)->andReturn(true, false);

@@ -217,14 +219,14 @@ class LdapTest extends TestCase

$userForm->assertDontSee('Password');

$save = $this->post('/settings/users/create', [

- 'name' => $this->mockUser->name,

+ 'name' => $this->mockUser->name,

'email' => $this->mockUser->email,

]);

$save->assertSessionHasErrors(['external_auth_id' => 'The external auth id field is required.']);

$save = $this->post('/settings/users/create', [

- 'name' => $this->mockUser->name,

- 'email' => $this->mockUser->email,

+ 'name' => $this->mockUser->name,

+ 'email' => $this->mockUser->email,

'external_auth_id' => $this->mockUser->name,

]);

$save->assertRedirect('/settings/users');

@@ -239,8 +241,8 @@ class LdapTest extends TestCase

$editPage->assertDontSee('Password');

$update = $this->put("/settings/users/{$editUser->id}", [

- 'name' => $editUser->name,

- 'email' => $editUser->email,

+ 'name' => $editUser->name,

+ 'email' => $editUser->email,

'external_auth_id' => 'test_auth_id',

]);

$update->assertRedirect('/settings/users');

@@ -249,7 +251,8 @@ class LdapTest extends TestCase

public function test_registration_disabled()

{

- $this->followingRedirects()->get('/register')->assertElementContains('#content', 'Log In');

+ $resp = $this->followingRedirects()->get('/register');

+ $this->withHtml($resp)->assertElementContains('#content', 'Log In');

}

public function test_non_admins_cannot_change_auth_id()

@@ -262,15 +265,15 @@ class LdapTest extends TestCase

public function test_login_maps_roles_and_retains_existing_roles()

{

- $roleToReceive = factory(Role::class)->create(['display_name' => 'LdapTester']);

- $roleToReceive2 = factory(Role::class)->create(['display_name' => 'LdapTester Second']);

- $existingRole = factory(Role::class)->create(['display_name' => 'ldaptester-existing']);

+ $roleToReceive = Role::factory()->create(['display_name' => 'LdapTester']);

+ $roleToReceive2 = Role::factory()->create(['display_name' => 'LdapTester Second']);

+ $existingRole = Role::factory()->create(['display_name' => 'ldaptester-existing']);

$this->mockUser->forceFill(['external_auth_id' => $this->mockUser->name])->save();

$this->mockUser->attachRole($existingRole);

app('config')->set([

- 'services.ldap.user_to_groups' => true,

- 'services.ldap.group_attribute' => 'memberOf',

+ 'services.ldap.user_to_groups' => true,

+ 'services.ldap.group_attribute' => 'memberOf',

'services.ldap.remove_from_groups' => false,

]);

@@ -278,15 +281,15 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

- 'mail' => [$this->mockUser->email],

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'mail' => [$this->mockUser->email],

'memberof' => [

'count' => 2,

- 0 => "cn=ldaptester,ou=groups,dc=example,dc=com",

- 1 => "cn=ldaptester-second,ou=groups,dc=example,dc=com",

- ]

+ 0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ 1 => 'cn=ldaptester-second,ou=groups,dc=example,dc=com',

+ ],

]]);

$this->mockUserLogin()->assertRedirect('/');

@@ -294,28 +297,28 @@ class LdapTest extends TestCase

$user = User::where('email', $this->mockUser->email)->first();

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive->id

+ 'role_id' => $roleToReceive->id,

]);

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive2->id

+ 'role_id' => $roleToReceive2->id,

]);

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $existingRole->id

+ 'role_id' => $existingRole->id,

]);

}

public function test_login_maps_roles_and_removes_old_roles_if_set()

{

- $roleToReceive = factory(Role::class)->create(['display_name' => 'LdapTester']);

- $existingRole = factory(Role::class)->create(['display_name' => 'ldaptester-existing']);

+ $roleToReceive = Role::factory()->create(['display_name' => 'LdapTester']);

+ $existingRole = Role::factory()->create(['display_name' => 'ldaptester-existing']);

$this->mockUser->forceFill(['external_auth_id' => $this->mockUser->name])->save();

$this->mockUser->attachRole($existingRole);

app('config')->set([

- 'services.ldap.user_to_groups' => true,

- 'services.ldap.group_attribute' => 'memberOf',

+ 'services.ldap.user_to_groups' => true,

+ 'services.ldap.group_attribute' => 'memberOf',

'services.ldap.remove_from_groups' => true,

]);

@@ -323,14 +326,14 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(3)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

- 'mail' => [$this->mockUser->email],

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'mail' => [$this->mockUser->email],

'memberof' => [

'count' => 1,

- 0 => "cn=ldaptester,ou=groups,dc=example,dc=com",

- ]

+ 0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ ],

]]);

$this->mockUserLogin()->assertRedirect('/');

@@ -338,29 +341,85 @@ class LdapTest extends TestCase

$user = User::query()->where('email', $this->mockUser->email)->first();

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive->id

+ 'role_id' => $roleToReceive->id,

]);

$this->assertDatabaseMissing('role_user', [

'user_id' => $user->id,

- 'role_id' => $existingRole->id

+ 'role_id' => $existingRole->id,

+ ]);

+ }

+

+ public function test_dump_user_groups_shows_group_related_details_as_json()

+ {

+ app('config')->set([

+ 'services.ldap.user_to_groups' => true,

+ 'services.ldap.group_attribute' => 'memberOf',

+ 'services.ldap.remove_from_groups' => true,

+ 'services.ldap.dump_user_groups' => true,

+ ]);

+

+ $userResp = ['count' => 1, 0 => [

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => 'dc=test,' . config('services.ldap.base_dn'),

+ 'mail' => [$this->mockUser->email],

+ ]];

+ $this->commonLdapMocks(1, 1, 4, 5, 4, 2);

+ $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)

+ ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

+ ->andReturn($userResp, ['count' => 1,

+ 0 => [

+ 'dn' => 'dc=test,' . config('services.ldap.base_dn'),

+ 'memberof' => [

+ 'count' => 1,

+ 0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ ],

+ ], [

+ 'count' => 1,

+ 0 => [

+ 'dn' => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ 'memberof' => [

+ 'count' => 1,

+ 0 => 'cn=monsters,ou=groups,dc=example,dc=com',

+ ],

+ ], ['count' => 0]);

+

+ $resp = $this->mockUserLogin();

+ $resp->assertJson([

+ 'details_from_ldap' => [

+ 'dn' => 'dc=test,' . config('services.ldap.base_dn'),

+ 'memberof' => [

+ 0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ 'count' => 1,

+ ],

+ 'parsed_direct_user_groups' => [

+ 'ldaptester',

+ ],

+ 'parsed_recursive_user_groups' => [

+ 'ldaptester',

+ 'monsters',

+ ],

]);

}

public function test_external_auth_id_visible_in_roles_page_when_ldap_active()

{

- $role = factory(Role::class)->create(['display_name' => 'ldaptester', 'external_auth_id' => 'ex-auth-a, test-second-param']);

+ $role = Role::factory()->create(['display_name' => 'ldaptester', 'external_auth_id' => 'ex-auth-a, test-second-param']);

$this->asAdmin()->get('/settings/roles/' . $role->id)

->assertSee('ex-auth-a');

}

public function test_login_maps_roles_using_external_auth_ids_if_set()

{

- $roleToReceive = factory(Role::class)->create(['display_name' => 'ldaptester', 'external_auth_id' => 'test-second-param, ex-auth-a']);

- $roleToNotReceive = factory(Role::class)->create(['display_name' => 'ex-auth-a', 'external_auth_id' => 'test-second-param']);

+ $roleToReceive = Role::factory()->create(['display_name' => 'ldaptester', 'external_auth_id' => 'test-second-param, ex-auth-a']);

+ $roleToNotReceive = Role::factory()->create(['display_name' => 'ex-auth-a', 'external_auth_id' => 'test-second-param']);

app('config')->set([

- 'services.ldap.user_to_groups' => true,

- 'services.ldap.group_attribute' => 'memberOf',

+ 'services.ldap.user_to_groups' => true,

+ 'services.ldap.group_attribute' => 'memberOf',

'services.ldap.remove_from_groups' => true,

]);

@@ -368,14 +427,14 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(3)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

- 'mail' => [$this->mockUser->email],

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'mail' => [$this->mockUser->email],

'memberof' => [

'count' => 1,

- 0 => "cn=ex-auth-a,ou=groups,dc=example,dc=com",

- ]

+ 0 => 'cn=ex-auth-a,ou=groups,dc=example,dc=com',

+ ],

]]);

$this->mockUserLogin()->assertRedirect('/');

@@ -383,25 +442,25 @@ class LdapTest extends TestCase

$user = User::query()->where('email', $this->mockUser->email)->first();

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive->id

+ 'role_id' => $roleToReceive->id,

]);

$this->assertDatabaseMissing('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToNotReceive->id

+ 'role_id' => $roleToNotReceive->id,

]);

}

public function test_login_group_mapping_does_not_conflict_with_default_role()

{

- $roleToReceive = factory(Role::class)->create(['display_name' => 'LdapTester']);

- $roleToReceive2 = factory(Role::class)->create(['display_name' => 'LdapTester Second']);

+ $roleToReceive = Role::factory()->create(['display_name' => 'LdapTester']);

+ $roleToReceive2 = Role::factory()->create(['display_name' => 'LdapTester Second']);

$this->mockUser->forceFill(['external_auth_id' => $this->mockUser->name])->save();

setting()->put('registration-role', $roleToReceive->id);

app('config')->set([

- 'services.ldap.user_to_groups' => true,

- 'services.ldap.group_attribute' => 'memberOf',

+ 'services.ldap.user_to_groups' => true,

+ 'services.ldap.group_attribute' => 'memberOf',

'services.ldap.remove_from_groups' => true,

]);

@@ -409,15 +468,15 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

- 'mail' => [$this->mockUser->email],

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'mail' => [$this->mockUser->email],

'memberof' => [

'count' => 2,

- 0 => "cn=ldaptester,ou=groups,dc=example,dc=com",

- 1 => "cn=ldaptester-second,ou=groups,dc=example,dc=com",

- ]

+ 0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ 1 => 'cn=ldaptester-second,ou=groups,dc=example,dc=com',

+ ],

]]);

$this->mockUserLogin()->assertRedirect('/');

@@ -425,28 +484,28 @@ class LdapTest extends TestCase

$user = User::query()->where('email', $this->mockUser->email)->first();

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive->id

+ 'role_id' => $roleToReceive->id,

]);

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive2->id

+ 'role_id' => $roleToReceive2->id,

]);

}

public function test_login_uses_specified_display_name_attribute()

{

app('config')->set([

- 'services.ldap.display_name_attribute' => 'displayName'

+ 'services.ldap.display_name_attribute' => 'displayName',

]);

$this->commonLdapMocks(1, 1, 2, 4, 2);

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

- 'displayname' => 'displayNameAttribute'

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'displayname' => 'displayNameAttribute',

]]);

$this->mockUserLogin()->assertRedirect('/login');

@@ -461,7 +520,7 @@ class LdapTest extends TestCase

public function test_login_uses_default_display_name_attribute_if_specified_not_present()

{

app('config')->set([

- 'services.ldap.display_name_attribute' => 'displayName'

+ 'services.ldap.display_name_attribute' => 'displayName',

]);

$this->commonLdapMocks(1, 1, 2, 4, 2);

@@ -469,8 +528,8 @@ class LdapTest extends TestCase

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$this->mockUserLogin()->assertRedirect('/login');

@@ -480,25 +539,25 @@ class LdapTest extends TestCase

$resp->assertRedirect('/');

$this->get('/')->assertSee($this->mockUser->name);

$this->assertDatabaseHas('users', [

- 'email' => $this->mockUser->email,

- 'email_confirmed' => false,

+ 'email' => $this->mockUser->email,

+ 'email_confirmed' => false,

'external_auth_id' => $this->mockUser->name,

- 'name' => $this->mockUser->name

+ 'name' => $this->mockUser->name,

]);

}

protected function checkLdapReceivesCorrectDetails($serverString, $expectedHost, $expectedPort)

{

app('config')->set([

- 'services.ldap.server' => $serverString

+ 'services.ldap.server' => $serverString,

]);

// Standard mocks

$this->commonLdapMocks(0, 1, 1, 2, 1);

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)->andReturn(['count' => 1, 0 => [

'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$this->mockLdap->shouldReceive('connect')->once()

@@ -557,15 +616,17 @@ class LdapTest extends TestCase

public function test_dump_user_details_option_works()

{

- config()->set(['services.ldap.dump_user_details' => true]);

+ config()->set(['services.ldap.dump_user_details' => true, 'services.ldap.thumbnail_attribute' => 'jpegphoto']);

$this->commonLdapMocks(1, 1, 1, 1, 1);

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ // Test dumping binary data for avatar responses

+ 'jpegphoto' => base64_decode('/9j/4AAQSkZJRg=='),

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$resp = $this->post('/login', [

@@ -573,7 +634,7 @@ class LdapTest extends TestCase

'password' => $this->mockUser->password,

]);

$resp->assertJsonStructure([

- 'details_from_ldap' => [],

+ 'details_from_ldap' => [],

'details_bookstack_parsed' => [],

]);

}

@@ -603,8 +664,8 @@ class LdapTest extends TestCase

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), ['cn', 'dn', 'uid', 'mail', 'cn'])

->andReturn(['count' => 1, 0 => [

'uid' => [hex2bin('FFF8F7')],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')]

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

]]);

$details = $ldapService->getUserDetails('test');

@@ -617,14 +678,14 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'uid' => [$this->mockUser->name],

- 'cn' => [$this->mockUser->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'uid' => [$this->mockUser->name],

+ 'cn' => [$this->mockUser->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

'mail' => '[email protected]',

]], ['count' => 1, 0 => [

- 'uid' => ['Barry'],

- 'cn' => ['Scott'],

- 'dn' => ['dc=bscott' . config('services.ldap.base_dn')],

+ 'uid' => ['Barry'],

+ 'cn' => ['Scott'],

+ 'dn' => ['dc=bscott' . config('services.ldap.base_dn')],

'mail' => '[email protected]',

]]);

@@ -639,44 +700,50 @@ class LdapTest extends TestCase

public function test_login_with_email_confirmation_required_maps_groups_but_shows_confirmation_screen()

{

- $roleToReceive = factory(Role::class)->create(['display_name' => 'LdapTester']);

- $user = factory(User::class)->make();

+ $roleToReceive = Role::factory()->create(['display_name' => 'LdapTester']);

+ $user = User::factory()->make();

setting()->put('registration-confirmation', 'true');

app('config')->set([

- 'services.ldap.user_to_groups' => true,

- 'services.ldap.group_attribute' => 'memberOf',

+ 'services.ldap.user_to_groups' => true,

+ 'services.ldap.group_attribute' => 'memberOf',

'services.ldap.remove_from_groups' => true,

]);

- $this->commonLdapMocks(1, 1, 3, 4, 3, 2);

+ $this->commonLdapMocks(1, 1, 6, 8, 6, 4);

$this->mockLdap->shouldReceive('searchAndGetEntries')

- ->times(3)

+ ->times(6)

->andReturn(['count' => 1, 0 => [

- 'uid' => [$user->name],

- 'cn' => [$user->name],

- 'dn' => ['dc=test' . config('services.ldap.base_dn')],

- 'mail' => [$user->email],

+ 'uid' => [$user->name],

+ 'cn' => [$user->name],

+ 'dn' => ['dc=test' . config('services.ldap.base_dn')],

+ 'mail' => [$user->email],

'memberof' => [

'count' => 1,

- 0 => "cn=ldaptester,ou=groups,dc=example,dc=com",

- ]

+ 0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',

+ ],

]]);

- $this->followingRedirects()->mockUserLogin()->assertSee('Thanks for registering!');

+ $login = $this->followingRedirects()->mockUserLogin();

+ $login->assertSee('Thanks for registering!');

$this->assertDatabaseHas('users', [

- 'email' => $user->email,

+ 'email' => $user->email,

'email_confirmed' => false,

]);

$user = User::query()->where('email', '=', $user->email)->first();

$this->assertDatabaseHas('role_user', [

'user_id' => $user->id,

- 'role_id' => $roleToReceive->id

+ 'role_id' => $roleToReceive->id,

]);

+ $this->assertNull(auth()->user());

+

$homePage = $this->get('/');

- $homePage->assertRedirect('/register/confirm/awaiting');

+ $homePage->assertRedirect('/login');

+

+ $login = $this->followingRedirects()->mockUserLogin();

+ $login->assertSee('Email Address Not Confirmed');

}

public function test_failed_logins_are_logged_when_message_configured()

@@ -696,11 +763,11 @@ class LdapTest extends TestCase

$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)

->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))

->andReturn(['count' => 1, 0 => [

- 'cn' => [$this->mockUser->name],

- 'dn' => $ldapDn,

+ 'cn' => [$this->mockUser->name],

+ 'dn' => $ldapDn,

'jpegphoto' => [base64_decode('/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8Q

EBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=')],

- 'mail' => [$this->mockUser->email]

+ 'mail' => [$this->mockUser->email],

]]);

$this->mockUserLogin()