.gitignore

@@ -1,11 +0,0 @@
-.user
-.o
-*.user
-*.o
-*.a
-moc_*.cpp
-moc_*.h
-Makefile
-cli/looqs
-gui/looqs-gui
-qrc_*

CHANGELOG.md

@@ -1,10 +1,5 @@
 # looqs: Release notes
 
-## 2022-06-07 - v0.2
-CHANGES:
-- Sandboxing: Add environment variable `LOOQS_DISABLE_SANDBOXING` to disable sandboxing. This is intended for troubleshooting
-- Sandboxing: Fix issue where activation failed on kernels without landlock
-
 ## 2022-06-06 - v0.1
 The first release comes with basic functionality. It's a start that can be considered useful to some degree.
 

HACKING.md

@@ -12,8 +12,6 @@ The architecture ensures that the parsing of documents and the preview generatio
 
 Qt code is considered trusted in this model. While one may critize this, it was the only practical solution. looqs uses its serialization mechanism and other classes to communicate between the non-sandboxed GUI process and the sandboxed processes. 
 
-Set the enviornment variable `LOOQS_DISABLE_SANDBOX=1` to disable sandboxing. It's intended for troublehshooting.
-
 ## Database
 The heart is sqlite, with the FTS5 extensions behind the full-text search. I definitly did not
 want to run some heavy Java based solutions. I explored other options like Postgresql, I've discard them due to some limitations back then.

README.md

@@ -30,7 +30,7 @@ There is no need to write the long form of filters. There are also booleans avai
 
 
 ## Current status
-Last version: 2022-06-07, v0.2
+Last version: 2022-06-06, v0.1
 
 Please see [Changelog](CHANGELOG.md) for a human readable list of changes.
 

gui/main.cpp

@@ -23,23 +23,19 @@ void enableIpcSandbox()
 		qCritical() << "Failed to init policy for sandbox";
 		exit(EXIT_FAILURE);
 	}
-	policy->namespace_options = EXILE_UNSHARE_USER | EXILE_UNSHARE_MOUNT | EXILE_UNSHARE_NETWORK;
+	policy->namespace_options = EXILE_UNSHARE_NETWORK | EXILE_UNSHARE_USER;
 	policy->no_new_privs = 1;
 	policy->drop_caps = 1;
 	policy->vow_promises =
 		exile_vows_from_str("thread cpath wpath rpath unix stdio prot_exec proc shm fsnotify ioctl error");
-	policy->mount_path_policies_to_chroot = 1;
 
 	QString ipcSocketPath = Common::ipcSocketPath();
 	QFileInfo info{ipcSocketPath};
 	QString ipcSocketPathDir = info.absolutePath();
 	std::string stdIpcSocketPath = ipcSocketPathDir.toStdString();
 
-	/* ALLOW_EXEC is needed for fallback, not in landlock mode. It does not allow executing anything though here
+	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ, "/");
-	 * due to the vows */
+	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_ALL_WRITE, stdIpcSocketPath.c_str());
-	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_EXEC, "/");
-	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_ALL_WRITE | EXILE_FS_ALLOW_EXEC,
-							   stdIpcSocketPath.c_str());
 	int ret = exile_enable_policy(policy);
 	if(ret != 0)
 	{
@@ -58,21 +54,14 @@ int main(int argc, char *argv[])
 		if(arg == "ipc")
 		{
 			Common::setupAppInfo();
-			if(Common::noSandboxModeRequested())
+			enableIpcSandbox();
-			{
-				qInfo() << "Launching with no sandbox!" << Qt::endl;
-			}
-			else
-			{
-				enableIpcSandbox();
-			}
 			QApplication a(argc, argv);
 
 			IpcServer *ipcserver = new IpcServer();
 			qDebug() << "Launching IPC Server";
 			if(!ipcserver->startSpawner(socketPath))
 			{
-				qCritical() << "Error failed to spawn" << Qt::endl;
+				qCritical() << "Error failed to spawn";
 				return 1;
 			}
 			qDebug() << "Launched IPC Server";

shared/common.cpp

@@ -157,16 +157,6 @@ QString Common::databasePath()
 	return env;
 }
 
-bool Common::noSandboxModeRequested()
-{
-	QString env = getenv("LOOQS_DISABLE_SANDBOX");
-	if(env == "1")
-	{
-		return true;
-	}
-	return false;
-}
-
 QString Common::ipcSocketPath()
 {
 	return "/tmp/.looqs/looqs-ipc-socket";

shared/common.h

@@ -15,7 +15,6 @@ QStringList excludedPaths();
 QStringList mountPaths();
 bool isTextFile(QFileInfo fileInfo);
 bool isMountPath(QString path);
-bool noSandboxModeRequested();
 QString versionText();
 } // namespace Common
 #endif

shared/sandboxedprocessor.cpp

@@ -27,11 +27,6 @@ static QMap<QString, Processor *> processors{
 
 void SandboxedProcessor::enableSandbox(QString readablePath)
 {
-	if(Common::noSandboxModeRequested())
-	{
-		qInfo() << "Sandbox is disabled!" << Qt::endl;
-		return;
-	}
 	struct exile_policy *policy = exile_init_policy();
 	if(policy == NULL)
 	{