added ability for users to delete own challenges, added jinja translation customization

Author: Kathode-Negative

CTFd/plugins/LuaUtils/__init__.py

@@ -1,18 +1,30 @@
 import difflib
 import functools
+import json
 import os
 import re
 
 from flask import current_app, request, url_for
+from flask_babel import gettext, ngettext
 
 from CTFd.cache import cache
+from CTFd.constants.languages import Languages
 from CTFd.utils import _get_asset_json, get_asset_json, get_config, set_config
 from CTFd.utils.decorators import admins_only
 from CTFd.utils.helpers import markup
 
 
 def load(app):
     cache.delete_memoized(_get_asset_json)
+    
+    # Auto-register translations from all plugins
+    plugins_dir = os.path.join(current_app.root_path, "plugins")
+    for plugin_name in os.listdir(plugins_dir):
+        plugin_dir = os.path.join(plugins_dir, plugin_name)
+        if os.path.isdir(plugin_dir):
+            translations_file = os.path.join(plugin_dir, 'translations.json')
+            if os.path.exists(translations_file):
+                register_translations(app, plugin_name, plugin_dir)
 
     @app.route("/admin/LuaUtils/config/<configType>", methods=["GET"])
     @admins_only
@@ -33,7 +45,6 @@ def set_inlines(configType):
         set_config(key, value)
         return {"success": True}
 
-
     return
 
 class _LuaAsset():
@@ -166,3 +177,80 @@ def modify_p(p_match):
 
     # 4. Reconstruct the full document
     return text[:container_match.start()] + prefix + new_inner_content + suffix + text[container_match.end():]
+
+
+def load_plugin_translations(plugin_dir):
+    """Load translations from a plugin's translations.json"""
+    translations_path = os.path.join(plugin_dir, 'translations.json')
+    try:
+        with open(translations_path, 'r', encoding='utf-8') as f:
+            return json.load(f)
+    except FileNotFoundError:
+        return {}
+
+def register_translations(app, plugin_name, plugin_dir):
+    """General-purpose method to integrate plugin translations into Jinja.
+    
+    Args:
+        app: Flask application
+        plugin_name: Plugin name (e.g., 'LuaUtils', 'CustomPlugin')
+        plugin_dir: Absolute path to plugin directory
+    
+    Usage:
+        from CTFd.plugins.LuaUtils import register_translations
+        register_translations(app, 'MyPlugin', os.path.dirname(__file__))
+    """
+    from flask_babel import get_locale
+    from flask_babel import gettext as babel_gettext
+    from flask_babel import ngettext as babel_ngettext
+    
+    translations = load_plugin_translations(plugin_dir)
+    if not translations:
+        return
+    
+    # Store translations in config for database persistence
+    for lang, terms in translations.items():
+        for term, translation in terms.items():
+            key = f"{plugin_name.lower()}_translation_{lang}_{term}"
+            set_config(key, translation)
+    
+    # Wrap Flask-Babel's gettext functions to check plugin translations first
+    if not hasattr(app, '_luautils_gettext_wrapped'):
+        def wrapped_gettext(s):
+            """Check plugin translations first, then fall back to Flask-Babel."""
+            for check_plugin in getattr(app, '_registered_plugins', []):
+                try:
+                    lang = str(get_locale())
+                    config_key = f"{check_plugin.lower()}_translation_{lang}_{s}"
+                    translation = get_config(config_key)
+                    if translation:
+                        return translation
+                except Exception:
+                    pass
+            # Fall back to Flask-Babel's default
+            return babel_gettext(s)
+        
+        def wrapped_ngettext(s, p, n):
+            """Check plugin translations for plurals, then fall back to Flask-Babel."""
+            msg = s if n == 1 else p
+            for check_plugin in getattr(app, '_registered_plugins', []):
+                try:
+                    lang = str(get_locale())
+                    config_key = f"{check_plugin.lower()}_translation_{lang}_{msg}"
+                    translation = get_config(config_key)
+                    if translation:
+                        return translation
+                except Exception:
+                    pass
+            # Fall back to Flask-Babel's default
+            return babel_ngettext(s, p, n)
+        
+        # Install our wrapped callables
+        app.jinja_env.install_gettext_callables(wrapped_gettext, wrapped_ngettext, newstyle=True)
+        app._luautils_gettext_wrapped = True
+    
+    # Track registered plugins
+    if not hasattr(app, '_registered_plugins'):
+        app._registered_plugins = []
+    if plugin_name not in app._registered_plugins:
+        app._registered_plugins.append(plugin_name)

CTFd/plugins/LuaUtils/translate_keyword.py

@@ -0,0 +1,180 @@
+#!/usr/bin/env python3
+"""
+Script to translate a keyword into all CTFd available languages and add to a plugin's translations.json
+
+Usage:
+    python translate_keyword.py <keyword> <plugin_name>
+
+Examples:
+    python translate_keyword.py "Challenge Created" MyPlugin
+    python translate_keyword.py "Challenge Created" /path/to/plugin  # Full path also works
+"""
+
+import argparse
+import json
+import os
+import sys
+
+# Try to import translation library
+try:
+    from deep_translator import GoogleTranslator
+    HAS_TRANSLATOR = True
+except ImportError:
+    HAS_TRANSLATOR = False
+
+# Import CTFd's language constants
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../..'))
+
+
+Languages = {
+    "en": "English",
+    "de": "Deutsch",
+    "pl": "Polski",
+    "es": "Español",
+    "ar": "اَلْعَرَبِيَّةُ",
+    "zh_CN": "简体中文",
+    "zh_TW": "繁體中文",
+    "fr": "Français",
+    "ko": "한국어",
+    "ru": "русский язык",
+    "pt_BR": "Português do Brasil",
+    "sk": "Slovenský jazyk",
+    "ja": "日本語",
+    "it": "Italiano",
+    "vi": "tiếng Việt",
+    "ca": "Català",
+    "el": "Ελληνικά",
+    "fi": "Suomi",
+    "ro": "Română",
+    "sl": "Slovenščina",
+    "sv": "Svenska",
+    "he": "עברית",
+    "uz": "oʻzbekcha",
+}
+
+
+def translate_keyword(keyword, target_lang):
+    """Translate keyword to target language using available service."""    
+    try:
+        translator = GoogleTranslator(source='auto', target=target_lang)
+        result = translator.translate(keyword)
+        return result
+    except Exception as e:
+        print(f"Warning: Translation failed for {target_lang}: {e}")
+        return None
+
+
+
+def load_translations_file(plugin_dir):
+    """Load existing translations from plugin's translations.json"""
+    translations_path = os.path.join(plugin_dir, 'translations.json')
+    if os.path.exists(translations_path):
+        try:
+            with open(translations_path, 'r', encoding='utf-8') as f:
+                return json.load(f)
+        except json.JSONDecodeError:
+            return {}
+    return {}
+
+
+def resolve_plugin_dir(plugin_input):
+    """Resolve plugin name or path to absolute plugin directory.
+    
+    Args:
+        plugin_input: Either a plugin name (e.g., 'MyPlugin') or full path
+    
+    Returns:
+        Absolute path to plugin directory
+    """
+    # If it's an absolute path or looks like a path (contains / or \), use it as-is
+    if os.path.isabs(plugin_input) or '/' in plugin_input or '\\' in plugin_input:
+        return os.path.abspath(plugin_input)
+    
+    # Otherwise, treat it as a plugin name and resolve relative to CTFd/plugins/
+    luautils_dir = os.path.dirname(__file__)
+    plugins_dir = os.path.dirname(luautils_dir)
+    plugin_dir = os.path.join(plugins_dir, plugin_input)
+    return os.path.abspath(plugin_dir)
+
+
+def save_translations_file(plugin_dir, translations):
+    """Save translations to plugin's translations.json"""
+    translations_path = os.path.join(plugin_dir, 'translations.json')
+    os.makedirs(plugin_dir, exist_ok=True)
+    with open(translations_path, 'w', encoding='utf-8') as f:
+        json.dump(translations, f, ensure_ascii=False, indent=2)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Translate a keyword into all CTFd available languages'
+    )
+    parser.add_argument('keyword', help='The keyword to translate')
+    parser.add_argument('plugin_name', help='Plugin name (e.g., MyPlugin) or full path')
+    parser.add_argument(
+        '--key',
+        help='Translation key (defaults to lowercase keyword with underscores)'
+    )
+    parser.add_argument(
+        '--no-save',
+        action='store_true',
+        help='Print translations without saving'
+    )
+    
+    args = parser.parse_args()
+    
+    keyword = args.keyword
+    plugin_input = args.plugin_name
+    translation_key = args.key or keyword.lower().replace(' ', '_')
+    
+    # Resolve plugin directory
+    plugin_dir = resolve_plugin_dir(plugin_input)
+    
+    # Validate plugin directory
+    if not os.path.isdir(plugin_dir):
+        print(f"Error: Plugin directory not found: {plugin_dir}")
+        sys.exit(1)
+    
+    # Check if translator is available
+    if not HAS_TRANSLATOR:
+        print("Error: deep-translator is required but not installed.")
+        print("Install with: pip install deep-translator")
+        sys.exit(1)
+    
+    translations = {}
+    failed_langs = []
+    
+    # Translate to each language
+    for lang_code, lang_name in Languages.items():
+        if lang_code == 'en':
+            # English is the source, use the keyword as-is
+            translation = keyword
+        else:
+            translation = translate_keyword(keyword, lang_code)
+            if translation is None:
+                failed_langs.append(lang_code)
+                continue
+        
+        if lang_code not in translations:
+            translations[lang_code] = {}
+        translations[lang_code][translation_key] = translation
+    
+    if failed_langs:
+        print(f"Warning: Failed to translate to: {', '.join(failed_langs)}")
+    
+    # Save if not --no-save
+    if not args.no_save:
+        # Load existing translations and merge
+        existing = load_translations_file(plugin_dir)
+        
+        # Merge new translations with existing
+        for lang_code, new_terms in translations.items():
+            if lang_code not in existing:
+                existing[lang_code] = {}
+            existing[lang_code].update(new_terms)
+        
+        save_translations_file(plugin_dir, existing)
+        print(f"Saved to {os.path.join(plugin_dir, 'translations.json')}")
+
+if __name__ == '__main__':
+    main()

CTFd/plugins/userchallenge/api_calls/challenges.py

@@ -28,6 +28,7 @@
 )
 from CTFd.utils.dates import ctf_ended
 from CTFd.utils.decorators import admins_only
+from CTFd.utils.logging import log
 from CTFd.utils.security.signing import serialize
 from CTFd.utils.user import authed, get_current_team, get_current_user, is_admin
 
@@ -327,7 +328,7 @@ def idchallget(challenge_id):
 
         return {"success": True, "data": response}
 
-    @admins_only
+
     @ReadOnly
     def delete_userchallenge(challenge_id):
         if request.method == "DELETE":
@@ -340,6 +341,20 @@ def delete_userchallenge(challenge_id):
 
     #run_after_route(app,'api.challenges_challenge',delete_userchallenge)
 
+
+    @app.route('/userchallenge/api/challenges/<challenge_id>',methods=['DELETE'])
+    @userChallenge_allowed
+    @ReadOnly
+    def delete_challenge(challenge_id):
+        delete_userchallenge(challenge_id)
+        challenge = Challenges.query.filter_by(id=challenge_id).first_or_404()
+        chal_class = get_chal_class(challenge.type)
+        chal_class.delete(challenge)
+
+        clear_standings()
+        clear_challenges()
+        return {"success": True}
+
     @app.route('/userchallenge/challenges/preview/<challenge_id>')
     @userChallenge_allowed
     def render_preview(challenge_id):

CTFd/plugins/userchallenge/assets/js/userChallenge.js

@@ -165,7 +165,7 @@ $(() => {
           })
           .then(function (response) {
             if (response.success) {
-              window.location = CTFd.config.urlRoot + "/admin/challenges";
+              window.location = CTFd.config.urlRoot + "/userchallenge/challenges";
             }
           });
       },