merged with upstreamHEADmaster

2 files changed, 0 insertions, 110 deletions

diff --git a/archinstall/lib/hsm/__init__.py b/archinstall/lib/hsm/__init__.py
deleted file mode 100644
index a3f64019..00000000
--- a/archinstall/lib/hsm/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .fido import Fido2
diff --git a/archinstall/lib/hsm/fido.py b/archinstall/lib/hsm/fido.py
deleted file mode 100644
index 1c226322..00000000
--- a/archinstall/lib/hsm/fido.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from __future__ import annotations
-
-import getpass
-import logging
-
-from dataclasses import dataclass
-from pathlib import Path
-from typing import List, Dict
-
-from ..general import SysCommand, SysCommandWorker, clear_vt100_escape_codes
-from ..disk.partition import Partition
-from ..general import log
-
-
-@dataclass
-class Fido2Device:
-	path: Path
-	manufacturer: str
-	product: str
-
-	def json(self) -> Dict[str, str]:
-		return {
-			'path': str(self.path),
-			'manufacturer': self.manufacturer,
-			'product': self.product
-		}
-
-	@classmethod
-	def parse_arg(cls, arg: Dict[str, str]) -> 'Fido2Device':
-		return Fido2Device(
-			Path(arg['path']),
-			arg['manufacturer'],
-			arg['product']
-		)
-
-
-class Fido2:
-	_loaded: bool = False
-	_fido2_devices: List[Fido2Device] = []
-
-	@classmethod
-	def get_fido2_devices(cls, reload: bool = False) -> List[Fido2Device]:
-		"""
-		Uses systemd-cryptenroll to list the FIDO2 devices
-		connected that supports FIDO2.
-		Some devices might show up in udevadm as FIDO2 compliant
-		when they are in fact not.
-
-		The drawback of systemd-cryptenroll is that it uses human readable format.
-		That means we get this weird table like structure that is of no use.
-
-		So we'll look for `MANUFACTURER` and `PRODUCT`, we take their index
-		and we split each line based on those positions.
-
-		Output example:
-
-		PATH         MANUFACTURER PRODUCT
-		/dev/hidraw1 Yubico       YubiKey OTP+FIDO+CCID
-		"""
-
-		# to prevent continous reloading which will slow
-		# down moving the cursor in the menu
-		if not cls._loaded or reload:
-			ret = SysCommand(f"systemd-cryptenroll --fido2-device=list").decode('UTF-8')
-			if not ret:
-				log('Unable to retrieve fido2 devices', level=logging.ERROR)
-				return []
-
-			fido_devices = clear_vt100_escape_codes(ret)
-
-			manufacturer_pos = 0
-			product_pos = 0
-			devices = []
-
-			for line in fido_devices.split('\r\n'):
-				if '/dev' not in line:
-					manufacturer_pos = line.find('MANUFACTURER')
-					product_pos = line.find('PRODUCT')
-					continue
-
-				path = line[:manufacturer_pos].rstrip()
-				manufacturer = line[manufacturer_pos:product_pos].rstrip()
-				product = line[product_pos:]
-
-				devices.append(
-					Fido2Device(path, manufacturer, product)
-				)
-
-			cls._loaded = True
-			cls._fido2_devices = devices
-
-		return cls._fido2_devices
-
-	@classmethod
-	def fido2_enroll(cls, hsm_device: Fido2Device, partition :Partition, password :str):
-		worker = SysCommandWorker(f"systemd-cryptenroll --fido2-device={hsm_device.path} {partition.real_device}", peek_output=True)
-		pw_inputted = False
-		pin_inputted = False
-
-		while worker.is_alive():
-			if pw_inputted is False and bytes(f"please enter current passphrase for disk {partition.real_device}", 'UTF-8') in worker._trace_log.lower():
-				worker.write(bytes(password, 'UTF-8'))
-				pw_inputted = True
-
-			elif pin_inputted is False and bytes(f"please enter security token pin", 'UTF-8') in worker._trace_log.lower():
-				worker.write(bytes(getpass.getpass(" "), 'UTF-8'))
-				pin_inputted = True
-
-				log(f"You might need to touch the FIDO2 device to unlock it if no prompt comes up after 3 seconds.", level=logging.INFO, fg="yellow")