Compare commits
12 Commits
creation_p
...
13fd0db8a8
Author | SHA1 | Date | |
---|---|---|---|
![]() |
13fd0db8a8
|
||
![]() |
55fb5c54c6
|
||
![]() |
402a5d109f
|
||
![]() |
beec6f4a4c | ||
![]() |
16b8d77fb9 | ||
![]() |
aea6e94ad7 | ||
![]() |
52fcb4d4e3 | ||
badbf2ff98 | |||
![]() |
07e4ce3eb4 | ||
![]() |
cf2b7a280a | ||
![]() |
4c8092378b | ||
291ad62897 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -4,3 +4,5 @@ build/*
|
|||||||
test/protected/*
|
test/protected/*
|
||||||
test/.pt.db
|
test/.pt.db
|
||||||
compile_commands.json
|
compile_commands.json
|
||||||
|
test/perf*
|
||||||
|
test/callgraph*
|
||||||
|
@@ -11,6 +11,7 @@
|
|||||||
See the file LICENSE.
|
See the file LICENSE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
#define FUSE_USE_VERSION 31
|
#define FUSE_USE_VERSION 31
|
||||||
|
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
@@ -39,23 +40,58 @@
|
|||||||
#include "sourcefs.h"
|
#include "sourcefs.h"
|
||||||
#include "ui-socket.h"
|
#include "ui-socket.h"
|
||||||
|
|
||||||
// TODO: move this to other file
|
|
||||||
const char *get_process_name_by_pid(const int pid) {
|
const char *get_process_name_by_pid(const int pid) {
|
||||||
char *name = (char *)calloc(1024, sizeof(char));
|
char path[1024];
|
||||||
if (name) {
|
sprintf(path, "/proc/%d/exe", pid);
|
||||||
sprintf(name, "/proc/%d/cmdline", pid);
|
|
||||||
FILE *f = fopen(name, "r");
|
char *name = realpath(path, NULL);
|
||||||
if (f) {
|
if (name == NULL) {
|
||||||
size_t size;
|
fprintf(stderr, "Could not get process name by pid %d", pid);
|
||||||
size = fread(name, sizeof(char), 1024, f);
|
perror("");
|
||||||
if (size > 0) {
|
}
|
||||||
if ('\n' == name[size - 1])
|
|
||||||
name[size - 1] = '\0';
|
/*
|
||||||
}
|
size_t namelen = 32;
|
||||||
fclose(f);
|
ssize_t readret = 0;
|
||||||
|
char *name = NULL;
|
||||||
|
while (namelen >= (size_t)readret && readret > 0) {
|
||||||
|
namelen *= 2;
|
||||||
|
name = calloc(namelen, sizeof(char));
|
||||||
|
if (name == NULL) {
|
||||||
|
free(path);
|
||||||
|
fprintf(stderr, "Could not get get process name by pid %d", pid);
|
||||||
|
perror("");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
readret = readlink(path, name, namelen);
|
||||||
|
if (readret < 0) {
|
||||||
|
free(name);
|
||||||
|
free(path);
|
||||||
|
fprintf(stderr, "Couldn't get process name by pid %d", pid);
|
||||||
|
perror("");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
if (namelen >= (size_t)readret) {
|
||||||
|
free(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
|
|
||||||
|
/*
|
||||||
|
FILE *file = fopen(path, "r");
|
||||||
|
if (file) {
|
||||||
|
size_t size = 0;
|
||||||
|
size = fread(path, sizeof(char), 1024, file);
|
||||||
|
if (size > 0) {
|
||||||
|
if ('\n' == path[size - 1]) {
|
||||||
|
path[size - 1] = '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fclose(file);
|
||||||
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: move this somewhere else
|
// TODO: move this somewhere else
|
||||||
@@ -70,8 +106,8 @@ static void *xmp_init(struct fuse_conn_info *conn, struct fuse_config *cfg) {
|
|||||||
To make parallel_direct_writes valid, need either set cfg->direct_io
|
To make parallel_direct_writes valid, need either set cfg->direct_io
|
||||||
in current function (recommended in high level API) or set fi->direct_io
|
in current function (recommended in high level API) or set fi->direct_io
|
||||||
in xmp_create() or xmp_open(). */
|
in xmp_create() or xmp_open(). */
|
||||||
// cfg->direct_io = 1;
|
cfg->direct_io = 1;
|
||||||
// cfg->parallel_direct_writes = 1;
|
cfg->parallel_direct_writes = 1;
|
||||||
|
|
||||||
/* Pick up changes from lower filesystem right away. This is
|
/* Pick up changes from lower filesystem right away. This is
|
||||||
also necessary for better hardlink support. When the kernel
|
also necessary for better hardlink support. When the kernel
|
||||||
@@ -83,18 +119,19 @@ static void *xmp_init(struct fuse_conn_info *conn, struct fuse_config *cfg) {
|
|||||||
cfg->entry_timeout = 0;
|
cfg->entry_timeout = 0;
|
||||||
cfg->attr_timeout = 0;
|
cfg->attr_timeout = 0;
|
||||||
cfg->negative_timeout = 0;
|
cfg->negative_timeout = 0;
|
||||||
|
fprintf(stderr, "%d\n", getpid());
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xmp_getattr(const char *path, struct stat *stbuf,
|
static int xmp_getattr(const char *path, struct stat *stbuf,
|
||||||
struct fuse_file_info *fi) {
|
struct fuse_file_info *file_info) {
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
(void)path;
|
(void)path;
|
||||||
|
|
||||||
if (fi)
|
if (file_info)
|
||||||
res = fstat(fi->fh, stbuf);
|
res = fstat(file_info->fh, stbuf);
|
||||||
else
|
else
|
||||||
res = source_stat(path, stbuf);
|
res = source_stat(path, stbuf);
|
||||||
if (res == -1) {
|
if (res == -1) {
|
||||||
@@ -106,38 +143,39 @@ static int xmp_getattr(const char *path, struct stat *stbuf,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int xmp_access(const char *path, int mask) {
|
static int xmp_access(const char *path, int mask) {
|
||||||
int res;
|
int res = -1;
|
||||||
|
|
||||||
// if mask is F_OK, then we don't need to check the permissions
|
// if mask is F_OK, then we don't need to check the permissions
|
||||||
// (is that possible?)
|
// (is that possible?)
|
||||||
|
|
||||||
if (mask != F_OK) {
|
if (mask != F_OK) {
|
||||||
struct process_info pi;
|
struct process_info proc_info;
|
||||||
struct fuse_context *fc = fuse_get_context();
|
struct fuse_context *context = fuse_get_context();
|
||||||
|
|
||||||
pi.PID = fc->pid;
|
proc_info.PID = context->pid;
|
||||||
pi.name = get_process_name_by_pid(pi.PID);
|
proc_info.name = get_process_name_by_pid(proc_info.PID);
|
||||||
|
|
||||||
// fprintf(stderr, "%s, %d\n", path, ask_access(path, pi));
|
// fprintf(stderr, "%s, %d\n", path, ask_access(path, pi));
|
||||||
|
|
||||||
if (!interactive_access(real_filename(path), pi, 0)) {
|
if (!interactive_access(real_filename(path), proc_info, 0)) {
|
||||||
free(pi.name);
|
free((void *)proc_info.name);
|
||||||
return -EACCES;
|
return -EACCES;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(pi.name);
|
free((void *)proc_info.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
res = source_access(path, mask);
|
res = source_access(path, mask);
|
||||||
|
|
||||||
if (res == -1)
|
if (res == -1) {
|
||||||
return -errno;
|
return -errno;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xmp_readlink(const char *path, char *buf, size_t size) {
|
static int xmp_readlink(const char *path, char *buf, size_t size) {
|
||||||
int res;
|
int res = -1;
|
||||||
|
|
||||||
res = readlink(path, buf, size - 1);
|
res = readlink(path, buf, size - 1);
|
||||||
if (res == -1)
|
if (res == -1)
|
||||||
@@ -264,17 +302,18 @@ static int xmp_mknod(const char *path, mode_t mode, dev_t rdev) {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static int xmp_mkdir(const char *path, mode_t mode) {
|
static int xmp_mkdir(const char *path, mode_t mode) {
|
||||||
int res;
|
int res = -1;
|
||||||
|
|
||||||
res = source_mkdir(path, mode);
|
res = source_mkdir(path, mode);
|
||||||
if (res == -1)
|
if (res == -1) {
|
||||||
return -errno;
|
return -errno;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xmp_unlink(const char *path) {
|
static int xmp_unlink(const char *path) {
|
||||||
int res;
|
int res = -1;
|
||||||
struct process_info pi;
|
struct process_info pi;
|
||||||
struct fuse_context *fc = fuse_get_context();
|
struct fuse_context *fc = fuse_get_context();
|
||||||
|
|
||||||
|
35
src/main.c
35
src/main.c
@@ -15,9 +15,10 @@
|
|||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <fuse3/fuse.h>
|
#include <fuse3/fuse.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "fuse_operations.h"
|
#include "fuse_operations.h"
|
||||||
#include "sourcefs.h"
|
#include "sourcefs.h"
|
||||||
@@ -26,25 +27,35 @@
|
|||||||
const char *mountpoint = NULL;
|
const char *mountpoint = NULL;
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
umask(0);
|
if (argc < 3) {
|
||||||
|
fprintf(stderr, "Usage: icfs <FUSE arguments> [target directory] [path to "
|
||||||
mountpoint = realpath(argv[argc - 1], NULL);
|
"the permanent permissions database\n");
|
||||||
|
return EXIT_FAILURE;
|
||||||
int ret = source_init(mountpoint);
|
|
||||||
if (ret != 0) {
|
|
||||||
perror("source_init");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = init_ui_socket();
|
// if umask != 0, the filesystem will create files with more restrictive
|
||||||
|
// permissions than it's caller reqested
|
||||||
|
umask(0);
|
||||||
|
|
||||||
|
// ui socket should always be initialized before anything else, since it
|
||||||
|
// handles the setuid bits!
|
||||||
|
int ret = init_ui_socket(argv[argc - 1]);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
fprintf(stderr, "Could not initalize ui-socket.\n");
|
fprintf(stderr, "Could not initalize ui-socket.\n");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = fuse_main(argc, argv, get_fuse_operations(), NULL);
|
mountpoint = realpath(argv[argc - 2], NULL);
|
||||||
|
|
||||||
free(mountpoint);
|
ret = source_init(mountpoint);
|
||||||
|
if (ret != 0) {
|
||||||
|
perror("source_init");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = fuse_main(argc - 1, argv, get_fuse_operations(), NULL);
|
||||||
|
|
||||||
|
free((void *)mountpoint);
|
||||||
destroy_ui_socket();
|
destroy_ui_socket();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@@ -1,10 +1,24 @@
|
|||||||
|
/*
|
||||||
|
ICFS: Interactively Controlled File System
|
||||||
|
Copyright (C) 2024-2025 Fedir Kovalov
|
||||||
|
|
||||||
|
This program can be distributed under the terms of the GNU GPLv2.
|
||||||
|
See the file LICENSE.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "perm_permissions_table.h"
|
#include "perm_permissions_table.h"
|
||||||
#include "process_info.h"
|
#include "process_info.h"
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <pthread.h>
|
||||||
#include <sqlite3.h>
|
#include <sqlite3.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <sys/fsuid.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
sqlite3 *perm_database = NULL;
|
sqlite3 *perm_database = NULL;
|
||||||
const char *const table_name = "permissions";
|
const char *const table_name = "permissions";
|
||||||
@@ -12,6 +26,38 @@ const char *const table_name = "permissions";
|
|||||||
const int column_count = 2;
|
const int column_count = 2;
|
||||||
const char *const schema[] = {"executable", "filename"};
|
const char *const schema[] = {"executable", "filename"};
|
||||||
const char *const types[] = {"TEXT", "TEXT"};
|
const char *const types[] = {"TEXT", "TEXT"};
|
||||||
|
uid_t ruid, euid, current_pid;
|
||||||
|
pthread_mutex_t uid_switch = PTHREAD_MUTEX_INITIALIZER;
|
||||||
|
|
||||||
|
void set_db_fsuid() {
|
||||||
|
pthread_mutex_lock(&uid_switch);
|
||||||
|
if (current_pid == ruid)
|
||||||
|
return;
|
||||||
|
|
||||||
|
int status = -1;
|
||||||
|
|
||||||
|
status = setfsuid(ruid);
|
||||||
|
if (status < 0) {
|
||||||
|
fprintf(stderr, "Couldn't set uid to %d.\n", ruid);
|
||||||
|
exit(status);
|
||||||
|
}
|
||||||
|
pthread_mutex_unlock(&uid_switch);
|
||||||
|
}
|
||||||
|
|
||||||
|
void set_real_fsuid() {
|
||||||
|
pthread_mutex_lock(&uid_switch);
|
||||||
|
if (current_pid == ruid)
|
||||||
|
return;
|
||||||
|
|
||||||
|
int status = -1;
|
||||||
|
|
||||||
|
status = setfsuid(ruid);
|
||||||
|
if (status < 0) {
|
||||||
|
fprintf(stderr, "Couldn't set uid to %d.\n", euid);
|
||||||
|
exit(status);
|
||||||
|
}
|
||||||
|
pthread_mutex_unlock(&uid_switch);
|
||||||
|
}
|
||||||
|
|
||||||
static int check_table_col_schema(void *notused, int argc, char **argv,
|
static int check_table_col_schema(void *notused, int argc, char **argv,
|
||||||
char **colname) {
|
char **colname) {
|
||||||
@@ -21,15 +67,16 @@ static int check_table_col_schema(void *notused, int argc, char **argv,
|
|||||||
fprintf(stderr, "Unexpected amount of arguments given to the callback.\n");
|
fprintf(stderr, "Unexpected amount of arguments given to the callback.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
int i = atoi(argv[0]);
|
int column_num = atoi(argv[0]);
|
||||||
if (i >= column_count) {
|
if (column_num >= column_count) {
|
||||||
fprintf(stderr, "Table contains more columns than expected.\n");
|
fprintf(stderr, "Table contains more columns than expected.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (strcmp(schema[i], argv[1]) == 0 && strcmp(types[i], argv[2]) == 0) {
|
if (strcmp(schema[column_num], argv[1]) == 0 &&
|
||||||
|
strcmp(types[column_num], argv[2]) == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
fprintf(stderr, "Column %d does not conform to the schema.\n", i);
|
fprintf(stderr, "Column %d does not conform to the schema.\n", column_num);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,14 +148,31 @@ int ensure_database_schema() {
|
|||||||
* @return: 0 on success, -1 on failure
|
* @return: 0 on success, -1 on failure
|
||||||
*/
|
*/
|
||||||
int init_perm_permissions_table(const char *db_filename) {
|
int init_perm_permissions_table(const char *db_filename) {
|
||||||
if (sqlite3_open(db_filename, &perm_database)) {
|
// we don't want the group and others to access the db
|
||||||
perror("Can't open permanent permissions database:");
|
umask(0077);
|
||||||
|
ruid = getuid();
|
||||||
|
euid = geteuid();
|
||||||
|
fprintf(stderr, "Running with uid: %d, gid: %d\n", euid, getegid());
|
||||||
|
|
||||||
|
if (sqlite3_open_v2(db_filename, &perm_database,
|
||||||
|
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE |
|
||||||
|
SQLITE_OPEN_FULLMUTEX,
|
||||||
|
NULL)) {
|
||||||
|
perror("Can't open permanent permissions database");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
umask(0);
|
||||||
if (ensure_database_schema()) {
|
if (ensure_database_schema()) {
|
||||||
fprintf(stderr, "Database schema is not correct.\n");
|
fprintf(stderr, "Database schema is not correct.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int status = seteuid(ruid);
|
||||||
|
if (status < 0) {
|
||||||
|
fprintf(stderr, "Couldn't set euid to ruid during database setup.\n");
|
||||||
|
exit(status);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,3 +1,10 @@
|
|||||||
|
/*
|
||||||
|
ICFS: Interactively Controlled File System
|
||||||
|
Copyright (C) 2024-2025 Fedir Kovalov
|
||||||
|
|
||||||
|
This program can be distributed under the terms of the GNU GPLv2.
|
||||||
|
See the file LICENSE.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef PERM_PERMISSION_TABLE_H
|
#ifndef PERM_PERMISSION_TABLE_H
|
||||||
#define PERM_PERMISSION_TABLE_H
|
#define PERM_PERMISSION_TABLE_H
|
||||||
|
@@ -1,3 +1,10 @@
|
|||||||
|
/*
|
||||||
|
ICFS: Interactively Controlled File System
|
||||||
|
Copyright (C) 2024-2025 Fedir Kovalov
|
||||||
|
|
||||||
|
This program can be distributed under the terms of the GNU GPLv2.
|
||||||
|
See the file LICENSE.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef PROCESS_INFO_H
|
#ifndef PROCESS_INFO_H
|
||||||
#define PROCESS_INFO_H
|
#define PROCESS_INFO_H
|
||||||
|
@@ -33,6 +33,8 @@ int source_init(const char *root_path) {
|
|||||||
int root_fd = open(root_path, O_PATH);
|
int root_fd = open(root_path, O_PATH);
|
||||||
|
|
||||||
if (root_fd == -1) {
|
if (root_fd == -1) {
|
||||||
|
fprintf(stderr, "Could not initialize source file system at %s", root_path);
|
||||||
|
perror("");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -75,6 +75,7 @@ unsigned long long get_process_creation_time(pid_t pid) {
|
|||||||
int init_temp_permissions_table() {
|
int init_temp_permissions_table() {
|
||||||
pthread_mutex_init(&temp_permissions_table_lock, PTHREAD_MUTEX_DEFAULT);
|
pthread_mutex_init(&temp_permissions_table_lock, PTHREAD_MUTEX_DEFAULT);
|
||||||
init(&temp_permissions_table);
|
init(&temp_permissions_table);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -225,7 +226,6 @@ int give_temp_access(const char *filename, struct process_info pi) {
|
|||||||
push(&new_permission_entry.allowed_files, strdup(filename));
|
push(&new_permission_entry.allowed_files, strdup(filename));
|
||||||
|
|
||||||
insert(&temp_permissions_table, pi.PID, new_permission_entry);
|
insert(&temp_permissions_table, pi.PID, new_permission_entry);
|
||||||
printf("temp_permissions_table size: %ld\n", size(&temp_permissions_table));
|
|
||||||
|
|
||||||
pthread_mutex_unlock(&temp_permissions_table_lock);
|
pthread_mutex_unlock(&temp_permissions_table_lock);
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -13,7 +13,6 @@
|
|||||||
#include "perm_permissions_table.h"
|
#include "perm_permissions_table.h"
|
||||||
#include "temp_permissions_table.h"
|
#include "temp_permissions_table.h"
|
||||||
#include "ui-socket.h"
|
#include "ui-socket.h"
|
||||||
#include <errno.h>
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -22,17 +21,17 @@
|
|||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
int init_ui_socket() {
|
#define ZENITY_TEMP_ALLOW_MESSAGE "Allow this time\n"
|
||||||
char line[256];
|
|
||||||
FILE *fp;
|
int init_ui_socket(const char *perm_permissions_db_filename) {
|
||||||
|
FILE *fp = NULL;
|
||||||
|
|
||||||
if (init_temp_permissions_table()) {
|
if (init_temp_permissions_table()) {
|
||||||
fprintf(stderr, "Could not initialize temporary permissions table.\n");
|
fprintf(stderr, "Could not initialize temporary permissions table.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (init_perm_permissions_table(
|
if (init_perm_permissions_table(perm_permissions_db_filename)) {
|
||||||
"/home/fedir/Developement/uni/ICFS/test/.pt.db")) {
|
|
||||||
fprintf(stderr, "Could not initialize permanent permissions table.\n");
|
fprintf(stderr, "Could not initialize permanent permissions table.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -44,13 +43,11 @@ int init_ui_socket() {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (fgets(line, sizeof(line), fp))
|
|
||||||
printf("%s", line);
|
|
||||||
pclose(fp);
|
pclose(fp);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void destroy_ui_socket() {
|
void destroy_ui_socket(void) {
|
||||||
destroy_temp_permissions_table();
|
destroy_temp_permissions_table();
|
||||||
destroy_perm_permissions_table();
|
destroy_perm_permissions_table();
|
||||||
}
|
}
|
||||||
@@ -64,16 +61,16 @@ void destroy_ui_socket() {
|
|||||||
* @return: 0 if access is denied, 1 if access is allowed, 2 if access is
|
* @return: 0 if access is denied, 1 if access is allowed, 2 if access is
|
||||||
* allowed for the runtime of the process
|
* allowed for the runtime of the process
|
||||||
*/
|
*/
|
||||||
int ask_access(const char *filename, struct process_info pi) {
|
int ask_access(const char *filename, struct process_info proc_info) {
|
||||||
FILE *fp;
|
FILE *fp = NULL;
|
||||||
size_t command_len =
|
size_t command_len =
|
||||||
139 + sizeof(pid_t) * 8 + strlen(pi.name) + strlen(filename);
|
139 + sizeof(pid_t) * 8 + strlen(proc_info.name) + strlen(filename);
|
||||||
char *command = (char *)malloc(command_len);
|
char *command = (char *)malloc(command_len);
|
||||||
snprintf(command, command_len,
|
snprintf(command, command_len,
|
||||||
"zenity --question --extra-button \"Allow this time\" --title "
|
"zenity --question --extra-button \"Allow this time\" --title "
|
||||||
"\"Allow Access?\" --text \"Allow process "
|
"\"Allow Access?\" --text \"Allow process "
|
||||||
"<tt>%s</tt> with PID <tt>%d</tt> to access <tt>%s</tt>\"",
|
"<tt>%s</tt> with PID <tt>%d</tt> to access <tt>%s</tt>\"",
|
||||||
pi.name, pi.PID, filename);
|
proc_info.name, proc_info.PID, filename);
|
||||||
|
|
||||||
// Zenity Question Message Popup
|
// Zenity Question Message Popup
|
||||||
fp = popen(command, "r");
|
fp = popen(command, "r");
|
||||||
@@ -87,10 +84,10 @@ int ask_access(const char *filename, struct process_info pi) {
|
|||||||
// if the user clicks the "Allow this time" button, `zenity` will only
|
// if the user clicks the "Allow this time" button, `zenity` will only
|
||||||
// write it to `stdout`, but the exit code will still be `1`. So, we need
|
// write it to `stdout`, but the exit code will still be `1`. So, we need
|
||||||
// to manually check the output.
|
// to manually check the output.
|
||||||
char buffer[1024];
|
char buffer[sizeof(ZENITY_TEMP_ALLOW_MESSAGE) + 1];
|
||||||
while (fgets(buffer, sizeof(buffer), fp)) {
|
while (fgets(buffer, sizeof(buffer), fp)) {
|
||||||
printf("%s", buffer);
|
printf("%s", buffer);
|
||||||
if (strcmp(buffer, "Allow this time\n") == 0) {
|
if (strcmp(buffer, ZENITY_TEMP_ALLOW_MESSAGE) == 0) {
|
||||||
pclose(fp);
|
pclose(fp);
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
@@ -117,9 +114,11 @@ int ask_access(const char *filename, struct process_info pi) {
|
|||||||
* @param opts: options (GRANT_TEMP, GRANT_PERM)
|
* @param opts: options (GRANT_TEMP, GRANT_PERM)
|
||||||
* @return: 0 if access is denied, 1 if access is allowed
|
* @return: 0 if access is denied, 1 if access is allowed
|
||||||
*/
|
*/
|
||||||
int interactive_access(const char *filename, struct process_info pi, int opts) {
|
int interactive_access(const char *filename, struct process_info proc_info,
|
||||||
|
int opts) {
|
||||||
|
|
||||||
if (check_temp_access(filename, pi) || check_perm_access(filename, pi)) {
|
if (check_temp_access(filename, proc_info) ||
|
||||||
|
check_perm_access(filename, proc_info)) {
|
||||||
// access was already granted before
|
// access was already granted before
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -128,22 +127,24 @@ int interactive_access(const char *filename, struct process_info pi, int opts) {
|
|||||||
// permissions are granted
|
// permissions are granted
|
||||||
|
|
||||||
if (opts & GRANT_PERM) {
|
if (opts & GRANT_PERM) {
|
||||||
give_perm_access(filename, pi);
|
give_perm_access(filename, proc_info);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (opts & GRANT_TEMP) {
|
if (opts & GRANT_TEMP) {
|
||||||
give_temp_access(filename, pi);
|
give_temp_access(filename, proc_info);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int user_response = ask_access(filename, pi);
|
int user_response = ask_access(filename, proc_info);
|
||||||
if (user_response == 1) {
|
if (user_response == 1) {
|
||||||
// user said "yes"
|
// user said "yes"
|
||||||
give_perm_access(filename, pi);
|
give_perm_access(filename, proc_info);
|
||||||
return 1;
|
return 1;
|
||||||
} else if (user_response == 2) {
|
}
|
||||||
|
|
||||||
|
if (user_response == 2) {
|
||||||
// user said "yes, but only this time"
|
// user said "yes, but only this time"
|
||||||
give_temp_access(filename, pi);
|
give_temp_access(filename, proc_info);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
*
|
*
|
||||||
* @return: 0 on success, -1 on faliure.
|
* @return: 0 on success, -1 on faliure.
|
||||||
*/
|
*/
|
||||||
int init_ui_socket(void);
|
int init_ui_socket(const char *perm_permissions_db_filename);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close the GUI communication.
|
* Close the GUI communication.
|
||||||
|
@@ -16,9 +16,23 @@ PATH="$(realpath ./mock/):$PATH"
|
|||||||
# mount the filesystem
|
# mount the filesystem
|
||||||
|
|
||||||
echo "Run $(date -u +%Y-%m-%dT%H:%M:%S) "
|
echo "Run $(date -u +%Y-%m-%dT%H:%M:%S) "
|
||||||
valgrind -s ../build/icfs -o default_permissions ./protected &
|
if [[ $1 == "--setuid" ]]; then
|
||||||
|
echo "Setting the setuid bit..."
|
||||||
|
echo "root privilieges are required to create a special user and set correct ownership of the executable."
|
||||||
|
id -u icfs &>/dev/null || sudo useradd --system --user-group icfs
|
||||||
|
sudo chown icfs: ../build/icfs && sudo chmod 4777 ../build/icfs
|
||||||
|
chmod g+w . # needed for icfs to be able to create the database
|
||||||
|
echo "Valgrind will not be used due to setuid compatibility issues."
|
||||||
|
../build/icfs -o default_permissions ./protected ./.pt.db &
|
||||||
|
sleep 1
|
||||||
|
else
|
||||||
|
echo "Database protection will not be tested due to the lack of setuid capabilites."
|
||||||
|
echo "To test it, run this script with '--setuid'."
|
||||||
|
valgrind -s ../build/icfs -o default_permissions ./protected ./.pt.db &
|
||||||
|
sleep 5
|
||||||
|
fi
|
||||||
|
|
||||||
sleep 5
|
#valgrind -s ../build/icfs -o default_permissions ./protected &
|
||||||
|
|
||||||
# WARN: please don't use `>` or `>>` operators. They force **this script** to open the file, **not the program you are trying to run**. This is probably not what you mean when you want to test a specific program's access.
|
# WARN: please don't use `>` or `>>` operators. They force **this script** to open the file, **not the program you are trying to run**. This is probably not what you mean when you want to test a specific program's access.
|
||||||
# WARN: avoid using touch, since it generates errors because setting times is not implemented in icfs **yet**.
|
# WARN: avoid using touch, since it generates errors because setting times is not implemented in icfs **yet**.
|
||||||
@@ -105,6 +119,13 @@ cat ./protected/motto >/dev/null 2>/dev/null &&
|
|||||||
echo "[ICFS-TEST]: OK" ||
|
echo "[ICFS-TEST]: OK" ||
|
||||||
echo "[ICFS-TEST]: echo cannot read protected/motto despite access being permitted!" # OK
|
echo "[ICFS-TEST]: echo cannot read protected/motto despite access being permitted!" # OK
|
||||||
|
|
||||||
|
# test database access
|
||||||
|
if [[ -r "./.pt.db" || -w "./.pt.db" ]]; then
|
||||||
|
echo "[ICFS-TEST]: permanent permissions is accessible!"
|
||||||
|
else
|
||||||
|
echo "[ICFS-TEST]: OK"
|
||||||
|
fi
|
||||||
|
|
||||||
# unmount
|
# unmount
|
||||||
|
|
||||||
sleep 0.5
|
sleep 0.5
|
||||||
|
Reference in New Issue
Block a user