RemoteRF 0.0.7.46__tar.gz → 0.0.7.48__tar.gz

{remoterf-0.0.7.46/src/remoteRF.egg-info → remoterf-0.0.7.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 0.0.7.46
+Version: 0.0.7.48
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com
@@ -14,6 +14,7 @@ Requires-Dist: protobuf<6.0.0,>=5.0.0
 Requires-Dist: numpy
 Requires-Dist: prompt_toolkit
 Requires-Dist: python-dotenv
+Requires-Dist: prompt-toolkit
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{remoterf-0.0.7.46 → remoterf-0.0.7.48}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoterf",
-    version="0.0.7.46",
+    version="0.0.7.48",
     author="Ethan Ge",
     author_email="ethoGalaxy@gmail.com",
     description="A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.",
@@ -17,7 +17,7 @@ setup(
     license_file='MIT',
     include_package_data=True,  # Includes files specified in MANIFEST.in
     install_requires=[
-        "grpcio==1.71.0", "protobuf>=5.0.0,<6.0.0", "numpy", "prompt_toolkit", "python-dotenv"
+        "grpcio==1.71.0", "protobuf>=5.0.0,<6.0.0", "numpy", "prompt_toolkit", "python-dotenv", "prompt-toolkit"
     ],
     classifiers=[
         "Programming Language :: Python :: 3",
@@ -25,10 +25,21 @@ setup(
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.10',
+    # entry_points={
+    #     'console_scripts': [
+    #         'remoterf-login=remoteRF.core.acc_login:main',
+    #         'remoterf-v=remoteRF.core.version:main',
+    #         'remoterf-config=remoteRF.config.config_cli:main',
+    #     ],
+    # },
+    
     entry_points={
-        'console_scripts': [
-            'remoterf-login=remoteRF.core.acc_login:main',
-            'remoterf-v=remoteRF.core.version:main'
-        ],
-    },
+    "console_scripts": [
+        "remoterf=remoteRF.cli:main",
+        "remoterf-login=remoteRF.core.acc_login:main",
+        "remoterf-v=remoteRF.core.version:main",
+        "remoterf-config=remoteRF.config.config_cli:main",
+    ],
+},
+
 )

remoterf-0.0.7.48/src/remoteRF/cli.py

@@ -0,0 +1,141 @@
+# src/remoteRF/cli.py
+from __future__ import annotations
+
+import argparse
+import sys
+from typing import Optional, Sequence
+
+from remoteRF.core.acc_login import main as login_main
+from remoteRF.core.version import main as version_main
+from remoteRF.config.config_cli import main as config_main
+
+
+def build_parser() -> argparse.ArgumentParser:
+    p = argparse.ArgumentParser(
+        prog="remoterf",
+        formatter_class=argparse.RawTextHelpFormatter,
+        add_help=True,
+        description=(
+            "RemoteRF unified CLI\n\n"
+            "Examples:\n"
+            "  remoterf --login\n"
+            "  remoterf -l\n"
+            "  remoterf --config --addr 164.67.195.207:61005\n"
+            "  remoterf -c -a 164.67.195.207:61005\n"
+            "  remoterf --config --wipe\n"
+            "  remoterf -v\n"
+        ),
+    )
+
+    mode = p.add_mutually_exclusive_group()
+
+    mode.add_argument("-l", "--login", action="store_true", help="Login / register (interactive).")
+    mode.add_argument("-c", "--config", action="store_true", help="Configure server target / CA cert.")
+    mode.add_argument("-v", "--version", action="store_true", help="Print version and exit.")
+
+    # These are only meaningful with --config, but we accept them at top-level
+    # so your UX works as requested.
+    p.add_argument(
+        "-a", "--addr", "-addr",
+        dest="addr",
+        default=None,
+        help="Server address (host:port). Used with --config / -c.",
+    )
+
+    p.add_argument(
+        "-w", "--wipe",
+        action="store_true",
+        help="Wipe local config (~/.config/remoterf). Used with --config / -c.",
+    )
+
+    p.add_argument(
+        "--yes",
+        action="store_true",
+        help="Skip confirmation prompts (use with --config --wipe).",
+    )
+
+    return p
+
+
+def main(argv: Optional[Sequence[str]] = None) -> int:
+    argv = list(sys.argv[1:] if argv is None else argv)
+
+    parser = build_parser()
+
+    # No args => help panel
+    if len(argv) == 0:
+        parser.print_help()
+        return 0
+
+    args, extra = parser.parse_known_args(argv)
+
+    # --- Version ---
+    if args.version:
+        if extra:
+            parser.error(f"Unexpected arguments for --version: {' '.join(extra)}")
+        # If your version_main supports argv, pass [].
+        try:
+            version_main([])
+        except TypeError:
+            version_main()
+        return 0
+
+    # --- Login ---
+    if args.login:
+        if extra:
+            parser.error(f"Unexpected arguments for --login: {' '.join(extra)}")
+        try:
+            login_main([])
+        except TypeError:
+            login_main()
+        return 0
+
+    # --- Config ---
+    if args.config:
+        cfg_argv: list[str] = []
+
+        # Normalize to whatever config_cli expects.
+        # If your config_cli supports --wipe/--yes, pass them through.
+        if args.wipe:
+            cfg_argv.append("--wipe")
+            if args.yes:
+                cfg_argv.append("--yes")
+
+        # Address handling
+        if args.addr:
+            # If config_cli expects a positional addr, pass it positionally:
+            cfg_argv.append(args.addr)
+            # If your config_cli instead expects --addr, switch to:
+            # cfg_argv += ["--addr", args.addr]
+
+        # Preserve any extra args for config_cli (if you want)
+        cfg_argv += extra
+
+        # If neither addr nor wipe was supplied, show config help-like message.
+        if not args.addr and not args.wipe and len(extra) == 0:
+            # Call config_cli with --help if it supports it; otherwise print ours.
+            try:
+                config_main(["--help"])
+            except Exception:
+                parser.error("Config mode requires --addr <host:port> or --wipe.")
+            return 0
+
+        try:
+            config_main(cfg_argv)
+        except TypeError:
+            # Fallback if config_main does not accept argv; last resort:
+            old = sys.argv[:]
+            try:
+                sys.argv = ["remoterf-config", *cfg_argv]
+                config_main()
+            finally:
+                sys.argv = old
+        return 0
+
+    # If user passed only -a/-w without -c/--config, show help
+    parser.print_help()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

remoterf-0.0.7.48/src/remoteRF/config/cert_fetcher.py

@@ -0,0 +1,118 @@
+# cert_fetcher.py
+
+from __future__ import annotations
+
+import hashlib
+import os
+import socket
+import urllib.request
+from pathlib import Path
+from typing import Optional
+
+
+CERT_FILENAME_DEFAULT = "ca.crt"
+
+
+def _default_config_dir() -> Path:
+    # Cross-platform-ish default; adjust if you already have a standard in your project.
+    # Linux: ~/.config/remoterf
+    # macOS: also acceptable; if you want Apple-standard, use ~/Library/Application Support/remoterf
+    base = Path(os.path.expanduser("~")) / ".config" / "remoterf"
+    return base
+
+
+def _ensure_parent_dir(p: Path) -> None:
+    p.parent.mkdir(parents=True, exist_ok=True)
+
+
+def _looks_like_pem_cert(data: bytes) -> bool:
+    return b"BEGIN CERTIFICATE" in data and b"END CERTIFICATE" in data
+
+
+def sha256_fingerprint_pem(pem_bytes: bytes) -> str:
+    h = hashlib.sha256(pem_bytes).hexdigest()
+    return ":".join(h[i:i+2] for i in range(0, len(h), 2))
+
+
+def _fetch_http(host: str, port: int, timeout_sec: float) -> bytes:
+    url = f"http://{host}:{port}/ca.crt"
+    req = urllib.request.Request(url, method="GET")
+    with urllib.request.urlopen(req, timeout=timeout_sec) as resp:
+        data = resp.read()
+    return data
+
+
+def _fetch_raw_tcp(host: str, port: int, timeout_sec: float) -> bytes:
+    chunks: list[bytes] = []
+    with socket.create_connection((host, port), timeout=timeout_sec) as s:
+        s.settimeout(timeout_sec)
+        while True:
+            try:
+                b = s.recv(4096)
+            except socket.timeout:
+                break
+            if not b:
+                break
+            chunks.append(b)
+    return b"".join(chunks)
+
+
+def fetch_and_save_ca_cert(
+    host: str,
+    port: int,
+    *,
+    out_path: Optional[str | Path] = None,
+    profile: Optional[str] = None,
+    timeout_sec: float = 3.0,
+    overwrite: bool = True,
+) -> bool:
+    """
+    Fetch CA cert from the server bootstrap endpoint and save it to disk.
+
+    Args:
+        host: server host/ip running cert_provider
+        port: cert_provider port (NOT the TLS gRPC port)
+        out_path: explicit output path (overrides profile/default location)
+        profile: if provided, saves as ~/.config/remoterf/certs/<profile>.crt
+        timeout_sec: network timeout
+        overwrite: whether to overwrite existing file
+
+    Returns:
+        True on success, False on any failure.
+    """
+    try:
+        if not isinstance(port, int):
+            port = int(port)
+
+        # Determine destination path
+        if out_path is not None:
+            dest = Path(out_path).expanduser().resolve()
+        else:
+            cfg = _default_config_dir()
+            certs_dir = cfg / "certs"
+            name = f"{profile}.crt" if profile else CERT_FILENAME_DEFAULT
+            dest = certs_dir / name
+
+        _ensure_parent_dir(dest)
+
+        if dest.exists() and not overwrite:
+            return True  # already present, treat as success
+
+        # Fetch (HTTP first, then raw TCP fallback)
+        data = b""
+        try:
+            data = _fetch_http(host, port, timeout_sec)
+        except Exception:
+            data = _fetch_raw_tcp(host, port, timeout_sec)
+
+        if not data or not _looks_like_pem_cert(data):
+            return False
+
+        # Save
+        dest.write_bytes(data)
+
+        # Optional: you may want to return/print fingerprint, but requested API is bool.
+        return True
+
+    except Exception:
+        return False

remoterf-0.0.7.48/src/remoteRF/config/config_cli.py

@@ -0,0 +1,174 @@
+# src/remoteRF/core/remoterf_config.py
+
+from __future__ import annotations
+
+import os
+import sys
+import shutil
+from pathlib import Path
+from typing import Tuple
+
+from .cert_fetcher import fetch_and_save_ca_cert
+
+# -----------------------------
+# Local config locations
+# -----------------------------
+def _config_root() -> Path:
+    return Path(os.path.expanduser("~")) / ".config" / "remoterf"
+
+def _env_path() -> Path:
+    return _config_root() / ".env"
+
+def _certs_dir() -> Path:
+    return _config_root() / "certs"
+
+def _parse_hostport(s: str) -> Tuple[str, int]:
+    s = s.strip()
+    if "://" in s:
+        s = s.split("://", 1)[1]
+
+    if ":" not in s:
+        raise ValueError("Expected format host:port")
+
+    host, port_str = s.rsplit(":", 1)
+    host = host.strip()
+    port = int(port_str.strip())
+    if not host:
+        raise ValueError("Host is empty")
+    if port <= 0 or port > 65535:
+        raise ValueError("Port out of range")
+    return host, port
+
+def _write_env_kv(path: Path, kv: dict[str, str]) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    lines: list[str] = []
+    for k, v in kv.items():
+        if any(c.isspace() for c in v) or any(c in v for c in ['"', "'"]):
+            v = v.replace('"', '\\"')
+            lines.append(f'{k}="{v}"')
+        else:
+            lines.append(f"{k}={v}")
+    path.write_text("\n".join(lines) + "\n", encoding="utf-8")
+
+def _confirm_wipe(root: Path) -> bool:
+    prompt = (
+        f"This will permanently delete ALL RemoteRF config at:\n"
+        f"  {root}\n\n"
+        f"Type 'wipe' to confirm: "
+    )
+    try:
+        return input(prompt).strip().lower() == "wipe"
+    except KeyboardInterrupt:
+        print("\nCancelled.")
+        return False
+
+def _wipe_config(root: Path) -> None:
+    if not root.exists():
+        print(f"No config found at: {root}")
+        return
+    if not root.is_dir():
+        raise RuntimeError(f"Config root exists but is not a directory: {root}")
+    shutil.rmtree(root)
+    print(f"Wiped RemoteRF config: {root}")
+
+def main(argv=None) -> None:
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        prog="remoterf-config",
+        add_help=True,
+        formatter_class=argparse.RawTextHelpFormatter,
+        description=(
+            "Configure RemoteRF to talk to a server.\n"
+            "Fetches the server CA certificate and saves the gRPC target locally."
+        ),
+    )
+
+    parser.add_argument(
+        "addr",
+        nargs="?",
+        help="Server address in host:port form. Example: 164.67.195.207:61005",
+    )
+
+    parser.add_argument(
+        "--wipe",
+        action="store_true",
+        help="Delete ALL existing RemoteRF config at ~/.config/remoterf and exit.",
+    )
+
+    parser.add_argument(
+        "--yes",
+        action="store_true",
+        help="Skip confirmation prompts (use with --wipe).",
+    )
+
+    args = parser.parse_args()
+
+    # ----- Wipe mode -----
+    if args.wipe:
+        root = _config_root()
+        if not args.yes:
+            if not _confirm_wipe(root):
+                print("Wipe aborted.")
+                sys.exit(1)
+        try:
+            _wipe_config(root)
+            sys.exit(0)
+        except Exception as e:
+            print(f"Error wiping config: {e}", file=sys.stderr)
+            sys.exit(1)
+
+    # ----- Normal configure mode -----
+    if not args.addr:
+        print(
+            "\nError: missing required argument: host:port\n\n"
+            "Usage:\n"
+            "  remoterf-config <host:port>\n"
+            "  remoterf-config --wipe [--yes]\n\n"
+            "Example:\n"
+            "  remoterf-config 164.67.195.207:61005\n"
+        )
+        sys.exit(2)
+
+    try:
+        host, grpc_port = _parse_hostport(args.addr)
+    except Exception as e:
+        print(f"Error: invalid addr '{args.addr}': {e}", file=sys.stderr)
+        sys.exit(2)
+
+    cert_port = grpc_port + 1
+    profile = "default"
+    timeout_sec = 3.0
+    overwrite = True
+
+    certs_dir = _certs_dir()
+    certs_dir.mkdir(parents=True, exist_ok=True)
+    ca_out = certs_dir / f"{profile}.crt"
+
+    fetched_ok = fetch_and_save_ca_cert(
+        host,
+        cert_port,
+        out_path=ca_out,
+        timeout_sec=timeout_sec,
+        overwrite=overwrite,
+    )
+
+    if not fetched_ok:
+        print(f"Failed to fetch CA cert from {host}:{cert_port}.", file=sys.stderr)
+        sys.exit(1)
+
+    env_file = _env_path()
+    _write_env_kv(env_file, {
+        "REMOTERF_ADDR": f"{host}:{grpc_port}",
+        "REMOTERF_CA_CERT": str(ca_out),
+        "REMOTERF_PROFILE": profile,
+    })
+
+    print("RemoteRF configured successfully.")
+    print(f"  gRPC target : {host}:{grpc_port}")
+    print(f"  cert port   : {host}:{cert_port}")
+    print(f"  CA cert     : {ca_out}")
+    print(f"  env file    : {env_file}")
+
+if __name__ == "__main__":
+    main()

{remoterf-0.0.7.46 → remoterf-0.0.7.48}/src/remoteRF/core/acc_login.py

@@ -1,4 +1,4 @@
 from . import app as client
 
-def main():
+def main(argv=None):
     pass

{remoterf-0.0.7.46 → remoterf-0.0.7.48}/src/remoteRF/core/app.py

@@ -1,3 +1,4 @@
+from remoteRF.core.grpc_client import handle_admin_command
 from . import *
 from ..common.utils import *
 
@@ -30,6 +31,7 @@ def welcome():
                     
             account.password = password
             account.email = input("Email: ")  # TODO: Email verification.
+            account.enrollment_code = input("Enrollment Code: ")
             # check if login was valid
             os.system('cls' if os.name == 'nt' else 'clear')
             
@@ -59,6 +61,7 @@ def commands():
     printf("'getdev' ", Sty.MAGENTA, "        : View devices", Sty.DEFAULT)
     printf("'help' or 'h' ", Sty.MAGENTA, "   : Show this help message", Sty.DEFAULT)
     printf("'perms' ", Sty.MAGENTA, "         : View permissions", Sty.DEFAULT)
+    printf("'enroll' ", Sty.MAGENTA, "        : Enroll with an enrollment code", Sty.DEFAULT)
     printf("'exit' or 'quit' ", Sty.MAGENTA, ": Exit", Sty.DEFAULT)
     printf("'getres' ", Sty.MAGENTA, "        : View all reservations", Sty.DEFAULT)
     printf("'myres' ", Sty.MAGENTA, "         : View my reservations", Sty.DEFAULT)
@@ -66,8 +69,20 @@ def commands():
     printf("'resdev' ", Sty.MAGENTA, "        : Reserve a device", Sty.DEFAULT)
     # printf("'resdev -n' ", Sty.MAGENTA, "- naive reserve device", Sty.DEFAULT)
     # printf("'resdev s' ", Sty.MAGENTA, "- Reserve a Device (by single date)", Sty.DEFAULT)
-    # check if user is admin
-    # if account.get_perms().results['UC'] == 'Admin':
+    
+    if account.is_admin:
+        print()
+        printf("Admin Commands:", Sty.BOLD)
+        printf("'admin printa' ", Sty.MAGENTA, " : Print all accounts", Sty.DEFAULT)
+        printf("'admin printr' ", Sty.MAGENTA, " : Print all reservations", Sty.DEFAULT)
+        printf("'admin printp' ", Sty.MAGENTA, " : Print all perms", Sty.DEFAULT)
+        printf("'admin printd' ", Sty.MAGENTA, " : Print all devices", Sty.DEFAULT)
+        printf("'admin rm a <username>' ", Sty.MAGENTA, " : Remove one account", Sty.DEFAULT)
+        printf("'admin rm aa' ", Sty.MAGENTA, " : Remove all accounts", Sty.DEFAULT)
+        printf("'admin rm ar' ", Sty.MAGENTA, " : Remove all reservations", Sty.DEFAULT)
+        # If you expose set_account remotely:
+        printf("'admin setacc <username> <U|P|A> [args...]' ", Sty.MAGENTA, " : Set perms", Sty.DEFAULT)
+    
     
 def clear():
     os.system('cls' if os.name == 'nt' else 'clear')
@@ -267,6 +282,18 @@ def perms():
         printf(f'No restrictions on reservation count or duration.', Sty.DEFAULT)
     else:
         printf(f"Error: Unknown permission level {results[0]}", Sty.BRIGHT_RED)
+        
+def enroll():
+    code = session.prompt(stylize("Enter your enrollment code: ", Sty.DEFAULT))
+    account.enrollment_code = code
+    data = account.set_enroll()
+    
+    if 'ace' in data.results:
+        print(f"Error: {unmap_arg(data.results['ace'])}")
+        return
+    else:
+        # todo: print out specifics, like group name (ie: successfully enrolled in ECE 132A)
+        printf("Enrollment successful.", Sty.BOLD_GREEN)
 
 # New block scheduling
 
@@ -484,6 +511,8 @@ while True:
             commands()
         elif inpu == "perms":
             perms()
+        elif inpu == "enroll":
+            enroll()
         elif inpu == "quit" or inpu == "exit":
             break
         elif inpu == "getres":
@@ -496,10 +525,13 @@ while True:
             interactive_reserve_next_days(block_minutes=30) 
         elif inpu == 'cancelres':
             cancel_my_reservation()
+            
         elif inpu == 'resdev -n':
             # check if user is admin
             # if account.get_perms().results['UC'] == 'Admin':
             reserve()
+        elif account.is_admin and inpu.strip().startswith("admin"):
+            handle_admin_command(inpu)
         else:
             print(f"Unknown command: {inpu}")
     except KeyboardInterrupt:

{remoterf-0.0.7.46 → remoterf-0.0.7.48}/src/remoteRF/core/grpc_acc.py

@@ -1,3 +1,4 @@
+import ast
 from .grpc_client import rpc_client
 from ..common.utils import *
 
@@ -8,9 +9,10 @@ class RemoteRFAccount:
         self.username = username
         self.password = password
         self.email = email
+        self.enrollment_code = ""
     
     def create_user(self):
-        response = rpc_client(function_name="ACC:create_user", args={"un":map_arg(self.username), "pw":map_arg(self.password), "em":map_arg(self.email)})
+        response = rpc_client(function_name="ACC:create_user", args={"un":map_arg(self.username), "pw":map_arg(self.password), "em":map_arg(self.email), "ec":map_arg(self.enrollment_code)})
         if 'UC' in response.results:
             print(f'User {unmap_arg(response.results["UC"])} successfully created.')
             return True
@@ -24,6 +26,8 @@ class RemoteRFAccount:
         response = rpc_client(function_name="ACC:login", args={"un":map_arg(username), "pw":map_arg(password)})
         if 'UC' in response.results:
             print(f'User {unmap_arg(response.results["UC"])} successful login.')
+            
+            self.is_admin = (ast.literal_eval(unmap_arg(self.get_perms().results['UC']))[0][0] == 'Admin')
             return True
         elif 'UE' in response.results:
             print(f'Error: {unmap_arg(response.results["UE"])}')
@@ -49,4 +53,7 @@ class RemoteRFAccount:
     def get_perms(self):
         return rpc_client(function_name='ACC:get_perms', args={"un":map_arg(self.username), "pw":map_arg(self.password)})
     
+    def set_enroll(self):
+        return rpc_client(function_name='ACC:set_enroll', args={"un":map_arg(self.username), "pw":map_arg(self.password), "ec":map_arg(self.enrollment_code)})
+