diff --git a/maigret/web/app.py b/maigret/web/app.py index 910e80a..48177dc 100644 --- a/maigret/web/app.py +++ b/maigret/web/app.py @@ -1,4 +1,3 @@ -# app.py from flask import ( Flask, render_template, @@ -22,7 +21,7 @@ from maigret.report import generate_report_context app = Flask(__name__) app.secret_key = 'your-secret-key-here' -# Add background job tracking +#add background job tracking background_jobs = {} job_results = {} @@ -46,16 +45,38 @@ async def maigret_search(username, options): logger = setup_logger(logging.WARNING, 'maigret') try: db = MaigretDatabase().load_from_path(MAIGRET_DB_FILE) - sites = db.ranked_sites_dict(top=int(options.get('top_sites', 500))) + + top_sites = int(options.get('top_sites') or 500) + if options.get('all_sites'): + top_sites = 999999999 # effectively all + + tags = options.get('tags', []) + site_list= options.get('site_list', []) + logger.info(f"Filtering sites by tags: {tags}") + + sites = db.ranked_sites_dict( + top=top_sites, + tags=tags, + names=site_list, + disabled=False, + id_type='username' + ) + + logger.info(f"Found {len(sites)} sites matching the tag criteria") results = await maigret.search( username=username, site_dict=sites, timeout=int(options.get('timeout', 30)), logger=logger, - id_type=options.get('id_type', 'username'), + id_type='username', cookies=COOKIES_FILE if options.get('use_cookies') else None, - is_parsing_enabled=True, + is_parsing_enabled=(not options.get('disable_extracting', False)), + recursive_search_enabled=(not options.get('disable_recursive_search', False)), + check_domains=options.get('with_domains', False), + proxy=options.get('proxy', None), + tor_proxy=options.get('tor_proxy', None), + i2p_proxy=options.get('i2p_proxy', None), ) return results except Exception as e: @@ -68,7 +89,7 @@ async def search_multiple_usernames(usernames, options): for username in usernames: try: search_results = await maigret_search(username.strip(), options) - results.append((username.strip(), options['id_type'], search_results)) + results.append((username.strip(), 'username', search_results)) except Exception as e: logging.error(f"Error searching username {username}: {str(e)}") return results @@ -76,20 +97,16 @@ async def search_multiple_usernames(usernames, options): def process_search_task(usernames, options, timestamp): try: - # Setup event loop for async operations loop = asyncio.new_event_loop() asyncio.set_event_loop(loop) - # Run the search general_results = loop.run_until_complete( search_multiple_usernames(usernames, options) ) - # Create session folder session_folder = os.path.join(REPORTS_FOLDER, f"search_{timestamp}") os.makedirs(session_folder, exist_ok=True) - # Save the combined graph graph_path = os.path.join(session_folder, "combined_graph.html") maigret.report.save_graph_report( graph_path, @@ -97,7 +114,6 @@ def process_search_task(usernames, options, timestamp): MaigretDatabase().load_from_path(MAIGRET_DB_FILE), ) - # Save individual reports individual_reports = [] for username, id_type, results in general_results: report_base = os.path.join(session_folder, f"report_{username}") @@ -154,7 +170,7 @@ def process_search_task(usernames, options, timestamp): } ) - # Save results and mark job as complete + # save results and mark job as complete using timestamp as key job_results[timestamp] = { 'status': 'completed', 'session_folder': f"search_{timestamp}", @@ -162,7 +178,9 @@ def process_search_task(usernames, options, timestamp): 'usernames': usernames, 'individual_reports': individual_reports, } + except Exception as e: + logging.error(f"Error in search task for timestamp {timestamp}: {str(e)}") job_results[timestamp] = {'status': 'failed', 'error': str(e)} finally: background_jobs[timestamp]['completed'] = True @@ -170,9 +188,24 @@ def process_search_task(usernames, options, timestamp): @app.route('/') def index(): - return render_template('index.html') + #load site data for autocomplete + db = MaigretDatabase().load_from_path(MAIGRET_DB_FILE) + site_options = [] + + for site in db.sites: + #add main site name + site_options.append(site.name) + #add URL if different from name + if site.url_main and site.url_main not in site_options: + site_options.append(site.url_main) + + #sort and deduplicate + site_options = sorted(set(site_options)) + + return render_template('index.html', site_options=site_options) +# Modified search route @app.route('/search', methods=['POST']) def search(): usernames_input = request.form.get('usernames', '').strip() @@ -187,15 +220,28 @@ def search(): # Create timestamp for this search session timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") - logging.info(f"Starting search for usernames: {usernames}") + # Get selected tags - ensure it's a list + selected_tags = request.form.getlist('tags') + logging.info(f"Selected tags: {selected_tags}") options = { - 'top_sites': request.form.get('top_sites', '500'), - 'timeout': request.form.get('timeout', '30'), - 'id_type': 'username', # fixed as username + 'top_sites': request.form.get('top_sites') or '500', + 'timeout': request.form.get('timeout') or '30', 'use_cookies': 'use_cookies' in request.form, + 'all_sites': 'all_sites' in request.form, + 'disable_recursive_search': 'disable_recursive_search' in request.form, + 'disable_extracting': 'disable_extracting' in request.form, + 'with_domains': 'with_domains' in request.form, + 'proxy': request.form.get('proxy', None) or None, + 'tor_proxy': request.form.get('tor_proxy', None) or None, + 'i2p_proxy': request.form.get('i2p_proxy', None) or None, + 'permute': 'permute' in request.form, + 'tags': selected_tags, # Pass selected tags as a list + 'site_list': [s.strip() for s in request.form.get('site', '').split(',') if s.strip()], } + logging.info(f"Starting search for usernames: {usernames} with tags: {selected_tags}") + # Start background job background_jobs[timestamp] = { 'completed': False, @@ -205,46 +251,42 @@ def search(): } background_jobs[timestamp]['thread'].start() - logging.info(f"Search job started with timestamp: {timestamp}") - - # Redirect to status page return redirect(url_for('status', timestamp=timestamp)) - @app.route('/status/') def status(timestamp): logging.info(f"Status check for timestamp: {timestamp}") # Validate timestamp if timestamp not in background_jobs: - flash('Invalid search session', 'danger') + flash('Invalid search session.', 'danger') + logging.error(f"Invalid search session: {timestamp}") return redirect(url_for('index')) # Check if job is completed if background_jobs[timestamp]['completed']: result = job_results.get(timestamp) if not result: - flash('No results found for this search session', 'warning') + flash('No results found for this search session.', 'warning') + logging.error(f"No results found for completed session: {timestamp}") return redirect(url_for('index')) if result['status'] == 'completed': - # Redirect to results page once done + # Note: use the session_folder from the results to redirect return redirect(url_for('results', session_id=result['session_folder'])) else: - error_msg = result.get('error', 'Unknown error occurred') + error_msg = result.get('error', 'Unknown error occurred.') flash(f'Search failed: {error_msg}', 'danger') + logging.error(f"Search failed for session {timestamp}: {error_msg}") return redirect(url_for('index')) - # If job is still running, show status page with a simple spinner + # If job is still running, show a status page return render_template('status.html', timestamp=timestamp) @app.route('/results/') def results(session_id): - if not session_id.startswith('search_'): - flash('Invalid results session format', 'danger') - return redirect(url_for('index')) - + # Find completed results that match this session_folder result_data = next( ( r @@ -254,6 +296,11 @@ def results(session_id): None, ) + if not result_data: + flash('No results found for this session ID.', 'danger') + logging.error(f"Results for session {session_id} not found in job_results.") + return redirect(url_for('index')) + return render_template( 'results.html', usernames=result_data['usernames'], @@ -266,7 +313,9 @@ def results(session_id): @app.route('/reports/') def download_report(filename): try: - file_path = os.path.join(REPORTS_FOLDER, filename) + file_path = os.path.normpath(os.path.join(REPORTS_FOLDER, filename)) + if not file_path.startswith(REPORTS_FOLDER): + raise Exception("Invalid file path") return send_file(file_path) except Exception as e: logging.error(f"Error serving file {filename}: {str(e)}") @@ -278,4 +327,5 @@ if __name__ == '__main__': level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', ) - app.run(debug=True) + debug_mode = os.getenv('FLASK_DEBUG', 'False').lower() in ['true', '1', 't'] + app.run(debug=debug_mode) diff --git a/maigret/web/static/maigret.png b/maigret/web/static/maigret.png new file mode 100644 index 0000000..257ebe8 Binary files /dev/null and b/maigret/web/static/maigret.png differ diff --git a/maigret/web/templates/base.html b/maigret/web/templates/base.html index 2ab4d2f..221ca15 100644 --- a/maigret/web/templates/base.html +++ b/maigret/web/templates/base.html @@ -1,44 +1,118 @@ - + - - -Maigret Web Interface - - + + + Maigret Web Interface + + + -
-
- +
+
+
+
+ +

Maigret Web Interface

+
+ +
+
- {% block content %}{% endblock %} -
- - + +
+
+ {% block content %}{% endblock %} +
+
+ + + + + - + + \ No newline at end of file diff --git a/maigret/web/templates/index.html b/maigret/web/templates/index.html index 3218200..a7c3287 100644 --- a/maigret/web/templates/index.html +++ b/maigret/web/templates/index.html @@ -1,35 +1,383 @@ {% extends "base.html" %} + {% block content %} + +
-

Maigret Web Interface

- {% if error %}
{{ error }}
{% endif %} - +
-
- - + +
+
+ + +
+ +
+
+ + +
+
+ + +
+
+
+ + +
+
+
- -
- - + + +
+
+
Filters
+ +
+
+
+ + + + + {% for site in site_options %} + +
+
+ +
+ +
+ +
+
- -
- - + + +
+
+
Advanced Options
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
- -
- - -
- - + +
+ + {% endblock %} \ No newline at end of file diff --git a/maigret/web/templates/results.html b/maigret/web/templates/results.html index 7ce144e..da0f053 100644 --- a/maigret/web/templates/results.html +++ b/maigret/web/templates/results.html @@ -1,56 +1,156 @@ {% extends "base.html" %} {% block content %} -
-

Search Results

+ + +
+

Search Results

+ + {% with messages = get_flashed_messages() %} + {% if messages %} + {% for message in messages %}
{{ message }}
- {% endfor %} + {% endfor %} + {% endif %} + {% endwith %} + +

The search has completed. Back to start.

+ + {% if graph_file %} +

Combined Graph

+ {% endif %} - {% endwith %} - -

The search has completed. Below are the results:

- - - {% if graph_file %} -

Combined Graph

- - {% endif %} - -
- - - {% if individual_reports %} + +
+ + {% if individual_reports %}

Individual Reports

-
    - {% for report in individual_reports %} -
  • -
    {{ report.username }}
    -

    - CSV Report | - JSON Report | - PDF Report | - HTML Report -

    - {% if report.claimed_profiles %} +
    + {% for report in individual_reports %} +
    +
    +
    + {{ report.username }} + +
    +
    +
    +

    + CSV Report | + JSON Report | + PDF Report | + HTML Report +

    + {% if report.claimed_profiles %} Claimed Profiles: -
      - {% for profile in report.claimed_profiles %} -
    • - {{ profile.site_name }} (Tags: {{ profile.tags|join(', ') }}) +
        + {% for profile in report.claimed_profiles %} +
      • +
        + + {{ profile.site_name }} +
        + {% if profile.tags %} +
        + {% for tag in profile.tags %} + {{ tag }} + {% endfor %} +
        + {% endif %}
        • - {% endfor %} + {% endfor %}
      - {% else %} + {% else %}

      No claimed profiles found.

      - {% endif %} -
      • - {% endfor %} -
    - {% else %} + {% endif %} +
    +
    + {% endfor %} +
    + {% else %}

    No individual reports available.

    - {% endif %} -
-{% endblock %} + {% endif %} +
+ + +{% endblock %} \ No newline at end of file diff --git a/static/web_interface_screenshot.png b/static/web_interface_screenshot.png index c76b623..2d18c17 100644 Binary files a/static/web_interface_screenshot.png and b/static/web_interface_screenshot.png differ diff --git a/static/web_interface_screenshot_start.png b/static/web_interface_screenshot_start.png index 94fc386..1d19da0 100644 Binary files a/static/web_interface_screenshot_start.png and b/static/web_interface_screenshot_start.png differ