Skip to content

Commit c1abb90

Browse files
HalsekiRaikaHalsekiRaika
authored
⬆️ - Apply updates to dependencies that renovate cannot handle. (#30)
1 parent 22c1b12 commit c1abb90

13 files changed

Lines changed: 709 additions & 542 deletions

File tree

‎Cargo.lock‎

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

‎application/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "AGPL-3.0-or-later"
99
name = "main"
1010

1111
[dependencies]
12-
mockall = "0.11"
12+
mockall = "0.12"
1313
async-trait = "0.1"
1414

1515
thiserror = { workspace = true }

‎driver/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "AGPL-3.0-or-later"
99
[dependencies]
1010
dotenvy = "0.15"
1111
async-trait = "0.1"
12-
deadpool-redis = "0.13"
12+
deadpool-redis = "0.14.0"
1313
sqlx = { version = "0.7", features = ["uuid", "time", "postgres", "runtime-tokio-native-tls"] }
1414
lettre = { version = "0.11", features = ["tokio1", "tokio1-native-tls"] }
1515
once_cell = "1"

‎kernel/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "AGPL-3.0-or-later"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
mockall = "0.11"
10+
mockall = "0.12.1"
1111
dotenvy = "0.15"
1212
argon2 = { version = "0.5", features = ["std"] }
1313
rand = "0.8.5"
@@ -17,9 +17,9 @@ serde = { version = "1", features = ["derive"] }
1717
sha2 = "0.10.8"
1818
base64 = "0.21.5"
1919
once_cell = "1"
20-
destructure = "0.3.0"
20+
destructure = "0.5.5"
2121
async-trait = "0.1"
22-
jsonwebtoken = "8.3.0"
22+
jsonwebtoken = "9.2.0"
2323
jsonwebkey = { version = "0.3.5", features = ["generate"] }
2424
url = { version = "2.4.1", features = ["serde"] }
2525
try-ref = "0.1"

‎kernel/src/entities/client/jwt.rs‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl ClientSignJwt {
2525
JwtClaims {
2626
iss: Uuid::new_v4(),
2727
sub: Uuid::new_v4(),
28-
aud: "".to_string(),
28+
aud: "placeholder".to_string(),
2929
exp: 0,
3030
jti: "".to_string(),
3131
iat: OffsetDateTime::now_utc().unix_timestamp(),
@@ -34,7 +34,8 @@ impl ClientSignJwt {
3434

3535
pub fn decode(self, pubkey: impl AsRef<[u8]>) -> Result<ClientDecodeJwt, KernelError> {
3636
let key = DecodingKey::from_rsa_pem(pubkey.as_ref())?;
37-
let val = Validation::new(Algorithm::RS512);
37+
let mut val = Validation::new(Algorithm::RS512);
38+
val.validate_aud = false; // FixMe: Should validate aud.
3839
let dec = jsonwebtoken::decode::<JwtClaims>(self.as_ref(), &key, &val)?;
3940
Ok(ClientDecodeJwt(dec.claims))
4041
}
@@ -128,42 +129,43 @@ mod tests {
128129
let ticket = TicketId::default();
129130

130131
let test_privkey = r#"-----BEGIN PRIVATE KEY-----
131-
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDkEVd+zWLER7H/
132-
XkcC8jHojBzlNj0QRDwyiGeIu+GTJdbYXUZ6a5gFdSJiQO/T0JhGhX0Q23LwOBL/
133-
vPWZsW/oTzcIpzGfvvg0HJQRiixmBGfxFgultTyoXVd21dhl+TzA1tJZbEVFcVZ1
134-
JbvzbZoLA46G2gX4aaXqEEqbgHD8PN6pZQkcTjEaEsruvzUiFPTx4ODQKemYyRxn
135-
ES6NQcbuxN20++pFW81RsCAf4c1bc+EfCjPXLzdGRAT/NAz6etl7il7yL7Dm6tHJ
136-
uY7r5LMozZDXLqA+iRjmG/DvWTvd5dgZGP1+jZNYbFc0BSkXp+n8Ki1tJ41Wc1cU
137-
wd2P/KudAgMBAAECggEABozs9hUQwichA1RXi8vIXS/btfBR3qwRt+MtE236CPpB
138-
lSNQs+bFOLA9lZQx5I6Ni8ZSakUzTuz9YV+xr4FmKnD5WVlGq++V52vutiDsLN3x
139-
h6jPcCn9clnZT5jNcgME7gZS3QNRa1uEVTGz7UZM8gYJy5vAJ3tkADi0O9/Q3vMU
140-
DbZNtFInjONlmE7HenuVG5JHEPDMnGGa2gWEyFjPqqoQl2WkC3tQTgiNHKWqnb6G
141-
IlqS7S57wfzINBB0xyATL0ccALII7VCtG0oXD9/5X/knJngOyIoOR01plfpAijQ6
142-
LKghxzBdnenzSKUYiQp7pwlzdbkUX8dPVSXEmqLqYQKBgQD98bDD4RT/LeE8d8YY
143-
DbCgO+JxzGY5vK/XJt1lmgGpnhCqVFLlujkuckyqdqYmbR6RBv46LlUoP6cawEI9
144-
U6ookHPkIopRMqoOupumnehVdmtGAtOgUc45GPYP4c+QYj872nNsGd5aoxip58Sp
145-
GES0nrEqNj7TfDdacAfFeifBuQKBgQDl6gV/T0e4JnRnSopYy0Kc6CBBslFe6hPY
146-
F6s4iPPcd/RElkIvmA1MIvSZRDbPlbtgND0f0Y0XE5h936dk/iXr/FHrZsimSV1P
147-
aszkul+/wtBM917F/2JRFlA8cCksquuaLNWQCPRhyb2YXQToJ/VzoN64KdMt4Yfc
148-
Tbe5pTJ7BQKBgFONgSaB2UG4m8IkenYRkwq1iWT95qiaj5SPwgqa6G8hhcQ1KG1T
149-
n1rL2rO/hB1ii8sV7PHBqt0qTFX96g15iKP+G1N1leLvc4qTFYF1tSrhYpxPc8ft
150-
AphAwT0qg/uyh7Gux4lK3aEexo+opUkppflzuUD1RiiZVzEXaUctUQVpAoGBAI9y
151-
1f86veq9w3722R7Rozw28HlNAswPjFYVXnUlrdFu3m80uRLs8c8BOE+waepW59P8
152-
g+6oVjmBtnFC7DRtBcgZZBtVw/dMavW0EybaygbhTAnZhb5Pu04Qd/tdl7MQ6XMG
153-
ajE2BRRGRQ8daoRW+iQsyQlqvyIvRw9DRlCEK9zpAoGBAOt5b+dv9QfoAUjxx1dH
154-
bg+skddR4yECjixizTZW0MzmpJX+XyjEadxGzfRNFUigrOKBPKDZszATfHjkTPEW
155-
jkVDCHoCcH933Jm9OoyDBipOcS+3nJXICmTYJbQctnV39ifHaHc33vfPwD30QCbp
156-
JlWfCE3u+4pT68/Fc8kOq6oT
157-
-----END PRIVATE KEY-----"#;
132+
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDbMeVgbOOI6uT/
133+
Jj4JqP3FTP2ymBTG15jcOZekMxgeYr/D5Yn4G8OZyVqc5UfPnUe1nZYxIOz5G6kV
134+
scToNVPfqyvsyp9wpV0jZiUpOwG7zv6sSuG4cIXjg1ZBycNNEaYLqki4xw/yfei+
135+
46DHYn/MYU7SipmGSIgcBRXEixvnZU4WyUl1+hfzsTcWUe6s7UDR/SLm8PnmUALA
136+
aKhyQro46vSTMUD8W01drehnxtk+MjLOPnWI21N7rzVp3fecKn+rYBZJWZhoaMIa
137+
eKFgASVqt1u19Zjs1sBFhiYegkRh/UO0v8wDOEN5mv7RslzTkaEkNJ1DjUrcDbAc
138+
QZeuAdwdAgMBAAECggEAJ2EZcm9dmXWJ2oUGVDn2DYI9ed50rRyCq9307lz3kk3v
139+
YcRVOyvRwkk4bEOM2THKdkhveTgPGtnrUKh1Vbpu7RoVdB8a8ePjjb6GIpglQZZ4
140+
jn+NedNNWoh38K3M1oW7LRFUq02oAcq5C8JdWjTJ/O/md1DLMCLLwSzwsjTDuJhX
141+
SK//LMg4E1rYkdMxJMx7VD2KyGyfSM4akC/Fqgca3v707nv1nRB8W+BAxGfGgOGa
142+
5381KlTxSX1f3Y7EJ1qziGtu1ROSUCkKXGVLOSD6wD5axO7Yi9JrEQ1yrOFKstmi
143+
MobfUCMYtHb94196/fOs1hbcU4WX0gMvH8ckGjuNgQKBgQDbj7cyqFY7d3btsLR5
144+
le/UUHn0fIYrVI4J3UNOC3K5GiJkpPdgSgNSYCmQZ6t7WKfsh5NeA4BOdKEBBFQd
145+
+Ao1tjAmKe0xjiGoOVDGVT2mmE6GGkR+8o7Iu7eG3JJ6Rb/HG8mhjJus8HVPhYlN
146+
5pQZI45vuLt+AcDRNF5UR2hV8QKBgQD/kpwos9KiF+Lh19BFYuFqk6uk6jDj7urR
147+
qCwNnD1Z6m4zXJ3kgEoe/RGdWIBdOuZs3goX9z36wWurWmR1cpPPm7deWQh8Kpwa
148+
rK0Pef7bHYdW3O27Vp+ofi9tVDOMnleOKYcxqPWKljMSFsYTuLTDPDAEs2/XYoTb
149+
A8GbpZMM7QKBgQC3Msw+RX1mMwEVxNphlPy+38NSf1CH+Q5nJqrRBPZdgnPuHEOY
150+
oUjyQ/CKYCYSTmAXGOyahjtZuzDYI194fg0u0eyM+3DBZ4Gn1uMSCe/eALmMZYB/
151+
mC4RSagRrBvAUFB7dzEfTa5bd2u6xYZSbLFn5GYlzDMNKbNUG+kVU1u4UQKBgQC9
152+
7fafSQP/8kBqFjhxWEqtKZElveUXfzaDGLekZbgyWkYLZYjxh2WOIgQ1KtA6eMtF
153+
nL1jkho9gADEFykRH1U5tD9Rnljv7bqVGD6EgeUkcY1iwEzsLDP6w8v7M9gbaJEo
154+
1TPjc+0GURkjGEmb3mh3rwMAe1lid5TELsZzJVljAQKBgQCtFC5jt8e83ZavJ5QI
155+
O8uLmYw53sgKh0A0V6b0Gdtb43WFwjklq06x0UvmOIkWDGeInoG1++vni6kKs+fI
156+
uL+2bEiLihRW+6dEVtkdLp7ubr8wGC8Khg79j8KGWFpk5UnnkgVFcNko1XyoXj5j
157+
Mdcoc6fLHcNU3ck83PBHSXuahg==
158+
-----END PRIVATE KEY-----
159+
"#;
158160

159161
let test_pub_key = r#"-----BEGIN PUBLIC KEY-----
160-
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5BFXfs1ixEex/15HAvIx
161-
6Iwc5TY9EEQ8MohniLvhkyXW2F1GemuYBXUiYkDv09CYRoV9ENty8DgS/7z1mbFv
162-
6E83CKcxn774NByUEYosZgRn8RYLpbU8qF1XdtXYZfk8wNbSWWxFRXFWdSW7822a
163-
CwOOhtoF+Gml6hBKm4Bw/DzeqWUJHE4xGhLK7r81IhT08eDg0CnpmMkcZxEujUHG
164-
7sTdtPvqRVvNUbAgH+HNW3PhHwoz1y83RkQE/zQM+nrZe4pe8i+w5urRybmO6+Sz
165-
KM2Q1y6gPokY5hvw71k73eXYGRj9fo2TWGxXNAUpF6fp/CotbSeNVnNXFMHdj/yr
166-
nQIDAQAB
162+
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2zHlYGzjiOrk/yY+Caj9
163+
xUz9spgUxteY3DmXpDMYHmK/w+WJ+BvDmclanOVHz51HtZ2WMSDs+RupFbHE6DVT
164+
36sr7MqfcKVdI2YlKTsBu87+rErhuHCF44NWQcnDTRGmC6pIuMcP8n3ovuOgx2J/
165+
zGFO0oqZhkiIHAUVxIsb52VOFslJdfoX87E3FlHurO1A0f0i5vD55lACwGiockK6
166+
OOr0kzFA/FtNXa3oZ8bZPjIyzj51iNtTe681ad33nCp/q2AWSVmYaGjCGnihYAEl
167+
ardbtfWY7NbARYYmHoJEYf1DtL/MAzhDeZr+0bJc05GhJDSdQ41K3A2wHEGXrgHc
168+
HQIDAQAB
167169
-----END PUBLIC KEY-----"#;
168170

169171
let mut jwt = ClientSignJwt::claims();

‎kernel/src/entities/client/scope.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub struct Scopes(HashMap<ScopeMethod, ScopeDescription>);
88

99
impl Scopes {
1010
pub fn new(values: impl Into<Vec<(ScopeMethod, ScopeDescription)>>) -> Self {
11-
Self(HashMap::from_iter(values.into().into_iter()))
11+
Self(HashMap::from_iter(values.into()))
1212
}
1313

1414
pub fn iter(&self) -> impl Iterator<Item = (&ScopeMethod, &ScopeDescription)> {

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.73.0"
2+
channel = "stable"

‎server/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ license = "AGPL-3.0-or-later"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
axum = { version = "0.6", features = ["multipart", "query", "headers"] }
11-
axum-extra = { version = "0.8.0", features = ["cookie"] }
12-
tower-http = { version = "0.4", features = ["cors", "trace"] }
10+
axum = { version = "0.7", features = ["multipart", "query"] }
11+
axum-extra = { version = "0.9", features = ["cookie", "typed-header"] }
12+
tower-http = { version = "0.5", features = ["cors", "trace"] }
1313
tokio = { version = "1", features = ["full"] }
1414
thiserror = { workspace = true }
1515
anyhow = { workspace = true }

‎server/src/error.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use application::{ApplicationError, ExpectUserAction};
22
use axum::{
3-
headers::{HeaderMap, HeaderValue},
43
http::header::CONTENT_LOCATION,
54
http::StatusCode,
65
response::{IntoResponse, Response},
76
Json,
87
};
8+
use axum_extra::headers::{HeaderMap, HeaderValue};
99
use driver::DriverError;
1010
use serde_json::json;
1111
use std::convert::Infallible;
@@ -61,8 +61,8 @@ impl From<axum::Error> for ServerError {
6161
}
6262
}
6363

64-
impl From<axum::headers::Error> for ServerError {
65-
fn from(e: axum::headers::Error) -> Self {
64+
impl From<axum_extra::headers::Error> for ServerError {
65+
fn from(e: axum_extra::headers::Error) -> Self {
6666
Self::Axum(anyhow::Error::new(e))
6767
}
6868
}

‎server/src/extract/session.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::ServerError;
22
use axum::extract::FromRequestParts;
3-
use axum::headers::Cookie;
43
use axum::http::request::Parts;
5-
use axum::{RequestPartsExt, TypedHeader};
4+
use axum::RequestPartsExt;
5+
use axum_extra::{headers::Cookie, typed_header::TypedHeader};
66

77
pub const SESSION_TAG: &str = "stellar_session";
88

0 commit comments

Comments
 (0)