Browse Source

Change timestamp data type. (#4355)

Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
pull/4436/head
gzfrozen 10 months ago
committed by GitHub
parent
commit
000c606029
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 0
      migrations/mysql/2024-02-14-135828_change_time_stamp_data_type/down.sql
  2. 1
      migrations/mysql/2024-02-14-135828_change_time_stamp_data_type/up.sql
  3. 0
      migrations/postgresql/2024-02-14-135953_change_time_stamp_data_type/down.sql
  4. 3
      migrations/postgresql/2024-02-14-135953_change_time_stamp_data_type/up.sql
  5. 0
      migrations/sqlite/2024-02-14-140000_change_time_stamp_data_type/down.sql
  6. 1
      migrations/sqlite/2024-02-14-140000_change_time_stamp_data_type/up.sql
  7. 6
      src/api/core/two_factor/authenticator.rs
  8. 2
      src/db/models/two_factor.rs
  9. 2
      src/db/schemas/mysql/schema.rs
  10. 2
      src/db/schemas/postgresql/schema.rs
  11. 2
      src/db/schemas/sqlite/schema.rs

0
migrations/mysql/2024-02-14-135828_change_time_stamp_data_type/down.sql

1
migrations/mysql/2024-02-14-135828_change_time_stamp_data_type/up.sql

@ -0,0 +1 @@
ALTER TABLE twofactor MODIFY last_used BIGINT NOT NULL;

0
migrations/postgresql/2024-02-14-135953_change_time_stamp_data_type/down.sql

3
migrations/postgresql/2024-02-14-135953_change_time_stamp_data_type/up.sql

@ -0,0 +1,3 @@
ALTER TABLE twofactor
ALTER COLUMN last_used TYPE BIGINT,
ALTER COLUMN last_used SET NOT NULL;

0
migrations/sqlite/2024-02-14-140000_change_time_stamp_data_type/down.sql

1
migrations/sqlite/2024-02-14-140000_change_time_stamp_data_type/up.sql

@ -0,0 +1 @@
-- Integer size in SQLite is already i64, so we don't need to do anything

6
src/api/core/two_factor/authenticator.rs

@ -157,7 +157,7 @@ pub async fn validate_totp_code(
let generated = totp_custom::<Sha1>(30, 6, &decoded_secret, time);
// Check the given code equals the generated and if the time_step is larger then the one last used.
if generated == totp_code && time_step > i64::from(twofactor.last_used) {
if generated == totp_code && time_step > twofactor.last_used {
// If the step does not equals 0 the time is drifted either server or client side.
if step != 0 {
warn!("TOTP Time drift detected. The step offset is {}", step);
@ -165,10 +165,10 @@ pub async fn validate_totp_code(
// Save the last used time step so only totp time steps higher then this one are allowed.
// This will also save a newly created twofactor if the code is correct.
twofactor.last_used = time_step as i32;
twofactor.last_used = time_step;
twofactor.save(conn).await?;
return Ok(());
} else if generated == totp_code && time_step <= i64::from(twofactor.last_used) {
} else if generated == totp_code && time_step <= twofactor.last_used {
warn!("This TOTP or a TOTP code within {} steps back or forward has already been used!", steps);
err!(
format!("Invalid TOTP code! Server time: {} IP: {}", current_time.format("%F %T UTC"), ip.ip),

2
src/db/models/two_factor.rs

@ -12,7 +12,7 @@ db_object! {
pub atype: i32,
pub enabled: bool,
pub data: String,
pub last_used: i32,
pub last_used: i64,
}
}

2
src/db/schemas/mysql/schema.rs

@ -160,7 +160,7 @@ table! {
atype -> Integer,
enabled -> Bool,
data -> Text,
last_used -> Integer,
last_used -> BigInt,
}
}

2
src/db/schemas/postgresql/schema.rs

@ -160,7 +160,7 @@ table! {
atype -> Integer,
enabled -> Bool,
data -> Text,
last_used -> Integer,
last_used -> BigInt,
}
}

2
src/db/schemas/sqlite/schema.rs

@ -160,7 +160,7 @@ table! {
atype -> Integer,
enabled -> Bool,
data -> Text,
last_used -> Integer,
last_used -> BigInt,
}
}

Loading…
Cancel
Save