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
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
use std::{
fs::Metadata,
future::Future,
io::Cursor,
path::{Path, PathBuf},
pin::Pin,
sync::Arc,
task::{Context, Poll, ready},
};
use assert2::assert;
use pin_project::pin_project;
use tokio::{
fs::{File, metadata, read_dir, read_link},
io::{AsyncRead, AsyncSeek, ReadBuf},
};
use crate::{Builder, BuilderEntry, EntryData, builder::AddEntryError};
/// An [`EntryData`] implementation representing a filesystem object -- file, directory or symlink.
///
/// Constructing this structure directly through [`FilesystemEntry::with_metadata()`] gives the most
/// versatile interface, but [`Builder::add_filesystem_entry`] or [`Builder::add_directory_recursive`]
/// can be used as simpler (and more opinionated) alternatives.
#[derive(Debug, Clone)]
pub struct FilesystemEntry {
path: PathBuf,
entry_type: EntryType,
}
#[derive(Debug, Clone)]
enum EntryType {
File { size: u64 },
Directory,
Symlink { target_bytes: Arc<[u8]> },
}
impl FilesystemEntry {
/// Constructs a new `FilesystemEntry`, with entry metadata given from outside.
/// # Errors
/// Fails if reading link target fails.
pub async fn with_metadata(path: PathBuf, metadata: &Metadata) -> std::io::Result<Self> {
let entry_type = EntryType::with_metadata(&path, metadata).await?;
Ok(FilesystemEntry { path, entry_type })
}
}
impl EntryType {
/// Constructs the entry type with already extracted metadata.
/// This helps avoid repeated redundant calls of `metadata()`.
/// # Errors
/// Fails if reading link target fails.
async fn with_metadata(path: &Path, metadata: &Metadata) -> std::io::Result<Self> {
if metadata.is_dir() {
Ok(EntryType::Directory)
} else if metadata.is_symlink() {
let target = read_link(path).await?;
Ok(EntryType::Symlink {
target_bytes: target.as_os_str().as_encoded_bytes().into(),
})
} else {
Ok(EntryType::File {
size: metadata.len(),
})
}
}
}
impl EntryData for FilesystemEntry {
type Reader = FilesystemEntryReader;
type Future = FilesystemEntryFuture;
fn get_reader(&self) -> Self::Future {
match self.entry_type {
EntryType::File { size: _ } => FilesystemEntryFuture::File {
file_future: Box::pin(File::open(self.path.clone())),
},
EntryType::Symlink { ref target_bytes } => FilesystemEntryFuture::Symlink {
target_bytes: Arc::clone(target_bytes),
},
EntryType::Directory => {
unreachable!("Directories are zero-sized, should be skipped by reader")
}
}
}
fn size(&self) -> u64 {
match self.entry_type {
EntryType::File { size } => size,
EntryType::Directory => 0,
EntryType::Symlink { ref target_bytes } => target_bytes.len() as u64,
}
}
}
/// Future for obtaining [`FilesystemEntryReader`].
/// Mostly this covers opening the file.
pub enum FilesystemEntryFuture {
File {
file_future: Pin<Box<dyn Future<Output = std::io::Result<File>>>>,
},
Symlink {
target_bytes: Arc<[u8]>,
},
// Directory is not here, because zero sized entries are skipped by reader.
}
impl Future for FilesystemEntryFuture {
type Output = std::io::Result<FilesystemEntryReader>;
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
// FilesystemEntryFuture is Unpin, because it only contains the future through Pin<Box<_>>.
match &mut *self {
FilesystemEntryFuture::File { file_future } => {
let inner_reader = ready!(file_future.as_mut().poll(cx))?;
Poll::Ready(Ok(FilesystemEntryReader::File(inner_reader)))
}
FilesystemEntryFuture::Symlink { target_bytes } => {
let cursor = Cursor::new(Arc::clone(target_bytes));
Poll::Ready(Ok(FilesystemEntryReader::Symlink(cursor)))
}
}
}
}
/// [`EntryData::Reader`] implementation covering files (data comes from the file itself) and symlinks (data is stored in an `Arc<[u8]>`).
#[pin_project(project = FilesystemEntryReaderProj)]
pub enum FilesystemEntryReader {
File(#[pin] File),
Symlink(#[pin] Cursor<Arc<[u8]>>),
// Cursor is unpin, so we wouldn't really need to pin it here, but it saves a bit of typing later
}
impl AsyncRead for FilesystemEntryReader {
fn poll_read(
self: Pin<&mut Self>,
cx: &mut Context<'_>,
buf: &mut ReadBuf<'_>,
) -> Poll<std::io::Result<()>> {
match self.project() {
FilesystemEntryReaderProj::File(pin) => pin.poll_read(cx, buf),
FilesystemEntryReaderProj::Symlink(cursor) => cursor.poll_read(cx, buf),
}
}
}
impl AsyncSeek for FilesystemEntryReader {
fn start_seek(self: Pin<&mut Self>, position: std::io::SeekFrom) -> std::io::Result<()> {
match self.project() {
FilesystemEntryReaderProj::File(pin) => pin.start_seek(position),
FilesystemEntryReaderProj::Symlink(cursor) => cursor.start_seek(position),
}
}
fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<u64>> {
match self.project() {
FilesystemEntryReaderProj::File(pin) => pin.poll_complete(cx),
FilesystemEntryReaderProj::Symlink(cursor) => cursor.poll_complete(cx),
}
}
}
/// Modifies the `entry_name` to have no trailing slashes for files and exactly one trailig slash for directories.
fn sanitize_entry_name_slashes(mut entry_name: String, is_directory: bool) -> String {
entry_name.truncate(entry_name.trim_end_matches('/').len());
if is_directory {
entry_name.push('/');
}
entry_name
}
/// Creates a string suitable as ZIP file entry name from a path.
///
/// `root` has to be a prefix of `path`.
/// `root_name` is used as described in [`Builder::add_directory_recursive()`], but additionally it has to to end with a single slash.
/// If `is_directory` is `True`, then the generated path will end with a slash.
fn make_entry_name(
path: &Path,
root: &Path,
root_name: Option<&str>,
is_directory: bool,
) -> String {
let root_prefix = match root_name {
Some(root_prefix) => {
assert!(root_prefix.ends_with('/'));
root_prefix
}
None => "",
};
let path = path
.strip_prefix(root)
.expect("`root` must be a prefix of `path`")
.to_string_lossy();
assert!(!path.ends_with('/'));
assert!(!path.is_empty());
let trailing_slash = if is_directory { "/" } else { "" };
format!("{root_prefix}{path}{trailing_slash}")
}
impl Builder<FilesystemEntry> {
/// Addd a filesystem entry to the builder.
///
/// This method handles setting entry type, permissions and modification time from the metadata
/// and modifies the entry name to include a final slash for directories (or remove the slash for non-directories).
/// Symlinks are added as symlink type, not followed.
/// # Errors
/// Forwards errors from [`FilesystemEntry::with_metadata`] and [`Builder::add_entry`].
pub async fn add_filesystem_entry(
&mut self,
name: String,
path: PathBuf,
metadata: &Metadata,
) -> Result<&mut BuilderEntry<FilesystemEntry>, AddEntryError> {
let fs_entry = FilesystemEntry::with_metadata(path, metadata).await?;
let name =
sanitize_entry_name_slashes(name, matches!(fs_entry.entry_type, EntryType::Directory));
let added_entry = self.add_entry(name, fs_entry)?;
added_entry.metadata(metadata);
Ok(added_entry)
}
/// Adds content of a directory to the builder recursively.
///
/// Adds both files and directories, calls [`Builder::add_filesystem_entry`] for each item.
/// If `root_name` is Some, it is used as a prefix for all entry names, separated by a slash
/// and also the root directory is added as a separate directory entry.
/// If `root_name` is Some and contains slashes itself, its parent directories are not added as zip entries.
/// Any trailing slashes (including no trailing slashes) in `root_name` will be normalized to a single trailing slash.
/// # Examples
/// Given directory with subdirectory `foo` and files `foo/bar` and `baz`:
///
/// ## No prefix
/// ```
/// # tokio_test::block_on(async {
/// # let tempdir = tempfile::TempDir::new().unwrap();
/// # let dir = tempdir.path().to_path_buf();
/// # let foo_path = dir.join("foo");
/// # std::fs::create_dir(&foo_path).unwrap();
/// # std::fs::write(foo_path.join("bar"), b"").unwrap();
/// # std::fs::write(dir.join("baz"), b"").unwrap();
/// # let mut builder = zippity::Builder::new();
/// builder.add_directory_recursive(dir, None).await;
/// assert_eq!(builder.get_entries().len(), 3);
/// assert!(builder.get_entries().contains_key("foo/"));
/// assert!(builder.get_entries().contains_key("foo/bar"));
/// assert!(builder.get_entries().contains_key("baz"));
/// # })
/// ```
///
/// ## Simple prefix
/// ```
/// # tokio_test::block_on(async {
/// # let tempdir = tempfile::TempDir::new().unwrap();
/// # let dir = tempdir.path().to_path_buf();
/// # let foo_path = dir.join("foo");
/// # std::fs::create_dir(&foo_path).unwrap();
/// # std::fs::write(foo_path.join("bar"), b"").unwrap();
/// # std::fs::write(dir.join("baz"), b"").unwrap();
/// # let mut builder = zippity::Builder::new();
/// builder.add_directory_recursive(dir, Some("prefix")).await;
/// assert_eq!(builder.get_entries().len(), 4);
/// assert!(builder.get_entries().contains_key("prefix/"));
/// assert!(builder.get_entries().contains_key("prefix/foo/"));
/// assert!(builder.get_entries().contains_key("prefix/foo/bar"));
/// assert!(builder.get_entries().contains_key("prefix/baz"));
/// # })
/// ```
///
/// ## Prefix contains slashes
/// ```
/// # tokio_test::block_on(async {
/// # let tempdir = tempfile::TempDir::new().unwrap();
/// # let dir = tempdir.path().to_path_buf();
/// # let foo_path = dir.join("foo");
/// # std::fs::create_dir(&foo_path).unwrap();
/// # std::fs::write(foo_path.join("bar"), b"").unwrap();
/// # std::fs::write(dir.join("baz"), b"").unwrap();
/// # let mut builder = zippity::Builder::new();
/// builder.add_directory_recursive(dir, Some("pre/fix")).await;
/// assert_eq!(builder.get_entries().len(), 4);
/// assert!(builder.get_entries().contains_key("pre/fix/"));
/// assert!(builder.get_entries().contains_key("pre/fix/foo/"));
/// assert!(builder.get_entries().contains_key("pre/fix/foo/bar"));
/// assert!(builder.get_entries().contains_key("pre/fix/baz"));
/// # })
/// ```
/// # Errors
/// Forwards errors from [`FilesystemEntry::with_metadata`] and [`Builder::add_entry`], or IO errors from directory traversal.
pub async fn add_directory_recursive(
&mut self,
directory: PathBuf,
root_name: Option<&str>,
) -> Result<(), AddEntryError> {
let directory_metadata = metadata(&directory).await?;
// Cleaning up the root name trailing slashes:
let root_name = root_name.map(|root_name| format!("{}/", root_name.trim_matches('/')));
let mut stack = vec![directory.clone()];
while let Some(path) = stack.pop() {
let mut dir = read_dir(path).await?;
while let Some(dir_entry) = dir.next_entry().await? {
let path = dir_entry.path();
let metadata = dir_entry.metadata().await?;
if metadata.is_dir() {
stack.push(path.clone());
}
let entry_name =
make_entry_name(&path, &directory, root_name.as_deref(), metadata.is_dir());
let zip_entry = FilesystemEntry::with_metadata(path, &metadata).await?;
let added_entry = self.add_entry(entry_name, zip_entry)?;
added_entry.metadata(&metadata);
}
}
if let Some(root_name) = root_name {
let root_entry = FilesystemEntry::with_metadata(directory, &directory_metadata).await?;
dbg!(&root_name);
self.add_entry(root_name, root_entry)?;
// TODO: What happens if this is called on a file and not a directory? What if root_name is set?
}
Ok(())
}
}
#[cfg(test)]
mod test {
use std::ffi::OsStr;
use super::*;
use crate::test_util::{
read_to_vec,
test_entry_data::{ArbitraryTestEntryDataParams, TestEntryData},
};
use assert2::assert;
use std::pin::pin;
use tempfile::TempDir;
use test_case::test_case;
use test_strategy::proptest;
#[test_case("file.txt", false => "file.txt"; "file without trailing slash")]
#[test_case("file.txt/", false => "file.txt"; "file with trailing slash")]
#[test_case("directory", true => "directory/"; "directory without trailing slash")]
#[test_case("directory/", true => "directory/"; "directory with trailing slash")]
#[test_case("directory///", true => "directory/"; "directory with multiple trailing slashes")]
#[test_case("a/b.txt", false => "a/b.txt"; "path with internal slashes")]
#[test_case("/a///b.txt", false => "/a///b.txt"; "path with weird internal slashes is not modified")]
fn test_sanitize_entry_name_slashes(entry_name: &str, is_directory: bool) -> String {
sanitize_entry_name_slashes(entry_name.to_string(), is_directory)
}
#[test_case("/root/subdir/file.txt", "/root", None, false => "subdir/file.txt"; "file without root name")]
#[test_case("/root/subdir", "/root", None, true => "subdir/"; "directory without root name")]
#[test_case("/root/subdir/file.txt", "/root", Some("archive/"), false => "archive/subdir/file.txt"; "file with root name")]
#[test_case("/root/subdir", "/root", Some("archive/"), true => "archive/subdir/"; "directory with root name")]
#[test_case("/root/subdir", "/root/", Some("archive/"), true => "archive/subdir/"; "root name with trailing slash")]
fn test_make_entry_name(
path: &str,
root: &str,
root_name: Option<&str>,
is_directory: bool,
) -> String {
let path = Path::new(path);
let root = Path::new(root);
make_entry_name(path, root, root_name, is_directory)
}
/// Tests that when adding a directory, entries are added to the builder as expected:
/// Each file has an entry, each parent directory of the entry has an entry.
/// Also verifies that root name is present in entry names and there is a corresponding directory entry for it.
/// Content is not tested at all.
#[proptest(async = "tokio")]
async fn add_directory_recursive_entries(
#[any(ArbitraryTestEntryDataParams {
entry_name_pattern: "[a-z]+(/[a-z]+)+", // limit special characters to not mess up the paths
max_size: 0,
..Default::default()
})]
content: TestEntryData,
#[strategy(proptest::option::of("[a-z]+/?"))] root_name: Option<String>,
) {
let test_dir = content.make_directory().unwrap();
let mut builder = Builder::new();
builder
.add_directory_recursive(test_dir.as_ref().to_path_buf(), root_name.as_deref())
.await
.unwrap();
dbg!(content.0.len());
for (name, _) in content.0 {
let name = match root_name {
Some(ref root_name) => format!("{}/{}", root_name.trim_end_matches('/'), name),
None => name.to_owned(),
};
// First check that the file entry itself is stored in the builder
assert!(builder.get_entries().contains_key(name.as_str()));
// Then check that every parent directory of the path is stored
let mut path = name.as_str();
while let Some(pos) = path.rfind('/') {
let path_with_slash = &path[..=pos];
path = &path[..pos];
assert!(
builder.get_entries().contains_key(path_with_slash),
"{} must be present in builder entries",
path_with_slash
);
}
}
}
#[tokio::test]
async fn file_entry_with_metadata() {
let test_dir = TempDir::new().unwrap();
let file_path = test_dir.path().join("file.txt");
tokio::fs::write(&file_path, b"hello").await.unwrap();
let metadata = tokio::fs::symlink_metadata(&file_path).await.unwrap();
let fs_entry = FilesystemEntry::with_metadata(file_path.clone(), &metadata)
.await
.unwrap();
match fs_entry.entry_type {
EntryType::File { size } => {
assert!(size == 5);
}
_ => panic!("Expected symlink entry type"),
}
assert_eq!(fs_entry.path, file_path);
}
#[tokio::test]
async fn directory_entry_with_metadata() {
let test_dir = TempDir::new().unwrap();
let directory_path = test_dir.path().join("directory");
tokio::fs::create_dir(&directory_path).await.unwrap();
let metadata = tokio::fs::symlink_metadata(&directory_path).await.unwrap();
let fs_entry = FilesystemEntry::with_metadata(directory_path.clone(), &metadata)
.await
.unwrap();
match fs_entry.entry_type {
EntryType::Directory => (),
_ => panic!("Expected symlink entry type"),
}
assert_eq!(fs_entry.path, directory_path);
}
#[tokio::test]
async fn symlink_entry_with_metadata() {
let test_dir = TempDir::new().unwrap();
let target_path = test_dir.path().join("target.txt");
tokio::fs::write(&target_path, b"hello").await.unwrap();
let symlink_path = test_dir.path().join("link.txt");
std::os::unix::fs::symlink(&target_path, &symlink_path).unwrap();
let metadata = tokio::fs::symlink_metadata(&symlink_path).await.unwrap();
let fs_entry = FilesystemEntry::with_metadata(symlink_path.clone(), &metadata)
.await
.unwrap();
match fs_entry.entry_type {
EntryType::Symlink { ref target_bytes } => {
use std::os::unix::ffi::OsStrExt;
let resolved = Path::new(&OsStr::from_bytes(target_bytes)).to_path_buf();
assert!(resolved.ends_with("target.txt"));
}
_ => panic!("Expected symlink entry type"),
}
assert_eq!(fs_entry.path, symlink_path);
}
/// Create a fixed directory-based sample zip and try reading a random byte in it.
/// Checks the functionality of seeking in FileEntry.
#[cfg(unix)]
#[proptest(async = "tokio")]
async fn file_dir_symlink_seek(#[strategy(0f64..1f64)] seek_pos: f64) {
use crate::test_util::{prepare_test_dir, skip_length};
use tokio::io::{AsyncReadExt, AsyncSeekExt};
let tempdir = prepare_test_dir();
let mut builder = Builder::new();
builder
.add_directory_recursive(tempdir.path().to_owned(), None)
.await
.unwrap();
let mut whole_reader = pin!(builder.clone().build());
let whole_zip = read_to_vec(whole_reader.as_mut(), 8192).await.unwrap();
let seek_pos = skip_length(whole_zip.len(), seek_pos);
// Insert CRC32s from the first reader to the second builder.
// Not having to recalcualte the CRC makes the second reader actually seek in
// the file, not just read the whole thing and ignore the beginning.
for (k, v) in whole_reader.crc32s() {
builder.get_entries_mut().get_mut(k).unwrap().crc32(v);
}
let mut reader = pin!(builder.build());
reader
.seek(std::io::SeekFrom::Start(seek_pos))
.await
.unwrap();
let byte = reader.read_u8().await.unwrap();
assert!(byte == whole_zip[usize::try_from(seek_pos).unwrap()]);
}
}