Merge branch 'OWASP-BLT:main' into issue_2972_added_refrash_feature_1…

…_fix
JisanAR03 · Jan 2, 2025 · 73653db · 73653db
2 parents 396f36a + 502b908
commit 73653db
Show file tree

Hide file tree

Showing 12 changed files with 547 additions and 902 deletions.
diff --git a/blt/asgi.py b/blt/asgi.py
@@ -1,6 +1,7 @@
 # asgi.py
 
 import os
+import tracemalloc
 
 import django
 
@@ -12,6 +13,8 @@
 from django.core.asgi import get_asgi_application
 from django.urls import path
 
+tracemalloc.start()
+
 from website import consumers  # You will define a consumer for handling WebSockets
 
 application = ProtocolTypeRouter(

diff --git a/blt/settings.py b/blt/settings.py
@@ -330,32 +330,32 @@
 
 LOGIN_REDIRECT_URL = "/"
 
-# LOGGING = {
-#     "version": 1,
-#     "disable_existing_loggers": False,
-#     "handlers": {
-#         "console": {
-#             "class": "logging.StreamHandler",
-#         },
-#         "mail_admins": {
-#             "class": "django.utils.log.AdminEmailHandler",
-#         },
-#     },
-#     "loggers": {
-#         "": {
-#             "handlers": ["console"],
-#             "level": "DEBUG",
-#         },
-#     },
-# }
-# disable logging unless critical
-
 LOGGING = {
     "version": 1,
-    "disable_existing_loggers": True,  # Disable all existing loggers
-    "handlers": {},  # No handlers defined
-    "loggers": {},  # No loggers defined
+    "disable_existing_loggers": False,
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+        },
+        "mail_admins": {
+            "class": "django.utils.log.AdminEmailHandler",
+        },
+    },
+    "loggers": {
+        "": {
+            "handlers": ["console"],
+            "level": "DEBUG",
+        },
+    },
 }
+# disable logging unless critical
+
+# LOGGING = {
+#     "version": 1,
+#     "disable_existing_loggers": True,  # Disable all existing loggers
+#     "handlers": {},  # No handlers defined
+#     "loggers": {},  # No loggers defined
+# }
 
 
 USERS_AVATAR_PATH = "avatars"

diff --git a/blt/urls.py b/blt/urls.py
@@ -63,7 +63,7 @@
     delete_prize,
     edit_prize,
 )
-from website.views.core import (
+from website.views.core import (  # chatbot_conversation,
     FacebookConnect,
     FacebookLogin,
     GithubConnect,
@@ -74,7 +74,6 @@
     UploadCreate,
     add_suggestions,
     badge_list,
-    chatbot_conversation,
     check_status,
     donate_view,
     facebook_callback,
@@ -175,8 +174,7 @@
     view_hunt,
     weekly_report,
 )
-from website.views.project import (
-    ProjectBadgeView,
+from website.views.project import (  # ProjectBadgeView,
     ProjectDetailView,
     ProjectListView,
     ProjectsDetailView,
@@ -294,7 +292,9 @@
     path("auth/facebook/url/", facebook_views.oauth2_callback),
     path("socialaccounts/", SocialAccountListView.as_view(), name="social_account_list"),
     path(
-        "add_domain_to_organization/", add_domain_to_organization, name="add_domain_to_organization"
+        "add_domain_to_organization/",
+        add_domain_to_organization,
+        name="add_domain_to_organization",
     ),
     path(
         "socialaccounts/<int:pk>/disconnect/",
@@ -375,9 +375,17 @@
         admin_organization_dashboard_detail,
         name="admin_organization_dashboard_detail",
     ),
-    re_path(r"^dashboard/organization/hunt/create$", CreateHunt.as_view(), name="create_hunt"),
+    re_path(
+        r"^dashboard/organization/hunt/create$",
+        CreateHunt.as_view(),
+        name="create_hunt",
+    ),
     path("hunt/<int:pk>", ShowBughuntView.as_view(), name="show_bughunt"),
-    re_path(r"^dashboard/organization/hunt/drafts$", DraftHunts.as_view(), name="draft_hunts"),
+    re_path(
+        r"^dashboard/organization/hunt/drafts$",
+        DraftHunts.as_view(),
+        name="draft_hunts",
+    ),
     re_path(
         r"^dashboard/organization/hunt/upcoming$",
         UpcomingHunts.as_view(),
@@ -430,7 +438,11 @@
     ),
     re_path(r"^flag_issue/(?P<issue_pk>\d+)/$", flag_issue, name="flag_issue"),
     re_path(r"^resolve/(?P<id>\w+)/$", resolve, name="resolve"),
-    re_path(r"^create_github_issue/(?P<id>\w+)/$", create_github_issue, name="create_github_issue"),
+    re_path(
+        r"^create_github_issue/(?P<id>\w+)/$",
+        create_github_issue,
+        name="create_github_issue",
+    ),
     re_path(r"^vote_count/(?P<issue_pk>\d+)/$", vote_count, name="vote_count"),
     path("domain/<int:pk>/subscribe/", subscribe_to_domains, name="subscribe_to_domains"),
     re_path(r"^save_issue/(?P<issue_pk>\d+)/$", save_issue, name="save_issue"),
@@ -591,7 +603,9 @@
     re_path(r"^api/v1/count/$", issue_count, name="api_count"),
     re_path(r"^api/v1/contributors/$", contributors, name="api_contributor"),
     path("project/<slug:slug>/", ProjectDetailView.as_view(), name="project_view"),
-    path("projects/<slug:slug>/badge/", ProjectBadgeView.as_view(), name="project-badge"),
+    # path(
+    #     "projects/<slug:slug>/badge/", ProjectBadgeView.as_view(), name="project-badge"
+    # ),
     path("repository/<slug:slug>/", RepoDetailView.as_view(), name="repo_detail"),
     re_path(r"^report-ip/$", ReportIpView.as_view(), name="report_ip"),
     re_path(r"^reported-ips/$", ReportedIpListView.as_view(), name="reported_ips_list"),
@@ -659,7 +673,11 @@
     # users
     path("users/", users_view, name="users"),
     # company specific urls :
-    path("organization/", RegisterOrganizationView.as_view(), name="register_organization"),
+    path(
+        "organization/",
+        RegisterOrganizationView.as_view(),
+        name="register_organization",
+    ),
     path("organization/dashboard/", Organization_view, name="organization_view"),
     path(
         "organization/<int:id>/dashboard/analytics/",
@@ -692,10 +710,20 @@
         name="organization_manage_bughunts",
     ),
     path(
-        "organization/dashboard/end_bughunt/<int:pk>", EndBughuntView.as_view(), name="end_bughunt"
+        "organization/dashboard/end_bughunt/<int:pk>",
+        EndBughuntView.as_view(),
+        name="end_bughunt",
+    ),
+    path(
+        "organization/<int:id>/dashboard/add_bughunt/",
+        AddHuntView.as_view(),
+        name="add_bughunt",
+    ),
+    path(
+        "organization/<int:id>/dashboard/add_domain/",
+        AddDomainView.as_view(),
+        name="add_domain",
     ),
-    path("organization/<int:id>/dashboard/add_bughunt/", AddHuntView.as_view(), name="add_bughunt"),
-    path("organization/<int:id>/dashboard/add_domain/", AddDomainView.as_view(), name="add_domain"),
     path(
         "organization/<int:id>/dashboard/add_slack_integration/",
         AddSlackIntegrationView.as_view(),
@@ -706,7 +734,11 @@
         AddDomainView.as_view(),
         name="edit_domain",
     ),
-    path("organization/domain/<int:pk>/", login_required(DomainView.as_view()), name="view_domain"),
+    path(
+        "organization/domain/<int:pk>/",
+        login_required(DomainView.as_view()),
+        name="view_domain",
+    ),
     path(
         "organization/delete_prize/<int:prize_id>/<int:organization_id>",
         delete_prize,
@@ -717,7 +749,11 @@
         edit_prize,
         name="edit_prize",
     ),
-    path("organization/accept_bug/<int:issue_id>/<str:reward_id>/", accept_bug, name="accept_bug"),
+    path(
+        "organization/accept_bug/<int:issue_id>/<str:reward_id>/",
+        accept_bug,
+        name="accept_bug",
+    ),
     path(
         "organization/accept_bug/<int:issue_id>/<str:no_reward>/",
         accept_bug,
@@ -732,7 +768,11 @@
     path("donate/", donate_view, name="donate"),
     path("organizations/", DomainListView.as_view(), name="domain_lists"),
     path("trademarks/", trademark_search, name="trademark_search"),
-    path("generate_bid_image/<int:bid_amount>/", generate_bid_image, name="generate_bid_image"),
+    path(
+        "generate_bid_image/<int:bid_amount>/",
+        generate_bid_image,
+        name="generate_bid_image",
+    ),
     path("bidding/", SaveBiddingData, name="BiddingData"),
     path("select_bid/", select_bid, name="select_bid"),
     path("get_unique_issues/", get_unique_issues, name="get_unique_issues"),
@@ -754,15 +794,25 @@
         update_bch_address,
         name="update_bch_address",
     ),
-    path("api/chatbot/conversation/", chatbot_conversation, name="chatbot_conversation"),
+    # path(
+    #     "api/chatbot/conversation/", chatbot_conversation, name="chatbot_conversation"
+    # ),
     path("blt-tomato/", blt_tomato, name="blt-tomato"),
     path(
         "api/v1/projects/",
         ProjectViewSet.as_view({"get": "list", "post": "create", "patch": "update"}),
         name="projects_api",
     ),
-    path("auth/delete", AuthApiViewset.as_view({"delete": "delete"}), name="auth-delete-api"),
-    path("api/v1/tags", TagApiViewset.as_view({"get": "list", "post": "create"}), name="tags-api"),
+    path(
+        "auth/delete",
+        AuthApiViewset.as_view({"delete": "delete"}),
+        name="auth-delete-api",
+    ),
+    path(
+        "api/v1/tags",
+        TagApiViewset.as_view({"get": "list", "post": "create"}),
+        name="tags-api",
+    ),
     path("sizzle/", sizzle, name="sizzle"),
     path("check-in/", checkIN, name="checkIN"),
     path("add-sizzle-checkin/", add_sizzle_checkIN, name="add_sizzle_checkin"),