Compare commits

...

8 Commits

Author SHA1 Message Date
93588036aa Implemented GUI with zenity
Now the program is completely functional and is using zenity dialogues.
`sources` directory was renamed to `src`. UI related stuff was moved to
`src/gui/ui`.
2025-02-07 12:42:51 +01:00
81a955888e Updated Makefile 2025-02-07 12:38:36 +01:00
BritishTeapot
8f8841c7d9 Added start window description 2025-02-03 18:13:34 +01:00
BritishTeapot
1fa6c306db Added Cambalache gui file 2025-02-03 18:12:10 +01:00
e0b69cfea1 Improved ui socket and made open and create send requests. 2024-12-25 17:07:52 +01:00
3cbe520916 Edited Makefile to compite ui socket. 2024-12-25 17:06:56 +01:00
e2014f03f1 Basic socket communication 2024-12-25 11:00:35 +01:00
dadcc6476b Added the ui-socket.h.
Two new issues to solve:

* Should the ui communication component also be the one that manages
  permissions?
* The format of data sent (protocol) needs definition.
2024-12-20 08:48:21 +01:00
8 changed files with 246 additions and 20 deletions

View File

@ -19,10 +19,10 @@ else
LDFLAGS +=
endif
SOURCES_DIR := ./sources
SOURCES_DIR := ./src
BUILD_DIR := ./build
build: $(BUILD_DIR)/main.o $(BUILD_DIR)/sourcefs.o
build: $(BUILD_DIR)/main.o $(BUILD_DIR)/sourcefs.o $(BUILD_DIR)/ui-socket.o
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $(BUILD_DIR)/icfs
$(BUILD_DIR)/main.o: $(SOURCES_DIR)/main.c
@ -31,5 +31,8 @@ $(BUILD_DIR)/main.o: $(SOURCES_DIR)/main.c
$(BUILD_DIR)/sourcefs.o: $(SOURCES_DIR)/sourcefs.c $(SOURCES_DIR)/sourcefs.h
$(CC) $(CFLAGS) -c $< $(LDFLAGS) -o $@
$(BUILD_DIR)/ui-socket.o: $(SOURCES_DIR)/ui-socket.c $(SOURCES_DIR)/ui-socket.h
$(CC) $(CFLAGS) -c $< $(LDFLAGS) -o $@
clean:
rm $(BUILD_DIR)/*

37
src/gui/ui/icfs.cmb Normal file
View File

@ -0,0 +1,37 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
<cambalache-project version="0.94.0" target_tk="gtk-4.0">
<ui>
(1,None,"icfs.ui","start_window.ui",None,None,None,None,None,None,None),
(3,None,None,"open-dialog.ui",None,None,None,None,None,None,None)
</ui>
<object>
(1,1,"AdwApplicationWindow",None,None,None,None,None,0,None,None),
(1,2,"AdwToolbarView",None,1,None,None,None,0,None,None),
(1,3,"AdwHeaderBar",None,2,None,"top",None,0,None,None),
(1,4,"AdwPreferencesPage",None,2,None,None,None,1,None,None),
(1,5,"AdwPreferencesGroup",None,4,None,None,None,0,None,None),
(1,6,"AdwEntryRow",None,5,None,None,None,0,None,None),
(1,7,"GtkButton",None,6,None,None,None,0,None,None),
(1,8,"GtkButton",None,3,None,"start",None,0,None,None),
(3,1,"AdwMessageDialog",None,None,None,None,None,0,None,None)
</object>
<object_property>
(1,1,"AdwApplicationWindow","content","2",None,None,None,None,2,None,None,None,None),
(1,1,"GtkWindow","title","ICFS",None,None,None,None,None,None,None,None,None),
(1,2,"AdwToolbarView","content",None,None,None,None,None,4,None,None,None,None),
(1,6,"AdwEntryRow","input-hints","no-spellcheck",None,None,None,None,None,None,None,None,None),
(1,6,"AdwEntryRow","input-purpose","url",None,None,None,None,None,None,None,None,None),
(1,6,"AdwPreferencesRow","title","Mountpoint",None,None,None,None,None,None,None,None,None),
(1,7,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
(1,7,"GtkButton","icon-name","folder-open-symbolic",None,None,None,None,None,None,None,None,None),
(1,8,"GtkButton","label","Start",None,None,None,None,None,None,None,None,None),
(3,1,"AdwMessageDialog","body","Allow this process to open the file?",None,None,None,None,None,None,None,None,None),
(3,1,"AdwMessageDialog","default-response","deny",None,None,None,None,None,None,None,None,None),
(3,1,"AdwMessageDialog","heading","Allow Access?",None,None,None,None,None,None,None,None,None)
</object_property>
<object_data>
(1,8,"GtkWidget",2,2,None,1,None,None,None,None),
(1,8,"GtkWidget",2,3,None,1,None,None,None,None)
</object_data>
</cambalache-project>

View File

@ -0,0 +1,44 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.94.1 -->
<interface>
<!-- interface-name icfs.ui -->
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.6"/>
<object class="AdwApplicationWindow">
<property name="content">
<object class="AdwToolbarView">
<property name="content">
<object class="AdwPreferencesPage">
<child>
<object class="AdwPreferencesGroup">
<child>
<object class="AdwEntryRow">
<property name="input-hints">no-spellcheck</property>
<property name="input-purpose">url</property>
<property name="title">Mountpoint</property>
<child>
<object class="GtkButton">
<property name="has-frame">False</property>
<property name="icon-name">folder-open-symbolic</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</property>
<child type="top">
<object class="AdwHeaderBar">
<child type="start">
<object class="GtkButton">
<property name="label">Start</property>
</object>
</child>
</object>
</child>
</object>
</property>
<property name="title">ICFS</property>
</object>
</interface>

View File

@ -49,6 +49,7 @@
#include <sys/file.h> /* flock(2) */
#include "sourcefs.h"
#include "ui-socket.h"
const char *mountpoint = NULL;
@ -356,10 +357,49 @@ static int xmp_utimens(const char *path, const struct timespec ts[2],
}
#endif
// TODO: move this to other file
const char *get_process_name_by_pid(const int pid) {
char *name = (char *)calloc(1024, sizeof(char));
if (name) {
sprintf(name, "/proc/%d/cmdline", pid);
FILE *f = fopen(name, "r");
if (f) {
size_t size;
size = fread(name, sizeof(char), 1024, f);
if (size > 0) {
if ('\n' == name[size - 1])
name[size - 1] = '\0';
}
fclose(f);
}
}
return name;
}
// TODO: move this somewhere else
const char *real_filename(const char *filename) { return filename; }
static int xmp_create(const char *path, mode_t mode,
struct fuse_file_info *fi) {
int fd;
struct process_info pi;
struct fuse_context *fc = fuse_get_context();
pi.PID = fc->pid;
pi.UID = fc->uid;
pi.name = get_process_name_by_pid(pi.PID);
// fprintf(stderr, "%s, %d\n", path, ask_access(path, pi));
if (ask_access(real_filename(path), pi)) {
free(pi.name);
return -EACCES;
}
free(pi.name);
fd = source_create(path, fi->flags, mode);
if (fd == -1)
return -errno;
@ -371,6 +411,22 @@ static int xmp_create(const char *path, mode_t mode,
static int xmp_open(const char *path, struct fuse_file_info *fi) {
int fd;
struct process_info pi;
struct fuse_context *fc = fuse_get_context();
pi.PID = fc->pid;
pi.UID = fc->uid;
pi.name = get_process_name_by_pid(pi.PID);
// fprintf(stderr, "%s, %d\n", path, ask_access(path, pi));
if (ask_access(real_filename(path), pi)) {
free(pi.name);
return -EACCES;
}
free(pi.name);
fd = source_open(path, fi->flags);
if (fd == -1)
return -errno;
@ -663,9 +719,17 @@ int main(int argc, char *argv[]) {
int ret = source_init(mountpoint);
if (ret != 0) {
perror("Failed to initialize filesystem.");
perror("source_init");
exit(EXIT_FAILURE);
}
return fuse_main(argc, argv, &xmp_oper, NULL);
ret = init_ui_socket("/home/fedir/.icfs-sock");
if (ret != 0) {
perror("init_ui_socket");
exit(EXIT_FAILURE);
}
ret = fuse_main(argc, argv, &xmp_oper, NULL);
free(mountpoint);
return ret;
}

View File

@ -13,7 +13,7 @@ static struct source_files_handle {
int root_fd;
} handle;
const char *source_fname_translate(const char *filename) {
const char *source_filename_translate(const char *filename) {
if (strcmp("/", filename) == 0) {
return ".";
} else {
@ -34,32 +34,32 @@ int source_init(const char *root_path) {
}
int source_mkdir(const char *filename, mode_t mode) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return mkdirat(handle.root_fd, relative_filename, mode);
}
int source_unlink(const char *filename) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return unlinkat(handle.root_fd, relative_filename, 0);
}
int source_stat(const char *restrict filename, struct stat *restrict statbuf) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return fstatat(handle.root_fd, relative_filename, statbuf, 0);
}
int source_rmdir(const char *filename) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return unlinkat(handle.root_fd, relative_filename, AT_REMOVEDIR);
}
int source_symlink(const char *target, const char *linkpath) {
const char *relative_linkpath = source_fname_translate(linkpath);
const char *relative_linkpath = source_filename_translate(linkpath);
return symlinkat(target, handle.root_fd, relative_linkpath);
}
DIR *source_opendir(const char *filename) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
int fd = openat(handle.root_fd, relative_filename, NULL);
if (fd < 0) {
perror("Openat failed");
@ -70,33 +70,33 @@ DIR *source_opendir(const char *filename) {
}
int source_rename(const char *oldpath, const char *newpath) {
const char *relative_oldpath = source_fname_translate(oldpath);
const char *relative_newpath = source_fname_translate(newpath);
const char *relative_oldpath = source_filename_translate(oldpath);
const char *relative_newpath = source_filename_translate(newpath);
return renameat(handle.root_fd, relative_oldpath, handle.root_fd,
relative_newpath);
}
int source_link(const char *oldpath, const char *newpath) {
const char *relative_oldpath = source_fname_translate(oldpath);
const char *relative_newpath = source_fname_translate(newpath);
const char *relative_oldpath = source_filename_translate(oldpath);
const char *relative_newpath = source_filename_translate(newpath);
return linkat(handle.root_fd, relative_oldpath, handle.root_fd,
relative_newpath, 0);
// NOTE: perhaps the flags here need to be reevaluated.
}
int source_chmod(const char *filename, mode_t mode) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return fchmodat(handle.root_fd, relative_filename, mode, 0);
// NOTE: perhaps the flags here need to be reevaluated.
}
int source_chown(const char *filename, uid_t owner, gid_t group) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return fchownat(handle.root_fd, filename, owner, group, AT_SYMLINK_NOFOLLOW);
}
int source_truncate(const char *filename, off_t length) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
int fd = openat(handle.root_fd, relative_filename, NULL);
if (fd < 0) {
perror("Openat failed");
@ -106,11 +106,11 @@ int source_truncate(const char *filename, off_t length) {
}
int source_open(const char *filename, int flags) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return openat(handle.root_fd, relative_filename, flags);
}
int source_create(const char *filename, int flags, mode_t mode) {
const char *relative_filename = source_fname_translate(filename);
const char *relative_filename = source_filename_translate(filename);
return openat(handle.root_fd, relative_filename, flags, mode);
}

56
src/ui-socket.c Normal file
View File

@ -0,0 +1,56 @@
#include <stddef.h>
#include <sys/types.h>
#define _GNU_SOURCE
#include "ui-socket.h"
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>
int init_ui_socket(const char *filename) {
char line[256];
FILE *fp;
// Test if Zenity is installed (get version)
fp = popen("zenity --version", "r");
if (fp == NULL) {
perror("Pipe returned a error");
return 1;
} else {
while (fgets(line, sizeof(line), fp))
printf("%s", line);
pclose(fp);
return 0;
}
}
/*
* This function is called from the FUSE operations functions. Those are called
* from separate threads. Therefore, there can be multiple threads that try to
* ask for access at the same time, but we have to
*/
int ask_access(const char *filename, struct process_info pi) {
FILE *fp;
size_t command_len =
139 + sizeof(pid_t) * 8 + strlen(pi.name) + strlen(filename);
char *command = (char *)malloc(command_len);
snprintf(command, command_len,
"zenity --question --title \"Allow Access?\" --text \"Allow process "
"<tt>%s</tt> with PID <tt>%d</tt> to access <tt>%s</tt>\"",
pi.name, pi.PID, filename);
// Zenity Question Message Popup
fp = popen(command, "r");
free(command);
if (fp == NULL) {
perror("Pipe returned a error");
return -1;
} else {
return WEXITSTATUS(pclose(fp));
}
}

22
src/ui-socket.h Normal file
View File

@ -0,0 +1,22 @@
/*
* Interface for controlling communication with the UI.
*/
#ifndef UI_SOCKET_H
#define UI_SOCKET_H
#include <sys/types.h>
struct process_info {
pid_t PID;
const char *name;
uid_t UID;
};
// For default socket location, set socket_path = NULL.
int init_ui_socket(const char *socket_path);
int ask_access(const char *filename, struct process_info pi);
#endif // !UI_SOCKET_H