Split up pycroft.lib.user into separate packages

pycroft/helpers/printing/__init__.py

@@ -100,7 +100,7 @@ def generate_user_sheet(
     new_user: bool,
     wifi: bool,
     bank_account: BankAccount,
-    user: User | None = None,
+    user: User = None,
     user_id: str | None = None,
     plain_user_password: str | None = None,
     generation_purpose: str = "",

pycroft/lib/host.py

@@ -15,7 +15,6 @@
 from pycroft.helpers.net import port_name_sort_key
 from pycroft.lib.logging import log_user_event
 from pycroft.lib.net import get_subnets_for_room, get_free_ip, delete_ip
-from pycroft.lib.user import migrate_user_host
 from pycroft.model.facilities import Room
 from pycroft.model.host import Interface, IP, Host, SwitchPort
 from pycroft.model.port import PatchPort
@@ -95,7 +94,46 @@ def host_edit(host: Host, owner: User, room: Room, name: str, processor: User) -
         host.owner = owner
 
     if host.room != room:
-        migrate_user_host(host, room, processor)
+        migrate_host(session, host, room, processor)
+
+
+def migrate_host(session: Session, host: Host, new_room: Room, processor: User) -> None:
+    """
+    Migrate a Host to a new room and if necessary to a new subnet.
+    If the host changes subnet, it will get a new IP address.
+
+    :param host: Host to be migrated
+    :param new_room: new room of the host
+    :param processor: User processing the migration
+    :return:
+    """
+    old_room = host.room
+    host.room = new_room
+
+    subnets_old = get_subnets_for_room(old_room)
+    subnets = get_subnets_for_room(new_room)
+
+    if subnets_old != subnets:
+        for interface in host.interfaces:
+            old_ips = tuple(ip for ip in interface.ips)
+            for old_ip in old_ips:
+                ip_address, subnet = get_free_ip(subnets)
+                new_ip = IP(interface=interface, address=ip_address, subnet=subnet)
+                session.add(new_ip)
+
+                old_address = old_ip.address
+                session.delete(old_ip)
+
+                message = deferred_gettext("Changed IP of {mac} from {old_ip} to {new_ip}.").format(
+                    old_ip=str(old_address), new_ip=str(new_ip.address), mac=interface.mac
+                )
+                log_user_event(author=processor, user=host.owner, message=message.to_json())
+
+    message = deferred_gettext("Moved host '{name}' from {room_old} to {room_new}.").format(
+        name=host.name, room_old=old_room.short_name, room_new=new_room.short_name
+    )
+
+    log_user_event(author=processor, user=host.owner, message=message.to_json())
 
 
 @with_transaction
@@ -234,3 +272,13 @@ def get_conflicting_interface(
     if new_mac == current_mac:
         return None
     return session.scalar(select(Interface).filter_by(mac=new_mac))
+
+
+def setup_ipv4_networking(session: Session, host: Host) -> None:
+    """Add suitable ips for every interface of a host"""
+    subnets = get_subnets_for_room(host.room)
+
+    for interface in host.interfaces:
+        ip_address, subnet = get_free_ip(subnets)
+        new_ip = IP(interface=interface, address=ip_address, subnet=subnet)
+        session.add(new_ip)

pycroft/lib/mail.py

@@ -18,13 +18,13 @@
 
 from pycroft.lib.exc import PycroftLibException
 
-mail_envelope_from = os.environ.get('PYCROFT_MAIL_ENVELOPE_FROM')
-mail_from = os.environ.get('PYCROFT_MAIL_FROM')
-mail_reply_to = os.environ.get('PYCROFT_MAIL_REPLY_TO')
-smtp_host = os.environ.get('PYCROFT_SMTP_HOST')
+mail_envelope_from = os.environ["PYCROFT_MAIL_ENVELOPE_FROM"]
+mail_from = os.environ["PYCROFT_MAIL_FROM"]
+mail_reply_to = os.environ["PYCROFT_MAIL_REPLY_TO"]
+smtp_host = os.environ["PYCROFT_SMTP_HOST"]
 smtp_port = int(os.environ.get('PYCROFT_SMTP_PORT', 465))
-smtp_user = os.environ.get('PYCROFT_SMTP_USER')
-smtp_password = os.environ.get('PYCROFT_SMTP_PASSWORD')
+smtp_user = os.environ["PYCROFT_SMTP_USER"]
+smtp_password = os.environ["PYCROFT_SMTP_PASSWORD"]
 smtp_ssl = os.environ.get('PYCROFT_SMTP_SSL', 'ssl')
 template_path_type = os.environ.get('PYCROFT_TEMPLATE_PATH_TYPE', 'filesystem')
 template_path = os.environ.get('PYCROFT_TEMPLATE_PATH', 'pycroft/templates')
@@ -68,12 +68,12 @@ def render(self, **kwargs: t.Any) -> tuple[str, str]:
 
 
 def compose_mail(mail: Mail) -> MIMEMultipart:
-    msg = MIMEMultipart('alternative', _charset='utf-8')
-    msg['Message-Id'] = make_msgid()
-    msg['From'] = mail_from
-    msg['To'] = Header(mail.to_address)
-    msg['Subject'] = mail.subject
-    msg['Date'] = formatdate(localtime=True)
+    msg = MIMEMultipart("alternative", _charset="utf-8")
+    msg["Message-Id"] = make_msgid()
+    msg["From"] = mail_from
+    msg["To"] = str(Header(mail.to_address))
+    msg["Subject"] = mail.subject
+    msg["Date"] = formatdate(localtime=True)
 
     msg.attach(MIMEText(mail.body_plain, 'plain', _charset='utf-8'))
 

pycroft/lib/task.py

@@ -114,12 +114,13 @@ class UserMoveTaskImpl(UserTaskImpl[UserMoveParams]):
 
     def _execute(self, task: UserTask, parameters: UserMoveParams) -> None:
         from pycroft.lib import user as lib_user
+        from pycroft.lib.facilities import get_room
         if task.user.room is None:
             self.errors.append("Tried to move in user, "
                                "but user was already living in a dormitory.")
             return
 
-        room = lib_user.get_room(
+        room = get_room(
             room_number=parameters.room_number,
             level=parameters.level,
             building_id=parameters.building_id,
@@ -147,13 +148,14 @@ class UserMoveInTaskImpl(UserTaskImpl):
 
     def _execute(self, task: UserTask, parameters: UserMoveInParams) -> None:
         from pycroft.lib import user as lib_user
+        from pycroft.lib.facilities import get_room
 
         if task.user.room is not None:
             self.errors.append("Tried to move in user, "
                                "but user was already living in a dormitory.")
             return
 
-        room = lib_user.get_room(
+        room = get_room(
             room_number=parameters.room_number,
             level=parameters.level,
             building_id=parameters.building_id,
@@ -195,7 +197,7 @@ def schedule_user_task(
     due: DateTimeTz,
     user: User,
     parameters: TaskParams,
-    processor: User,
+    processor: User | None,
 ) -> UserTask:
     if due < session.utcnow():
         raise ValueError("the due date must be in the future")