Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storage mangment API: disks infos #1953

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Depends: ${python3:Depends}, ${misc:Depends}
, python3-miniupnpc, python3-dbus, python3-jinja2
, python3-toml, python3-packaging, python3-publicsuffix2
, python3-ldap, python3-zeroconf (>= 0.36), python3-lexicon,
, python3-pyudev
, python-is-python3
, nginx, nginx-extras (>=1.18)
, apt, apt-transport-https, apt-utils, aptitude, dirmngr
Expand Down
15 changes: 15 additions & 0 deletions share/actionsmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2082,3 +2082,18 @@ diagnosis:
help: Remove a filter (it should be an existing filter as listed with "ignore --list")
nargs: "*"
metavar: CRITERIA


#############################
# Storage #
#############################
storage:
category_help: Manage hard-drives, filesystem, pools
subcategories:
disk:
subcategory_help: Manage et get infos about hard-drives
actions:
# storage_disks_list
infos:
action_help: Gets infos about hard-drives currently attached to this system
api: GET /storage/disk/infos
101 changes: 101 additions & 0 deletions src/disks.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
from collections import OrderedDict
import dataclasses
from glob import glob
from typing import Optional

import pyudev
import psutil

from moulinette.utils.log import getActionLogger


from yunohost.utils.disks import filter_device


logger = getActionLogger("yunohost.storage")


@dataclasses.dataclass
class DiskParts:
devname: str
filesystem: str
encrypted: bool
mountpoint: str

@staticmethod
def from_parent_device(device: pyudev.Device, partitions):
result = OrderedDict()
for child_dev in sorted(
filter(filter_device, device.children), key=lambda it: it.device_node
):
encrypted_provider = glob(f"/sys/block/dm-*/slaves/{child_dev.sys_name}")
if encrypted_provider:
# retrive the dm-x part
dm = encrypted_provider[0].split("/")[3]
enc_dev = pyudev.Devices.from_name(device.context, "block", dm)
# This work for LUKS, what about other partition mecanisms?
partname = f"/dev/mapper/{enc_dev.properties['DM_NAME']}"
encrypted = True
else:
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method detects LUKS partitions but I'm not sure it does not detect other unecrypted partitions, like LVM. If someone with more system knowlege than me could check this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could use pyparted here but this needs sufficient rights. If I'm not mistaken, yunohost-api is running as root, so this shouldn't be an issue, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out this solution detects LVM (non-LUKS) partitions as encrypted. And I can't figure out how to retrieve FS with pyparted. I don't know how gparted and KDE partition manager detect the partition filesystem.

partname = child_dev.device_node
encrypted = False

if partname not in partitions:
logger.warning(
f"{child_dev.device_node} not found by 'psutil.disk_partitions'"
)
continue

result[child_dev.sys_name] = DiskParts(
devname=device.device_node,
filesystem=partitions[partname].fstype,
encrypted=encrypted,
mountpoint=partitions[partname].mountpoint,
)

return result


@dataclasses.dataclass
class DiskInfos:
devname: str
model: str
serial: str
size: int
links: list[str]
partitions: Optional[list[DiskParts]]

@staticmethod
def from_device(device, partitions):
try:
dev_size = device.attributes.asint("size")
except (AttributeError, UnicodeError, ValueError):
dev_size = None

dev_links = list(sorted(it for it in device.device_links))
child_parts = DiskParts.from_parent_device(device, partitions)

return DiskInfos(
devname=device.device_node,
model=device.get("ID_MODEL", None),
serial=device.get("ID_SERIAL_SHORT", None),
size=dev_size,
links=dev_links,
partitions=child_parts or None,
)


def infos():
context = pyudev.Context()
partitions = {it.device: it for it in psutil.disk_partitions()}
result = OrderedDict()

for it in sorted(
filter(filter_device, context.list_devices(subsystem="block", DEVTYPE="disk")),
key=lambda it: it.device_node,
):
result[it.sys_name] = dataclasses.asdict(
DiskInfos.from_device(it, partitions), dict_factory=OrderedDict
)

return result
4 changes: 4 additions & 0 deletions src/storage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
def storage_disk_infos():
from yunohost.disks import infos

return infos()
12 changes: 12 additions & 0 deletions src/utils/disks.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import re

IGNORE_DISKS = "sr", "md", "dm-", "loop", "zd", "pmem"
# regex: ^((sr)|(md)|...)
IGNORE_DISK_RE = re.compile(rf"""^({"|".join([f'({it})' for it in IGNORE_DISKS])})""")


def filter_device(device):
"""
Returns True if device has parents (e.g. USB device) and its name is not amongst
"""
return device.parent is not None and not IGNORE_DISK_RE.match(device.sys_name)