forked from apache/opendal
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathcore.rs
More file actions
208 lines (182 loc) · 6.44 KB
/
Copy pathcore.rs
File metadata and controls
208 lines (182 loc) · 6.44 KB
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
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
use std::future::Future;
use std::path::Path;
use std::path::PathBuf;
use std::sync::Arc;
use compio::buf::{IoBuf, IoVectoredBuf};
use compio::dispatcher::Dispatcher;
use opendal_core::raw::*;
use opendal_core::*;
// Wrapper type to avoid orphan rules
#[derive(Debug, Clone)]
pub struct CompfsBuffer(pub Vec<compio::bytes::Bytes>);
impl IoBuf for CompfsBuffer {
fn as_init(&self) -> &[u8] {
self.0.first().map_or(&[], |b| b.as_ref())
}
}
impl From<CompfsBuffer> for opendal_core::Buffer {
fn from(buf: CompfsBuffer) -> Self {
buf.0.into()
}
}
impl From<opendal_core::Buffer> for CompfsBuffer {
fn from(mut buf: opendal_core::Buffer) -> Self {
Self(buf.by_ref().collect())
}
}
impl IoVectoredBuf for CompfsBuffer {
fn iter_slice(&self) -> impl Iterator<Item = &[u8]> {
self.0.iter().map(|b| b.as_ref())
}
}
#[derive(Debug)]
pub(super) struct CompfsCore {
pub info: Arc<AccessorInfo>,
pub root: PathBuf,
pub dispatcher: Dispatcher,
pub buf_pool: oio::PooledBuf,
}
impl CompfsCore {
/// Join a caller-supplied key onto `self.root` while keeping the result
/// confined to that root.
///
/// `normalize_path` (opendal-core) strips leading `/` and empty segments but
/// intentionally does NOT resolve `.`/`..`, and `PathBuf::join` is purely
/// lexical, so a key such as `../../etc/passwd` would otherwise escape the
/// configured `root` at syscall time. compfs is a local (compio-backed)
/// filesystem, so the host kernel resolves `..` when the path is used; we
/// reject any key whose components include a `..` (parent-dir) traversal.
///
/// This mirrors the confinement added to the `fs` backend in #7684.
pub fn prepare_path(&self, path: &str) -> Result<PathBuf> {
use std::path::Component;
let trimmed = path.trim_end_matches('/');
if Path::new(trimmed)
.components()
.any(|c| matches!(c, Component::ParentDir))
{
return Err(Error::new(
ErrorKind::NotFound,
"path escapes the configured root via `..`",
)
.with_context("path", path));
}
Ok(self.root.join(trimmed))
}
pub async fn exec<Fn, Fut, R>(&self, f: Fn) -> opendal_core::Result<R>
where
Fn: FnOnce() -> Fut + Send + 'static,
Fut: Future<Output = std::io::Result<R>> + 'static,
R: Send + 'static,
{
self.dispatcher
.dispatch(f)
.map_err(|_| Error::new(ErrorKind::Unexpected, "compio spawn io task failed"))?
.await
.map_err(|_| Error::new(ErrorKind::Unexpected, "compio task cancelled"))?
.map_err(new_std_io_error)
}
pub async fn exec_blocking<Fn, R>(&self, f: Fn) -> Result<R>
where
Fn: FnOnce() -> R + Send + 'static,
R: Send + 'static,
{
self.dispatcher
.dispatch_blocking(f)
.map_err(|_| Error::new(ErrorKind::Unexpected, "compio spawn blocking task failed"))?
.await
.map_err(|_| Error::new(ErrorKind::Unexpected, "compio task cancelled"))
}
}
#[cfg(test)]
mod tests {
use bytes::Bytes;
use rand::{RngExt, rng};
use super::*;
fn setup_buffer() -> (CompfsBuffer, usize, Bytes) {
let mut rng = rng();
let bs = (0..100)
.map(|_| {
let len = rng.random_range(1..100);
let mut buf = vec![0; len];
rng.fill(&mut buf[..]);
Bytes::from(buf)
})
.collect::<Vec<_>>();
let total_size = bs.iter().map(|b| b.len()).sum::<usize>();
let total_content = bs.iter().flatten().copied().collect::<Bytes>();
let buf = Buffer::from(bs);
(CompfsBuffer::from(buf), total_size, total_content)
}
#[test]
fn test_io_buf() {
let (buf, _len, _bytes) = setup_buffer();
let slice = IoBuf::as_init(&buf);
assert_eq!(slice, buf.0.first().unwrap().as_ref())
}
#[test]
fn test_io_vectored_buf() {
let (buf, len, bytes) = setup_buffer();
let collected = buf.iter_slice().flatten().copied().collect::<Bytes>();
assert_eq!(buf.total_len(), len);
assert_eq!(collected, bytes);
}
fn new_test_core() -> CompfsCore {
CompfsCore {
info: Arc::new(AccessorInfo::default()),
root: PathBuf::from("/data/root"),
dispatcher: Dispatcher::new().unwrap(),
buf_pool: oio::PooledBuf::new(16),
}
}
#[test]
fn test_prepare_path_rejects_parent_dir() {
let core = new_test_core();
for key in ["../etc/passwd", "../../etc/passwd", "a/../../b", "a/.."] {
let err = core.prepare_path(key).unwrap_err();
assert_eq!(
err.kind(),
ErrorKind::NotFound,
"key should be rejected: {key}"
);
}
}
#[test]
fn test_prepare_path_allows_normal_keys() {
let core = new_test_core();
// Normal keys, `.` (CurDir), and trailing slashes resolve unchanged.
assert_eq!(
core.prepare_path("a/b.txt").unwrap(),
PathBuf::from("/data/root/a/b.txt")
);
assert_eq!(
core.prepare_path("a/b/").unwrap(),
PathBuf::from("/data/root/a/b")
);
assert_eq!(
core.prepare_path("./a/b").unwrap(),
PathBuf::from("/data/root/a/b")
);
// A key containing `..` only as a substring of a name is not a traversal.
assert_eq!(
core.prepare_path("a..b").unwrap(),
PathBuf::from("/data/root/a..b")
);
}
}