-
-
Notifications
You must be signed in to change notification settings - Fork 283
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
christophehenry
wants to merge
2
commits into
YunoHost:dev
Choose a base branch
from
christophehenry:storage-api-disks-infos
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes
There was a problem hiding this comment.
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.