From 257e9bb4d57d841719b81cdd00ff25cba4d35c09 Mon Sep 17 00:00:00 2001
From: "Noah Hanford (spaced)" <spaced@csh.rit.edu>
Date: Wed, 18 Mar 2026 09:56:12 -0400
Subject: [PATCH 1/3] make it use the right bucket name

---
 conditional/blueprints/major_project_submission.py  | 6 +++++-
 conditional/templates/major_project_submission.html | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/conditional/blueprints/major_project_submission.py b/conditional/blueprints/major_project_submission.py
index a11b81a1..d5bf58e9 100644
--- a/conditional/blueprints/major_project_submission.py
+++ b/conditional/blueprints/major_project_submission.py
@@ -65,6 +65,7 @@ def display_major_project(user_dict=None):
     return render_template(
         "major_project_submission.html",
         major_projects=major_projects,
+        bucket_name=bucket,
         major_projects_len=len(major_projects),
         username=user_dict["username"])
 
@@ -156,12 +157,15 @@ def submit_major_project(user_dict=None):
         for file in os.listdir(temp_dir):
             filepath = f"{temp_dir}/{file}"
 
-            s3.upload_file(filepath, 'major-project-media', f"{project.id}/{file}")
+            s3.upload_file(filepath, app.config['S3_BUCKET_ID'], f"{project.id}/{file}")
 
             os.remove(filepath)
 
         # Delete the temp directory once all the files have been stored in S3
         os.rmdir(temp_dir)
+    else:
+        log.error("Could not create temp directory for uploading files")
+        return jsonify({"success": False}), 500
 
 
     # Send the slack ping only after we know that the data was properly saved to the DB
diff --git a/conditional/templates/major_project_submission.html b/conditional/templates/major_project_submission.html
index ba9bcf95..aa00ffa0 100644
--- a/conditional/templates/major_project_submission.html
+++ b/conditional/templates/major_project_submission.html
@@ -326,7 +326,7 @@ <h5 class="img-header"><strong>Images</strong></h5>
                             {% for f in p['files'] %}
                                 <img 
                                     class="proj-img" 
-                                    src="https://assets.csh.rit.edu/major-project-media/{{ f }}"
+                                    src="https://assets.csh.rit.edu/{{ bucket_name }}/{{ f }}"
                                     alt="User submitted image for the project"/>
                             {% endfor %}
                         {% endif %}
@@ -342,4 +342,4 @@ <h5 class="img-header"><strong>Images</strong></h5>
 {% endif %}
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From c5f0f404c9d5f2f5b7039d8b498a62fb3a21d396 Mon Sep 17 00:00:00 2001
From: "Noah Hanford (spaced)" <spaced@csh.rit.edu>
Date: Wed, 18 Mar 2026 11:20:18 -0400
Subject: [PATCH 2/3] expected owner arg

---
 conditional/blueprints/major_project_submission.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conditional/blueprints/major_project_submission.py b/conditional/blueprints/major_project_submission.py
index d5bf58e9..1c4a863a 100644
--- a/conditional/blueprints/major_project_submission.py
+++ b/conditional/blueprints/major_project_submission.py
@@ -157,7 +157,9 @@ def submit_major_project(user_dict=None):
         for file in os.listdir(temp_dir):
             filepath = f"{temp_dir}/{file}"
 
-            s3.upload_file(filepath, app.config['S3_BUCKET_ID'], f"{project.id}/{file}")
+            s3.upload_file(filepath, app.config['S3_BUCKET_ID'], f"{project.id}/{file}", {
+                'ExpectedBucketOwner': app.config['S3_BUCKET_ID']
+            })
 
             os.remove(filepath)
 

From 8427767f71acc3a560d5a8b0c74464a0460c733f Mon Sep 17 00:00:00 2001
From: "Noah Hanford (spaced)" <spaced@csh.rit.edu>
Date: Wed, 18 Mar 2026 11:22:05 -0400
Subject: [PATCH 3/3] making sonarqube happy

---
 conditional/blueprints/major_project_submission.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conditional/blueprints/major_project_submission.py b/conditional/blueprints/major_project_submission.py
index 1c4a863a..2fc47193 100644
--- a/conditional/blueprints/major_project_submission.py
+++ b/conditional/blueprints/major_project_submission.py
@@ -157,7 +157,7 @@ def submit_major_project(user_dict=None):
         for file in os.listdir(temp_dir):
             filepath = f"{temp_dir}/{file}"
 
-            s3.upload_file(filepath, app.config['S3_BUCKET_ID'], f"{project.id}/{file}", {
+            s3.upload_file(filepath, app.config['S3_BUCKET_ID'], f"{project.id}/{file}", ExtraArgs={
                 'ExpectedBucketOwner': app.config['S3_BUCKET_ID']
             })