Page MenuHomePhorge
Differential D1894

Room Security Options - Password
ClosedPublic
Actions

Authored by machniak on Nov 27 2020, 12:43 PM.

Details

Reviewers
vanmeeuwen
Group Reviewers
Restricted Project
Commits
rK0794370955ad: Room Security Options - Password
Test Plan

./phpunit

Diff Detail

Repository
rK kolab
Branch
dev/room-security-options
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 31990
Build 12217: arc lint + arc unit

Event Timeline

machniak requested review of this revision.Nov 27 2020, 12:43 PM
machniak created this revision.
Harbormaster completed remote builds in B31966: Diff 5218.Nov 27 2020, 12:43 PM
machniak updated this revision to Diff 5242.Dec 1 2020, 2:32 PM
  • Comment out room locking options
Harbormaster completed remote builds in B31990: Diff 5242.Dec 1 2020, 2:32 PM
vanmeeuwen updated this revision to Diff 5248.Dec 4 2020, 10:31 AM
vanmeeuwen subscribed.
  • We're getting superfluous log messages from the web socket router
Harbormaster completed remote builds in B31996: Diff 5248.Dec 4 2020, 10:31 AM
vanmeeuwen accepted this revision.Dec 4 2020, 10:36 AM
This revision is now accepted and ready to land.Dec 4 2020, 10:36 AM
Closed by commit rK0794370955ad: Room Security Options - Password. · Explain WhyDec 4 2020, 10:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
src/
app/
Http/
Controllers/
API/
V4/
91 lines
OpenVidu/
8 lines
resources/
js/
2 lines
lang/
en/
4 lines
themes/
30 lines
4 lines
vue/
Meet/
117 lines
110 lines
routes/
3 lines
tests/
Browser/
Meet/
5 lines
129 lines
15 lines
Pages/
Meet/
1 line
Feature/
Controller/
129 lines

Diff 5242

View Options

src/app/Http/Controllers/API/V4/OpenViduController.php

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/app/OpenVidu/Room.php

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/resources/js/meet.js

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/resources/lang/en/meet.php

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/resources/themes/forms.scss

Loading...
View Options

src/resources/themes/meet.scss

Loading...
View Options

src/resources/vue/Meet/Room.vue

Loading...
View Options

src/resources/vue/Meet/SessionSecurityOptions.vue

Loading...
View Options

src/routes/api.php

Loading...
View Options

src/tests/Browser/Meet/RoomControlsTest.php

Loading...
View Options

src/tests/Browser/Meet/RoomSecurityTest.php

Loading...
View Options

src/tests/Browser/Meet/RoomSetupTest.php

Loading...
View Options

src/tests/Browser/Pages/Meet/Room.php

Loading...
View Options

src/tests/Feature/Controller/OpenViduTest.php

Loading...