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
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
#[cfg(unix)]
use super::shared::apply_executable_bit_async;
use super::shared::{
ExportState, copy_dir_missing_recursive_async, create_dir_all_no_symlink_async,
ensure_no_symlink_prefix_async, is_symlink_like,
};
use super::*;
/// Applies `update`/`switch`/`replay`-style editor drives to a filesystem directory
/// using async `tokio::fs` I/O.
///
/// This editor implements [`AsyncEditorEventHandler`], so it can be driven via
/// methods like [`crate::RaSvnSession::update_with_async_handler`].
///
/// Like [`FsEditor`], it refuses writes through symlinks (or Windows reparse
/// points) under `root`.
#[derive(Debug)]
pub struct TokioFsEditor {
state: ExportState,
pending_files: HashMap<String, PendingFileAsync>,
}
impl TokioFsEditor {
/// Creates a filesystem editor rooted at `root`.
pub fn new(root: impl Into<PathBuf>) -> Self {
Self {
state: ExportState::new(root),
pending_files: HashMap::new(),
}
}
/// Returns the export root directory.
pub fn root(&self) -> &Path {
self.state.root()
}
/// Strips `prefix` from incoming editor paths if present.
///
/// This is useful when the server emits repository-relative paths, but the
/// caller wants `root` to correspond to a specific subtree (for example
/// exporting `trunk/` into an empty directory).
#[must_use]
pub fn with_strip_prefix(mut self, prefix: impl Into<String>) -> Self {
self.state = self.state.with_strip_prefix(prefix);
self
}
pub(super) fn repo_path_to_fs(
&self,
path: &str,
allow_empty: bool,
) -> Result<PathBuf, SvnError> {
self.state.repo_path_to_fs(path, allow_empty)
}
fn new_tmp_path(&mut self, dest: &Path, token: &str) -> PathBuf {
self.state.new_tmp_path(dest, token)
}
}
impl Default for TokioFsEditor {
fn default() -> Self {
Self::new(".")
}
}
impl AsyncEditorEventHandler for TokioFsEditor {
fn on_event<'a>(
&'a mut self,
event: EditorEvent,
) -> Pin<Box<dyn Future<Output = Result<(), SvnError>> + Send + 'a>> {
Box::pin(async move {
match event {
EditorEvent::TargetRev { .. } => Ok(()),
EditorEvent::OpenRoot { token, .. } => {
create_dir_all_no_symlink_async(self.state.root(), self.state.root()).await?;
self.state.open_root(token);
Ok(())
}
EditorEvent::AddDir {
path,
child_token,
copy_from,
..
} => {
let dir = self.repo_path_to_fs(&path, true)?;
create_dir_all_no_symlink_async(self.state.root(), &dir).await?;
if let Some((src_path, _src_rev)) = copy_from {
let src = self.repo_path_to_fs(&src_path, true)?;
ensure_no_symlink_prefix_async(self.state.root(), &src).await?;
if tokio::fs::metadata(&src).await.is_ok() {
copy_dir_missing_recursive_async(&src, &dir).await?;
}
}
self.state.open_dir(child_token, dir);
Ok(())
}
EditorEvent::OpenDir {
path, child_token, ..
} => {
let dir = self.repo_path_to_fs(&path, true)?;
create_dir_all_no_symlink_async(self.state.root(), &dir).await?;
self.state.open_dir(child_token, dir);
Ok(())
}
EditorEvent::CloseDir { dir_token } => {
self.state.close_dir(&dir_token);
Ok(())
}
EditorEvent::DeleteEntry { path, .. } => {
let fs_path = self.repo_path_to_fs(&path, false)?;
if let Some(parent) = fs_path.parent() {
ensure_no_symlink_prefix_async(self.state.root(), parent).await?;
}
if let Ok(meta) = tokio::fs::symlink_metadata(&fs_path).await {
if is_symlink_like(&meta) {
if meta.is_dir() {
tokio::fs::remove_dir(&fs_path).await?;
} else {
tokio::fs::remove_file(&fs_path).await?;
}
} else if meta.is_dir() {
tokio::fs::remove_dir_all(&fs_path).await?;
} else {
tokio::fs::remove_file(&fs_path).await?;
}
}
Ok(())
}
EditorEvent::AbsentDir { .. } | EditorEvent::AbsentFile { .. } => Ok(()),
EditorEvent::AddFile {
path,
file_token,
copy_from,
..
} => {
let file_path = self.repo_path_to_fs(&path, false)?;
if let Some(parent) = file_path.parent() {
create_dir_all_no_symlink_async(self.state.root(), parent).await?;
}
let copy_from = match copy_from {
Some((src_path, _src_rev)) => {
let src = self.repo_path_to_fs(&src_path, false)?;
ensure_no_symlink_prefix_async(self.state.root(), &src).await?;
Some(src)
}
None => None,
};
self.state.track_file(file_token, file_path, copy_from);
Ok(())
}
EditorEvent::OpenFile {
path, file_token, ..
} => {
let file_path = self.repo_path_to_fs(&path, false)?;
if let Some(parent) = file_path.parent() {
create_dir_all_no_symlink_async(self.state.root(), parent).await?;
}
self.state.track_file(file_token, file_path, None);
Ok(())
}
EditorEvent::ApplyTextDelta { file_token, .. } => {
let dest = self.state.file_dest(&file_token)?;
ensure_no_symlink_prefix_async(self.state.root(), &dest).await?;
if let Ok(meta) = tokio::fs::symlink_metadata(&dest).await
&& is_symlink_like(&meta)
{
return Err(SvnError::InvalidPath(
"refusing to apply textdelta to a symlink/reparse point".into(),
));
}
let base = match tokio::fs::File::open(&dest).await {
Ok(file) => Some(file),
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
if let Some(src) = self.state.file_copy_source(&file_token) {
ensure_no_symlink_prefix_async(self.state.root(), src).await?;
match tokio::fs::File::open(src).await {
Ok(file) => Some(file),
Err(err) if err.kind() == std::io::ErrorKind::NotFound => None,
Err(err) => return Err(err.into()),
}
} else {
None
}
}
Err(err) => return Err(err.into()),
};
let applier = TextDeltaApplierFile::new(base).await?;
let tmp = self.new_tmp_path(&dest, &file_token);
let out = tokio::fs::OpenOptions::new()
.write(true)
.create_new(true)
.open(&tmp)
.await?;
self.pending_files.insert(
file_token,
PendingFileAsync {
dest,
tmp,
out,
applier: Some(applier),
delta_ended: false,
},
);
Ok(())
}
EditorEvent::TextDeltaChunk { file_token, chunk } => {
let pending = self.pending_files.get_mut(&file_token).ok_or_else(|| {
SvnError::Protocol("textdelta-chunk without apply-textdelta".into())
})?;
let applier = pending.applier.as_mut().ok_or_else(|| {
SvnError::Protocol("textdelta-chunk after textdelta-end".into())
})?;
applier.push(&chunk, &mut pending.out).await?;
Ok(())
}
EditorEvent::TextDeltaEnd { file_token } => {
let pending = self.pending_files.get_mut(&file_token).ok_or_else(|| {
SvnError::Protocol("textdelta-end without apply-textdelta".into())
})?;
let applier = pending
.applier
.take()
.ok_or_else(|| SvnError::Protocol("duplicate textdelta-end".into()))?;
applier.finish(&mut pending.out).await?;
pending.delta_ended = true;
Ok(())
}
EditorEvent::ChangeFileProp {
file_token,
name,
value,
} => {
#[cfg(unix)]
if name == "svn:executable" {
self.state.record_exec(&file_token, value.is_some());
}
let _ = (file_token, name, value);
Ok(())
}
EditorEvent::ChangeDirProp { .. } => Ok(()),
EditorEvent::CloseFile { file_token, .. } => {
let dest = self.state.file_dest_if_known(&file_token);
let pending = self.pending_files.remove(&file_token);
if let Some(mut pending) = pending {
ensure_no_symlink_prefix_async(self.state.root(), &pending.dest).await?;
if pending.applier.is_some() || !pending.delta_ended {
return Err(SvnError::Protocol(
"close-file before textdelta-end".into(),
));
}
pending.out.flush().await?;
drop(pending.out);
match tokio::fs::remove_file(&pending.dest).await {
Ok(()) => {}
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {}
Err(err) => return Err(err.into()),
}
tokio::fs::rename(&pending.tmp, &pending.dest).await?;
#[cfg(unix)]
if let Some(exec) = self.state.take_exec(&file_token) {
apply_executable_bit_async(&pending.dest, exec).await?;
}
} else if let Some(dest) = dest {
match tokio::fs::metadata(&dest).await {
Ok(_) => {}
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
match self.state.file_copy_source(&file_token) {
Some(src) => {
ensure_no_symlink_prefix_async(self.state.root(), src)
.await?;
if tokio::fs::metadata(src).await.is_ok() {
ensure_no_symlink_prefix_async(
self.state.root(),
&dest,
)
.await?;
if let Ok(meta) =
tokio::fs::symlink_metadata(&dest).await
&& is_symlink_like(&meta)
{
return Err(SvnError::InvalidPath(
"refusing to copy a file over a symlink/reparse point"
.into(),
));
}
let _ = tokio::fs::copy(src, &dest).await?;
} else {
return Err(SvnError::Protocol(
"close-file for missing file without textdelta"
.into(),
));
}
}
None => {
return Err(SvnError::Protocol(
"close-file for missing file without textdelta".into(),
));
}
}
}
Err(err) => return Err(err.into()),
}
}
self.state.clear_file(&file_token);
Ok(())
}
EditorEvent::CloseEdit => {
if !self.pending_files.is_empty() {
return Err(SvnError::Protocol(
"close-edit with pending textdeltas".into(),
));
}
self.state.reset();
Ok(())
}
EditorEvent::AbortEdit => {
for (_, pending) in self.pending_files.drain() {
let _ = tokio::fs::remove_file(pending.tmp).await;
}
self.state.reset();
Ok(())
}
EditorEvent::FinishReplay | EditorEvent::RevProps { .. } => Ok(()),
}
})
}
}
#[derive(Debug)]
struct PendingFileAsync {
dest: PathBuf,
tmp: PathBuf,
out: tokio::fs::File,
applier: Option<TextDeltaApplierFile>,
delta_ended: bool,
}