limit image upload to 4mb

mapforge-org · Jan 30, 2025 · 3ef764f · 3ef764f
1 parent 41c216e
commit 3ef764f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -14,6 +14,6 @@ def destroy
   private
 
   def require_admin_user
-    not_found! unless @user&.admin?
+    redirect_to login_path unless @user&.admin?
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -13,7 +13,7 @@ def set_user
   end
 
   def require_login
-    not_found! unless @user
+    redirect_to login_path unless @user
   end
 
   def disable_session_cookies

diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
@@ -20,6 +20,7 @@ def upload
     file = params[:image]
     ext = file.content_type.split("/").last
     filename = "#{SecureRandom.hex(4)}.#{ext}"
+    raise "Image size exceeds 4MB" if file.size / (1024 * 1024) > 4
     uid = Dragonfly.app.store(file.tempfile, "name" => filename)
     img = Image.create!(img_uid: uid)
     render json: { icon: "/icon/#{img.public_id}", image: "/image/#{img.public_id}" }

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -23,6 +23,6 @@ def create
     # Make first user admin
     user.update!(admin: true) if User.count == 1
     session[:user_id] = user.id
-    redirect_to root_path
+    redirect_to my_path
   end
 end
diff --git a/app/javascript/controllers/feature_edit_controller.js b/app/javascript/controllers/feature_edit_controller.js
@@ -127,6 +127,11 @@ export default class extends Controller {
     const feature = this.getFeature()
     const image = document.querySelector('#marker-image').files[0]
     const formData = new FormData() // send using multipart/form-data
+
+    if (image && image.size > (4 * 1024 * 1024)) {
+      alert('Image is too large. Maximum size is 4MB.')
+    }
+
     formData.append('image', image)
     fetch('/images', {
       method: 'POST',
@@ -141,6 +146,7 @@ export default class extends Controller {
         console.log('Setting icon: ' + data.icon)
         feature.properties['marker-image-url'] = data.icon
         draw.setFeatureProperty(this.featureIdValue, 'marker-image-url', data.icon)
+        draw.setFeatureProperty(this.featureIdValue, 'marker-size', 15)
         setFeatureTitleImage(feature)
         redrawGeojson(false)
         this.saveFeature()