Unstable 0.1500.2.0 (Rokvach's dog edition)

2021-09-10 04:52:34 +09:00
parent e7b7c1a748
commit 1231170fce
126 changed files with 2424 additions and 1083 deletions
@@ -494,7 +494,26 @@ namespace Barotrauma.Networking
                    stream?.Close();
                    break;
                case FileTransferType.CampaignSave:
-                    //TODO: verify that the received file is a valid save file
+                    try
+                    {
+                        var files = SaveUtil.EnumerateContainedFiles(fileTransfer.FilePath);
+                        foreach (var file in files)
+                        {
+                            string extension = Path.GetExtension(file);
+                            if ((!extension.Equals(".sub", StringComparison.OrdinalIgnoreCase)
+                                && !file.Equals("gamesession.xml"))
+                                || file.CleanUpPathCrossPlatform(correctFilenameCase: false).Contains('/'))
+                            {
+                                ErrorMessage = $"Found unexpected file in \"{fileTransfer.FileName}\"! ({file})";
+                                return false;
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        ErrorMessage = $"Loading received campaign save \"{fileTransfer.FileName}\" failed! {{{e.Message}}}";
+                        return false;
+                    }
                    break;
            }