From 3c2ad92190a80b38c2369f4ca102411b1839de5a Mon Sep 17 00:00:00 2001 From: J S Date: Tue, 19 Dec 2023 23:58:12 -0500 Subject: [PATCH] feat[all] Minimum example reached. - Added command-line options for help, version, and setting/unsetting a single option. - Added test files - Added error check for empty file. --- build.lisp | 7 +++++++ packages.lisp | 7 +++++++ src/edit.lisp | 6 ++++++ src/flags.lisp | 30 ++++++++++++++++++++++++++++++ src/main.lisp | 24 ++++++++++++++++++++++++ src/ui.lisp | 20 ++++++++++++++++++++ sst.asd | 4 +++- test/test.service | 26 ++++++++++++++++++++++++++ test/test2.service | 23 +++++++++++++++++++++++ 9 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 build.lisp create mode 100644 packages.lisp create mode 100644 src/edit.lisp create mode 100644 src/flags.lisp create mode 100644 src/main.lisp create mode 100644 src/ui.lisp create mode 100644 test/test.service create mode 100644 test/test2.service diff --git a/build.lisp b/build.lisp new file mode 100644 index 0000000..4b8cd30 --- /dev/null +++ b/build.lisp @@ -0,0 +1,7 @@ +;; Load and build the project +(ql:quickload :sst) + +(sb-ext:save-lisp-and-die "sst" + :toplevel 'sst-ui:toplevel + :executable t + :save-runtime-options t) diff --git a/packages.lisp b/packages.lisp new file mode 100644 index 0000000..857f0ff --- /dev/null +++ b/packages.lisp @@ -0,0 +1,7 @@ +(defpackage :sst-ui + (:use :common-lisp) + (:export :toplevel)) + +(defpackage :sst-edit + (:use :common-lisp) + (:export :add-settings)) diff --git a/src/edit.lisp b/src/edit.lisp new file mode 100644 index 0000000..cabff4a --- /dev/null +++ b/src/edit.lisp @@ -0,0 +1,6 @@ +(in-package :sst-edit) + +(defun add-settings (settings-list settings-table) + (dolist (setting settings-list) + (systemd-parse:split-line setting + (cdr (assoc "Service" settings-table :test #'string=))))) diff --git a/src/flags.lisp b/src/flags.lisp new file mode 100644 index 0000000..bf36698 --- /dev/null +++ b/src/flags.lisp @@ -0,0 +1,30 @@ +(in-package :sst-ui) + +(defparameter *option-version* + (adopt:make-option 'version + :long "version" + :help "Display version and exit." + :reduce (constantly t))) + +(defparameter *option-help* + (adopt:make-option 'help + :long "help" + :short #\h + :help "Display help and exit." + :reduce (constantly t))) + +(defparameter *option-secure* + (adopt:make-option 'secure + :long "secure" + :short #\s + :help "Apply basic sandboxing configuration to the given service file." + :reduce (constantly t))) + +(defparameter *option-setting* + (adopt:make-option 'setting + :long "setting" + :parameter "SETTING" + :help "Add SETTING to the .system file(s)" + :manual "Add SETTING (an expression in the form Option=value) to the .system file being operated on. Multiple SETTINGs can be set by giving this option multiple times. Use 'Option=nil' to revoke a setting." + :initial-value nil + :reduce (adopt:flip #'cons))) diff --git a/src/main.lisp b/src/main.lisp new file mode 100644 index 0000000..94f7032 --- /dev/null +++ b/src/main.lisp @@ -0,0 +1,24 @@ +(in-package :sst-ui) + +(defun run (file &key direct-settings secure) + ;; Apply the settings to the file. + (let ((settings-table (systemd-parse:read-service file))) + (sst-edit:add-settings direct-settings settings-table) ; Inject all the settings options required + (systemd-parse:write-service file settings-table))) + +(defun toplevel () + (handler-case + (multiple-value-bind (arguments options) (adopt:parse-options *ui*) + (when (gethash 'help options) + (adopt:print-help-and-exit *ui*)) + (when (gethash 'version options) + (format t "1.0.0~%") + (adopt:exit)) + (when (not arguments) + (format t "Enter .service file to operate on!~%") + (adopt:exit)) + (run (first arguments) + :direct-settings (gethash 'setting options) + :secure (gethash 'secure options))) + (error (c) + (adopt:print-error-and-exit c)))) diff --git a/src/ui.lisp b/src/ui.lisp new file mode 100644 index 0000000..3a8dbb0 --- /dev/null +++ b/src/ui.lisp @@ -0,0 +1,20 @@ +(in-package :sst-ui) + + +(adopt:define-string *help-text* + "Automatically configure each SERVICE according to the ~ + OPTIONS given. The SERVICE can be a common name, .service name, ~ + or a path to the .service file.") + + +(defparameter *ui* + (adopt:make-interface + :name "sst" + :summary "Automatically secure systemd files" + :usage "[OPTIONS] [SETTINGS] SERVICE..." + :help *help-text* + :contents (list + *option-help* + *option-secure* + *option-version* + *option-setting*))) diff --git a/sst.asd b/sst.asd index e7716b2..2a32f5e 100644 --- a/sst.asd +++ b/sst.asd @@ -1,9 +1,11 @@ -(defsystem :ssd +(defsystem :sst :depends-on (:systemd-parse :adopt) :components ((:file "packages") (:module "src" :serial t :components ((:file "flags") + (:file "ui") + (:file "edit") (:file "main") ))) :author "Judah Sotomayor " diff --git a/test/test.service b/test/test.service new file mode 100644 index 0000000..95ee20e --- /dev/null +++ b/test/test.service @@ -0,0 +1,26 @@ +[Unit] +Description=D-Bus System Message Bus +Documentation=man:dbus-broker-launch(1) +DefaultDependencies=false +After=dbus.socket +Before=basic.target shutdown.target +Requires=dbus.socket +Conflicts=shutdown.target + +[Service] +Type=notify +Sockets=dbus.socket +OOMScoreAdjust=-900 +LimitNOFILE=16384 +ProtectSystem=full +PrivateTmp=false +PrivateDevices=true +ExecStart=/usr/bin/dbus-broker-launch --scope system --audit +ExecReload=/usr/bin/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig +NewBinding=Yes + +[Install] +Alias=dbus.service + +ervice + diff --git a/test/test2.service b/test/test2.service new file mode 100644 index 0000000..ae68fc2 --- /dev/null +++ b/test/test2.service @@ -0,0 +1,23 @@ +[Unit] +Description=D-Bus System Message Bus +Documentation=man:dbus-broker-launch(1) +DefaultDependencies=false +After=dbus.socket +Before=basic.target shutdown.target +Requires=dbus.socket +Conflicts=shutdown.target + +[Service] +Type=notify +Sockets=dbus.socket +OOMScoreAdjust=-900 +LimitNOFILE=16384 +ProtectSystem=full +PrivateTmp=true +PrivateDevices=true +ExecStart=/usr/bin/dbus-broker-launch --scope system --audit +ExecReload=/usr/bin/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig + +[Install] +Alias=dbus.service +