Skip to content

Get password from session if not given when joining room #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 3 commits into from
Aug 28, 2019
Merged

Get password from session if not given when joining room #2121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee0e77f
Get password from session if not given when joining room
nickvergessen Jun 27, 2019
5a178aa
Add acceptance tests for joining a password protected room as a user
danxuliu Aug 26, 2019
bff5d29
Add acceptance tests for joining again a password protected room
danxuliu Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Get password from session if not given when joining room 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @danxuliu
nickvergessen authored and danxuliu committed Aug 28, 2019
commit ee0e77f48f533f8ab9f0faa8eb181dd45124e3f5
13 changes: 7 additions & 6 deletions lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@ public function index(string $token = '', string $callUser = '', string $passwor
$token = '';
}

$this->talkSession->removePasswordForRoom($token);

if ($room instanceof Room && $room->hasPassword()) {
// If the user joined themselves or is not found, they need the password.
try {
Expand All @@ -172,12 +170,14 @@ public function index(string $token = '', string $callUser = '', string $passwor
}

if ($requirePassword) {
$password = $password !== '' ? $password : (string) $this->talkSession->getPasswordForRoom($token);

$passwordVerification = $room->verifyPassword($password);

if ($passwordVerification['result']) {
$this->talkSession->setPasswordForRoom($token, $token);
$this->talkSession->setPasswordForRoom($token, $password);
} else {
$this->talkSession->removePasswordForRoom($token);
if ($passwordVerification['url'] === '') {
return new TemplateResponse($this->appName, 'authenticate', [
'wrongpw' => $password !== '',
Expand Down Expand Up @@ -226,13 +226,14 @@ protected function guestEnterRoom(string $token, string $password): Response {
]));
}

$this->talkSession->removePasswordForRoom($token);
if ($room->hasPassword()) {
$passwordVerification = $room->verifyPassword($password);
$password = $password !== '' ? $password : (string) $this->talkSession->getPasswordForRoom($token);

$passwordVerification = $room->verifyPassword($password);
if ($passwordVerification['result']) {
$this->talkSession->setPasswordForRoom($token, $token);
$this->talkSession->setPasswordForRoom($token, $password);
} else {
$this->talkSession->removePasswordForRoom($token);
if ($passwordVerification['url'] === '') {
return new TemplateResponse($this->appName, 'authenticate', [
'wrongpw' => $password !== '',
Expand Down
5 changes: 3 additions & 2 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,10 +879,11 @@ public function joinRoom(string $token, string $password = ''): DataResponse {

$user = $this->userManager->get($this->userId);
try {
$result = $room->verifyPassword((string) $this->session->getPasswordForRoom($token));
if ($user instanceof IUser) {
$newSessionId = $room->joinRoom($user, $password, $this->session->getPasswordForRoom($token) === $room->getToken());
$newSessionId = $room->joinRoom($user, $password, $result['result']);
} else {
$newSessionId = $room->joinRoomGuest($password, $this->session->getPasswordForRoom($token) === $room->getToken());
$newSessionId = $room->joinRoomGuest($password, $result['result']);
}
} catch (InvalidPasswordException $e) {
return new DataResponse([], Http::STATUS_FORBIDDEN);
Expand Down