Skip to content

Commit e90efc8

Browse files
luckyratluckyrat
committed
Enable multi-entry edit support for KeePass 2.46+
1 parent 7f6d66c commit e90efc8

File tree

7 files changed

+240
-5
lines changed

7 files changed

+240
-5
lines changed

‎KeePassRPC/Forms/KeeMultiEntryUserControl.Designer.cs‎

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎KeePassRPC/Forms/KeeMultiEntryUserControl.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Drawing;
5+
using System.Data;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace KeePassRPC.Forms
12+
{
13+
public partial class KeeMultiEntryUserControl : UserControl
14+
{
15+
public KeeMultiEntryUserControl()
16+
{
17+
InitializeComponent();
18+
}
19+
}
20+
}

‎KeePassRPC/Forms/KeeMultiEntryUserControl.resx‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="label1.Text" xml:space="preserve">
121+
<value>These entries KeePassRPC configurations are different. To view or edit them, ensure you only edit a single KeePass entry or a set of entries with strictly identical KeePassRPC configurations. Some hidden configuration differences between entries are possible.</value>
122+
</data>
123+
</root>

‎KeePassRPC/KeePassRPC.csproj‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@
157157
<Compile Include="Forms\KeeMAMOverride.Designer.cs">
158158
<DependentUpon>KeeMAMOverride.cs</DependentUpon>
159159
</Compile>
160+
<Compile Include="Forms\KeeMultiEntryUserControl.cs">
161+
<SubType>UserControl</SubType>
162+
</Compile>
163+
<Compile Include="Forms\KeeMultiEntryUserControl.Designer.cs">
164+
<DependentUpon>KeeMultiEntryUserControl.cs</DependentUpon>
165+
</Compile>
160166
<Compile Include="Forms\KeeURLForm.cs">
161167
<SubType>Form</SubType>
162168
</Compile>
@@ -259,6 +265,9 @@
259265
<EmbeddedResource Include="Forms\KeeMAMOverride.resx">
260266
<DependentUpon>KeeMAMOverride.cs</DependentUpon>
261267
</EmbeddedResource>
268+
<EmbeddedResource Include="Forms\KeeMultiEntryUserControl.resx">
269+
<DependentUpon>KeeMultiEntryUserControl.cs</DependentUpon>
270+
</EmbeddedResource>
262271
<EmbeddedResource Include="Forms\KeeURLForm.resx">
263272
<DependentUpon>KeeURLForm.cs</DependentUpon>
264273
</EmbeddedResource>
@@ -398,7 +407,7 @@
398407
:BuildEventOK
399408
echo POSTBUILDSTEP for $(ProjectName) COMPLETED OK</PostBuildEvent>
400409
</PropertyGroup>
401-
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
410+
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
402411
<PostBuildEvent>
403412
#!/bin/bash
404413
echo POSTBUILDSTEP for $(ProjectName)
@@ -429,7 +438,7 @@
429438

430439
echo POSTBUILDSTEP for $(ProjectName) COMPLETED OK</PostBuildEvent>
431440
</PropertyGroup>
432-
<PropertyGroup Condition="'$(OS)' != 'Windows_NT' AND '$(ConfigurationName)' == 'ReleasePLGX'">
441+
<PropertyGroup Condition="'$(OS)' != 'Windows_NT' AND '$(ConfigurationName)' == 'ReleasePLGX'">
433442
<PostBuildEvent>
434443
#!/bin/bash
435444
echo POSTBUILDSTEP for $(ProjectName)

‎KeePassRPC/KeePassRPCExt.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace KeePassRPC
3333
public sealed class KeePassRPCExt : Plugin
3434
{
3535
// version information
36-
public static readonly Version PluginVersion = new Version(1, 13, 0);
36+
public static readonly Version PluginVersion = new Version(1, 14, 0);
3737

3838
public override string UpdateUrl
3939
{

‎KeePassRPC/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
// Assembly version information
2121
[assembly: AssemblyVersion("2.0.34.*")]
22-
[assembly: AssemblyFileVersion("1.13.0.0")] // also change PluginVersion in KeePassRPCExt.cs!
22+
[assembly: AssemblyFileVersion("1.14.0.0")] // also change PluginVersion in KeePassRPCExt.cs!

‎KeePassRPC/RPCClientManagers.cs‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using KeePassLib.Collections;
77
using KeePass.UI;
88
using KeePass.Forms;
9+
using System.Reflection;
910

1011
namespace KeePassRPC
1112
{
@@ -118,7 +119,30 @@ public GeneralRPCClientManager()
118119

119120
public override void AttachToEntryDialog(KeePassRPCExt plugin, PwEntry entry, TabControl mainTabControl, PwEntryForm form, CustomListViewEx advancedListView, ProtectedStringDictionary strings)
120121
{
121-
KeeEntryUserControl entryControl = new KeeEntryUserControl(plugin, entry, advancedListView, form, strings);
122+
UserControl entryControl;
123+
124+
try
125+
{
126+
string qualifiedName = typeof(KeePass.Util.AutoType).AssemblyQualifiedName
127+
.Replace("KeePass.Util.AutoType", "KeePass.Util.MultipleValues.MultipleValuesEx");
128+
System.Type mvType = System.Type.GetType(qualifiedName);
129+
PropertyInfo prop = mvType.GetProperty("CueString", BindingFlags.Public | BindingFlags.Static);
130+
string mvString = (string)prop.GetValue(null, null);
131+
string json = strings.ReadSafe("KPRPC JSON");
132+
if (!string.IsNullOrEmpty(json) && mvString == json)
133+
{
134+
entryControl = new KeeMultiEntryUserControl();
135+
} else
136+
{
137+
entryControl = new KeeEntryUserControl(plugin, entry, advancedListView, form, strings);
138+
}
139+
}
140+
catch
141+
{
142+
// Assume we're running in an older version of KeePass that can't edit multiple entries
143+
entryControl = new KeeEntryUserControl(plugin, entry, advancedListView, form, strings);
144+
}
145+
122146
TabPage keeTabPage = new TabPage("Kee");
123147
entryControl.Dock = DockStyle.Fill;
124148
keeTabPage.Controls.Add(entryControl);

0 commit comments

Comments
 (0)