Reorganize files

Author: losynix

Cargo.toml

@@ -28,7 +28,7 @@ members = [
   "usbsas-server",
   "usbsas-hid/hid-user",
   "usbsas-hid/hid-dealer",
-  "client/usbsas-client",
+  "usbsas-client",
   "usbsas-tools"
 ]
 default-members = [
@@ -64,4 +64,4 @@ overflow-checks = true
 strip = true
 
 [workspace.metadata]
-version = "0.2.1"
+version = "0.2.2"

client/kiosk/.gitignore

@@ -18,6 +18,7 @@ RUN set -eux; \
     libdbus-1-dev \
     libudev-dev \
     libseccomp-dev \
+    libwebkit2gtk-4.1-dev \
     live-build \
     dpkg-dev \
     clamav-daemon \

client/kiosk/Makefile

@@ -4,15 +4,14 @@ PKG_DIR=../target/debian
 
 export USBSAS_ISO_VER=$(ISO_VER)
 export USBSAS_BIN_PATH=/usr/libexec
-export USBSAS_WEBFILES_DIR=/usr/share/usbsas/web
 
 CORE_VER := $(shell grep '^version = ' ../usbsas-usbsas/Cargo.toml | cut -d'"' -f2)-1
 SRV_VER := $(shell grep '^version = ' ../usbsas-server/Cargo.toml | cut -d'"' -f2)-1
 ASRV_VER := $(shell grep '^version = ' ../usbsas-analyzer-server/Cargo.toml | cut -d'"' -f2)-1
 HID_VER := $(shell grep '^version = ' ../usbsas-hid/hid-dealer/Cargo.toml | cut -d'"' -f2)-1
 KIOSK_VER := $(shell grep 'Version' ../client/kiosk/usbsas-kiosk/DEBIAN/control | cut -d' ' -f2)-1
 
-all: ../client/live-iso/usbsas-$(ISO_VER)-amd64.hybrid.iso
+all: ../live-iso/usbsas-$(ISO_VER)-amd64.hybrid.iso
 
 pkgs: $(PKG_DIR)/usbsas-kiosk_$(KIOSK_VER)_amd64.deb \
 	$(PKG_DIR)/usbsas-core_$(CORE_VER)_amd64.deb \
@@ -21,7 +20,8 @@ pkgs: $(PKG_DIR)/usbsas-kiosk_$(KIOSK_VER)_amd64.deb \
 	$(PKG_DIR)/usbsas-hid_$(HID_VER)_amd64.deb
 
 $(PKG_DIR)/usbsas-kiosk_$(KIOSK_VER)_amd64.deb:
-	make -C ../client/kiosk
+	cargo build --release --manifest-path=../usbsas-client/Cargo.toml
+	cargo-deb --no-build --manifest-path=../usbsas-client/Cargo.toml
 
 $(PKG_DIR)/usbsas-core_$(CORE_VER)_amd64.deb:
 	cargo build --release --manifest-path=../Cargo.toml
@@ -39,14 +39,12 @@ $(PKG_DIR)/usbsas-hid_$(HID_VER)_amd64.deb:
 	cargo build --release --manifest-path=../usbsas-hid/hid-dealer/Cargo.toml
 	cargo-deb --no-build --manifest-path=../usbsas-hid/hid-dealer/Cargo.toml
 
-../client/live-iso/usbsas-$(ISO_VER)-amd64.hybrid.iso: pkgs
-	make -C ../client/live-iso
+../live-iso/usbsas-$(ISO_VER)-amd64.hybrid.iso: pkgs
+	make -C ../live-iso
 
 clean:
-	make -C ../client/live-iso clean
-	make -C ../client/kiosk clean
+	make -C ../live-iso clean
 
 distclean: clean
-	make -C ../client/live-iso distclean
-	make -C ../client/kiosk distclean
+	make -C ../live-iso distclean
 	cargo clean --manifest-path=../Cargo.toml

client/kiosk/usbsas-kiosk/DEBIAN/control

@@ -1,15 +1,15 @@
-ISO_VER=$(shell grep '^version' ../../Cargo.toml | cut -d'"' -f2)
+ISO_VER=$(shell grep '^version' ../Cargo.toml | cut -d'"' -f2)
 
 DST_PKG_DIR=config/includes.chroot
-SRC_PKG_DIR=../../target/debian
+SRC_PKG_DIR=../target/debian
 
 export USBSAS_ISO_VER=$(ISO_VER)
 
-CORE_VER := $(shell grep '^version = ' ../../usbsas-usbsas/Cargo.toml | cut -d'"' -f2)
-SRV_VER := $(shell grep '^version = ' ../../usbsas-server/Cargo.toml | cut -d'"' -f2)
-ASRV_VER := $(shell grep '^version = ' ../../usbsas-analyzer-server/Cargo.toml | cut -d'"' -f2)
-HID_VER := $(shell grep '^version = ' ../../usbsas-hid/hid-dealer/Cargo.toml | cut -d'"' -f2)
-KIOSK_VER := $(shell grep 'Version' ../kiosk/usbsas-kiosk/DEBIAN/control | cut -d' ' -f2)
+CORE_VER := $(shell grep '^version = ' ../usbsas-usbsas/Cargo.toml | cut -d'"' -f2)-1
+SRV_VER := $(shell grep '^version = ' ../usbsas-server/Cargo.toml | cut -d'"' -f2)-1
+ASRV_VER := $(shell grep '^version = ' ../usbsas-analyzer-server/Cargo.toml | cut -d'"' -f2)-1
+HID_VER := $(shell grep '^version = ' ../usbsas-hid/hid-dealer/Cargo.toml | cut -d'"' -f2)-1
+KIOSK_VER := $(shell grep '^version = ' ../usbsas-client/Cargo.toml | cut -d'"' -f2)-1
 
 SU=sudo
 

client/kiosk/usbsas-kiosk/DEBIAN/copyright

@@ -1,8 +1,8 @@
 all: proto/usbsas/proto3_pb2.py proto/common/proto3_pb2.py
 
-proto/%/proto3_pb2.py: ../../usbsas-proto/proto/%.proto3
+proto/%/proto3_pb2.py: ../usbsas-proto/proto/%.proto3
 	mkdir -p proto
-	protoc  --proto_path=../../usbsas-proto/proto \
+	protoc  --proto_path=../usbsas-proto/proto \
 		--python_out=proto \
 		$<
 	# fix import

client/kiosk/usbsas-kiosk/DEBIAN/postinst

@@ -23,12 +23,12 @@
 from proto.usbsas import proto3_pb2 as proto_usbsas
 
 usbsas_bin = "/usr/libexec/usbsas-usbsas"
-config_path = "../../config.example.toml"
+config_path = "../config.example.toml"
 date = datetime.datetime.now()
 pid_usbsas = -1
 
 if not os.path.exists(usbsas_bin):
-    usbsas_bin = "../../target/release/usbsas-usbsas"
+    usbsas_bin = "../target/release/usbsas-usbsas"
     if not os.path.exists(usbsas_bin):
         print("usbsas-usbsas binary not found")
         sys.exit(1)

client/kiosk/usbsas-kiosk/DEBIAN/postrm

@@ -0,0 +1,41 @@
+[package]
+name = "usbsas-client"
+version = "0.2.0"
+edition = "2021"
+
+[dependencies]
+clap = "4.4"
+tao = "0.24"
+usbsas-sandbox = { path = "../usbsas-sandbox" }
+wry = { version = "0.35", default-features = false, features = ["os-webview", "fullscreen"] }
+
+# cargo-deb
+[package.metadata.deb]
+name = "usbsas-kiosk"
+maintainer = "usbsas"
+copyright = "usbsas"
+revision = "1"
+depends = "$auto, usbsas-server, xserver-xorg-core, x11-xserver-utils, xinit, xdotool, unclutter, fonts-noto-color-emoji, fonts-lato"
+section = "utility"
+priority = "optional"
+maintainer-scripts = "debian/"
+systemd-units = { enable = false }
+assets = [
+  ["target/release/usbsas-client", "usr/bin/", "755"],
+  ["assets/usbsas-client-xinit", "usr/bin/", "755"],
+  ["web/*", "usr/share/usbsas/web/", "644"],
+  ["web/static/css/*", "usr/share/usbsas/web/static/css/", "644"],
+  ["web/static/js/*", "usr/share/usbsas/web/static/js/", "644"],
+  ["web/static/i18n/*", "usr/share/usbsas/web/static/i18n/", "644"],
+  ["web/static/img/*", "usr/share/usbsas/web/static/img/", "644"],
+  ["web/static/bs/css/*", "usr/share/usbsas/web/static/bs/css/", "644"],
+  ["web/static/bs/js/*", "usr/share/usbsas/web/static/bs/js/", "644"],
+  ["web/static/fontawesome/*", "usr/share/usbsas/web/static/fontawesome/", "644"],
+  ["web/static/fontawesome/css/*", "usr/share/usbsas/web/static/fontawesome/css/", "644"],
+  ["web/static/fontawesome/js/*", "usr/share/usbsas/web/static/fontawesome/js/", "644"],
+  ["web/static/fontawesome/less/*", "usr/share/usbsas/web/static/fontawesome/less/", "644"],
+  ["web/static/fontawesome/metadata/*", "usr/share/usbsas/web/static/fontawesome/metadata/*", "644"],
+  ["web/static/fontawesome/scss/*", "usr/share/usbsas/web/static/fontawesome/scss/", "644"],
+  ["web/static/fontawesome/sprites/*", "usr/share/usbsas/web/static/fontawesome/sprites/", "644"],
+  ["web/static/fontawesome/webfonts/*", "usr/share/usbsas/web/static/fontawesome/webfonts/", "644"],
+]