1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
use async_trait::async_trait;
use eyre::{Context, Result, bail};
use reqwest::{Url, header::USER_AGENT};
use crate::{
atuin_client::api_client,
atuin_common::{
api::{ATUIN_CARGO_VERSION, ATUIN_HEADER_VERSION, ChangePasswordRequest, LoginRequest},
tls::ensure_crypto_provider,
},
};
use crate::atuin_client::settings::Settings;
static APP_USER_AGENT: &str = concat!("atuin/", env!("CARGO_PKG_VERSION"));
/// Result of an auth operation that may require 2FA.
pub enum AuthResponse {
/// Operation succeeded; for login/register, contains the session token.
/// `auth_type` indicates the kind of token: `Some("hub")` for Hub API
/// tokens (prefixed `atapi_`), `Some("cli")` for legacy CLI session
/// tokens. `None` when the server didn't include the field (old servers).
Success {
session: String,
auth_type: Option<String>,
},
/// Two-factor authentication is required; the caller should prompt for a
/// TOTP code and retry with it.
TwoFactorRequired,
}
/// Result of a mutating account operation that may require 2FA.
pub enum MutateResponse {
/// Operation completed successfully.
Success,
/// Two-factor authentication is required; the caller should prompt for a
/// TOTP code and retry.
TwoFactorRequired,
}
/// Abstraction over the legacy (Rust sync server) and Hub auth APIs.
///
/// CLI commands use this trait so they don't need to know which backend is
/// active — they just prompt for input and call these methods.
#[async_trait]
pub trait AuthClient: Send + Sync {
/// Log in with username + password, optionally providing a TOTP code.
async fn login(&self, username: &str, password: &str) -> Result<AuthResponse>;
/// Register a new account.
async fn register(&self, username: &str, email: &str, password: &str) -> Result<AuthResponse>;
/// Change the account password, optionally providing a TOTP code.
async fn change_password(
&self,
current_password: &str,
new_password: &str,
totp_code: Option<&str>,
) -> Result<MutateResponse>;
/// Delete the account, requiring the current password and optionally a TOTP code.
async fn delete_account(
&self,
password: &str,
totp_code: Option<&str>,
) -> Result<MutateResponse>;
}
/// Resolve the appropriate [`AuthClient`] for the current settings.
pub async fn auth_client(settings: &Settings) -> Box<dyn AuthClient> {
Box::new(LegacyAuthClient::new(
&settings.sync_address,
settings.session_token().await.ok(),
settings.network_connect_timeout,
settings.network_timeout,
)) as Box<dyn AuthClient>
}
// ---------------------------------------------------------------------------
// Legacy backend — talks to the Rust sync server
// ---------------------------------------------------------------------------
pub struct LegacyAuthClient {
address: String,
session_token: Option<String>,
connect_timeout: u64,
timeout: u64,
}
impl LegacyAuthClient {
pub fn new(
address: &str,
session_token: Option<String>,
connect_timeout: u64,
timeout: u64,
) -> Self {
Self {
address: address.to_string(),
session_token,
connect_timeout,
timeout,
}
}
fn authenticated_client(&self) -> Result<reqwest::Client> {
let token = self
.session_token
.as_deref()
.ok_or_else(|| eyre::eyre!("Not logged in"))?;
ensure_crypto_provider();
let mut headers = reqwest::header::HeaderMap::new();
headers.insert(
reqwest::header::AUTHORIZATION,
format!("Token {token}").parse()?,
);
headers.insert(USER_AGENT, APP_USER_AGENT.parse()?);
headers.insert(ATUIN_HEADER_VERSION, ATUIN_CARGO_VERSION.parse()?);
Ok(reqwest::Client::builder()
.default_headers(headers)
.connect_timeout(std::time::Duration::new(self.connect_timeout, 0))
.timeout(std::time::Duration::new(self.timeout, 0))
.build()?)
}
}
#[async_trait]
impl AuthClient for LegacyAuthClient {
async fn login(&self, username: &str, password: &str) -> Result<AuthResponse> {
// The legacy server has no 2FA support; totp_code is ignored.
let resp = api_client::login(
&self.address,
LoginRequest {
username: username.to_string(),
password: password.to_string(),
},
)
.await?;
Ok(AuthResponse::Success {
session: resp.session,
auth_type: resp.auth.or(Some("cli".into())),
})
}
async fn register(&self, username: &str, email: &str, password: &str) -> Result<AuthResponse> {
let resp = api_client::register(&self.address, username, email, password).await?;
Ok(AuthResponse::Success {
session: resp.session,
auth_type: resp.auth.or(Some("cli".into())),
})
}
async fn change_password(
&self,
current_password: &str,
new_password: &str,
_totp_code: Option<&str>,
) -> Result<MutateResponse> {
let client = self.authenticated_client()?;
let url = make_url(&self.address, "/account/password")?;
let resp = client
.patch(&url)
.json(&ChangePasswordRequest {
current_password: current_password.to_string(),
new_password: new_password.to_string(),
})
.send()
.await?;
match resp.status().as_u16() {
200 => Ok(MutateResponse::Success),
401 => bail!("current password is incorrect"),
403 => bail!("invalid login details"),
_ => bail!("unknown error"),
}
}
async fn delete_account(
&self,
password: &str,
_totp_code: Option<&str>,
) -> Result<MutateResponse> {
let client = self.authenticated_client()?;
let url = make_url(&self.address, "/account")?;
let resp = client
.delete(&url)
.json(&serde_json::json!({ "password": password }))
.send()
.await?;
match resp.status().as_u16() {
200 => Ok(MutateResponse::Success),
401 => bail!("password is incorrect"),
403 => bail!("invalid login details"),
_ => bail!("unknown error"),
}
}
}
// ---------------------------------------------------------------------------
// Shared helpers
// ---------------------------------------------------------------------------
fn make_url(address: &str, path: &str) -> Result<String> {
let address = if address.ends_with('/') {
address.to_string()
} else {
format!("{address}/")
};
let path = path.strip_prefix('/').unwrap_or(path);
let url = Url::parse(&address)
.context("failed to parse server address")?
.join(path)
.context("failed to join URL path")?;
Ok(url.to_string())
}
|
