A fork of attic a self-hostable Nix Binary Cache server
server: Replace derivative with derive_more
https://rustsec.org/advisories/RUSTSEC-2024-0388
+20
-13
+15
-5
Cargo.lock
+15
-5
Cargo.lock
···
314
314
"chrono",
315
315
"clap",
316
316
"console-subscriber",
317
-
"derivative",
317
+
"derive_more",
318
318
"digest",
319
319
"displaydoc",
320
320
"enum-as-inner",
···
1729
1729
]
1730
1730
1731
1731
[[package]]
1732
-
name = "derivative"
1733
-
version = "2.2.0"
1732
+
name = "derive_more"
1733
+
version = "2.0.1"
1734
1734
source = "registry+https://github.com/rust-lang/crates.io-index"
1735
-
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
1735
+
checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
1736
+
dependencies = [
1737
+
"derive_more-impl",
1738
+
]
1739
+
1740
+
[[package]]
1741
+
name = "derive_more-impl"
1742
+
version = "2.0.1"
1743
+
source = "registry+https://github.com/rust-lang/crates.io-index"
1744
+
checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
1736
1745
dependencies = [
1737
1746
"proc-macro2",
1738
1747
"quote",
1739
-
"syn 1.0.109",
1748
+
"syn 2.0.104",
1749
+
"unicode-xid",
1740
1750
]
1741
1751
1742
1752
[[package]]
+1
-1
server/Cargo.toml
+1
-1
server/Cargo.toml
+4
-7
server/src/config.rs
+4
-7
server/src/config.rs
···
10
10
use async_compression::Level as CompressionLevel;
11
11
use attic_token::SignatureType;
12
12
use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine};
13
-
use derivative::Derivative;
14
13
use serde::{de, Deserialize};
15
14
use xdg::BaseDirectories;
16
15
···
47
46
const ENV_DATABASE_URL: &str = "ATTIC_SERVER_DATABASE_URL";
48
47
49
48
/// Configuration for the Attic Server.
50
-
#[derive(Clone, Derivative, Deserialize)]
51
-
#[derivative(Debug)]
49
+
#[derive(Clone, Deserialize, derive_more::Debug)]
52
50
#[serde(deny_unknown_fields)]
53
51
pub struct Config {
54
52
/// Socket address to listen on.
···
133
131
#[serde(rename = "token-hs256-secret-base64")]
134
132
#[serde(default = "Default::default")]
135
133
#[serde(deserialize_with = "deserialize_deprecated_token_hs256_secret")]
136
-
#[derivative(Debug = "ignore")]
134
+
#[debug(skip)]
137
135
pub _depreated_token_hs256_secret: Option<String>,
138
136
}
139
137
140
138
/// JSON Web Token configuration.
141
-
#[derive(Clone, Derivative, Deserialize)]
142
-
#[derivative(Debug)]
139
+
#[derive(Clone, Deserialize, derive_more::Debug)]
143
140
pub struct JWTConfig {
144
141
/// The `iss` claim of the JWT.
145
142
///
···
160
157
/// JSON Web Token signing.
161
158
#[serde(rename = "signing")]
162
159
#[serde(default = "load_jwt_signing_config_from_env")]
163
-
#[derivative(Debug = "ignore")]
160
+
#[debug(skip)]
164
161
pub signing_config: JWTSigningConfig,
165
162
}
166
163