changes synced

.env.example

@@ -27,9 +27,10 @@ DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:${POSTGR
 #Sentry DSN
 SENTRY_DSN=https://[email protected]/0
 
-SLACK_CLIENT_ID=
-SLACK_CLIENT_SECRET=
-
+SLACK_ID_CLIENT=your_slack_client_id_here
+SLACK_SECRET_CLIENT=your_slack_client_secret_here
+SLACK_BOT_TOKEN=your_slack_bot_token_here
+SLACK_SIGNING_SECRET=your_slack_signing_secret_here
 
 #BlueSky User Details
 BLUESKY_USERNAME=example.bsky.social

.github/workflows/ci-cd.yml

@@ -155,7 +155,7 @@ jobs:
         with:
           python-version: 3.11.2
       - run: pip install poetry
-      - run: poetry lock --no-update
+      - run: poetry lock
       - run: poetry install
       - run: poetry run python manage.py collectstatic --noinput
       - name: Run tests
@@ -186,8 +186,8 @@ jobs:
           docker run -d --name my-container my-app
 
       - run: docker exec my-container pip install poetry
-      - run: docker exec my-container poetry lock --no-update
-      - run: docker exec my-container poetry install --no-dev --no-interaction
+      - run: docker exec my-container poetry lock
+      - run: docker exec my-container poetry install --without dev --no-interaction
 
       - name: Clean up
         run: |

Dockerfile

@@ -33,8 +33,8 @@ RUN ln -s /usr/bin/google-chrome-stable /usr/local/bin/google-chrome
 RUN pip install poetry
 RUN poetry config virtualenvs.create false
 COPY pyproject.toml poetry.lock* ./
-RUN poetry lock --no-update
-RUN poetry install
+RUN poetry lock
+RUN poetry install --no-root
 
 # Install additional Python packages
 RUN pip install opentelemetry-api opentelemetry-instrumentation

README.md

@@ -4,7 +4,7 @@
 <p align="center"><a href="https://github.com/OWASP/BLT/actions" rel="noopener noreferrer" target="__blank"><img alt="Build" src="https://github.com/OWASP/BLT/actions/workflows/auto-merge.yml/badge.svg"></a> <a href="https://github.com/OWASP/BLT/blob/main/LICENSE.md" rel="noopener noreferrer"><img src="https://img.shields.io/badge/license-AGPL--3.0-blue"></a>
 <a href="https://github.com/OWASP/BLT" rel="noopener noreferrer" target="__blank"><img alt="GitHub stars" src="https://img.shields.io/github/stars/OWASP/BLT?style=social"></a></p>
 
-<img alt="Views" src="https://blt.owasp.org/projects/blt/badge"></a>
+<img alt="Views" src="https://blt.owasp.org/repos/blt/badge/">
 
 Everything is on our <a href="https://blt.owasp.org">homepage</a>
 

blt/urls.py

@@ -55,6 +55,7 @@
     OrganizationDashboardManageBugsView,
     OrganizationDashboardManageDomainsView,
     OrganizationDashboardManageRolesView,
+    OrganizationDashboardTeamOverviewView,
     RegisterOrganizationView,
     ShowBughuntView,
     SlackCallbackView,
@@ -174,17 +175,18 @@
     view_hunt,
     weekly_report,
 )
-from website.views.project import (  # ProjectBadgeView,
-    ProjectDetailView,
-    ProjectListView,
+from website.views.project import (
+    ProjectBadgeView,
     ProjectsDetailView,
     ProjectView,
+    RepoBadgeView,
     RepoDetailView,
     blt_tomato,
     create_project,
     distribute_bacon,
     select_contribution,
 )
+from website.views.slack_handlers import slack_commands, slack_events
 from website.views.teams import (
     TeamOverview,
     add_member,
@@ -287,7 +289,8 @@
     re_path(r"^auth/github/connect/$", GithubConnect.as_view(), name="github_connect"),
     re_path(r"^auth/google/connect/$", GoogleConnect.as_view(), name="google_connect"),
     path("auth/github/url/", github_views.oauth2_login),
-    path("oauth/slack/callback/", SlackCallbackView.as_view(), name="slack_callback"),
+    path("oauth/slack/callback/", SlackCallbackView.as_view(), name="slack_oauth_callback"),
+    path("slack/commands/", slack_commands, name="slack_commands"),
     path("auth/google/url/", google_views.oauth2_login),
     path("auth/facebook/url/", facebook_views.oauth2_callback),
     path("socialaccounts/", SocialAccountListView.as_view(), name="social_account_list"),
@@ -552,8 +555,7 @@
         TemplateView.as_view(template_name="coming_soon.html"),
         name="googleplayapp",
     ),
-    re_path(r"^projects/$", ProjectListView.as_view(), name="project_list"),
-    re_path(r"^allprojects/$", ProjectView.as_view(), name="project_view"),
+    re_path(r"^projects/$", ProjectView.as_view(), name="project_view"),
     re_path(r"^apps/$", TemplateView.as_view(template_name="apps.html"), name="apps"),
     re_path(
         r"^deletions/$",
@@ -603,10 +605,8 @@
     re_path(r"^api/v1/createwallet/$", create_wallet, name="create_wallet"),
     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("repos/<slug:slug>/badge/", RepoBadgeView.as_view(), name="repo-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"),
@@ -695,6 +695,11 @@
         OrganizationDashboardManageBugsView.as_view(),
         name="organization_manage_bugs",
     ),
+    path(
+        "organization/<int:id>/dashboard/team-overview/",
+        OrganizationDashboardTeamOverviewView.as_view(),
+        name="organization_team_overview",
+    ),
     path(
         "organization/<int:id>/dashboard/domains/",
         OrganizationDashboardManageDomainsView.as_view(),
@@ -853,7 +858,8 @@
         name="similarity_scan",
     ),
     path("projects/create/", create_project, name="create_project"),
-    path("projects/<slug:slug>/", ProjectsDetailView.as_view(), name="projects_detail"),
+    path("project/<slug:slug>/", ProjectsDetailView.as_view(), name="projects_detail"),
+    path("slack/events", slack_events, name="slack_events"),
 ]
 
 if settings.DEBUG:

comments/migrations/0007_remove_comment_issue_comment_content_type_and_more.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("comments", "0006_comment_author_fk"),
         ("contenttypes", "0002_remove_content_type_name"),