hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Created a CryFs implementation based on the Fuse classes

Browse Source
This commit is contained in:
Sebastian Messmer 2014-11-15 16:33:24 +01:00
parent d088995178
commit 382a7b89f1
31 changed files with 882 additions and 783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

336
src/CryFuse.cpp
View File

@ -1,336 +0,0 @@
#include "CryFuse.h"
#include <sys/types.h>
#include <sys/time.h>
#include <dirent.h>
#include <fusepp/FuseErrnoException.h>
#include <fusepp/FuseNode.h>
#include <cassert>
#define UNUSED(expr) (void)(expr)
using fusepp::path;
namespace fusepp {
CryFuse::CryFuse(FuseDevice *device)
:_device(device) {
}
int CryFuse::getattr(const path &path, struct stat *stbuf) {
//printf("getattr(%s, _, _)\n", path.c_str());
try {
_device->lstat(path, stbuf);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::fgetattr(const path &path, struct stat *stbuf, fuse_file_info *fileinfo) {
//printf("fgetattr(%s, _, _)\n", path.c_str());
// On FreeBSD, trying to do anything with the mountpoint ends up
// opening it, and then using the FD for an fgetattr. So in the
// special case of a path of "/", I need to do a getattr on the
// underlying root directory instead of doing the fgetattr().
// TODO Check if necessary
if (path.native() == "/") {
return getattr(path, stbuf);
}
try {
_device->fstat(fileinfo->fh, stbuf);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int CryFuse::readlink(const path &path, char *buf, size_t size) {
//printf("readlink(%s, _, %zu)\n", path.c_str(), size);
auto real_path = _device->RootDir() / path;
//size-1, because the fuse readlink() function includes the null terminating byte in the buffer size,
//but the posix version does not and also doesn't append one.
int real_size = ::readlink(real_path.c_str(), buf, size-1);
if (real_size < 0) {
return -errno;
}
//Terminate the string
buf[real_size] = '\0';
return 0;
}
int CryFuse::mknod(const path &path, mode_t mode, dev_t rdev) {
UNUSED(rdev);
UNUSED(mode);
UNUSED(path);
printf("Called non-implemented mknod(%s, %d, _)\n", path.c_str(), mode);
return ENOSYS;
}
int CryFuse::mkdir(const path &path, mode_t mode) {
//printf("mkdir(%s, %d)\n", path.c_str(), mode);
try {
_device->mkdir(path, mode);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::unlink(const path &path) {
//printf("unlink(%s)\n", path.c_str());
try {
_device->unlink(path);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::rmdir(const path &path) {
try {
_device->rmdir(path);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int CryFuse::symlink(const path &from, const path &to) {
printf("NOT IMPLEMENTED: symlink(%s, %s)\n", from.c_str(), to.c_str());
//auto real_from = _device->RootDir() / from;
//auto real_to = _device->RootDir() / to;
//int retstat = ::symlink(real_from.c_str(), real_to.c_str());
//return errcode_map(retstat);
return ENOSYS;
}
int CryFuse::rename(const path &from, const path &to) {
//printf("rename(%s, %s)\n", from.c_str(), to.c_str());
try {
_device->rename(from, to);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int CryFuse::link(const path &from, const path &to) {
printf("NOT IMPLEMENTED: link(%s, %s)\n", from.c_str(), to.c_str());
//auto real_from = _device->RootDir() / from;
//auto real_to = _device->RootDir() / to;
//int retstat = ::link(real_from.c_str(), real_to.c_str());
//return errcode_map(retstat);
return ENOSYS;
}
//TODO
int CryFuse::chmod(const path &path, mode_t mode) {
printf("NOT IMPLEMENTED: chmod(%s, %d)\n", path.c_str(), mode);
//auto real_path = _device->RootDir() / path;
//int retstat = ::chmod(real_path.c_str(), mode);
//return errcode_map(retstat);
return ENOSYS;
}
//TODO
int CryFuse::chown(const path &path, uid_t uid, gid_t gid) {
printf("NOT IMPLEMENTED: chown(%s, %d, %d)\n", path.c_str(), uid, gid);
//auto real_path = _device->RootDir() / path;
//int retstat = ::chown(real_path.c_str(), uid, gid);
//return errcode_map(retstat);
return ENOSYS;
}
int CryFuse::truncate(const path &path, off_t size) {
//printf("truncate(%s, %zu)\n", path.c_str(), size);
try {
_device->truncate(path, size);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::ftruncate(const path &path, off_t size, fuse_file_info *fileinfo) {
//printf("ftruncate(%s, %zu, _)\n", path.c_str(), size);
UNUSED(path);
try {
_device->ftruncate(fileinfo->fh, size);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int CryFuse::utimens(const path &path, const timespec times[2]) {
//printf("utimens(%s, _)\n", path.c_str());
try {
_device->utimens(path, times);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::open(const path &path, fuse_file_info *fileinfo) {
//printf("open(%s, _)\n", path.c_str());
try {
fileinfo->fh = _device->openFile(path, fileinfo->flags);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::release(const path &path, fuse_file_info *fileinfo) {
//printf("release(%s, _)\n", path.c_str());
UNUSED(path);
try {
_device->closeFile(fileinfo->fh);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::read(const path &path, char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) {
//printf("read(%s, _, %zu, %zu, _)\n", path.c_str(), size, offset);
UNUSED(path);
try {
//printf("Reading from file %d\n", fileinfo->fh);
//fflush(stdout);
return _device->read(fileinfo->fh, buf, size, offset);
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::write(const path &path, const char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) {
//printf("write(%s, _, %zu, %zu, _)\n", path.c_str(), size, offset);
UNUSED(path);
try {
_device->write(fileinfo->fh, buf, size, offset);
return size;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int CryFuse::statfs(const path &path, struct statvfs *fsstat) {
//printf("statfs(%s, _)\n", path.c_str());
try {
_device->statfs(path, fsstat);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int CryFuse::flush(const path &path, fuse_file_info *fileinfo) {
//printf("Called non-implemented flush(%s, _)\n", path.c_str());
UNUSED(path);
UNUSED(fileinfo);
return 0;
}
int CryFuse::fsync(const path &path, int datasync, fuse_file_info *fileinfo) {
//printf("fsync(%s, %d, _)\n", path.c_str(), datasync);
UNUSED(path);
try {
if (datasync) {
_device->fdatasync(fileinfo->fh);
} else {
_device->fsync(fileinfo->fh);
}
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::opendir(const path &path, fuse_file_info *fileinfo) {
UNUSED(path);
UNUSED(fileinfo);
//printf("opendir(%s, _)\n", path.c_str());
//We don't need opendir, because readdir works directly on the path
return 0;
}
int CryFuse::readdir(const path &path, void *buf, fuse_fill_dir_t filler, off_t offset, fuse_file_info *fileinfo) {
UNUSED(fileinfo);
//printf("readdir(%s, _, _, %zu, _)\n", path.c_str(), offset);
UNUSED(offset);
try {
auto entries = _device->readDir(path);
for (const auto &entry : *entries) {
//We could pass file metadata to filler() in its third parameter,
//but it doesn't help performance since fuse seems to ignore it.
//It does getattr() calls on all entries nevertheless.
if (filler(buf, entry.c_str(), nullptr, 0) != 0) {
return -ENOMEM;
}
}
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::releasedir(const path &path, fuse_file_info *fileinfo) {
UNUSED(path);
UNUSED(fileinfo);
//printf("releasedir(%s, _)\n", path.c_str());
//We don't need releasedir, because readdir works directly on the path
return 0;
}
//TODO
int CryFuse::fsyncdir(const path &path, int datasync, fuse_file_info *fileinfo) {
UNUSED(fileinfo);
UNUSED(datasync);
UNUSED(path);
//printf("Called non-implemented fsyncdir(%s, %d, _)\n", path.c_str(), datasync);
return 0;
}
void CryFuse::init(fuse_conn_info *conn) {
UNUSED(conn);
//printf("init()\n");
}
void CryFuse::destroy() {
//printf("destroy()\n");
}
int CryFuse::access(const path &path, int mask) {
//printf("access(%s, %d)\n", path.c_str(), mask);
try {
_device->access(path, mask);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int CryFuse::create(const path &path, mode_t mode, fuse_file_info *fileinfo) {
//printf("create(%s, %d, _)\n", path.c_str(), mode);
try {
fileinfo->fh = _device->createAndOpenFile(path, mode);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
} /* namespace cryfs */

54
src/CryFuse.h
View File

@ -1,54 +0,0 @@
#pragma once
#ifndef CRYFS_LIB_CRYFUSE_H_
#define CRYFS_LIB_CRYFUSE_H_
#include "fusepp/Fuse.h"
#include "fusepp/FuseDevice.h"
#include "fusepp/utils/macros.h"
namespace fusepp {
class CryFuse: public fusepp::Fuse {
public:
CryFuse(FuseDevice *device);
int getattr(const fusepp::path &path, struct stat *stbuf) override;
int fgetattr(const fusepp::path &path, struct stat *stbuf, fuse_file_info *fileinfo) override;
int readlink(const fusepp::path &path, char *buf, size_t size) override;
int mknod(const fusepp::path &path, mode_t mode, dev_t rdev) override;
int mkdir(const fusepp::path &path, mode_t mode) override;
int unlink(const fusepp::path &path) override;
int rmdir(const fusepp::path &path) override;
int symlink(const fusepp::path &from, const fusepp::path &to) override;
int rename(const fusepp::path &from, const fusepp::path &to) override;
int link(const fusepp::path &from, const fusepp::path &to) override;
int chmod(const fusepp::path &path, mode_t mode) override;
int chown(const fusepp::path &path, uid_t uid, gid_t gid) override;
int truncate(const fusepp::path &path, off_t size) override;
int ftruncate(const fusepp::path &path, off_t size, fuse_file_info *fileinfo) override;
int utimens(const fusepp::path &path, const timespec times[2]) override;
int open(const fusepp::path &path, fuse_file_info *fileinfo) override;
int release(const fusepp::path &path, fuse_file_info *fileinfo) override;
int read(const fusepp::path &path, char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) override;
int write(const fusepp::path &path, const char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) override;
int statfs(const fusepp::path &path, struct statvfs *fsstat) override;
int flush(const fusepp::path &path, fuse_file_info *fileinfo) override;
int fsync(const fusepp::path &path, int flags, fuse_file_info *fileinfo) override;
int opendir(const fusepp::path &path, fuse_file_info *fileinfo) override;
int readdir(const fusepp::path &path, void *buf, fuse_fill_dir_t filler, off_t offset, fuse_file_info *fileinfo) override;
int releasedir(const fusepp::path &path, fuse_file_info *fileinfo) override;
int fsyncdir(const fusepp::path &path, int datasync, fuse_file_info *fileinfo) override;
void init(fuse_conn_info *conn) override;
void destroy() override;
int access(const fusepp::path &path, int mask) override;
int create(const fusepp::path &path, mode_t mode, fuse_file_info *fileinfo) override;
private:
FuseDevice *_device;
DISALLOW_COPY_AND_ASSIGN(CryFuse);
};
} /* namespace cryfs */
#endif /* CRYFS_LIB_CRYFUSE_H_ */

2
src/cryfs_lib/CMakeLists.txt
View File

@ -1,3 +1,3 @@
add_library(cryfs_lib ) add_library(cryfs_lib CryDevice.cpp CryDir.cpp CryFile.cpp CryNode.cpp CryOpenFile.cpp)
target_link_libraries(cryfs_lib fusepp) target_link_libraries(cryfs_lib fusepp)

41
src/cryfs_lib/CryDevice.cpp Normal file
View File

@ -0,0 +1,41 @@
#include "CryDevice.h"
#include "CryDir.h"
#include "CryFile.h"
#include "fusepp/FuseErrnoException.h"
using std::unique_ptr;
using std::unique_ptr;
using std::make_unique;
//TODO Get rid of this in favor of exception hierarchy
using fusepp::CHECK_RETVAL;
namespace cryfs {
CryDevice::CryDevice(const bf::path &root_path): _root_path(root_path) {
}
CryDevice::~CryDevice() {
}
unique_ptr<fusepp::FuseNode> CryDevice::Load(const bf::path &path) {
auto real_path = RootDir() / path;
if(bf::is_directory(real_path)) {
return make_unique<CryDir>(this, path);
} else if(bf::is_regular_file(real_path)) {
return make_unique<CryFile>(this, path);
}
throw fusepp::FuseErrnoException(ENOENT);
}
void CryDevice::statfs(const bf::path &path, struct statvfs *fsstat) {
auto real_path = RootDir() / path;
int retval = ::statvfs(real_path.c_str(), fsstat);
CHECK_RETVAL(retval);
}
} /* namespace cryfs */

35
src/cryfs_lib/CryDevice.h Normal file
View File

@ -0,0 +1,35 @@
#pragma once
#ifndef CRYFS_LIB_CRYDEVICE_H_
#define CRYFS_LIB_CRYDEVICE_H_
#include <boost/filesystem.hpp>
#include "fusepp/FuseDevice.h"
namespace cryfs {
namespace bf = boost::filesystem;
class CryDevice: public fusepp::FuseDevice {
public:
CryDevice(const bf::path &rootdir);
virtual ~CryDevice();
void statfs(const boost::filesystem::path &path, struct statvfs *fsstat) override;
const bf::path &RootDir() const;
private:
std::unique_ptr<fusepp::FuseNode> Load(const bf::path &path) override;
const bf::path _root_path;
DISALLOW_COPY_AND_ASSIGN(CryDevice);
};
inline const bf::path &CryDevice::RootDir() const {
return _root_path;
}
} /* namespace cryfs */
#endif /* CRYFS_LIB_CRYDEVICE_H_ */

81
src/cryfs_lib/CryDir.cpp Normal file
View File

@ -0,0 +1,81 @@
#include "CryDir.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include "fusepp/FuseErrnoException.h"
#include "CryDevice.h"
#include "CryFile.h"
//TODO Get rid of this in favor of exception hierarchy
using fusepp::CHECK_RETVAL;
namespace bf = boost::filesystem;
using std::unique_ptr;
using std::make_unique;
using std::string;
using std::vector;
namespace cryfs {
CryDir::CryDir(CryDevice *device, const bf::path &path)
:CryNode(device, path) {
assert(bf::is_directory(base_path()));
}
CryDir::~CryDir() {
}
unique_ptr<fusepp::FuseFile> CryDir::createFile(const string &name, mode_t mode) {
auto file_path = base_path() / name;
//Create file
int fd = ::creat(file_path.c_str(), mode);
CHECK_RETVAL(fd);
::close(fd);
return make_unique<CryFile>(device(), path() / name);
}
unique_ptr<fusepp::FuseDir> CryDir::createDir(const string &name, mode_t mode) {
auto dir_path = base_path() / name;
//Create dir
int retval = ::mkdir(dir_path.c_str(), mode);
CHECK_RETVAL(retval);
return make_unique<CryDir>(device(), path() / name);
}
void CryDir::rmdir() {
int retval = ::rmdir(base_path().c_str());
CHECK_RETVAL(retval);
}
unique_ptr<vector<string>> CryDir::children() const {
DIR *dir = ::opendir(base_path().c_str());
if (dir == nullptr) {
throw fusepp::FuseErrnoException(errno);
}
// Set errno=0 so we can detect whether it changed later
errno = 0;
auto result = make_unique<vector<string>>();
struct dirent *entry = ::readdir(dir);
while(entry != nullptr) {
result->push_back(entry->d_name);
entry = ::readdir(dir);
}
//On error, ::readdir returns nullptr and sets errno.
if (errno != 0) {
int readdir_errno = errno;
::closedir(dir);
throw fusepp::FuseErrnoException(readdir_errno);
}
int retval = ::closedir(dir);
CHECK_RETVAL(retval);
return result;
}
} /* namespace cryfs */

28
src/cryfs_lib/CryDir.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
#ifndef CRYFS_LIB_CRYDIR_H_
#define CRYFS_LIB_CRYDIR_H_
#include "fusepp/FuseDir.h"
#include "CryNode.h"
namespace cryfs {
class CryDir: public fusepp::FuseDir, CryNode {
public:
CryDir(CryDevice *device, const bf::path &path);
virtual ~CryDir();
//TODO return type variance to CryFile/CryDir?
std::unique_ptr<fusepp::FuseFile> createFile(const std::string &name, mode_t mode) override;
std::unique_ptr<fusepp::FuseDir> createDir(const std::string &name, mode_t mode) override;
void rmdir() override;
std::unique_ptr<std::vector<std::string>> children() const override;
private:
DISALLOW_COPY_AND_ASSIGN(CryDir);
};
} /* namespace cryfs */
#endif

39
src/cryfs_lib/CryFile.cpp Normal file
View File

@ -0,0 +1,39 @@
#include "CryFile.h"
#include "CryDevice.h"
#include "CryOpenFile.h"
#include "fusepp/FuseErrnoException.h"
namespace bf = boost::filesystem;
//TODO Get rid of this in favor of exception hierarchy
using fusepp::CHECK_RETVAL;
using std::unique_ptr;
using std::make_unique;
namespace cryfs {
CryFile::CryFile(CryDevice *device, const bf::path &path)
:CryNode(device, path) {
assert(bf::is_regular_file(base_path()));
}
CryFile::~CryFile() {
}
unique_ptr<fusepp::FuseOpenFile> CryFile::open(int flags) const {
return make_unique<CryOpenFile>(device(), path(), flags);
}
void CryFile::truncate(off_t size) const {
int retval = ::truncate(base_path().c_str(), size);
CHECK_RETVAL(retval);
}
void CryFile::unlink() {
int retval = ::unlink(base_path().c_str());
CHECK_RETVAL(retval);
}
} /* namespace cryfs */

25
src/cryfs_lib/CryFile.h Normal file
View File

@ -0,0 +1,25 @@
#pragma once
#ifndef CRYFS_LIB_CRYFILE_H_
#define CRYFS_LIB_CRYFILE_H_
#include "CryNode.h"
#include "fusepp/FuseFile.h"
namespace cryfs {
class CryFile: public fusepp::FuseFile, CryNode {
public:
CryFile(CryDevice *device, const boost::filesystem::path &path);
virtual ~CryFile();
std::unique_ptr<fusepp::FuseOpenFile> open(int flags) const override;
void truncate(off_t size) const override;
void unlink() override;
private:
DISALLOW_COPY_AND_ASSIGN(CryFile);
};
} /* namespace cryfs */
#endif

46
src/cryfs_lib/CryNode.cpp Normal file
View File

@ -0,0 +1,46 @@
#include "CryNode.h"
#include <sys/time.h>
#include "CryDevice.h"
#include "fusepp/FuseErrnoException.h"
namespace bf = boost::filesystem;
//TODO Get rid of this in favor of an exception hierarchy
using fusepp::CHECK_RETVAL;
namespace cryfs {
CryNode::CryNode(CryDevice *device, const bf::path &path)
:_device(device), _path(path) {
}
CryNode::~CryNode() {
}
void CryNode::stat(struct ::stat *result) const {
int retval = ::lstat(base_path().c_str(), result);
CHECK_RETVAL(retval);
}
void CryNode::access(int mask) const {
int retval = ::access(base_path().c_str(), mask);
CHECK_RETVAL(retval);
}
void CryNode::rename(const bf::path &to) {
auto new_base_path = device()->RootDir() / to;
int retval = ::rename(base_path().c_str(), new_base_path.c_str());
CHECK_RETVAL(retval);
_path = to;
}
void CryNode::utimens(const timespec times[2]) {
struct timeval timevals[2];
TIMESPEC_TO_TIMEVAL(&timevals[0], &times[0]);
TIMESPEC_TO_TIMEVAL(&timevals[1], &times[1]);
::lutimes(base_path().c_str(), timevals);
}
} /* namespace cryfs */

53
src/cryfs_lib/CryNode.h Normal file
View File

@ -0,0 +1,53 @@
#pragma once
#ifndef CRYFS_LIB_CRYNODE_H_
#define CRYFS_LIB_CRYNODE_H_
#include "fusepp/FuseNode.h"
#include "fusepp/utils/macros.h"
#include "CryDevice.h"
namespace cryfs {
class CryNode: public virtual fusepp::FuseNode {
public:
CryNode(CryDevice *device, const boost::filesystem::path &path);
virtual ~CryNode();
void stat(struct ::stat *result) const override;
void access(int mask) const override;
void rename(const boost::filesystem::path &to) override;
void utimens(const timespec times[2]) override;
protected:
boost::filesystem::path base_path() const;
const boost::filesystem::path &path() const;
CryDevice *device();
const CryDevice *device() const;
private:
CryDevice *const _device;
boost::filesystem::path _path;
DISALLOW_COPY_AND_ASSIGN(CryNode);
};
inline boost::filesystem::path CryNode::base_path() const {
return _device->RootDir() / _path;
}
inline const boost::filesystem::path &CryNode::path() const {
return _path;
}
inline CryDevice *CryNode::device() {
return const_cast<CryDevice*>(const_cast<const CryNode*>(this)->device());
}
inline const CryDevice *CryNode::device() const {
return _device;
}
} /* namespace cryfs */
#endif

63
src/cryfs_lib/CryOpenFile.cpp Normal file
View File

@ -0,0 +1,63 @@
#include "CryOpenFile.h"
#include <sys/types.h>
#include <fcntl.h>
#include "CryDevice.h"
#include "fusepp/FuseErrnoException.h"
namespace bf = boost::filesystem;
//TODO Get rid of this in favor of a exception hierarchy
using fusepp::CHECK_RETVAL;
namespace cryfs {
CryOpenFile::CryOpenFile(const CryDevice *device, const bf::path &path, int flags)
:_descriptor(::open((device->RootDir() / path).c_str(), flags)) {
CHECK_RETVAL(_descriptor);
}
CryOpenFile::~CryOpenFile() {
int retval = close(_descriptor);
CHECK_RETVAL(retval);
}
void CryOpenFile::stat(struct ::stat *result) const {
int retval = ::fstat(_descriptor, result);
CHECK_RETVAL(retval);
}
void CryOpenFile::truncate(off_t size) const {
int retval = ::ftruncate(_descriptor, size);
CHECK_RETVAL(retval);
}
int CryOpenFile::read(void *buf, size_t count, off_t offset) {
//printf("Reading from real descriptor %d (%d, %d)\n", _descriptor, offset, count);
//fflush(stdout);
int retval = ::pread(_descriptor, buf, count, offset);
CHECK_RETVAL(retval);
//printf("retval: %d, count: %d\n", retval, count);
//fflush(stdout);
assert(static_cast<unsigned int>(retval) <= count);
return retval;
}
void CryOpenFile::write(const void *buf, size_t count, off_t offset) {
int retval = ::pwrite(_descriptor, buf, count, offset);
CHECK_RETVAL(retval);
assert(static_cast<unsigned int>(retval) == count);
}
void CryOpenFile::fsync() {
int retval = ::fsync(_descriptor);
CHECK_RETVAL(retval);
}
void CryOpenFile::fdatasync() {
int retval = ::fdatasync(_descriptor);
CHECK_RETVAL(retval);
}
} /* namespace cryfs */

31
src/cryfs_lib/CryOpenFile.h Normal file
View File

@ -0,0 +1,31 @@
#pragma once
#ifndef CRYFS_LIB_CRYOPENFILE_H_
#define CRYFS_LIB_CRYOPENFILE_H_
#include "fusepp/FuseOpenFile.h"
#include "fusepp/utils/macros.h"
namespace cryfs {
class CryDevice;
class CryOpenFile: public fusepp::FuseOpenFile {
public:
CryOpenFile(const CryDevice *device, const boost::filesystem::path &path, int flags);
virtual ~CryOpenFile();
void stat(struct ::stat *result) const override;
void truncate(off_t size) const override;
int read(void *buf, size_t count, off_t offset) override;
void write(const void *buf, size_t count, off_t offset) override;
void fsync() override;
void fdatasync() override;
private:
int _descriptor;
DISALLOW_COPY_AND_ASSIGN(CryOpenFile);
};
} /* namespace cryfs */
#endif

318
src/fusepp/Fuse.cpp
View File

@ -1,7 +1,10 @@
#include "../fusepp/Fuse.h" #include "Fuse.h"
#include <memory> #include <memory>
#include <cassert> #include <cassert>
#include "FuseDevice.h"
#include "FuseErrnoException.h"
using std::unique_ptr; using std::unique_ptr;
using std::make_unique; using std::make_unique;
using std::string; using std::string;
@ -11,7 +14,6 @@ namespace bf = boost::filesystem;
using namespace fusepp; using namespace fusepp;
#define FUSE_OBJ ((Fuse *) fuse_get_context()->private_data) #define FUSE_OBJ ((Fuse *) fuse_get_context()->private_data)
#define UNUSED(obj) (void)obj
namespace { namespace {
int fusepp_getattr(const char *path, struct stat *stbuf) { int fusepp_getattr(const char *path, struct stat *stbuf) {
@ -203,6 +205,318 @@ fuse_operations *operations() {
Fuse::~Fuse() { Fuse::~Fuse() {
} }
Fuse::Fuse(FuseDevice *device)
:_device(device) {
}
void Fuse::run(int argc, char **argv) { void Fuse::run(int argc, char **argv) {
fuse_main(argc, argv, operations(), (void*)this); fuse_main(argc, argv, operations(), (void*)this);
} }
int Fuse::getattr(const bf::path &path, struct stat *stbuf) {
//printf("getattr(%s, _, _)\n", path.c_str());
try {
_device->lstat(path, stbuf);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::fgetattr(const bf::path &path, struct stat *stbuf, fuse_file_info *fileinfo) {
//printf("fgetattr(%s, _, _)\n", path.c_str());
// On FreeBSD, trying to do anything with the mountpoint ends up
// opening it, and then using the FD for an fgetattr. So in the
// special case of a path of "/", I need to do a getattr on the
// underlying root directory instead of doing the fgetattr().
// TODO Check if necessary
if (path.native() == "/") {
return getattr(path, stbuf);
}
try {
_device->fstat(fileinfo->fh, stbuf);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int Fuse::readlink(const bf::path &path, char *buf, size_t size) {
UNUSED(path);
UNUSED(buf);
UNUSED(size);
printf("Called non-implemented readlink(%s, _, %zu)\n", path.c_str(), size);
return ENOSYS;
}
int Fuse::mknod(const bf::path &path, mode_t mode, dev_t rdev) {
UNUSED(rdev);
UNUSED(mode);
UNUSED(path);
printf("Called non-implemented mknod(%s, %d, _)\n", path.c_str(), mode);
return ENOSYS;
}
int Fuse::mkdir(const bf::path &path, mode_t mode) {
//printf("mkdir(%s, %d)\n", path.c_str(), mode);
try {
_device->mkdir(path, mode);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::unlink(const bf::path &path) {
//printf("unlink(%s)\n", path.c_str());
try {
_device->unlink(path);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::rmdir(const bf::path &path) {
try {
_device->rmdir(path);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int Fuse::symlink(const bf::path &from, const bf::path &to) {
printf("NOT IMPLEMENTED: symlink(%s, %s)\n", from.c_str(), to.c_str());
//auto real_from = _device->RootDir() / from;
//auto real_to = _device->RootDir() / to;
//int retstat = ::symlink(real_from.c_str(), real_to.c_str());
//return errcode_map(retstat);
return ENOSYS;
}
int Fuse::rename(const bf::path &from, const bf::path &to) {
//printf("rename(%s, %s)\n", from.c_str(), to.c_str());
try {
_device->rename(from, to);
return 0;
} catch(fusepp::FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int Fuse::link(const bf::path &from, const bf::path &to) {
printf("NOT IMPLEMENTED: link(%s, %s)\n", from.c_str(), to.c_str());
//auto real_from = _device->RootDir() / from;
//auto real_to = _device->RootDir() / to;
//int retstat = ::link(real_from.c_str(), real_to.c_str());
//return errcode_map(retstat);
return ENOSYS;
}
//TODO
int Fuse::chmod(const bf::path &path, mode_t mode) {
printf("NOT IMPLEMENTED: chmod(%s, %d)\n", path.c_str(), mode);
//auto real_path = _device->RootDir() / path;
//int retstat = ::chmod(real_path.c_str(), mode);
//return errcode_map(retstat);
return ENOSYS;
}
//TODO
int Fuse::chown(const bf::path &path, uid_t uid, gid_t gid) {
printf("NOT IMPLEMENTED: chown(%s, %d, %d)\n", path.c_str(), uid, gid);
//auto real_path = _device->RootDir() / path;
//int retstat = ::chown(real_path.c_str(), uid, gid);
//return errcode_map(retstat);
return ENOSYS;
}
int Fuse::truncate(const bf::path &path, off_t size) {
//printf("truncate(%s, %zu)\n", path.c_str(), size);
try {
_device->truncate(path, size);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::ftruncate(const bf::path &path, off_t size, fuse_file_info *fileinfo) {
//printf("ftruncate(%s, %zu, _)\n", path.c_str(), size);
UNUSED(path);
try {
_device->ftruncate(fileinfo->fh, size);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int Fuse::utimens(const bf::path &path, const timespec times[2]) {
//printf("utimens(%s, _)\n", path.c_str());
try {
_device->utimens(path, times);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::open(const bf::path &path, fuse_file_info *fileinfo) {
//printf("open(%s, _)\n", path.c_str());
try {
fileinfo->fh = _device->openFile(path, fileinfo->flags);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::release(const bf::path &path, fuse_file_info *fileinfo) {
//printf("release(%s, _)\n", path.c_str());
UNUSED(path);
try {
_device->closeFile(fileinfo->fh);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::read(const bf::path &path, char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) {
//printf("read(%s, _, %zu, %zu, _)\n", path.c_str(), size, offset);
UNUSED(path);
try {
//printf("Reading from file %d\n", fileinfo->fh);
//fflush(stdout);
return _device->read(fileinfo->fh, buf, size, offset);
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::write(const bf::path &path, const char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) {
//printf("write(%s, _, %zu, %zu, _)\n", path.c_str(), size, offset);
UNUSED(path);
try {
_device->write(fileinfo->fh, buf, size, offset);
return size;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int Fuse::statfs(const bf::path &path, struct statvfs *fsstat) {
//printf("statfs(%s, _)\n", path.c_str());
try {
_device->statfs(path, fsstat);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
//TODO
int Fuse::flush(const bf::path &path, fuse_file_info *fileinfo) {
//printf("Called non-implemented flush(%s, _)\n", path.c_str());
UNUSED(path);
UNUSED(fileinfo);
return 0;
}
int Fuse::fsync(const bf::path &path, int datasync, fuse_file_info *fileinfo) {
//printf("fsync(%s, %d, _)\n", path.c_str(), datasync);
UNUSED(path);
try {
if (datasync) {
_device->fdatasync(fileinfo->fh);
} else {
_device->fsync(fileinfo->fh);
}
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::opendir(const bf::path &path, fuse_file_info *fileinfo) {
UNUSED(path);
UNUSED(fileinfo);
//printf("opendir(%s, _)\n", path.c_str());
//We don't need opendir, because readdir works directly on the path
return 0;
}
int Fuse::readdir(const bf::path &path, void *buf, fuse_fill_dir_t filler, off_t offset, fuse_file_info *fileinfo) {
UNUSED(fileinfo);
//printf("readdir(%s, _, _, %zu, _)\n", path.c_str(), offset);
UNUSED(offset);
try {
auto entries = _device->readDir(path);
for (const auto &entry : *entries) {
//We could pass file metadata to filler() in its third parameter,
//but it doesn't help performance since fuse seems to ignore it.
//It does getattr() calls on all entries nevertheless.
if (filler(buf, entry.c_str(), nullptr, 0) != 0) {
return -ENOMEM;
}
}
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::releasedir(const bf::path &path, fuse_file_info *fileinfo) {
UNUSED(path);
UNUSED(fileinfo);
//printf("releasedir(%s, _)\n", path.c_str());
//We don't need releasedir, because readdir works directly on the path
return 0;
}
//TODO
int Fuse::fsyncdir(const bf::path &path, int datasync, fuse_file_info *fileinfo) {
UNUSED(fileinfo);
UNUSED(datasync);
UNUSED(path);
//printf("Called non-implemented fsyncdir(%s, %d, _)\n", path.c_str(), datasync);
return 0;
}
void Fuse::init(fuse_conn_info *conn) {
UNUSED(conn);
//printf("init()\n");
}
void Fuse::destroy() {
//printf("destroy()\n");
}
int Fuse::access(const bf::path &path, int mask) {
//printf("access(%s, %d)\n", path.c_str(), mask);
try {
_device->access(path, mask);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}
int Fuse::create(const bf::path &path, mode_t mode, fuse_file_info *fileinfo) {
//printf("create(%s, %d, _)\n", path.c_str(), mode);
try {
fileinfo->fh = _device->createAndOpenFile(path, mode);
return 0;
} catch (FuseErrnoException &e) {
return -e.getErrno();
}
}

73
src/fusepp/Fuse.h
View File

@ -8,50 +8,53 @@
#include <string> #include <string>
#include <sys/stat.h> #include <sys/stat.h>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "utils/macros.h"
namespace fusepp { namespace fusepp {
class FuseDevice;
typedef boost::filesystem::path path;
//TODO If performance suffers here, we could use template<class FuseImpl>
// and redirect the fuse calls directly to the FuseImpl class instead
// of using virtual functions.
class Fuse { class Fuse {
public: public:
Fuse(FuseDevice *device);
virtual ~Fuse(); virtual ~Fuse();
void run(int argc, char **argv); void run(int argc, char **argv);
virtual int getattr(const path &path, struct stat *stbuf) = 0; int getattr(const boost::filesystem::path &path, struct stat *stbuf);
virtual int fgetattr(const path &path, struct stat *stbuf, fuse_file_info *fileinfo) = 0; int fgetattr(const boost::filesystem::path &path, struct stat *stbuf, fuse_file_info *fileinfo);
virtual int readlink(const path &path, char *buf, size_t size) = 0; int readlink(const boost::filesystem::path &path, char *buf, size_t size);
virtual int mknod(const path &path, mode_t mode, dev_t rdev) = 0; int mknod(const boost::filesystem::path &path, mode_t mode, dev_t rdev);
virtual int mkdir(const path &path, mode_t mode) = 0; int mkdir(const boost::filesystem::path &path, mode_t mode);
virtual int unlink(const path &path) = 0; int unlink(const boost::filesystem::path &path);
virtual int rmdir(const path &path) = 0; int rmdir(const boost::filesystem::path &path);
virtual int symlink(const path &from, const path &to) = 0; int symlink(const boost::filesystem::path &from, const boost::filesystem::path &to);
virtual int rename(const path &from, const path &to) = 0; int rename(const boost::filesystem::path &from, const boost::filesystem::path &to);
virtual int link(const path &from, const path &to) = 0; int link(const boost::filesystem::path &from, const boost::filesystem::path &to);
virtual int chmod(const path &path, mode_t mode) = 0; int chmod(const boost::filesystem::path &path, mode_t mode);
virtual int chown(const path &path, uid_t uid, gid_t gid) = 0; int chown(const boost::filesystem::path &path, uid_t uid, gid_t gid);
virtual int truncate(const path &path, off_t size) = 0; int truncate(const boost::filesystem::path &path, off_t size);
virtual int ftruncate(const path &path, off_t size, fuse_file_info *fileinfo) = 0; int ftruncate(const boost::filesystem::path &path, off_t size, fuse_file_info *fileinfo);
virtual int utimens(const path &path, const timespec times[2]) = 0; int utimens(const boost::filesystem::path &path, const timespec times[2]);
virtual int open(const path &path, fuse_file_info *fileinfo) = 0; int open(const boost::filesystem::path &path, fuse_file_info *fileinfo);
virtual int release(const path &path, fuse_file_info *fileinfo) = 0; int release(const boost::filesystem::path &path, fuse_file_info *fileinfo);
virtual int read(const path &path, char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) = 0; int read(const boost::filesystem::path &path, char *buf, size_t size, off_t offset, fuse_file_info *fileinfo);
virtual int write(const path &path, const char *buf, size_t size, off_t offset, fuse_file_info *fileinfo) = 0; int write(const boost::filesystem::path &path, const char *buf, size_t size, off_t offset, fuse_file_info *fileinfo);
virtual int statfs(const path &path, struct statvfs *fsstat) = 0; int statfs(const boost::filesystem::path &path, struct statvfs *fsstat);
virtual int flush(const path &path, fuse_file_info *fileinfo) = 0; int flush(const boost::filesystem::path &path, fuse_file_info *fileinfo);
virtual int fsync(const path &path, int datasync, fuse_file_info *fileinfo) = 0; int fsync(const boost::filesystem::path &path, int flags, fuse_file_info *fileinfo);
virtual int opendir(const path &path, fuse_file_info *fileinfo) = 0; int opendir(const boost::filesystem::path &path, fuse_file_info *fileinfo);
virtual int readdir(const path &path, void *buf, fuse_fill_dir_t filler, off_t offset, fuse_file_info *fileinfo) = 0; int readdir(const boost::filesystem::path &path, void *buf, fuse_fill_dir_t filler, off_t offset, fuse_file_info *fileinfo);
virtual int releasedir(const path &path, fuse_file_info *fileinfo) = 0; int releasedir(const boost::filesystem::path &path, fuse_file_info *fileinfo);
virtual int fsyncdir(const path &path, int datasync, fuse_file_info *fileinfo) = 0; int fsyncdir(const boost::filesystem::path &path, int datasync, fuse_file_info *fileinfo);
virtual void init(fuse_conn_info *conn) = 0; void init(fuse_conn_info *conn);
virtual void destroy() = 0; void destroy();
virtual int access(const path &path, int mask) = 0; int access(const boost::filesystem::path &path, int mask);
virtual int create(const path &path, mode_t mode, fuse_file_info *fileinfo) = 0; int create(const boost::filesystem::path &path, mode_t mode, fuse_file_info *fileinfo);
private:
FuseDevice *_device;
DISALLOW_COPY_AND_ASSIGN(Fuse);
}; };
} }

31
src/fusepp/FuseDevice.cpp
View File

@ -2,10 +2,11 @@
#include <memory> #include <memory>
#include <fcntl.h> #include <fcntl.h>
#include <fusepp/FuseDir.h>
#include <fusepp/FuseErrnoException.h> #include "FuseDir.h"
#include <fusepp/FuseFile.h> #include "FuseErrnoException.h"
#include <fusepp/FuseOpenFile.h> #include "FuseFile.h"
#include "utils/pointer.h" #include "utils/pointer.h"
@ -16,24 +17,15 @@ using std::make_unique;
using std::vector; using std::vector;
using std::string; using std::string;
FuseDevice::FuseDevice(const bf::path &rootdir) namespace bf = boost::filesystem;
:_rootdir(rootdir), _open_files() {
FuseDevice::FuseDevice()
:_open_files() {
} }
FuseDevice::~FuseDevice() { FuseDevice::~FuseDevice() {
} }
unique_ptr<FuseNode> FuseDevice::Load(const bf::path &path) {
auto real_path = RootDir() / path;
if(bf::is_directory(real_path)) {
return make_unique<FuseDir>(this, path);
} else if(bf::is_regular_file(real_path)) {
return make_unique<FuseFile>(this, path);
}
throw FuseErrnoException(ENOENT);
}
unique_ptr<FuseFile> FuseDevice::LoadFile(const bf::path &path) { unique_ptr<FuseFile> FuseDevice::LoadFile(const bf::path &path) {
auto node = Load(path); auto node = Load(path);
auto file = dynamic_pointer_move<FuseFile>(node); auto file = dynamic_pointer_move<FuseFile>(node);
@ -138,8 +130,3 @@ void FuseDevice::utimens(const bf::path &path, const timespec times[2]) {
auto node = Load(path); auto node = Load(path);
node->utimens(times); node->utimens(times);
} }
void FuseDevice::statfs(const bf::path &path, struct statvfs *fsstat) {
int retval = ::statvfs(path.c_str(), fsstat);
CHECK_RETVAL(retval);
}

40
src/fusepp/FuseDevice.h
View File

@ -16,49 +16,41 @@ class FuseFile;
class FuseOpenFile; class FuseOpenFile;
class FuseDir; class FuseDir;
namespace bf = boost::filesystem;
class FuseDevice { class FuseDevice {
public: public:
FuseDevice(const bf::path &rootdir); FuseDevice();
virtual ~FuseDevice(); virtual ~FuseDevice();
int openFile(const bf::path &path, int flags); int openFile(const boost::filesystem::path &path, int flags);
void closeFile(int descriptor); void closeFile(int descriptor);
void lstat(const bf::path &path, struct ::stat *stbuf); void lstat(const boost::filesystem::path &path, struct ::stat *stbuf);
void fstat(int descriptor, struct ::stat *stbuf); void fstat(int descriptor, struct ::stat *stbuf);
void truncate(const bf::path &path, off_t size); void truncate(const boost::filesystem::path &path, off_t size);
void ftruncate(int descriptor, off_t size); void ftruncate(int descriptor, off_t size);
int read(int descriptor, void *buf, size_t count, off_t offset); int read(int descriptor, void *buf, size_t count, off_t offset);
void write(int descriptor, const void *buf, size_t count, off_t offset); void write(int descriptor, const void *buf, size_t count, off_t offset);
void fsync(int descriptor); void fsync(int descriptor);
void fdatasync(int descriptor); void fdatasync(int descriptor);
void access(const bf::path &path, int mask); void access(const boost::filesystem::path &path, int mask);
int createAndOpenFile(const bf::path &path, mode_t mode); int createAndOpenFile(const boost::filesystem::path &path, mode_t mode);
void mkdir(const bf::path &path, mode_t mode); void mkdir(const boost::filesystem::path &path, mode_t mode);
void rmdir(const bf::path &path); void rmdir(const boost::filesystem::path &path);
void unlink(const bf::path &path); void unlink(const boost::filesystem::path &path);
void rename(const bf::path &from, const bf::path &to); void rename(const boost::filesystem::path &from, const boost::filesystem::path &to);
std::unique_ptr<std::vector<std::string>> readDir(const bf::path &path); std::unique_ptr<std::vector<std::string>> readDir(const boost::filesystem::path &path);
void utimens(const bf::path &path, const timespec times[2]); void utimens(const boost::filesystem::path &path, const timespec times[2]);
void statfs(const bf::path &path, struct statvfs *fsstat); virtual void statfs(const boost::filesystem::path &path, struct statvfs *fsstat) = 0;
const bf::path &RootDir() const;
private: private:
std::unique_ptr<FuseNode> Load(const bf::path &path); virtual std::unique_ptr<FuseNode> Load(const boost::filesystem::path &path) = 0;
std::unique_ptr<FuseFile> LoadFile(const bf::path &path); std::unique_ptr<FuseFile> LoadFile(const boost::filesystem::path &path);
std::unique_ptr<FuseDir> LoadDir(const bf::path &path); std::unique_ptr<FuseDir> LoadDir(const boost::filesystem::path &path);
int openFile(const FuseFile &file, int flags); int openFile(const FuseFile &file, int flags);
const bf::path _rootdir;
FuseOpenFileList _open_files; FuseOpenFileList _open_files;
DISALLOW_COPY_AND_ASSIGN(FuseDevice); DISALLOW_COPY_AND_ASSIGN(FuseDevice);
}; };
inline const bf::path &FuseDevice::RootDir() const {
return _rootdir;
}
} }
#endif /* FUSEPP_FUSEDEVICE_H_ */ #endif /* FUSEPP_FUSEDEVICE_H_ */

76
src/fusepp/FuseDir.cpp
View File

@ -1,75 +1 @@
#include <sys/types.h> #include "FuseDir.h"
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include <fusepp/FuseDevice.h>
#include <fusepp/FuseDir.h>
#include <fusepp/FuseErrnoException.h>
#include <fusepp/FuseFile.h>
using std::string;
using std::unique_ptr;
using std::make_unique;
using std::vector;
namespace fusepp {
FuseDir::FuseDir(FuseDevice *device, const bf::path &path)
:FuseNode(device, path) {
assert(bf::is_directory(base_path()));
}
FuseDir::~FuseDir() {
}
unique_ptr<FuseFile> FuseDir::createFile(const string &name, mode_t mode) {
auto file_path = base_path() / name;
//Create file
int fd = ::creat(file_path.c_str(), mode);
CHECK_RETVAL(fd);
::close(fd);
return make_unique<FuseFile>(device(), path() / name);
}
unique_ptr<FuseDir> FuseDir::createDir(const string &name, mode_t mode) {
auto dir_path = base_path() / name;
//Create dir
int retval = ::mkdir(dir_path.c_str(), mode);
CHECK_RETVAL(retval);
return make_unique<FuseDir>(device(), path() / name);
}
void FuseDir::rmdir() {
int retval = ::rmdir(base_path().c_str());
CHECK_RETVAL(retval);
}
unique_ptr<vector<string>> FuseDir::children() const {
DIR *dir = ::opendir(base_path().c_str());
if (dir == nullptr) {
throw FuseErrnoException(errno);
}
// Set errno=0 so we can detect whether it changed later
errno = 0;
auto result = make_unique<vector<string>>();
struct dirent *entry = ::readdir(dir);
while(entry != nullptr) {
result->push_back(entry->d_name);
entry = ::readdir(dir);
}
//On error, ::readdir returns nullptr and sets errno.
if (errno != 0) {
int readdir_errno = errno;
::closedir(dir);
throw FuseErrnoException(readdir_errno);
}
int retval = ::closedir(dir);
CHECK_RETVAL(retval);
return result;
}
} /* namespace fusepp */

21
src/fusepp/FuseDir.h
View File

@ -2,28 +2,23 @@
#ifndef FUSEPP_FUSEDIR_H_ #ifndef FUSEPP_FUSEDIR_H_
#define FUSEPP_FUSEDIR_H_ #define FUSEPP_FUSEDIR_H_
#include <fusepp/FuseNode.h> #include "FuseNode.h"
#include <memory> #include <memory>
#include <string> #include <string>
#include "utils/macros.h"
namespace fusepp { namespace fusepp {
class FuseDevice; class FuseDevice;
class FuseFile;
class FuseDir: public FuseNode { class FuseDir: public virtual FuseNode {
public: public:
FuseDir(FuseDevice *device, const bf::path &path); virtual ~FuseDir() {}
virtual ~FuseDir();
std::unique_ptr<FuseFile> createFile(const std::string &name, mode_t mode); virtual std::unique_ptr<FuseFile> createFile(const std::string &name, mode_t mode) = 0;
std::unique_ptr<FuseDir> createDir(const std::string &name, mode_t mode); virtual std::unique_ptr<FuseDir> createDir(const std::string &name, mode_t mode) = 0;
void rmdir(); virtual void rmdir() = 0;
std::unique_ptr<std::vector<std::string>> children() const; virtual std::unique_ptr<std::vector<std::string>> children() const = 0;
private:
DISALLOW_COPY_AND_ASSIGN(FuseDir);
}; };
} /* namespace fusepp */ } /* namespace fusepp */

3
src/fusepp/FuseErrnoException.cpp
View File

@ -1,4 +1,5 @@
#include <fusepp/FuseErrnoException.h> #include "FuseErrnoException.h"
#include <cstring> #include <cstring>
#include <cassert> #include <cassert>
#include <string> #include <string>

33
src/fusepp/FuseFile.cpp
View File

@ -1,32 +1 @@
#include <fusepp/FuseErrnoException.h> #include "FuseFile.h"
#include <fusepp/FuseFile.h>
#include <fusepp/FuseOpenFile.h>
using std::unique_ptr;
using std::make_unique;
namespace fusepp {
FuseFile::FuseFile(FuseDevice *device, const bf::path &path)
:FuseNode(device, path) {
assert(bf::is_regular_file(base_path()));
}
FuseFile::~FuseFile() {
}
std::unique_ptr<FuseOpenFile> FuseFile::open(int flags) const {
return make_unique<FuseOpenFile>(device(), path(), flags);
}
void FuseFile::truncate(off_t size) const {
int retval = ::truncate(base_path().c_str(), size);
CHECK_RETVAL(retval);
}
void FuseFile::unlink() {
int retval = ::unlink(base_path().c_str());
CHECK_RETVAL(retval);
}
} /* namespace fusepp */

17
src/fusepp/FuseFile.h
View File

@ -2,25 +2,20 @@
#ifndef FUSEPP_FUSEFILE_H_ #ifndef FUSEPP_FUSEFILE_H_
#define FUSEPP_FUSEFILE_H_ #define FUSEPP_FUSEFILE_H_
#include <fusepp/FuseNode.h> #include "FuseNode.h"
#include <memory> #include <memory>
#include "utils/macros.h"
namespace fusepp { namespace fusepp {
class FuseDevice; class FuseDevice;
class FuseOpenFile; class FuseOpenFile;
class FuseFile: public FuseNode { class FuseFile: public virtual FuseNode {
public: public:
FuseFile(FuseDevice *device, const bf::path &path); virtual ~FuseFile() {}
virtual ~FuseFile();
std::unique_ptr<FuseOpenFile> open(int flags) const; virtual std::unique_ptr<FuseOpenFile> open(int flags) const = 0;
void truncate(off_t size) const; virtual void truncate(off_t size) const = 0;
void unlink(); virtual void unlink() = 0;
private:
DISALLOW_COPY_AND_ASSIGN(FuseFile);
}; };
} /* namespace fusepp */ } /* namespace fusepp */

41
src/fusepp/FuseNode.cpp
View File

@ -1,40 +1 @@
#include <fusepp/FuseDevice.h> #include "FuseNode.h"
#include <fusepp/FuseErrnoException.h>
#include <fusepp/FuseNode.h>
#include <sys/time.h>
namespace fusepp {
FuseNode::FuseNode(FuseDevice *device, const bf::path &path)
:_device(device), _path(path) {
}
FuseNode::~FuseNode() {
}
void FuseNode::stat(struct ::stat *result) const {
int retval = ::lstat(base_path().c_str(), result);
CHECK_RETVAL(retval);
}
void FuseNode::access(int mask) const {
int retval = ::access(base_path().c_str(), mask);
CHECK_RETVAL(retval);
}
void FuseNode::rename(const bf::path &to) {
auto new_base_path = device()->RootDir() / to;
int retval = ::rename(base_path().c_str(), new_base_path.c_str());
CHECK_RETVAL(retval);
_path = to;
}
void FuseNode::utimens(const timespec times[2]) {
struct timeval timevals[2];
TIMESPEC_TO_TIMEVAL(&timevals[0], &times[0]);
TIMESPEC_TO_TIMEVAL(&timevals[1], &times[1]);
::lutimes(base_path().c_str(), timevals);
}
} /* namespace fusepp */

42
src/fusepp/FuseNode.h
View File

@ -3,54 +3,22 @@
#define FUSEPP_FUSENODE_H_ #define FUSEPP_FUSENODE_H_
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <fusepp/FuseDevice.h>
#include "utils/macros.h" #include "utils/macros.h"
#include <sys/stat.h> #include <sys/stat.h>
namespace fusepp { namespace fusepp {
namespace bf = boost::filesystem;
class FuseNode { class FuseNode {
public: public:
FuseNode(FuseDevice *device, const bf::path &path); virtual ~FuseNode() {}
virtual ~FuseNode();
void stat(struct ::stat *result) const; virtual void stat(struct ::stat *result) const = 0;
void access(int mask) const; virtual void access(int mask) const = 0;
void rename(const bf::path &to); virtual void rename(const boost::filesystem::path &to) = 0;
void utimens(const timespec times[2]); virtual void utimens(const timespec times[2]) = 0;
protected:
bf::path base_path() const;
const bf::path &path() const;
FuseDevice *device();
const FuseDevice *device() const;
private:
FuseDevice *const _device;
bf::path _path;
DISALLOW_COPY_AND_ASSIGN(FuseNode);
}; };
inline bf::path FuseNode::base_path() const {
return _device->RootDir() / _path;
}
inline const bf::path &FuseNode::path() const {
return _path;
}
inline FuseDevice *FuseNode::device() {
return const_cast<FuseDevice*>(const_cast<const FuseNode*>(this)->device());
}
inline const FuseDevice *FuseNode::device() const {
return _device;
}
} /* namespace fusepp */ } /* namespace fusepp */
#endif /* FUSEPP_FUSENODE_H_ */ #endif /* FUSEPP_FUSENODE_H_ */

56
src/fusepp/FuseOpenFile.cpp
View File

@ -1,55 +1 @@
#include <sys/types.h> #include "FuseOpenFile.h"
#include <fcntl.h>
#include <fusepp/FuseDevice.h>
#include <fusepp/FuseErrnoException.h>
#include <fusepp/FuseOpenFile.h>
using namespace fusepp;
FuseOpenFile::FuseOpenFile(const FuseDevice *device, const bf::path &path, int flags)
:_descriptor(::open((device->RootDir() / path).c_str(), flags)) {
CHECK_RETVAL(_descriptor);
}
FuseOpenFile::~FuseOpenFile() {
int retval = close(_descriptor);
CHECK_RETVAL(retval);
}
void FuseOpenFile::stat(struct ::stat *result) const {
int retval = ::fstat(_descriptor, result);
CHECK_RETVAL(retval);
}
void FuseOpenFile::truncate(off_t size) const {
int retval = ::ftruncate(_descriptor, size);
CHECK_RETVAL(retval);
}
int FuseOpenFile::read(void *buf, size_t count, off_t offset) {
//printf("Reading from real descriptor %d (%d, %d)\n", _descriptor, offset, count);
//fflush(stdout);
int retval = ::pread(_descriptor, buf, count, offset);
CHECK_RETVAL(retval);
//printf("retval: %d, count: %d\n", retval, count);
//fflush(stdout);
assert(static_cast<unsigned int>(retval) <= count);
return retval;
}
void FuseOpenFile::write(const void *buf, size_t count, off_t offset) {
int retval = ::pwrite(_descriptor, buf, count, offset);
CHECK_RETVAL(retval);
assert(static_cast<unsigned int>(retval) == count);
}
void FuseOpenFile::fsync() {
int retval = ::fsync(_descriptor);
CHECK_RETVAL(retval);
}
void FuseOpenFile::fdatasync() {
int retval = ::fdatasync(_descriptor);
CHECK_RETVAL(retval);
}

23
src/fusepp/FuseOpenFile.h
View File

@ -5,28 +5,19 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <sys/stat.h> #include <sys/stat.h>
#include "utils/macros.h"
namespace fusepp { namespace fusepp {
class FuseDevice; class FuseDevice;
namespace bf = boost::filesystem;
class FuseOpenFile { class FuseOpenFile {
public: public:
FuseOpenFile(const FuseDevice *device, const bf::path &path, int flags); virtual ~FuseOpenFile() {}
virtual ~FuseOpenFile();
void stat(struct ::stat *result) const; virtual void stat(struct ::stat *result) const = 0;
void truncate(off_t size) const; virtual void truncate(off_t size) const = 0;
int read(void *buf, size_t count, off_t offset); virtual int read(void *buf, size_t count, off_t offset) = 0;
void write(const void *buf, size_t count, off_t offset); virtual void write(const void *buf, size_t count, off_t offset) = 0;
void fsync(); virtual void fsync() = 0;
void fdatasync(); virtual void fdatasync() = 0;
private:
int _descriptor;
DISALLOW_COPY_AND_ASSIGN(FuseOpenFile);
}; };
} }

21
src/fusepp/FuseOpenFileList.cpp
View File

@ -1,25 +1,6 @@
#include <fusepp/FuseFile.h> #include "FuseOpenFileList.h"
#include <fusepp/FuseOpenFile.h>
#include <fusepp/FuseOpenFileList.h>
using namespace fusepp; using namespace fusepp;
FuseOpenFileList::~FuseOpenFileList() { FuseOpenFileList::~FuseOpenFileList() {
} }
FuseOpenFileList::FuseOpenFileList()
:_open_files() {
}
int FuseOpenFileList::open(const FuseFile &file, int flags) {
return _open_files.add(file.open(flags));
}
FuseOpenFile *FuseOpenFileList::get(int descriptor) {
return _open_files.get(descriptor);
}
void FuseOpenFileList::close(int descriptor) {
//The destructor of the stored FuseOpenFile closes the file
_open_files.remove(descriptor);
}

21
src/fusepp/FuseOpenFileList.h
View File

@ -4,10 +4,10 @@
#include "utils/macros.h" #include "utils/macros.h"
#include "IdList.h" #include "IdList.h"
#include "FuseFile.h"
#include "FuseOpenFile.h"
namespace fusepp { namespace fusepp {
class FuseOpenFile;
class FuseFile;
class FuseOpenFileList { class FuseOpenFileList {
public: public:
@ -24,6 +24,23 @@ private:
DISALLOW_COPY_AND_ASSIGN(FuseOpenFileList); DISALLOW_COPY_AND_ASSIGN(FuseOpenFileList);
}; };
inline FuseOpenFileList::FuseOpenFileList()
:_open_files() {
}
inline int FuseOpenFileList::open(const FuseFile &file, int flags) {
return _open_files.add(file.open(flags));
}
inline FuseOpenFile *FuseOpenFileList::get(int descriptor) {
return _open_files.get(descriptor);
}
inline void FuseOpenFileList::close(int descriptor) {
//The destructor of the stored FuseOpenFile closes the file
_open_files.remove(descriptor);
}
} }
#endif /* FUSEPP_FUSEOPENFILELIST_H_ */ #endif /* FUSEPP_FUSEOPENFILELIST_H_ */

4
src/fusepp/IdList.cpp
View File

@ -1,5 +1 @@
#include "IdList.h" #include "IdList.h"
namespace fusepp {
} /* namespace fusepp */

2
src/fusepp/utils/macros.h
View File

@ -6,4 +6,6 @@
Class(const Class &rhs) = delete; \ Class(const Class &rhs) = delete; \
Class &operator=(const Class &rhs) = delete; Class &operator=(const Class &rhs) = delete;
#define UNUSED(expr) (void)(expr)
#endif /* FUSEPP_UTILS_MACROS_H_ */ #endif /* FUSEPP_UTILS_MACROS_H_ */

9
src/main.cpp
View File

@ -3,13 +3,16 @@
#include <cstdlib> #include <cstdlib>
#include "buildconfig/BuildConfig.h" #include "buildconfig/BuildConfig.h"
#include "CryFuse.h" #include "fusepp/Fuse.h"
#include "cryfs_lib/CryDevice.h"
namespace bf = boost::filesystem;
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
printf("Version: %d\n", buildconfig::VERSION::MAJOR); printf("Version: %d\n", buildconfig::VERSION::MAJOR);
fusepp::FuseDevice device(fusepp::path("/home/heinzi/cryfstest/root")); cryfs::CryDevice device(bf::path("/home/heinzi/cryfstest/root"));
fusepp::CryFuse fuse(&device); fusepp::Fuse fuse(&device);
fuse.run(argc, argv); fuse.run(argc, argv);
return 0; return 0;
} }