Page MenuHomePhorge
Differential D4932

MFA: Support multiple digest algos at a time
ClosedPublic
Actions

Authored by machniak on Sep 12 2024, 10:58 AM.

Details

Reviewers
mollekopf
Group Reviewers
Restricted Project
Commits
rK4d6220e12bd9: MFA: Support multiple digest algos at a time
Summary

Marged in kolab_2fa changes from https://git.kolab.org/rRPKa2119c58f6d24533f11064127f356c546d66ef26

Test Plan

./phpunit

Diff Detail

Repository
rK kolab
Branch
dev/2fa-fix
Lint
Lint Skipped
Unit
No Test Coverage
Build Status
Buildable 50319
Build 18384: arc lint + arc unit

Revision Contents
Changeset List

PathSize
src/
app/
Auth/
19 lines
include/
Kolab2FA/
Driver/
194 lines
1 line
61 lines
93 lines
24 lines

Diff 14139

View Options

src/app/Auth/SecondFactor.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/include/Kolab2FA/Driver/Base.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/include/Kolab2FA/Driver/Exception.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/include/Kolab2FA/Driver/HOTP.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/include/Kolab2FA/Driver/TOTP.php

Loading...
View Options

src/include/Kolab2FA/Driver/Yubikey.php

Loading...