Skip to content

Commit d55149d

Browse files
chore: upgrade deps, switch to base-ui (#33)
Signed-off-by: Henry <mail@henrygressmann.de>
1 parent e5493e1 commit d55149d

31 files changed

Lines changed: 827 additions & 780 deletions

Cargo.lock

Lines changed: 559 additions & 295 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ path="src/main.rs"
1717
[dependencies]
1818
# async/concurrency
1919
arc-swap="1.8"
20-
tokio={version="1.49", default-features=false, features=["macros", "rt-multi-thread", "signal"]}
20+
tokio={version="1.50", default-features=false, features=["macros", "rt-multi-thread", "signal"]}
2121
tokio-util={version="0.7", features=["io"]}
2222
futures-lite={version="2.6", default-features=false, features=["alloc"]}
2323
quick_cache={version="0.6", features=["ahash"]}
@@ -27,18 +27,21 @@ hex={version="0.4"}
2727
bs58="0.5"
2828
serde={version="1.0", features=["derive"]}
2929
serde_json={version="1.0"}
30-
md5={package="md-5", version="0.10.6"}
30+
md-5={version="0.11.0-rc.5"}
3131
async-compression={version="0.4", default-features=false, features=["gzip", "tokio"]}
3232
tokio-tar={package="astral-tokio-tar", version="0.5"}
33-
sha3={version="0.10"}
34-
argon2={version="0.5", features=["rand"]}
35-
password-hash={version="0.5", features=["rand_core", "getrandom"]} # required for getrandom feature
33+
blake3={version="1.8"}
34+
argon2={version="0.6.0-rc.7", features=[]}
35+
password-hash={version="0.6.0-rc.12", features=[
36+
"rand_core",
37+
"getrandom",
38+
]} # required for getrandom feature
3639
zstd={version="0.13", default-features=false}
3740

3841
# general
3942
argh={version="0.1", default-features=false, features=["help"]}
4043
anyhow={version="1.0"}
41-
rand={version="0.9", default-features=false, features=["std", "thread_rng"]}
44+
rand={version="0.10.0", default-features=false, features=["std", "thread_rng"]}
4245
chrono={version="0.4", default-features=false, features=["std", "now", "serde"]}
4346
figment={version="0.10", features=["toml", "env"]}
4447
tracing={version="0.1", default-features=false, features=["std"]}
@@ -89,8 +92,7 @@ maxminddb={version="0.27", optional=true, features=["simdutf8"]}
8992
figment={version="*", features=["test"]}
9093
cookie={version="*", default-features=false}
9194
tower={version="*", features=["util"]}
92-
hyper={version="*", features=["full"]}
93-
axum-test={version="18"}
95+
axum-test={version="19"}
9496

9597
[features]
9698
default=["geoip"]

about.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ accepted=[
55
"ISC",
66
"MPL-2.0",
77
"BSD-3-Clause",
8+
"BSD-2-Clause",
89
"Unicode-DFS-2016",
910
"Unicode-3.0",
1011
"OpenSSL",

data/licenses-cargo.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

data/licenses-npm.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

data/spammers.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ bowigosale.xyz
342342
bpro1.top
343343
bradleylive.xyz
344344
brakehawk.com
345+
brandnewtube.com
345346
brateg.xyz
346347
brauni.com.ua
347348
bravica.biz
@@ -745,6 +746,7 @@ fartunabest.ru
745746
fashiong.ru
746747
fast-wordpress-start.com
747748
fastgg.net
749+
fatrizscae.online
748750
favoritki-msk.ru
749751
fazika.ru
750752
fbdownloader.com

data/ua_regexes.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

data/ua_regexes.json.zstd

-1.33 KB
Binary file not shown.

src/app/core.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pub mod events;
33
pub mod onboarding;
44
pub mod projects;
55
pub mod reports;
6-
mod reports_cached;
76
pub mod sessions;
87
pub mod users;
98

src/app/core/events.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::sync::Arc;
33
use anyhow::{Result, bail};
44
use arc_swap::ArcSwap;
55
use chrono::{DateTime, Utc};
6+
use rand::distr::{SampleString, StandardUniform};
67
use std::sync::mpsc::Receiver;
78

89
use crate::app::models::{Event, event_params};
910
use crate::app::{DuckDBPool, EVENT_BATCH_INTERVAL, SqlitePool};
10-
use crate::utils::hash::generate_salt;
1111

1212
#[derive(Clone)]
1313
pub struct LiwanEvents {
@@ -34,7 +34,7 @@ impl LiwanEvents {
3434
// if the salt is older than 24 hours, replace it with a new one (utils::generate_salt)
3535
if (Utc::now() - updated_at) > chrono::Duration::hours(24) {
3636
tracing::debug!("Daily salt expired, generating a new one");
37-
let new_salt = generate_salt();
37+
let new_salt = StandardUniform.sample_string(&mut rand::rng(), 16);
3838
let now = Utc::now();
3939
let conn = self.sqlite.get()?;
4040
conn.execute("update salts set salt = ?, updated_at = ? where id = 1", rusqlite::params![&new_salt, now])?;

0 commit comments

Comments
 (0)