mirror of
https://github.com/falk-werner/webfused
synced 2024-10-27 20:44:08 +00:00
parse filesystem info
This commit is contained in:
parent
16c5db6b2c
commit
b62e9fc67b
@ -50,6 +50,7 @@ target_compile_options(userdb PUBLIC ${OPENSSL_CFLAGS_OTHER})
|
|||||||
|
|
||||||
add_library(webfused-static STATIC
|
add_library(webfused-static STATIC
|
||||||
src/webfused/daemon.c
|
src/webfused/daemon.c
|
||||||
|
src/webfused/mountpoint_factory.c
|
||||||
src/webfused/config/config.c
|
src/webfused/config/config.c
|
||||||
src/webfused/config/factory.c
|
src/webfused/config/factory.c
|
||||||
src/webfused/config/builder.c
|
src/webfused/config/builder.c
|
||||||
@ -119,6 +120,7 @@ add_executable(alltests
|
|||||||
test/test_auth_settings.cc
|
test/test_auth_settings.cc
|
||||||
test/test_auth_factory.cc
|
test/test_auth_factory.cc
|
||||||
test/test_file_authenticator.cc
|
test/test_file_authenticator.cc
|
||||||
|
test/test_mountpoint_factory.cc
|
||||||
test/test_log.cc
|
test/test_log.cc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -48,4 +48,13 @@ wfd_config_builder_add_auth_provider(
|
|||||||
return builder.vtable->add_auth_provider(builder.data, settings);
|
return builder.vtable->add_auth_provider(builder.data, settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
wfd_config_builder_add_filesystem(
|
||||||
|
struct wfd_config_builder builder,
|
||||||
|
char const * name,
|
||||||
|
char const * mount_point)
|
||||||
|
{
|
||||||
|
return builder.vtable->add_filesystem(builder.data, name, mount_point);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,6 +42,12 @@ wfd_config_builder_add_auth_provider_fn(
|
|||||||
void * data,
|
void * data,
|
||||||
struct wfd_auth_settings * settings);
|
struct wfd_auth_settings * settings);
|
||||||
|
|
||||||
|
typedef bool
|
||||||
|
wfd_config_builder_add_filesystem_fn(
|
||||||
|
void * data,
|
||||||
|
char const * name,
|
||||||
|
char const * mount_point);
|
||||||
|
|
||||||
struct wfd_config_builder_vtable
|
struct wfd_config_builder_vtable
|
||||||
{
|
{
|
||||||
wfd_config_builder_set_server_vhostname_fn * set_server_vhostname;
|
wfd_config_builder_set_server_vhostname_fn * set_server_vhostname;
|
||||||
@ -50,6 +56,7 @@ struct wfd_config_builder_vtable
|
|||||||
wfd_config_builder_set_server_cert_fn * set_server_cert;
|
wfd_config_builder_set_server_cert_fn * set_server_cert;
|
||||||
wfd_config_builder_set_server_document_root_fn * set_server_document_root;
|
wfd_config_builder_set_server_document_root_fn * set_server_document_root;
|
||||||
wfd_config_builder_add_auth_provider_fn * add_auth_provider;
|
wfd_config_builder_add_auth_provider_fn * add_auth_provider;
|
||||||
|
wfd_config_builder_add_filesystem_fn * add_filesystem;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wfd_config_builder
|
struct wfd_config_builder
|
||||||
@ -88,6 +95,11 @@ wfd_config_builder_add_auth_provider(
|
|||||||
struct wfd_config_builder builder,
|
struct wfd_config_builder builder,
|
||||||
struct wfd_auth_settings * settings);
|
struct wfd_auth_settings * settings);
|
||||||
|
|
||||||
|
extern bool
|
||||||
|
wfd_config_builder_add_filesystem(
|
||||||
|
struct wfd_config_builder builder,
|
||||||
|
char const * name,
|
||||||
|
char const * mount_point);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "webfuse/adapter/server_config.h"
|
#include "webfuse/adapter/server_config.h"
|
||||||
#include "webfused/auth/factory.h"
|
#include "webfused/auth/factory.h"
|
||||||
#include "webfused/auth/authenticator.h"
|
#include "webfused/auth/authenticator.h"
|
||||||
|
#include "webfused/mountpoint_factory.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
@ -13,6 +14,7 @@ struct wfd_config
|
|||||||
struct wf_server_config * server;
|
struct wf_server_config * server;
|
||||||
bool has_authenticator;
|
bool has_authenticator;
|
||||||
struct wfd_authenticator authenticator;
|
struct wfd_authenticator authenticator;
|
||||||
|
struct wfd_mountpoint_factory * mountpoint_factory;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -86,6 +88,16 @@ wfd_config_add_auth_provider(
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
wfd_config_add_filesystem(
|
||||||
|
void * data,
|
||||||
|
char const * name,
|
||||||
|
char const * mount_point)
|
||||||
|
{
|
||||||
|
struct wfd_config * config = data;
|
||||||
|
return wfd_mountpoint_factory_add_filesystem(
|
||||||
|
config->mountpoint_factory, name, mount_point);
|
||||||
|
}
|
||||||
|
|
||||||
static const struct wfd_config_builder_vtable
|
static const struct wfd_config_builder_vtable
|
||||||
wfd_config_vtable_config_builder =
|
wfd_config_vtable_config_builder =
|
||||||
@ -95,7 +107,8 @@ wfd_config_vtable_config_builder =
|
|||||||
.set_server_key = &wfd_config_set_server_key,
|
.set_server_key = &wfd_config_set_server_key,
|
||||||
.set_server_cert = &wfd_config_set_server_cert,
|
.set_server_cert = &wfd_config_set_server_cert,
|
||||||
.set_server_document_root = &wfd_config_set_server_document_root,
|
.set_server_document_root = &wfd_config_set_server_document_root,
|
||||||
.add_auth_provider = &wfd_config_add_auth_provider
|
.add_auth_provider = &wfd_config_add_auth_provider,
|
||||||
|
.add_filesystem = &wfd_config_add_filesystem
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wfd_config *
|
struct wfd_config *
|
||||||
@ -103,11 +116,14 @@ wfd_config_create(void)
|
|||||||
{
|
{
|
||||||
struct wfd_config * config = malloc(sizeof(struct wfd_config));
|
struct wfd_config * config = malloc(sizeof(struct wfd_config));
|
||||||
|
|
||||||
|
config->mountpoint_factory = wfd_mountpoint_factory_create();
|
||||||
|
config->has_authenticator = false;
|
||||||
config->server = wf_server_config_create();
|
config->server = wf_server_config_create();
|
||||||
wf_server_config_set_vhostname(config->server, WFD_CONFIG_DEFAULT_VHOSTNAME);
|
wf_server_config_set_vhostname(config->server, WFD_CONFIG_DEFAULT_VHOSTNAME);
|
||||||
wf_server_config_set_port(config->server, WFD_CONFIG_DEFAULT_PORT);
|
wf_server_config_set_port(config->server, WFD_CONFIG_DEFAULT_PORT);
|
||||||
|
wf_server_config_set_mountpoint_factory(config->server,
|
||||||
config->has_authenticator = false;
|
wfd_mountpoint_factory_create_mountpoint,
|
||||||
|
config->mountpoint_factory);
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
@ -121,6 +137,7 @@ wfd_config_dispose(
|
|||||||
{
|
{
|
||||||
wfd_authenticator_dispose(config->authenticator);
|
wfd_authenticator_dispose(config->authenticator);
|
||||||
}
|
}
|
||||||
|
wfd_mountpoint_factory_dispose(config->mountpoint_factory);
|
||||||
|
|
||||||
free(config);
|
free(config);
|
||||||
}
|
}
|
||||||
|
@ -143,6 +143,55 @@ wfd_config_read_authentication(
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
wfd_config_read_filesystems(
|
||||||
|
config_t * config,
|
||||||
|
struct wfd_config_builder builder)
|
||||||
|
{
|
||||||
|
bool result = true;
|
||||||
|
config_setting_t * filesystems = config_lookup(config, "filesystems");
|
||||||
|
if (NULL != filesystems)
|
||||||
|
{
|
||||||
|
int length = config_setting_length(filesystems);
|
||||||
|
for (int i = 0; i < length; i++)
|
||||||
|
{
|
||||||
|
config_setting_t * fs = config_setting_get_elem(filesystems, i);
|
||||||
|
if (NULL == fs)
|
||||||
|
{
|
||||||
|
WFD_ERROR("failed to load config: invalid filesystem section");
|
||||||
|
result = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
char const * name;
|
||||||
|
int rc = config_setting_lookup_string(fs, "name", &name);
|
||||||
|
if (rc != CONFIG_TRUE)
|
||||||
|
{
|
||||||
|
WFD_ERROR("failed to load config: missing required filesystem property \'name\'");
|
||||||
|
result = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
char const * mount_point;
|
||||||
|
rc = config_setting_lookup_string(fs, "mount_point", &mount_point);
|
||||||
|
if (rc != CONFIG_TRUE)
|
||||||
|
{
|
||||||
|
WFD_ERROR("failed to load config: missing required filesystem property \'mount_point\'");
|
||||||
|
result = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
result = wfd_config_builder_add_filesystem(builder, name, mount_point);
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
wfd_config_load(
|
wfd_config_load(
|
||||||
struct wfd_config_builder builder,
|
struct wfd_config_builder builder,
|
||||||
@ -152,6 +201,7 @@ wfd_config_load(
|
|||||||
bool result = wfd_config_check_version(config)
|
bool result = wfd_config_check_version(config)
|
||||||
&& wfd_config_read_server(config, builder)
|
&& wfd_config_read_server(config, builder)
|
||||||
&& wfd_config_read_authentication(config, builder)
|
&& wfd_config_read_authentication(config, builder)
|
||||||
|
&& wfd_config_read_filesystems(config, builder)
|
||||||
;
|
;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
145
src/webfused/mountpoint_factory.c
Normal file
145
src/webfused/mountpoint_factory.c
Normal file
@ -0,0 +1,145 @@
|
|||||||
|
#include "webfused/mountpoint_factory.h"
|
||||||
|
#include "webfused/log/log.h"
|
||||||
|
|
||||||
|
#include <webfuse/adapter/mountpoint.h>
|
||||||
|
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#define WFD_FILESYSTEM_DEFAULT_CAPACITY 16
|
||||||
|
|
||||||
|
struct wfd_filesystem
|
||||||
|
{
|
||||||
|
char * name;
|
||||||
|
char * mount_point;
|
||||||
|
bool in_use;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct wfd_mountpoint_factory
|
||||||
|
{
|
||||||
|
struct wfd_filesystem * filesystems;
|
||||||
|
size_t capacity;
|
||||||
|
size_t count;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct wfd_filesystem *
|
||||||
|
wfd_mountpoint_factory_find(
|
||||||
|
struct wfd_mountpoint_factory * factory,
|
||||||
|
char const * name)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < factory->count; i++)
|
||||||
|
{
|
||||||
|
struct wfd_filesystem * filesystem = &(factory->filesystems[i]);
|
||||||
|
if (0 == strcmp(name, filesystem->name))
|
||||||
|
{
|
||||||
|
return filesystem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
wfd_mountpoint_factory_release_mountpoint(
|
||||||
|
void * user_data)
|
||||||
|
{
|
||||||
|
bool * in_use = user_data;
|
||||||
|
*in_use = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wfd_mountpoint_factory *
|
||||||
|
wfd_mountpoint_factory_create(void)
|
||||||
|
{
|
||||||
|
struct wfd_mountpoint_factory * factory = malloc(sizeof(struct wfd_mountpoint_factory));
|
||||||
|
factory->filesystems = malloc(sizeof(struct wfd_filesystem) * WFD_FILESYSTEM_DEFAULT_CAPACITY);
|
||||||
|
factory->count = 0;
|
||||||
|
factory->capacity = WFD_FILESYSTEM_DEFAULT_CAPACITY;
|
||||||
|
|
||||||
|
return factory;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
wfd_mountpoint_factory_dispose(
|
||||||
|
struct wfd_mountpoint_factory * factory)
|
||||||
|
{
|
||||||
|
for(size_t i = 0; i < factory->count; i++)
|
||||||
|
{
|
||||||
|
struct wfd_filesystem * filesystem = &(factory->filesystems[i]);
|
||||||
|
free(filesystem->name);
|
||||||
|
free(filesystem->mount_point);
|
||||||
|
}
|
||||||
|
|
||||||
|
free(factory->filesystems);
|
||||||
|
free(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
wfd_mountpoint_factory_add_filesystem(
|
||||||
|
struct wfd_mountpoint_factory * factory,
|
||||||
|
char const * name,
|
||||||
|
char const * mount_point)
|
||||||
|
{
|
||||||
|
bool result = (NULL == wfd_mountpoint_factory_find(factory, name));
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
WFD_ERROR("mount_point already defined: \'%s\'", mount_point);
|
||||||
|
}
|
||||||
|
|
||||||
|
char * path = NULL;
|
||||||
|
if (result)
|
||||||
|
{
|
||||||
|
mkdir(mount_point, 0755);
|
||||||
|
path = realpath(mount_point, NULL);
|
||||||
|
if (NULL == path)
|
||||||
|
{
|
||||||
|
WFD_ERROR("invalid mount_point: \'%s\'", mount_point);
|
||||||
|
result = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result)
|
||||||
|
{
|
||||||
|
if (factory->count >= factory->capacity)
|
||||||
|
{
|
||||||
|
factory->capacity *= 2;
|
||||||
|
factory->filesystems = realloc(factory->filesystems,
|
||||||
|
sizeof(struct wfd_filesystem) * factory->capacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wfd_filesystem * actual = &(factory->filesystems[factory->count]);
|
||||||
|
actual->name = strdup(name);
|
||||||
|
actual->mount_point = path;
|
||||||
|
actual->in_use = false;
|
||||||
|
factory->count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
extern struct wf_mountpoint *
|
||||||
|
wfd_mountpoint_factory_create_mountpoint(
|
||||||
|
char const * filesystem,
|
||||||
|
void * user_data)
|
||||||
|
{
|
||||||
|
struct wfd_mountpoint_factory * factory = user_data;
|
||||||
|
struct wfd_filesystem * fs = wfd_mountpoint_factory_find(factory, filesystem);
|
||||||
|
if (NULL == fs)
|
||||||
|
{
|
||||||
|
WFD_INFO("failed to create mountpoint: filesystem \'%s\' not found", filesystem);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fs->in_use)
|
||||||
|
{
|
||||||
|
WFD_INFO("failed to create mountpoint: filesystem \'%s\' already in use", filesystem);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
fs->in_use = true;
|
||||||
|
struct wf_mountpoint * result = wf_mountpoint_create(fs->mount_point);
|
||||||
|
wf_mountpoint_set_userdata(result,
|
||||||
|
&fs->in_use, &wfd_mountpoint_factory_release_mountpoint);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
39
src/webfused/mountpoint_factory.h
Normal file
39
src/webfused/mountpoint_factory.h
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#ifndef WFD_MOUNTPOINT_FACTORY_H
|
||||||
|
#define WFD_MOUNTPOINT_FACTORY_H
|
||||||
|
|
||||||
|
#include "webfuse/adapter/mountpoint_factory.h"
|
||||||
|
|
||||||
|
#ifndef __cplusplus
|
||||||
|
#include <stdbool.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
#endif
|
||||||
|
|
||||||
|
struct wfd_mountpoint_factory;
|
||||||
|
|
||||||
|
extern struct wfd_mountpoint_factory *
|
||||||
|
wfd_mountpoint_factory_create(void);
|
||||||
|
|
||||||
|
extern void
|
||||||
|
wfd_mountpoint_factory_dispose(
|
||||||
|
struct wfd_mountpoint_factory * factory);
|
||||||
|
|
||||||
|
extern bool
|
||||||
|
wfd_mountpoint_factory_add_filesystem(
|
||||||
|
struct wfd_mountpoint_factory * factory,
|
||||||
|
char const * name,
|
||||||
|
char const * mount_point);
|
||||||
|
|
||||||
|
extern struct wf_mountpoint *
|
||||||
|
wfd_mountpoint_factory_create_mountpoint(
|
||||||
|
char const * filesystem,
|
||||||
|
void * user_data);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
@ -55,7 +55,17 @@ wfd_MockConfigBuilder_add_auth_provider(
|
|||||||
struct wfd_auth_settings * settings)
|
struct wfd_auth_settings * settings)
|
||||||
{
|
{
|
||||||
auto * builder = reinterpret_cast<IConfigBuilder*>(data);
|
auto * builder = reinterpret_cast<IConfigBuilder*>(data);
|
||||||
builder->addAuthProvider(settings);
|
return builder->addAuthProvider(settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
wfd_MockConfigBuilder_add_filesystem(
|
||||||
|
void * data,
|
||||||
|
char const * name,
|
||||||
|
char const * mountpoint)
|
||||||
|
{
|
||||||
|
auto * builder = reinterpret_cast<IConfigBuilder*>(data);
|
||||||
|
return builder->addFilesystem(name, mountpoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -66,7 +76,8 @@ static const wfd_config_builder_vtable wfd_MockConfigBuilder_vtable =
|
|||||||
&wfd_MockConfigBuilder_set_server_key,
|
&wfd_MockConfigBuilder_set_server_key,
|
||||||
&wfd_MockConfigBuilder_set_server_cert,
|
&wfd_MockConfigBuilder_set_server_cert,
|
||||||
&wfd_MockConfigBuilder_set_server_document_root,
|
&wfd_MockConfigBuilder_set_server_document_root,
|
||||||
&wfd_MockConfigBuilder_add_auth_provider
|
&wfd_MockConfigBuilder_add_auth_provider,
|
||||||
|
&wfd_MockConfigBuilder_add_filesystem
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ public:
|
|||||||
virtual void setServerCert(char const * cert_path) = 0;
|
virtual void setServerCert(char const * cert_path) = 0;
|
||||||
virtual void setServerDocumentRoot(char const * document_root) = 0;
|
virtual void setServerDocumentRoot(char const * document_root) = 0;
|
||||||
virtual bool addAuthProvider(wfd_auth_settings * settings) = 0;
|
virtual bool addAuthProvider(wfd_auth_settings * settings) = 0;
|
||||||
|
virtual bool addFilesystem(char const * name, char const * mountpoint) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
class MockConfigBuilder: public IConfigBuilder
|
class MockConfigBuilder: public IConfigBuilder
|
||||||
@ -29,6 +30,7 @@ public:
|
|||||||
MOCK_METHOD1(setServerCert, void (char const * cert_path));
|
MOCK_METHOD1(setServerCert, void (char const * cert_path));
|
||||||
MOCK_METHOD1(setServerDocumentRoot, void (char const * document_root));
|
MOCK_METHOD1(setServerDocumentRoot, void (char const * document_root));
|
||||||
MOCK_METHOD1(addAuthProvider, bool (wfd_auth_settings * settings));
|
MOCK_METHOD1(addAuthProvider, bool (wfd_auth_settings * settings));
|
||||||
|
MOCK_METHOD2(addFilesystem, bool (char const * name, char const * mountpoint));
|
||||||
|
|
||||||
struct wfd_config_builder getBuilder();
|
struct wfd_config_builder getBuilder();
|
||||||
};
|
};
|
||||||
|
@ -2,6 +2,12 @@
|
|||||||
#include "webfused/config/config.h"
|
#include "webfused/config/config.h"
|
||||||
#include "mock_auth_settings.hpp"
|
#include "mock_auth_settings.hpp"
|
||||||
|
|
||||||
|
#include "webfused/log/logger.h"
|
||||||
|
#include "webfused/log/log.h"
|
||||||
|
#include "mock_logger.hpp"
|
||||||
|
using ::webfused_test::MockLogger;
|
||||||
|
using ::testing::_;
|
||||||
|
|
||||||
using ::webfused_test::MockAuthSettings;
|
using ::webfused_test::MockAuthSettings;
|
||||||
using ::testing::Return;
|
using ::testing::Return;
|
||||||
using ::testing::StrEq;
|
using ::testing::StrEq;
|
||||||
@ -74,5 +80,18 @@ TEST(config, auth_config_failed_to_add_unknown_provider)
|
|||||||
bool success = wfd_config_builder_add_auth_provider(builder, nullptr);
|
bool success = wfd_config_builder_add_auth_provider(builder, nullptr);
|
||||||
ASSERT_FALSE(success);
|
ASSERT_FALSE(success);
|
||||||
|
|
||||||
|
wfd_config_dispose(config);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(config, add_filesystem)
|
||||||
|
{
|
||||||
|
wfd_config * config = wfd_config_create();
|
||||||
|
ASSERT_NE(nullptr, config);
|
||||||
|
|
||||||
|
wfd_config_builder builder = wfd_config_get_builder(config);
|
||||||
|
|
||||||
|
bool success = wfd_config_builder_add_filesystem(builder, "test", "/tmp/test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
wfd_config_dispose(config);
|
wfd_config_dispose(config);
|
||||||
}
|
}
|
@ -20,6 +20,7 @@ TEST(config, is_loadable)
|
|||||||
EXPECT_CALL(builder, setServerVhostname(StrEq("localhost"))).Times(1);
|
EXPECT_CALL(builder, setServerVhostname(StrEq("localhost"))).Times(1);
|
||||||
EXPECT_CALL(builder, setServerPort(8080)).Times(1);
|
EXPECT_CALL(builder, setServerPort(8080)).Times(1);
|
||||||
EXPECT_CALL(builder, addAuthProvider(_)).Times(1).WillOnce(Return(true));
|
EXPECT_CALL(builder, addAuthProvider(_)).Times(1).WillOnce(Return(true));
|
||||||
|
EXPECT_CALL(builder, addFilesystem(_,_)).Times(1).WillOnce(Return(true));
|
||||||
|
|
||||||
bool result = wfd_config_load_file(builder.getBuilder(), "webfused.conf");
|
bool result = wfd_config_load_file(builder.getBuilder(), "webfused.conf");
|
||||||
ASSERT_TRUE(result);
|
ASSERT_TRUE(result);
|
||||||
@ -333,3 +334,102 @@ TEST(config, failed_missing_auth_settings)
|
|||||||
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
||||||
ASSERT_FALSE(result);
|
ASSERT_FALSE(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(config, filesystems)
|
||||||
|
{
|
||||||
|
MockLogger logger;
|
||||||
|
EXPECT_CALL(logger, log(_, _, _)).Times(0);
|
||||||
|
EXPECT_CALL(logger, onclose()).Times(1);
|
||||||
|
|
||||||
|
StrictMock<MockConfigBuilder> builder;
|
||||||
|
EXPECT_CALL(builder, addFilesystem(_, _)).Times(1).WillOnce(Return(true));
|
||||||
|
|
||||||
|
char const config_text[] =
|
||||||
|
"version = { major = 1, minor = 0 }\n"
|
||||||
|
"filesystems:\n"
|
||||||
|
"(\n"
|
||||||
|
" {name = \"foo\", mount_point = \"/tmp/test\" }\n"
|
||||||
|
")\n"
|
||||||
|
;
|
||||||
|
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
||||||
|
ASSERT_TRUE(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(config, filesystems_empty)
|
||||||
|
{
|
||||||
|
MockLogger logger;
|
||||||
|
EXPECT_CALL(logger, log(_, _, _)).Times(0);
|
||||||
|
EXPECT_CALL(logger, onclose()).Times(1);
|
||||||
|
|
||||||
|
StrictMock<MockConfigBuilder> builder;
|
||||||
|
EXPECT_CALL(builder, addFilesystem(_, _)).Times(0);
|
||||||
|
|
||||||
|
char const config_text[] =
|
||||||
|
"version = { major = 1, minor = 0 }\n"
|
||||||
|
"filesystems:\n"
|
||||||
|
"(\n"
|
||||||
|
")\n"
|
||||||
|
;
|
||||||
|
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
||||||
|
ASSERT_TRUE(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(config, filesystems_failed_add)
|
||||||
|
{
|
||||||
|
MockLogger logger;
|
||||||
|
EXPECT_CALL(logger, log(_, _, _)).Times(0);
|
||||||
|
EXPECT_CALL(logger, onclose()).Times(1);
|
||||||
|
|
||||||
|
StrictMock<MockConfigBuilder> builder;
|
||||||
|
EXPECT_CALL(builder, addFilesystem(_, _)).Times(1).WillOnce(Return(false));
|
||||||
|
|
||||||
|
char const config_text[] =
|
||||||
|
"version = { major = 1, minor = 0 }\n"
|
||||||
|
"filesystems:\n"
|
||||||
|
"(\n"
|
||||||
|
" {name = \"foo\", mount_point = \"/tmp/test\" }\n"
|
||||||
|
")\n"
|
||||||
|
;
|
||||||
|
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
||||||
|
ASSERT_FALSE(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(config, filesystems_failed_missing_name)
|
||||||
|
{
|
||||||
|
MockLogger logger;
|
||||||
|
EXPECT_CALL(logger, log(WFD_LOGLEVEL_ERROR, _, _)).Times(1);
|
||||||
|
EXPECT_CALL(logger, onclose()).Times(1);
|
||||||
|
|
||||||
|
StrictMock<MockConfigBuilder> builder;
|
||||||
|
EXPECT_CALL(builder, addFilesystem(_, _)).Times(0);
|
||||||
|
|
||||||
|
char const config_text[] =
|
||||||
|
"version = { major = 1, minor = 0 }\n"
|
||||||
|
"filesystems:\n"
|
||||||
|
"(\n"
|
||||||
|
" {mount_point = \"/tmp/test\" }\n"
|
||||||
|
")\n"
|
||||||
|
;
|
||||||
|
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
||||||
|
ASSERT_FALSE(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(config, filesystems_failed_missing_mountpoint)
|
||||||
|
{
|
||||||
|
MockLogger logger;
|
||||||
|
EXPECT_CALL(logger, log(WFD_LOGLEVEL_ERROR, _, _)).Times(1);
|
||||||
|
EXPECT_CALL(logger, onclose()).Times(1);
|
||||||
|
|
||||||
|
StrictMock<MockConfigBuilder> builder;
|
||||||
|
EXPECT_CALL(builder, addFilesystem(_, _)).Times(0);
|
||||||
|
|
||||||
|
char const config_text[] =
|
||||||
|
"version = { major = 1, minor = 0 }\n"
|
||||||
|
"filesystems:\n"
|
||||||
|
"(\n"
|
||||||
|
" {name = \"foo\"}\n"
|
||||||
|
")\n"
|
||||||
|
;
|
||||||
|
bool result = wfd_config_load_string(builder.getBuilder(), config_text);
|
||||||
|
ASSERT_FALSE(result);
|
||||||
|
}
|
||||||
|
135
test/test_mountpoint_factory.cc
Normal file
135
test/test_mountpoint_factory.cc
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
#include <gtest/gtest.h>
|
||||||
|
#include "webfused/mountpoint_factory.h"
|
||||||
|
#include <webfuse/adapter/mountpoint.h>
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
|
TEST(mountpoint_factory, create)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, add_filesystem)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfused_test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, add_filesystem_fail_to_add_twice)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfused_test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
|
success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfused_test");
|
||||||
|
ASSERT_FALSE(success);
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, add_filesystem_multi)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
|
||||||
|
for (size_t i = 0; i < 24; i++)
|
||||||
|
{
|
||||||
|
char name[10];
|
||||||
|
snprintf(name, 10, "test_%zu", i);
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, name, "/tmp/webfused_test");
|
||||||
|
ASSERT_TRUE(success) << i;
|
||||||
|
}
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, add_filesystem_fail_invalid_path)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/do/not/allow/nested/paths");
|
||||||
|
ASSERT_FALSE(success);
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, create_mountpoint)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfuse_test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
|
wf_mountpoint * mountpoint = wfd_mountpoint_factory_create_mountpoint("test", factory);
|
||||||
|
ASSERT_NE(nullptr, mountpoint);
|
||||||
|
ASSERT_STREQ("/tmp/webfuse_test", wf_mountpoint_get_path(mountpoint));
|
||||||
|
|
||||||
|
wf_mountpoint_dispose(mountpoint);
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, create_mountpoint_fail_already_in_use)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfuse_test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
|
wf_mountpoint * mountpoint = wfd_mountpoint_factory_create_mountpoint("test", factory);
|
||||||
|
ASSERT_NE(nullptr, mountpoint);
|
||||||
|
ASSERT_STREQ("/tmp/webfuse_test", wf_mountpoint_get_path(mountpoint));
|
||||||
|
|
||||||
|
wf_mountpoint * mountpoint2 = wfd_mountpoint_factory_create_mountpoint("test", factory);
|
||||||
|
ASSERT_EQ(nullptr, mountpoint2);
|
||||||
|
|
||||||
|
wf_mountpoint_dispose(mountpoint);
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, create_mountpoint_fail_unknown_filesystem)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfuse_test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
|
wf_mountpoint * mountpoint = wfd_mountpoint_factory_create_mountpoint("unkown", factory);
|
||||||
|
ASSERT_EQ(nullptr, mountpoint);
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(mountpiont_factory, create_mountpoint_multi)
|
||||||
|
{
|
||||||
|
wfd_mountpoint_factory * factory = wfd_mountpoint_factory_create();
|
||||||
|
ASSERT_NE(nullptr, factory);
|
||||||
|
|
||||||
|
bool success = wfd_mountpoint_factory_add_filesystem(factory, "test", "/tmp/webfuse_test");
|
||||||
|
ASSERT_TRUE(success);
|
||||||
|
|
||||||
|
for(int i = 0; i < 5; i++)
|
||||||
|
{
|
||||||
|
wf_mountpoint * mountpoint = wfd_mountpoint_factory_create_mountpoint("test", factory);
|
||||||
|
ASSERT_NE(nullptr, mountpoint) << i;
|
||||||
|
ASSERT_STREQ("/tmp/webfuse_test", wf_mountpoint_get_path(mountpoint)) << i;
|
||||||
|
|
||||||
|
wf_mountpoint_dispose(mountpoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
wfd_mountpoint_factory_dispose(factory);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user