mirror of
https://github.com/greenshot/greenshot
synced 2025-07-06 04:52:16 -07:00
This should improve the backwards compatibility for the .greenshot file from earlier versions. This was also addressed in #375
This commit is contained in:
Robin Krom
parent
7e005f741a
commit
a152e2883f
4 changed files with 446 additions and 325 deletions
|
|
@ -43,10 +43,12 @@ namespace Greenshot.Editor.Drawing
|
|||
0.5f, 0.25f, 0.75f
|
||||
};
|
||||
|
||||
[NonSerialized] private GraphicsPath freehandPath = new GraphicsPath();
|
||||
private NativeRect myBounds = NativeRect.Empty;
|
||||
private NativePoint lastMouse = NativePoint.Empty;
|
||||
private readonly List<Point> capturePoints = new List<Point>();
|
||||
[NonSerialized]
|
||||
private GraphicsPath freehandPath = new GraphicsPath();
|
||||
|
||||
private Rectangle myBounds = NativeRect.Empty;
|
||||
private Point lastMouse = NativePoint.Empty;
|
||||
private List<Point> capturePoints = new List<Point>();
|
||||
private bool isRecalculated;
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@ namespace Greenshot.Editor.Drawing
|
|||
[Serializable]
|
||||
public class SpeechbubbleContainer : TextContainer
|
||||
{
|
||||
private NativePoint _initialGripperPoint;
|
||||
private Point _initialGripperPoint;
|
||||
|
||||
// Only used for serializing the TargetGripper location
|
||||
private NativePoint _storedTargetGripperLocation;
|
||||
private Point _storedTargetGripperLocation;
|
||||
|
||||
/// <summary>
|
||||
/// Store the current location of the target gripper
|
||||
|
|
@ -120,7 +120,8 @@ namespace Greenshot.Editor.Drawing
|
|||
int xOffset = leftAligned ? -20 : 20;
|
||||
int yOffset = topAligned ? -20 : 20;
|
||||
|
||||
NativePoint newGripperLocation = _initialGripperPoint.Offset(xOffset, yOffset);
|
||||
NativePoint initialGripperPoint = _initialGripperPoint;
|
||||
NativePoint newGripperLocation = initialGripperPoint.Offset(xOffset, yOffset);
|
||||
|
||||
if (TargetAdorner.Location != newGripperLocation)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ using System.Drawing.Imaging;
|
|||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Serialization.Formatters.Binary;
|
||||
using System.ServiceModel.Security;
|
||||
using System.Windows.Forms;
|
||||
using Dapplo.Windows.Common.Extensions;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
|
|
@ -40,6 +41,7 @@ using Greenshot.Base.Interfaces.Drawing;
|
|||
using Greenshot.Base.Interfaces.Drawing.Adorners;
|
||||
using Greenshot.Editor.Configuration;
|
||||
using Greenshot.Editor.Drawing.Fields;
|
||||
using Greenshot.Editor.Helpers;
|
||||
using Greenshot.Editor.Memento;
|
||||
using log4net;
|
||||
|
||||
|
|
@ -722,6 +724,7 @@ namespace Greenshot.Editor.Drawing
|
|||
try
|
||||
{
|
||||
BinaryFormatter binaryRead = new BinaryFormatter();
|
||||
binaryRead.Binder = new BinaryFormatterHelper();
|
||||
IDrawableContainerList loadedElements = (IDrawableContainerList) binaryRead.Deserialize(streamRead);
|
||||
loadedElements.Parent = this;
|
||||
// Make sure the steplabels are sorted according to their number
|
||||
|
|
@ -731,6 +734,10 @@ namespace Greenshot.Editor.Drawing
|
|||
SelectElements(loadedElements);
|
||||
FieldAggregator.BindElements(loadedElements);
|
||||
}
|
||||
catch (SecurityAccessDeniedException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOG.Error("Error serializing elements from stream.", e);
|
||||
|
|
|
|||
111
src/Greenshot.Editor/Helpers/BinaryFormatterHelper.cs
Normal file
111
src/Greenshot.Editor/Helpers/BinaryFormatterHelper.cs
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
/*
|
||||
* Greenshot - a free and open source screenshot tool
|
||||
* Copyright (C) 2007-2021 Thomas Braun, Jens Klingen, Robin Krom
|
||||
*
|
||||
* For more information see: https://getgreenshot.org/
|
||||
* The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 1 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Serialization;
|
||||
using System.ServiceModel.Security;
|
||||
using Greenshot.Base.Interfaces.Drawing;
|
||||
using Greenshot.Editor.Drawing;
|
||||
using Greenshot.Editor.Drawing.Fields;
|
||||
using Greenshot.Editor.Drawing.Filters;
|
||||
using log4net;
|
||||
using static Greenshot.Editor.Drawing.FilterContainer;
|
||||
|
||||
namespace Greenshot.Editor.Helpers
|
||||
{
|
||||
internal class BinaryFormatterHelper : SerializationBinder
|
||||
{
|
||||
private static readonly ILog LOG = LogManager.GetLogger(typeof(BinaryFormatterHelper));
|
||||
private static readonly IDictionary<string, Type> TypeMapper = new Dictionary<string, Type>
|
||||
{
|
||||
{"System.Guid",typeof(Guid) },
|
||||
{"System.Drawing.Rectangle",typeof(System.Drawing.Rectangle) },
|
||||
{"System.Drawing.Point",typeof(System.Drawing.Point) },
|
||||
{"System.Drawing.Color",typeof(System.Drawing.Color) },
|
||||
{"System.Drawing.Bitmap",typeof(System.Drawing.Bitmap) },
|
||||
{"System.Drawing.StringAlignment",typeof(System.Drawing.StringAlignment) },
|
||||
{"System.Collections.Generic.List`1[[Greenshot.Base.Interfaces.Drawing.IFieldHolder", typeof(List<IFieldHolder>)},
|
||||
{"System.Collections.Generic.List`1[[Greenshot.Base.Interfaces.Drawing.IField", typeof(List<IField>)},
|
||||
{"System.Collections.Generic.List`1[[System.Drawing.Point", typeof(List<System.Drawing.Point>)},
|
||||
{"Greenshot.Editor.Drawing.ArrowContainer", typeof(ArrowContainer) },
|
||||
{"Greenshot.Editor.Drawing.LineContainer", typeof(LineContainer) },
|
||||
{"Greenshot.Editor.Drawing.TextContainer", typeof(TextContainer) },
|
||||
{"Greenshot.Editor.Drawing.SpeechbubbleContainer", typeof(SpeechbubbleContainer) },
|
||||
{"Greenshot.Editor.Drawing.RectangleContainer", typeof(RectangleContainer) },
|
||||
{"Greenshot.Editor.Drawing.EllipseContainer", typeof(EllipseContainer) },
|
||||
{"Greenshot.Editor.Drawing.FreehandContainer", typeof(FreehandContainer) },
|
||||
{"Greenshot.Editor.Drawing.HighlightContainer", typeof(HighlightContainer) },
|
||||
{"Greenshot.Editor.Drawing.IconContainer", typeof(IconContainer) },
|
||||
{"Greenshot.Editor.Drawing.ObfuscateContainer", typeof(ObfuscateContainer) },
|
||||
{"Greenshot.Editor.Drawing.StepLabelContainer", typeof(StepLabelContainer) },
|
||||
{"Greenshot.Editor.Drawing.SvgContainer", typeof(SvgContainer) },
|
||||
{"Greenshot.Editor.Drawing.VectorGraphicsContainer", typeof(VectorGraphicsContainer) },
|
||||
{"Greenshot.Editor.Drawing.MetafileContainer", typeof(MetafileContainer) },
|
||||
{"Greenshot.Editor.Drawing.ImageContainer", typeof(ImageContainer) },
|
||||
{"Greenshot.Editor.Drawing.FilterContainer", typeof(FilterContainer) },
|
||||
{"Greenshot.Editor.Drawing.DrawableContainer", typeof(DrawableContainer) },
|
||||
{"Greenshot.Editor.Drawing.DrawableContainerList", typeof(DrawableContainerList) },
|
||||
{"Greenshot.Editor.Drawing.CursorContainer", typeof(CursorContainer) },
|
||||
{"Greenshot.Editor.Drawing.Filters.HighlightFilter", typeof(HighlightFilter) },
|
||||
{"Greenshot.Editor.Drawing.Filters.GrayscaleFilter", typeof(GrayscaleFilter) },
|
||||
{"Greenshot.Editor.Drawing.Filters.MagnifierFilter", typeof(MagnifierFilter) },
|
||||
{"Greenshot.Editor.Drawing.Filters.BrightnessFilter", typeof(BrightnessFilter) },
|
||||
{"Greenshot.Editor.Drawing.Filters.BlurFilter", typeof(BlurFilter) },
|
||||
{"Greenshot.Editor.Drawing.Filters.PixelizationFilter", typeof(PixelizationFilter) },
|
||||
{"Greenshot.Base.Interfaces.Drawing.IDrawableContainer", typeof(IDrawableContainer) },
|
||||
{"Greenshot.Base.Interfaces.Drawing.EditStatus", typeof(EditStatus) },
|
||||
{"Greenshot.Base.Interfaces.Drawing.IFieldHolder", typeof(IFieldHolder) },
|
||||
{"Greenshot.Base.Interfaces.Drawing.IField", typeof(IField) },
|
||||
{"Greenshot.Base.Interfaces.Drawing.FieldFlag", typeof(FieldFlag) },
|
||||
{"Greenshot.Editor.Drawing.Fields.Field", typeof(Field) },
|
||||
{"Greenshot.Editor.Drawing.Fields.FieldType", typeof(FieldType) },
|
||||
{"Greenshot.Editor.Drawing.FilterContainer+PreparedFilter", typeof(PreparedFilter) },
|
||||
};
|
||||
// Greenshot.Plugin.Drawing.EditStatus -> Greenshot.Base.Interfaces.Drawing.EditStatus
|
||||
// GreenshotPlugin.Interfaces.Drawing.IFieldHolder -> Greenshot.Base.Interfaces.Drawing.IFieldHolder
|
||||
// Greenshot.Drawing.FilterContainer+PreparedFilter -> Greenshot.Editor.Drawing
|
||||
public override Type BindToType(string assemblyName, string typeName)
|
||||
{
|
||||
if (string.IsNullOrEmpty(typeName))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
var typeNameCommaLocation = typeName.IndexOf(",");
|
||||
var comparingTypeName = typeName.Substring(0, typeNameCommaLocation > 0 ? typeNameCommaLocation : typeName.Length);
|
||||
|
||||
// Correct wrong types
|
||||
comparingTypeName = comparingTypeName.Replace("Greenshot.Drawing", "Greenshot.Editor.Drawing");
|
||||
comparingTypeName = comparingTypeName.Replace("Greenshot.Plugin.Drawing", "Greenshot.Base.Interfaces.Drawing");
|
||||
comparingTypeName = comparingTypeName.Replace("GreenshotPlugin.Interfaces.Drawing", "Greenshot.Base.Interfaces.Drawing");
|
||||
comparingTypeName = comparingTypeName.Replace("Greenshot.Drawing.Fields", "Greenshot.Editor.Drawing.Fields");
|
||||
comparingTypeName = comparingTypeName.Replace("Greenshot.Drawing.Filters", "Greenshot.Editor.Drawing.Filters");
|
||||
|
||||
if (TypeMapper.TryGetValue(comparingTypeName, out var returnType))
|
||||
{
|
||||
LOG.Info($"Mapped {assemblyName} - {typeName} to {returnType.FullName}");
|
||||
return returnType;
|
||||
}
|
||||
LOG.Warn($"Unexpected Greenshot type in .greenshot file detected, maybe vulnerability attack created with ysoserial? Suspicious type: {assemblyName} - {typeName}");
|
||||
throw new SecurityAccessDeniedException($"Suspicious type in .greenshot file: {assemblyName} - {typeName}");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue