Browse Source

[fix] file and directory removing

encrypt 3 years ago
parent
commit
14debd8977
2 changed files with 7 additions and 3 deletions
  1. 1 1
      client/main.js
  2. 6 2
      server/server.rb

+ 1 - 1
client/main.js

@@ -178,7 +178,7 @@ var CryptoUploader = {
 			}
 			$("<span>🗑️</span>")
 			    .on('click', function(e){
-				Uploader.deleteFile(file.name);
+				Uploader.deleteFile(path+'/'+file.name);
 				CryptoUploader.showRoomContent();
 			    })
 			    .addClass("delete-button")

+ 6 - 2
server/server.rb

@@ -103,6 +103,10 @@ end
 
 # remove a file
 
-delete '/room/:id/:filename' do |id, filename|
-  FileUtils.rm(settings.storage_directory+id+"/"+filename)
+delete '/room/:id/*?' do |id, filename|
+  if path_is_base32?(filename)
+    FileUtils.rm_rf(settings.storage_directory+id+"/"+filename)
+  else
+    404
+  end
 end