Merge pull request #250 from ReturnFI/beta

Extra subscription configs & blocked-user check

Author: ReturnFI

changelog

@@ -1,32 +1,22 @@
-# [1.14.0] - 2025-08-13
+# [1.15.0] - 2025-08-17
 
 #### ✨ New Features
 
-* 🌐 **Per-User Unlimited IP Option**:
+* 🚫 **Blocked User Check**
 
-  * Added `unlimited_user` flag to exempt specific users from concurrent IP limits
-  * Works in both CLI and web panel
-  * Integrated into `limit.sh` for enforcement bypass
-* 🖥️ **Web Panel Enhancements**:
+  * Subscription endpoint now validates blocked users and prevents access
+* 🌐 **External Configs in Subscriptions**
 
-  * Unlimited IP control added to **Users** page
-  * IP limit UI now conditionally shown based on service status
-* 🛠️ **CLI & Scripts**:
+  * NormalSub links now include external proxy configs
+* ⚙️ **Settings Page**
 
-  * Add unlimited IP option to user creation and editing
-  * Menu script now supports unlimited IP configuration
+  * Added management UI for extra subscription configs
+* 🖥️ **Webpanel API**
 
-#### 🔄 Improvements
+  * New API endpoints for managing extra configs
+* 🛠️ **CLI & Scripts**
 
-* 📜 **API**:
+  * CLI support for extra subscription configs
+  * New `extra_config.py` script to manage additional proxy configs:
 
-  * Updated user schemas to match CLI output and new unlimited IP feature
-* 🐛 **Fixes**:
-
-  * Corrected type hints for optional parameters in `config_ip_limiter`
-
-#### 📦 Dependency Updates
-
-* ⬆️ `anyio` → 4.10.0
-* ⬆️ `certbot` → 4.2.0
-* ⬆️ `charset-normalizer` → 3.4.3
+    * `vmess`, `vless`, `ss`, `trojan`

core/cli.py

@@ -368,6 +368,56 @@ def masquerade(remove: bool, enable: str):
     except Exception as e:
         click.echo(f'{e}', err=True)
 
+@cli.group('extra-config')
+def extra_config():
+    """Manage extra proxy configurations for subscription links."""
+    pass
+
+
+@extra_config.command('add')
+@click.option('--name', required=True, help='A unique name for the configuration.')
+@click.option('--uri', required=True, help='The proxy URI (vmess, vless, ss, trojan).')
+def add_extra_config(name: str, uri: str):
+    """Add a new extra proxy configuration."""
+    try:
+        output = cli_api.add_extra_config(name, uri)
+        click.echo(output)
+    except Exception as e:
+        click.echo(f'{e}', err=True)
+
+
+@extra_config.command('delete')
+@click.option('--name', required=True, help='The name of the configuration to delete.')
+def delete_extra_config(name: str):
+    """Delete an extra proxy configuration."""
+    try:
+        output = cli_api.delete_extra_config(name)
+        click.echo(output)
+    except Exception as e:
+        click.echo(f'{e}', err=True)
+
+
+@extra_config.command('list')
+def list_extra_configs():
+    """List all extra proxy configurations."""
+    try:
+        output = cli_api.list_extra_configs()
+        click.echo(output)
+    except Exception as e:
+        click.echo(f'{e}', err=True)
+
+
+@extra_config.command('get')
+@click.option('--name', required=True, help='The name of the configuration to retrieve.')
+def get_extra_config(name: str):
+    """Get a specific extra proxy configuration."""
+    try:
+        res = cli_api.get_extra_config(name)
+        if res:
+            pretty_print(res)
+    except Exception as e:
+        click.echo(f'{e}', err=True)
+
 # endregion
 
 # region Advanced Menu

core/cli_api.py

@@ -36,6 +36,7 @@ class Command(Enum):
     NODE_MANAGER = os.path.join(SCRIPT_DIR, 'hysteria2', 'node.py')
     MANAGE_OBFS = os.path.join(SCRIPT_DIR, 'hysteria2', 'manage_obfs.py')
     MASQUERADE_SCRIPT = os.path.join(SCRIPT_DIR, 'hysteria2', 'masquerade.py')
+    EXTRA_CONFIG_SCRIPT = os.path.join(SCRIPT_DIR, 'hysteria2', 'extra_config.py')
     TRAFFIC_STATUS = 'traffic.py'  # won't be called directly (it's a python module)
     UPDATE_GEO = os.path.join(SCRIPT_DIR, 'hysteria2', 'update_geo.py')
     LIST_USERS = os.path.join(SCRIPT_DIR, 'hysteria2', 'list_users.sh')
@@ -476,6 +477,25 @@ def update_geo(country: str):
     except Exception as e:
         raise HysteriaError(f'An unexpected error occurred: {e}')
 
+def add_extra_config(name: str, uri: str) -> str:
+    """Adds an extra proxy configuration."""
+    return run_cmd(['python3', Command.EXTRA_CONFIG_SCRIPT.value, 'add', '--name', name, '--uri', uri])
+
+
+def delete_extra_config(name: str) -> str:
+    """Deletes an extra proxy configuration."""
+    return run_cmd(['python3', Command.EXTRA_CONFIG_SCRIPT.value, 'delete', '--name', name])
+
+
+def list_extra_configs() -> str:
+    """Lists all extra proxy configurations."""
+    return run_cmd(['python3', Command.EXTRA_CONFIG_SCRIPT.value, 'list'])
+
+
+def get_extra_config(name: str) -> dict[str, Any] | None:
+    """Gets a specific extra proxy configuration."""
+    if res := run_cmd(['python3', Command.EXTRA_CONFIG_SCRIPT.value, 'get', '--name', name]):
+        return json.loads(res)
 
 # endregion
 

core/scripts/hysteria2/extra_config.py

@@ -0,0 +1,104 @@
+import json
+import argparse
+import os
+import sys
+from init_paths import *
+from paths import *
+VALID_PROTOCOLS = ("vmess://", "vless://", "ss://", "trojan://")
+
+def read_configs():
+    if not os.path.exists(EXTRA_CONFIG_PATH):
+        return []
+    try:
+        with open(EXTRA_CONFIG_PATH, 'r') as f:
+            content = f.read()
+            if not content:
+                return []
+            return json.loads(content)
+    except (json.JSONDecodeError, IOError):
+        return []
+
+def write_configs(configs):
+    try:
+        os.makedirs(os.path.dirname(EXTRA_CONFIG_PATH), exist_ok=True)
+        with open(EXTRA_CONFIG_PATH, 'w') as f:
+            json.dump(configs, f, indent=4)
+    except IOError as e:
+        print(f"Error writing to {EXTRA_CONFIG_PATH}: {e}", file=sys.stderr)
+        sys.exit(1)
+
+def add_config(name, uri):
+    if not any(uri.startswith(protocol) for protocol in VALID_PROTOCOLS):
+        print(f"Error: Invalid URI. Must start with one of {', '.join(VALID_PROTOCOLS)}", file=sys.stderr)
+        sys.exit(1)
+
+    configs = read_configs()
+    
+    if any(c['name'] == name for c in configs):
+        print(f"Error: A configuration with the name '{name}' already exists.", file=sys.stderr)
+        sys.exit(1)
+
+    configs.append({"name": name, "uri": uri})
+    write_configs(configs)
+    print(f"Successfully added configuration '{name}'.")
+
+def delete_config(name):
+    configs = read_configs()
+    
+    initial_length = len(configs)
+    configs = [c for c in configs if c['name'] != name]
+    
+    if len(configs) == initial_length:
+        print(f"Error: No configuration found with the name '{name}'.", file=sys.stderr)
+        sys.exit(1)
+        
+    write_configs(configs)
+    print(f"Successfully deleted configuration '{name}'.")
+
+def list_configs():
+    configs = read_configs()
+    print(json.dumps(configs, indent=4))
+
+def get_config(name):
+    configs = read_configs()
+    config = next((c for c in configs if c['name'] == name), None)
+    
+    if config:
+        print(json.dumps(config, indent=4))
+    else:
+        print(f"Error: No configuration found with the name '{name}'.", file=sys.stderr)
+        sys.exit(1)
+
+def main():
+    parser = argparse.ArgumentParser(description="Manage extra proxy configurations for subscription links.")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    parser_add = subparsers.add_parser("add", help="Add a new proxy configuration.")
+    parser_add.add_argument("--name", type=str, required=True, help="A unique name for the configuration.")
+    parser_add.add_argument("--uri", type=str, required=True, help="The proxy URI (vmess, vless, ss, trojan).")
+
+    parser_delete = subparsers.add_parser("delete", help="Delete a proxy configuration.")
+    parser_delete.add_argument("--name", type=str, required=True, help="The name of the configuration to delete.")
+    
+    subparsers.add_parser("list", help="List all extra proxy configurations.")
+
+    parser_get = subparsers.add_parser("get", help="Get a specific proxy configuration by name.")
+    parser_get.add_argument("--name", type=str, required=True, help="The name of the configuration to retrieve.")
+    
+    args = parser.parse_args()
+
+    if os.geteuid() != 0:
+        print("This script must be run as root.", file=sys.stderr)
+        sys.exit(1)
+
+    if args.command == "add":
+        add_config(args.name, args.uri)
+    elif args.command == "delete":
+        delete_config(args.name)
+    elif args.command == "list":
+        list_configs()
+    elif args.command == "get":
+        get_config(args.name)
+
+if __name__ == "__main__":
+    main()