fix: Caches slack events in order to prevent resends firing

.env.template

@@ -7,6 +7,7 @@ CALENDAR_TIMEZONE=
 WATCHED_CHANNELS=
 SLACK_API_TOKEN=
 SLACK_JUMPSTART_MESSAGE=
+SLACK_SIGNING_SECRET=
 
 WIKI_API=
 WIKIBOT_USER=

README.md

@@ -12,7 +12,7 @@ Documentation for the project can be found be appended /docs to the url
 All HTML requests that are sent in the project can be seen by appending /swag
 
 This project uses Python, [FastAPI](https://fastapi.tiangolo.com/), HTML/CSS, and Javascript.
-See it live [here](http://jumpstart-cubed.cs.house/)!
+See it live [here](https://jumpstart.csh.rit.edu)!
 
 ## Installing
 1. Clone and cd into the repo: git clone https://github.com/WeatherGod3218/jumpstartV2

dev-requirements.txt

@@ -1,2 +1,3 @@
 pre-commit==4.5.1
 ruff==0.15.6
+pytest==9.0.2

docker-compose.yml

@@ -15,7 +15,8 @@ services:
       - WATCHED_CHANNELS=${WATCHED_CHANNELS}
       - SLACK_API_TOKEN=${SLACK_API_TOKEN}
       - SLACK_JUMPSTART_MESSAGE=${SLACK_JUMPSTART_MESSAGE}
-
+      - SLACK_SIGNING_SECRET=${SLACK_SIGNING_SECRET}
+
       - WIKI_API=${WIKI_API}
       - WIKIBOT_USER=${WIKIBOT_USER}
       - WIKIBOT_PASSWORD=${WIKIBOT_PASSWORD}

docs/endpoints/csh_calendar.md

@@ -4,6 +4,7 @@
 
 This API interacts with the CSH Google calendar to pull the number of events set in the .env file to display in the calendar widget on Jumpstart
 
+
 ---
 
 ### Authentication

mkdocs.yml

@@ -38,7 +38,7 @@ use_directory_urls: false
 nav:
   - Home: index.md
   - Getting Started: getting-started/getting-started.md
-  - Backend:      
+  - Backend:
       - Calendar: core/csh_calendar.md
       - Slack: core/slack.md
       - Wikithoughts: core/wikithoughts.md

src/api/endpoints.py

@@ -1,20 +1,15 @@
 from logging import getLogger, Logger
 
-import json
-import httpx
-
 from fastapi import APIRouter, Request, Form
 from fastapi.responses import JSONResponse
 
 from core import slack, wikithoughts, cshcalendar
-from config import WATCHED_CHANNELS
+import json
+import urllib
 
 logger: Logger = getLogger(__name__)
 router: APIRouter = APIRouter()
 
-ACCEPT_MESSAGE: str = "Posting right now :^)"
-DENY_MESSAGE: str = "Okay :( maybe next time"
-
 
 @router.get("/calendar")
 async def get_calendar() -> JSONResponse:
@@ -63,44 +58,25 @@ async def slack_events(request: Request) -> JSONResponse:
 		JSONResponse: A JSON response indicating the result of the event handling.
 	"""
 
-	try:
-		logger.debug(f"Received Slack event: {await request.body()}")
+	raw_body: bytes = await request.body()
 
-		body: dict = await request.json()
+	if not (slack.is_valid_slack_request(request, raw_body)):
+		logger.warning(f"Received a Fake Slack Event!: {raw_body}")
+		return JSONResponse({"error": "Invalid signature"}, status_code=403)
 
-		if request.headers.get("content-type") == "application/json":
-			if body.get("type") == "url_verification":
-				logger.info("SLACK EVENT: Was a challenge!")
-				return JSONResponse({"challenge": body.get("challenge")})
+	body: dict = json.loads(raw_body)
 
-		if not body:
-			logger.debug("SLACK EVENT: Was a challenge, with no body")
+	# Challenge from Bot Authentication
+	if request.headers.get("content-type") == "application/json":
+		if body.get("type") == "url_verification":
+			logger.info("SLACK EVENT: Was a challenge!")
 			return JSONResponse({"challenge": body.get("challenge")})
 
-		event: dict = body.get("event", {})
-		cleaned_text: str = slack.clean_text(event.get("text", ""))
-
-		if event.get("subtype", None) is not None:
-			logger.info("SLACK EVENT: Had no subtype, ignoring it")
-			return JSONResponse({"status": "ignored"})
-
-		if event.get("channel", None) not in WATCHED_CHANNELS:
-			logger.info(
-				"SLACK EVENT: Message was not in a Watched Channel, ignoring it"
-			)
-			return JSONResponse({"status": "ignored"})
-
-		logger.info("SLACK EVENT: Requesting upload via dm!")
-		await slack.request_upload_via_dm(event.get("user", ""), cleaned_text)
-	except Exception as e:
-		logger.error(f"Error handling Slack event: {e}")
-		return JSONResponse({"status": "error", "message": str(e)})
-
-	return JSONResponse({"status": "success"})
+	return JSONResponse(await slack.process_slack_events(body))
 
 
 @router.post("/slack/message_actions")
-async def message_actions(payload: str = Form(...)) -> JSONResponse:
+async def message_actions(request: Request) -> JSONResponse:
 	"""
 	Handles slack message action.
 
@@ -111,48 +87,20 @@ async def message_actions(payload: str = Form(...)) -> JSONResponse:
 		JSONResponse: A JSON response indicating the result of the action.
 	"""
 
-	try:
-		form_json: dict = json.loads(payload)
-		response_url = form_json.get("response_url")
-
-		if form_json.get("type") != "block_actions":
-			return JSONResponse({}, status_code=200)
-
-		if slack.convert_user_response_to_bool(form_json):
-			logger.info(
-				"User approved the announcement, Adding it to the announcement list!"
-			)
-
-			message_object: dict[str, dict] = json.loads(
-				form_json.get("actions", [{}])[0].get("value", '{text:""}')
-			).get("text", None)
-
-			user_id = form_json.get("user", {}).get("id")
-
-			username: str = await slack.get_username(user_id=user_id)
-			username = username[:40]
-
-			slack.add_announcement(message_object, username)
-
-			if response_url:
-				async with httpx.AsyncClient() as client:
-					await client.post(
-						response_url,
-						json={"text": ACCEPT_MESSAGE, "replace_original": True},
-					)
-		else:
-			if response_url:
-				async with httpx.AsyncClient() as client:
-					await client.post(
-						response_url,
-						json={"text": DENY_MESSAGE, "replace_original": True},
-					)
+	raw_body: bytes = await request.body()
 
-	except Exception as e:
-		logger.error(f"Error in message_actions: {e}")
-		return JSONResponse({"status": "error", "message": str(e)}, status_code=500)
+	if not (slack.is_valid_slack_request(request, raw_body)):
+		logger.warning(f"Received a Fake Slack Message Action! {raw_body}")
+		return JSONResponse({"error": "Invalid signature"}, status_code=403)
+
+	form_data = urllib.parse.parse_qs(raw_body.decode("utf-8"))
+	payload = form_data.get("payload", [None])[0]
+
+	if payload is None:
+		return JSONResponse({"error": "Missing payload"}, status_code=400)
 
-	return JSONResponse({"status": "success"}, status_code=200)
+	response_dict, status_code = await slack.process_slack_message_actions(payload)
+	return JSONResponse(response_dict, status_code=status_code)
 
 
 @router.get("/wikithought")

src/config.py

@@ -39,6 +39,8 @@ def _get_env_variable(name: str, default: str | None = None) -> str | None:
 
 SLACK_API_TOKEN: str | None = _get_env_variable("SLACK_API_TOKEN", None)
 SLACK_JUMPSTART_MESSAGE: str = "Would you like to post this message to Jumpstart?"
+SLACK_SIGNING_SECRET: str = _get_env_variable("SLACK_SIGNING_SECRET", None)
+
 WATCHED_CHANNELS: tuple[str] = tuple(
 	_get_env_variable("WATCHED_CHANNELS", "").split(",")
 )

src/core/cshcalendar.py

@@ -7,6 +7,9 @@
 import recurring_ical_events
 import arrow
 import re
+import asyncio
+
+from modules import taskmanager
 
 from config import (
 	CALENDAR_CACHE_REFRESH,
@@ -15,7 +18,6 @@
 	CALENDAR_TIMEZONE,
 	CALENDAR_URL,
 )
-import asyncio
 
 calendar_cache: list[CalendarInfo] = []  # The current cache of the calendar
 cal_last_update: date | None = (
@@ -136,6 +138,7 @@ def repl(match: re.Match[str]) -> str:
 
 	return TIME_PATTERN.sub(repl, unformatted_string)
 
+
 def format_events(events: list[CalendarInfo]) -> list[dict[str, str]]:
 	"""
 	Formats a parsed list of CalendarInfos, and returns the HTML required for front end
@@ -150,7 +153,7 @@ def format_events(events: list[CalendarInfo]) -> list[dict[str, str]]:
 	current_date: date = datetime.now(ZoneInfo(CALENDAR_TIMEZONE))
 
 	if not events:
-		return {"data": [{"header": ":(", "content": "No Events on the Calendar"}]}
+		return [{"header": ":(", "content": "No Events on the Calendar"}]
 
 	formatted_list: list[dict[str, str]] = []
 
@@ -291,9 +294,11 @@ async def get_future_events() -> list[CalendarInfo]:
 
 		if cal_correct_length:
 			logger.info("Calendar cache is full length, rebuilding async!")
-			async with asyncio.TaskGroup() as taskGroup:
-				taskGroup.create_task(rebuild_calendar())
-				# Calendar is correct length, we can just run this in the background
+
+			taskmanager.create_background_task(
+				rebuild_calendar()
+			)  # Calendar is correct length, we can just run this in the background
+
 		else:
 			logger.info("Calendar cache is NOT full length, yielding rebuild!")
 			await rebuild_calendar()