Implement FUSE_SYMLINK

Fixes #3452
This commit is contained in:
Boyuan He
2020-09-16 12:19:30 -07:00
committed by Andrei Vagin
parent b53e10f391
commit b50c03b571
5 changed files with 142 additions and 0 deletions
+27
View File
@@ -456,3 +456,30 @@ func (r *FUSEMknodIn) MarshalUnsafe(buf []byte) {
func (r *FUSEMknodIn) SizeBytes() int {
return r.MknodMeta.SizeBytes() + len(r.Name) + 1
}
// FUSESymLinkIn is the request sent by the kernel to the daemon,
// to create a symbolic link.
//
// Dynamically-sized objects cannot be marshalled.
type FUSESymLinkIn struct {
marshal.StubMarshallable
// Name of symlink to create.
Name string
// Target of the symlink.
Target string
}
// MarshalUnsafe serializes r.Name and r.Target to the dst buffer.
// Left null-termination at end of r.Name and r.Target.
func (r *FUSESymLinkIn) MarshalUnsafe(buf []byte) {
copy(buf, r.Name)
copy(buf[len(r.Name)+1:], r.Target)
}
// SizeBytes is the size of the memory representation of FUSESymLinkIn.
// 2 extra bytes for null-terminated string.
func (r *FUSESymLinkIn) SizeBytes() int {
return len(r.Name) + len(r.Target) + 2
}
+9
View File
@@ -362,6 +362,15 @@ func (i *inode) NewNode(ctx context.Context, name string, opts vfs.MknodOptions)
return i.newEntry(ctx, name, opts.Mode.FileType(), linux.FUSE_MKNOD, &in)
}
// NewSymlink implements kernfs.Inode.NewSymlink.
func (i *inode) NewSymlink(ctx context.Context, name, target string) (*vfs.Dentry, error) {
in := linux.FUSESymLinkIn{
Name: name,
Target: target,
}
return i.newEntry(ctx, name, linux.S_IFLNK, linux.FUSE_SYMLINK, &in)
}
// newEntry calls FUSE server for entry creation and allocates corresponding entry according to response.
// Shared by FUSE_MKNOD, FUSE_MKDIR, FUSE_SYMLINK, FUSE_LINK and FUSE_LOOKUP.
func (i *inode) newEntry(ctx context.Context, name string, fileType linux.FileMode, opcode linux.FUSEOpcode, payload marshal.Marshallable) (*vfs.Dentry, error) {
+5
View File
@@ -21,3 +21,8 @@ syscall_test(
fuse = "True",
test = "//test/fuse/linux:mknod_test",
)
syscall_test(
fuse = "True",
test = "//test/fuse/linux:symlink_test",
)
+13
View File
@@ -58,6 +58,19 @@ cc_binary(
],
)
cc_binary(
name = "symlink_test",
testonly = 1,
srcs = ["symlink_test.cc"],
deps = [
gtest,
":fuse_base",
"//test/util:fuse_util",
"//test/util:test_main",
"//test/util:test_util",
],
)
cc_library(
name = "fuse_base",
testonly = 1,
+88
View File
@@ -0,0 +1,88 @@
// Copyright 2020 The gVisor Authors.
//
// Licensed 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.
#include <errno.h>
#include <fcntl.h>
#include <linux/fuse.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <sys/types.h>
#include <unistd.h>
#include <string>
#include <vector>
#include "gtest/gtest.h"
#include "test/fuse/linux/fuse_base.h"
#include "test/util/fuse_util.h"
#include "test/util/test_util.h"
namespace gvisor {
namespace testing {
namespace {
class SymlinkTest : public FuseTest {
protected:
const std::string target_file_ = "target_file_";
const std::string symlink_ = "symlink_";
const mode_t perms_ = S_IRWXU | S_IRWXG | S_IRWXO;
};
TEST_F(SymlinkTest, CreateSymLink) {
const std::string symlink_path =
JoinPath(mount_point_.path().c_str(), symlink_);
struct fuse_out_header out_header = {
.len = sizeof(struct fuse_out_header) + sizeof(struct fuse_entry_out),
};
struct fuse_entry_out out_payload = DefaultEntryOut(S_IFLNK | perms_, 5);
auto iov_out = FuseGenerateIovecs(out_header, out_payload);
SetServerResponse(FUSE_SYMLINK, iov_out);
ASSERT_THAT(symlink(target_file_.c_str(), symlink_path.c_str()),
SyscallSucceeds());
struct fuse_in_header in_header;
std::vector<char> actual_target_file(target_file_.length() + 1);
std::vector<char> actual_symlink(symlink_.length() + 1);
auto iov_in =
FuseGenerateIovecs(in_header, actual_symlink, actual_target_file);
GetServerActualRequest(iov_in);
EXPECT_EQ(in_header.len,
sizeof(in_header) + symlink_.length() + target_file_.length() + 2);
EXPECT_EQ(in_header.opcode, FUSE_SYMLINK);
EXPECT_EQ(std::string(actual_target_file.data()), target_file_);
EXPECT_EQ(std::string(actual_symlink.data()), symlink_);
}
TEST_F(SymlinkTest, FileTypeError) {
const std::string symlink_path =
JoinPath(mount_point_.path().c_str(), symlink_);
struct fuse_out_header out_header = {
.len = sizeof(struct fuse_out_header) + sizeof(struct fuse_entry_out),
};
struct fuse_entry_out out_payload = DefaultEntryOut(S_IFREG | perms_, 5);
auto iov_out = FuseGenerateIovecs(out_header, out_payload);
SetServerResponse(FUSE_SYMLINK, iov_out);
ASSERT_THAT(symlink(target_file_.c_str(), symlink_path.c_str()),
SyscallFailsWithErrno(EIO));
SkipServerActualRequest();
}
} // namespace
} // namespace testing
} // namespace gvisor