chore: Rebase release/2.2.0 with latest master changes

[psyray]

Synchronize release/2.2.0 branch with latest master updates to ensure all recent fixes and improvements are included in the upcoming release.

Summary by Sourcery

Rebase the release/2.2.0 branch with the latest master changes to incorporate recent updates and improvements. Enhance error handling, logging, and user role management across the codebase. Improve the robustness of HTTP request handling and refactor code for better readability and maintainability.

Enhancements:

• Improve error handling and logging across various modules to provide more informative error messages and logs.
• Refactor the handling of user roles and permissions to enhance security and maintainability.
• Enhance the handling of HTTP requests and responses to improve robustness and error handling.
• Refactor the code to improve readability and maintainability, including the use of helper functions and better variable naming.

Chores:

• Rebase the release/2.2.0 branch with the latest changes from the master branch to synchronize updates.

[sourcery-ai]

Reviewer's Guide by Sourcery

This pull request performs a major refactoring and cleanup of the codebase to improve code quality, security, and maintainability. The changes include URL routing optimization, improved error handling, code standardization, and security enhancements across multiple components.

Updated class diagram for APIView classes

classDiagram
    class OllamaManager {
        +get(request)
        +delete(request)
        +put(request)
    }
    class GPTAttackSuggestion {
        +get(request)
    }
    class CreateProjectApi {
        +get(request)
    }
    class QueryInterestingSubdomains {
        +get(request)
    }
    class WafDetector {
        +get(request)
    }
    class FetchMostCommonVulnerability {
        +post(request)
    }
    class FetchMostVulnerable {
        +post(request)
    }
    class ToggleSubdomainImportantStatus {
        +post(request)
    }
    class AddDomainAsTarget {
        +post(request)
    }
    class FetchSubscanResults {
        +get(request)
    }
    class ListSubScans {
        +post(request)
    }
    class DeleteMultipleRows {
        +post(request)
    }
    class StopScan {
        +post(request)
    }
    class InitiateSubTask {
        +post(request)
    }
    class DeleteSubdomain {
        +post(request)
    }
    class DeleteVulnerability {
        +post(request)
    }
    class ListInterestingKeywords {
        +get(request, format=None)
    }
    class UninstallTool {
        +get(request)
    }
    class UpdateTool {
        +get(request)
    }
    class GetExternalToolCurrentVersion {
        +get(request)
    }
    class GithubToolCheckGetLatestRelease {
        +get(request)
    }
    class CMSDetector {
        +get(request)
    }
    class IPToDomain {
        +get(request)
    }
    class VulnerabilityReport {
        +get(request)
    }
    class ListTodoNotes {
        +get(request, format=None)
    }
    class ListOrganizations {
        +get(request, format=None)
    }
    class ListTargetsInOrganization {
        +get(request, format=None)
    }
    class VisualiseData {
        +get(request, format=None)
        +process_visualisation_data(data)
    }
    class ListTechnology {
        +get(request, format=None)
    }
    class ListDorkTypes {
        +get(request, format=None)
    }
    class ListEmails {
        +get(request, format=None)
    }
    class ListDorks {
        +get(request, format=None)
    }
    class ListEmployees {
        +get(request, format=None)
    }
    class ListPorts {
        +get(request, format=None)
    }
    class ListSubdomains {
        +get(request, format=None)
    }
    class ListOsintUsers {
        +get(request, format=None)
    }
    class ListMetadata {
        +get(request, format=None)
    }
    class ListIPs {
        +get(request, format=None)
    }
    class IpAddressViewSet {
        +get_queryset()
        +paginate_queryset(queryset, view=None)
    }
    class SubdomainsViewSet {
        +get_queryset()
        +paginate_queryset(queryset, view=None)
    }
    class SubdomainChangesViewSet {
        +get_queryset()
        +paginate_queryset(queryset, view=None)
    }
    class EndPointChangesViewSet {
        +get_queryset()
        +paginate_queryset(queryset, view=None)
    }
    class InterestingSubdomainViewSet {
        +get_queryset()
        +paginate_queryset(queryset, view=None)
    }
    class InterestingEndpointViewSet {
        +get_queryset()
        +paginate_queryset(queryset, view=None)
    }
    class SubdomainDatatableViewSet {
        +get_queryset()
    }
    class ListActivityLogsViewSet {
        +get_queryset()
    }
    class ListScanLogsViewSet {
        +get_queryset()
    }
    class ListEndpoints {
        +get(request, format=None)
    }
    class EndPointViewSet {
        +get_queryset()
    }
    class DirectoryViewSet {
        +get_queryset()
    }
    class ProjectViewSet {
        +get_queryset()
        +perform_create(serializer)
        +perform_update(serializer)
    }
    class VulnerabilityViewSet {
        +get_queryset()
    }

Loading

File-Level Changes

Change	Details	Files
Improved URL routing and navigation structure	Simplified URL patterns by removing redundant slug parameters Standardized URL naming conventions across the application Added URL reversing using named URLs instead of hardcoded paths Improved URL parameter handling and validation	web/scanEngine/urls.py web/targetApp/urls.py web/startScan/urls.py
Enhanced error handling and input validation	Added proper error handling for API responses Implemented input validation for form submissions Added type checking and sanitization for user inputs Improved exception handling with proper error messages	web/api/views.py web/dashboard/views.py web/targetApp/views.py
Security improvements and code hardening	Added CSRF protection to forms and API endpoints Implemented proper permission checks Added input sanitization for user-provided data Improved file handling security	web/reNgine/common_func.py web/reNgine/tasks.py
Frontend code optimization and modernization	Refactored JavaScript code to use modern practices Improved modal handling and UI interactions Enhanced error message display Added proper event handling for UI components	web/static/custom/custom.js web/static/custom/toolbox.js web/recon_note/static/note/js/todo.js
Installation script improvements	Added better Docker installation checks Improved error handling during installation Added version compatibility checks Enhanced user feedback during installation	install.sh

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time. You can also use
  this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

To fix the problem, we need to ensure that the command passed to subprocess.Popen is safe and not directly influenced by user input. This can be achieved by using a predefined allowlist of commands or by properly sanitizing the user input.

1. Use an allowlist: Define a set of allowed commands and only execute those commands if they match the predefined list.
2. Sanitize user input: Use shlex.split to safely parse the command string into a list of arguments, which can then be safely passed to subprocess.Popen.

In this case, we will implement the allowlist approach to ensure that only predefined commands are executed.

[sourcery-ai]

Hey @psyray - I've reviewed your changes and found some issues that need to be addressed.

Blocking issues:

• Add path traversal protection for file uploads (link)

Overall Comments:

• Consider adding more comprehensive error logging in the Docker installation checks to help diagnose installation issues. The current error messages could be more detailed.
• The JavaScript code still has some instances of string concatenation for HTML generation. Consider using template literals consistently throughout for better readability and security.

Here's what I looked at during the review

• 🟡 General issues: 2 issues found
• 🔴 Security: 1 blocking issue
• 🟢 Testing: all looks good
• 🟡 Complexity: 3 issues found
• 🟢 Documentation: all looks good

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[sourcery-ai]

suggestion (bug_risk): Add validation for the safe_int_cast return values

The safe_int_cast results should be validated before use. Consider adding explicit checks for None or invalid values.

		subdomain_id = safe_int_cast(req.query_params.get('subdomain_id'))
		if subdomain_id is None or subdomain_id < 1:
			return Response({'error': 'Invalid subdomain ID'}, status=400)

[sourcery-ai]

🚨 issue (security): Add path traversal protection for file uploads

The file path handling could be vulnerable to path traversal. Consider using os.path.basename and validating the final path.

[sourcery-ai]

suggestion (bug_risk): Add request timeout to external IP fetch

The requests.get() call should include a timeout parameter to prevent hanging if the external service is slow to respond.

Suggested change

	external_ip = requests.get('https://checkip.amazonaws.com').text.strip()
	external_ip = requests.get('https://checkip.amazonaws.com', timeout=5).text.strip()

[sourcery-ai]

issue (complexity): Consider refactoring FetchMostCommonVulnerability to use a query builder pattern.

The FetchMostCommonVulnerability class can be simplified by using a query builder pattern to reduce code duplication and nesting. Here's how to refactor it:

class FetchMostCommonVulnerability(APIView):
    def post(self, request):
        data = request.data
        limit = safe_int_cast(data.get('limit', 20))
        project_slug = data.get('slug')
        scan_history_id = safe_int_cast(data.get('scan_history_id'))
        target_id = safe_int_cast(data.get('target_id'))
        is_ignore_info = data.get('ignore_info', False)

        # Start with base queryset
        vulnerabilities = (Vulnerability.objects
            .filter(scan_history__domain__project__slug=project_slug) 
            if project_slug else Vulnerability.objects.all())

        # Build query filters
        if scan_history_id:
            vulnerabilities = vulnerabilities.filter(scan_history__id=scan_history_id)
        elif target_id:
            vulnerabilities = vulnerabilities.filter(target_domain__id=target_id)

        # Get vulnerability counts
        vuln_query = vulnerabilities.values("name", "severity")
        if is_ignore_info:
            vuln_query = vuln_query.exclude(severity=0)

        most_common = (vuln_query
            .annotate(count=Count('name'))
            .order_by("-count")[:limit])

        return Response({
            'status': bool(most_common),
            'result': list(most_common)
        })

This refactoring:

1. Eliminates duplicate query logic by building the query incrementally
2. Removes nested if-else chains using early returns
3. Simplifies error handling
4. Maintains all existing functionality while reducing code complexity

The query builder pattern makes the code more maintainable and easier to extend with new filters in the future.

[sourcery-ai]

issue (complexity): Consider consolidating vulnerability status management into a dedicated VulnerabilityManager class.

The vulnerability status management code has unnecessary complexity that should be simplified. Consider consolidating the scattered state management into a single VulnerabilityManager class:

class VulnerabilityManager {
  constructor() {
    this.selectedCount = 0;
    this.initializeEventHandlers();
  }

  initializeEventHandlers() {
    $('#select_all_checkbox').on('click', e => this.handleSelectAll(e));
    $('.vulnerability_checkbox').on('change', e => this.handleCheckboxChange(e));
  }

  handleSelectAll(e) {
    const checked = $(e.target).is(':checked');
    $("tr").find("[type=checkbox]").prop('checked', checked);
    this.updateUI();
  }

  handleCheckboxChange() {
    this.selectedCount = $('.vulnerability_checkbox:checked').length;
    this.updateUI();
  }

  updateUI() {
    const hasSelection = this.selectedCount > 0;
    $('#select_all_checkbox').prop('checked', this.selectedCount >= 2);
    $(".vulnerability_btns").toggleClass("disabled", !hasSelection);
    $('#vulnaribilities_selected_count')
      .toggle(hasSelection)
      .text(`${this.selectedCount} Vulnerabilities Selected x`);
  }
}

// Usage
const vulnManager = new VulnerabilityManager();

This refactoring:

1. Centralizes vulnerability selection state management
2. Reduces code duplication
3. Makes the code more maintainable by grouping related functionality
4. Simplifies the event handling logic

[sourcery-ai]

suggestion (code-quality): Assigning a variable to itself has no effect. (dont-self-assign-variables)

Suggested change

	add_target(endpoint_url, current_slug, domain_name, h1_handle = h1_handle, description = description, organization = organization);
	add_target(endpoint_url, current_slug, domain_name, , description = description, organization = organization);

Explanation

Assigning a variable to itself has no effect, and is therefore either redundant or a mistake.

[sourcery-ai]

suggestion (code-quality): Assigning a variable to itself has no effect. (dont-self-assign-variables)

Suggested change

	add_target(endpoint_url, current_slug, domain_name, h1_handle = h1_handle, description = description, organization = organization);
	add_target(endpoint_url, current_slug, domain_name, h1_handle = h1_handle, , organization = organization);

Explanation

Assigning a variable to itself has no effect, and is therefore either redundant or a mistake.

[sourcery-ai]

suggestion (code-quality): Assigning a variable to itself has no effect. (dont-self-assign-variables)

Suggested change

	add_target(endpoint_url, current_slug, domain_name, h1_handle = h1_handle, description = description, organization = organization);
	add_target(endpoint_url, current_slug, domain_name, h1_handle = h1_handle, description = description, );

Explanation

Assigning a variable to itself has no effect, and is therefore either redundant or a mistake.

[sourcery-ai]

issue (code-quality): Use const or let instead of var. (avoid-using-var)

Explanation

`const` is preferred as it ensures you cannot reassign references (which can lead to buggy and confusing code). `let` may be used if you need to reassign references - it's preferred to `var` because it is block- rather than function-scoped.

From the Airbnb JavaScript Style Guide

[sourcery-ai]

issue (code-quality): Use const or let instead of var. (avoid-using-var)

Explanation

`const` is preferred as it ensures you cannot reassign references (which can lead to buggy and confusing code). `let` may be used if you need to reassign references - it's preferred to `var` because it is block- rather than function-scoped.

From the Airbnb JavaScript Style Guide