fixed multiparts posts with file uploads (csrf problem in some cases)

Evolveum · Nov 30, 2017 · a4ad917 · a4ad917
1 parent c85bfd0
commit a4ad917
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -82,7 +82,8 @@
         PropertyPlaceholderAutoConfiguration.class,
         SecurityAutoConfiguration.class,
         SecurityFilterAutoConfiguration.class,
-        ServerPropertiesAutoConfiguration.class
+        ServerPropertiesAutoConfiguration.class,
+        MultipartAutoConfiguration.class
 })
 @SpringBootConfiguration
 public class MidPointSpringApplication extends SpringBootServletInitializer {

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
@@ -117,6 +117,7 @@ protected ImportOptionsType load() {
 
 	private void initLayout() {
 		Form mainForm = new com.evolveum.midpoint.web.component.form.Form(ID_MAIN_FORM);
+		mainForm.setMultiPart(true);
 		add(mainForm);
 
 		ImportOptionsPanel importOptions = new ImportOptionsPanel(ID_IMPORT_OPTIONS, optionsModel, fullProcessingModel);
@@ -308,7 +309,8 @@ private InputDescription getInputDescription(boolean editor) throws Exception {
 			// Save file
 
 			newFile.createNewFile();
-			uploadedFile.writeTo(newFile);
+
+			FileUtils.copyInputStreamToFile(uploadedFile.getInputStream(), newFile);
 
 			String language = getPrismContext().detectLanguage(newFile);
 			return new InputDescription(new FileInputStream(newFile), language);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
@@ -224,7 +224,7 @@ private void importReportFromFilePerformed(AjaxRequestTarget target) {
             // Save file
 //            Task task = createSimpleTask(OPERATION_IMPORT_FILE);
             newFile.createNewFile();
-            uploadedFile.writeTo(newFile);
+            FileUtils.copyInputStreamToFile(uploadedFile.getInputStream(), newFile);
 
             InputStreamReader reader = new InputStreamReader(new FileInputStream(newFile), "utf-8");
 //            reader.