shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20241121

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-21 19:32:26 +01:00
parent d3bf9458eb
commit 6bdbc4173e
56 changed files with 362 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
API_NetFramework/Controllers/ArchivController.cs
View File

@@ -18,6 +18,7 @@ using System.Security.Policy;
using System.Text; using System.Text;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Net.Http.Headers;
namespace API_NetFramework.Controllers namespace API_NetFramework.Controllers
@@ -233,7 +234,8 @@ namespace API_NetFramework.Controllers
db.Get_Tabledata("Select barcodenr from barcodeetikette where dokumentid='" + DokumentID + "'", false, true); db.Get_Tabledata("Select barcodenr from barcodeetikette where dokumentid='" + DokumentID + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0) if (db.dsdaten.Tables[0].Rows.Count > 0)
{ {
return Ok(DokumentID); return (ArchivDocFromIRIS(DokumentID));
//return Ok(DokumentID);
} }
APILogging.Log((HttpRequestMessage)Request, "Ende Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug); APILogging.Log((HttpRequestMessage)Request, "Ende Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug);
@@ -260,27 +262,35 @@ namespace API_NetFramework.Controllers
try try
{ {
APILogging.Log((HttpRequestMessage)Request, "Start ArchivDocFromIRIS DokumentID: " + dokumentid, LogLevelType.Debug); APILogging.Log((HttpRequestMessage)Request, "Start ArchivDocFromIRIS DokumentID: " + dokumentid, LogLevelType.Debug);
if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008") if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008")
{ {
return (ArchivDocFromDatabase(dokumentid)); return (ArchivDocFromDatabase(dokumentid));
} }
else else
{ {
DB db = new DB(connectionstring); DB db = new DB(connectionstring);
db.clear_parameter(); db.clear_parameter();
db.add_parameter("@dokumentid", dokumentid); db.add_parameter("@dokumentid", dokumentid);
if (db.Get_Tabledata("[OnDoc_IRIS_Archivierung]", true, false) == null) db.Get_Tabledata("[OnDoc_IRIS_Archivierung]", true, false);
{ string returnmessage = db.dsdaten.Tables[0].Rows[0][0].ToString();
APILogging.Log((HttpRequestMessage)Request, "ArchivDocFromIRIS Archivierung fehlgeschlagen - DokumentID:" + dokumentid, LogLevelType.Debug); switch (db.dsdaten.Tables[0].Rows[0][1].ToString())
return Content(HttpStatusCode.NotFound, "Archivierung fehlgeschlagen"); {
case "1":
case "2":
case "3":
APILogging.Log((HttpRequestMessage)Request, db.dsdaten.Tables[0].Rows[0].ToString() + dokumentid, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, returnmessage);
case "0":
APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug);
return Ok(dokumentid);
default:
break;
}; };
} }
//return Content(HttpStatusCode.OK, "");
APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug); APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug);
return Ok(dokumentid); return Ok(dokumentid);
} }

72
API_NetFramework/Controllers/DocumentController.cs
View File

@@ -92,47 +92,47 @@ namespace API_NetFramework.Controllers
} }
[HttpGet] //[HttpGet]
[Route("API/SendToOnBase")] //[Route("API/SendToOnBase")]
public IHttpActionResult SendToOnBase(string dokid) //public IHttpActionResult SendToOnBase(string dokid)
{ //{
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false) // if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{ // {
return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key"); // return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
} // }
try // try
{ // {
APILogging.Log((HttpRequestMessage)Request, "Start SendToOnBase:" + dokid, LogLevelType.Debug); // APILogging.Log((HttpRequestMessage)Request, "Start SendToOnBase:" + dokid, LogLevelType.Debug);
DB db = new DB(connectionstring); // DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid='" + dokid + "'", false, true); // db.Get_Tabledata("Select * from dokument where dokumentid='" + dokid + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count < 1) // if (db.dsdaten.Tables[0].Rows.Count < 1)
{ // {
db = null; // db = null;
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug); // APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
return BadRequest("Dokument " + dokid + " not found"); // return BadRequest("Dokument " + dokid + " not found");
} // }
else // else
{ // {
DocGet dg = new DocGet(connectionstring); // DocGet dg = new DocGet(connectionstring);
clsdok dok = new clsdok("", "", ""); // clsdok dok = new clsdok("", "", "");
dok = dg.GetDocAsPDF(dokid); // dok = dg.GetDocAsPDF(dokid);
db.Exec_SQL("Update dokument set loeschgrund='Archiviert' where dokumentid='" + dokid + "'"); // db.Exec_SQL("Update dokument set loeschgrund='Archiviert' where dokumentid='" + dokid + "'");
db = null; // db = null;
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug); // APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
return Ok("Archivierung ausgelöst"); // return Ok("Archivierung ausgelöst");
} // }
} // }
catch (Exception e) // catch (Exception e)
{ // {
APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error); // APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error);
return Content(HttpStatusCode.InternalServerError, e.Message); // return Content(HttpStatusCode.InternalServerError, e.Message);
} // }
} //}
[HttpPost] [HttpPost]
[Route("API/GenDoc")] [Route("API/GenDoc")]

10
API_NetFramework/Web.config
View File

@@ -12,9 +12,7 @@
<add key="UnterschriftPath" value="x:\docdemo\unterschriften\" /> <add key="UnterschriftPath" value="x:\docdemo\unterschriften\" />
<add key="JSONDebugPath" value="X:\\jsontemp\" /> <add key="JSONDebugPath" value="X:\\jsontemp\" />
<add key="Bearer" value="abc" /> <add key="Bearer" value="abc" />
<add key="APIKeys" value="U3AF12C/o+r8c1fhnk+NkEOduuH9uNH3aZ1AVb0dHN1fxMGLr1s0eKcvoeJ7bPY02ytHD4SjcFb78NiQQyvWtDD+S7noWCyNmaCQkXHMx4LAomlnvnwKPqVs1TQ0qFB+, <add key="APIKeys" value="x:\apikeys.key"/>
5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6,
ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4Pan5rN+bgwm2YjdPl56Et/Z5hIr+QJhPMB8lmNO1oJytu3GS" />
<add key="APIUser" value="OnDoc,OnBase,Fivo"/> <add key="APIUser" value="OnDoc,OnBase,Fivo"/>
<add key="AuthCheck" value="Yes" /> <add key="AuthCheck" value="Yes" />
<add key="SendToOnBase" value="No" /> <add key="SendToOnBase" value="No" />
@@ -128,8 +126,4 @@ ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4
</system.webServer> </system.webServer>
</configuration> </configuration>
<!--APIKeys
Adresse: U3AF12C/o+r8c1fhnk+NkEOduuH9uNH3aZ1AVb0dHN1fxMGLr1s0eKcvoeJ7bPY02ytHD4SjcFb78NiQQyvWtDD+S7noWCyNmaCQkXHMx4LAomlnvnwKPqVs1TQ0qFB+
Archiv,Dokument,Unterschrift: 5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6
Unterschrift: ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4Pan5rN+bgwm2YjdPl56Et/Z5hIr+QJhPMB8lmNO1oJytu3GS
-->

13
API_NetFramework/auth.cs
View File

@@ -14,6 +14,8 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web; using System.Web;
using System.Web.Configuration; using System.Web.Configuration;
using System.Reflection;
using System.Collections.Specialized;
namespace SecuringWebApiUsingApiKey.Middleware namespace SecuringWebApiUsingApiKey.Middleware
{ {
@@ -126,12 +128,21 @@ namespace SecuringWebApiUsingApiKey.Middleware
{ return true; } { return true; }
else return false; else return false;
} }
public static string[] get_apikeys()
{
string keyfile = GetValue("APIKeys").ToString();
string fileinahlt = System.IO.File.ReadAllText(keyfile).Replace(System.Environment.NewLine,"");
string decrypted = StringCipher.Decrypt(fileinahlt, "PBod8b%s@c9ib7Lws#na5sGM2trugrx3h!oyB^y!Bc%fHEYUT3QvTVr6sAaAr9FoQWzb");
return decrypted.Split(',');
}
public static Boolean Authorized(HttpRequestMessage request, string function) public static Boolean Authorized(HttpRequestMessage request, string function)
{ {
if (GetValue("AuthCheck") == "Yes") if (GetValue("AuthCheck") == "Yes")
{ {
apikeys = GetValue("APIKeys").ToString().Split(','); apikeys = get_apikeys();
// apikeys = GetValue("APIKeys").ToString().Split(',');
for (int i = 0; i < apikeys.Length; i++) for (int i = 0; i < apikeys.Length; i++)
{ {
apikeys[i] = apikeys[i].Replace(Environment.NewLine, ""); apikeys[i] = apikeys[i].Replace(Environment.NewLine, "");

BIN
API_NetFramework/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

10
API_NetFramework/bin/OnDoc_NetFramework.dll.config
View File

@@ -12,9 +12,7 @@
<add key="UnterschriftPath" value="x:\docdemo\unterschriften\" /> <add key="UnterschriftPath" value="x:\docdemo\unterschriften\" />
<add key="JSONDebugPath" value="X:\\jsontemp\" /> <add key="JSONDebugPath" value="X:\\jsontemp\" />
<add key="Bearer" value="abc" /> <add key="Bearer" value="abc" />
<add key="APIKeys" value="U3AF12C/o+r8c1fhnk+NkEOduuH9uNH3aZ1AVb0dHN1fxMGLr1s0eKcvoeJ7bPY02ytHD4SjcFb78NiQQyvWtDD+S7noWCyNmaCQkXHMx4LAomlnvnwKPqVs1TQ0qFB+, <add key="APIKeys" value="x:\apikeys.key"/>
5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6,
ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4Pan5rN+bgwm2YjdPl56Et/Z5hIr+QJhPMB8lmNO1oJytu3GS" />
<add key="APIUser" value="OnDoc,OnBase,Fivo"/> <add key="APIUser" value="OnDoc,OnBase,Fivo"/>
<add key="AuthCheck" value="Yes" /> <add key="AuthCheck" value="Yes" />
<add key="SendToOnBase" value="No" /> <add key="SendToOnBase" value="No" />
@@ -128,8 +126,4 @@ ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4
</system.webServer> </system.webServer>
</configuration> </configuration>
<!--APIKeys
Adresse: U3AF12C/o+r8c1fhnk+NkEOduuH9uNH3aZ1AVb0dHN1fxMGLr1s0eKcvoeJ7bPY02ytHD4SjcFb78NiQQyvWtDD+S7noWCyNmaCQkXHMx4LAomlnvnwKPqVs1TQ0qFB+
Archiv,Dokument,Unterschrift: 5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6
Unterschrift: ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4Pan5rN+bgwm2YjdPl56Et/Z5hIr+QJhPMB8lmNO1oJytu3GS
-->

BIN
API_NetFramework/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

66
API_NetFramework/log.txt
View File

@@ -615,3 +615,69 @@ done
Die Anweisung wurde beendet. Die Anweisung wurde beendet.
done done
2024-11-20 15:17:56.0420|DEBUG|OnDoc|ArchivDocFromIRIS Archivierung fehlgeschlagen - DokumentID:OFFEDK000200800197119 2024-11-20 15:17:56.0420|DEBUG|OnDoc|ArchivDocFromIRIS Archivierung fehlgeschlagen - DokumentID:OFFEDK000200800197119
2024-11-21 15:42:05.9482|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 15:42:15.8171|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 15:42:53.0763|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 15:43:57.1384|DEBUG|OnDoc|Start Adresse GetAll
2024-11-21 15:43:57.1786|DEBUG|OnDoc|
2024-11-21 15:43:57.1786|DEBUG|OnDoc|Ende Adresse GetAll
2024-11-21 16:30:54.3310|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:31:14.8038|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:31:31.6049|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:31:53.9141|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:32:55.3227|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:32:57.1188|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:32:57.7279|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:32:57.9460|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:32:58.1307|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:32:58.3303|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:33:09.8521|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:35:28.6760|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:39:47.3440|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:39:53.8286|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:40:56.6584|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:54:19.7130|ERROR|OnDoc|Unberechtigter Zugriff
2024-11-21 16:56:09.6977|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002024002450934
2024-11-21 16:56:12.8721|DEBUG|OnDoc|
2024-11-21 16:56:15.2217|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK0002024002450934
2024-11-21 16:56:22.9535|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002024002450934
2024-11-21 16:56:22.9896|DEBUG|OnDoc|
2024-11-21 16:56:22.9896|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK0002024002450934
2024-11-21 16:56:58.7435|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK00020240024509347
2024-11-21 16:56:58.7795|DEBUG|OnDoc|
2024-11-21 16:56:58.7795|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK00020240024509347
2024-11-21 16:57:10.3798|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK000202400245093
2024-11-21 16:57:10.4158|DEBUG|OnDoc|
2024-11-21 16:57:10.4158|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK000202400245093
2024-11-21 16:57:45.9207|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK000202400245093
2024-11-21 16:57:50.4011|DEBUG|OnDoc|
2024-11-21 16:58:16.4175|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK000202400245093
2024-11-21 17:01:33.0556|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002024002450934
2024-11-21 17:01:34.9187|DEBUG|OnDoc|
2024-11-21 17:01:41.7492|ERROR|OnDoc|Spalte 1 wurde nicht gefunden.
2024-11-21 17:02:27.8908|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002024002450934
2024-11-21 17:02:27.9353|DEBUG|OnDoc|
2024-11-21 17:02:27.9353|DEBUG|OnDoc|System.Data.DataRowOFFEDK0002024002450934
2024-11-21 17:02:42.3566|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002007001960501
2024-11-21 17:02:42.3928|DEBUG|OnDoc|
2024-11-21 17:02:42.3928|DEBUG|OnDoc|System.Data.DataRowOFFEDK0002007001960501
2024-11-21 17:03:04.9076|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0022004000359839
2024-11-21 17:03:04.9437|DEBUG|OnDoc|
2024-11-21 17:03:04.9437|DEBUG|OnDoc|System.Data.DataRowOFFEDK0022004000359839
2024-11-21 17:05:11.3528|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002008001966621
2024-11-21 17:05:20.8860|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0002008001966621
2024-11-21 17:05:24.8112|DEBUG|OnDoc|
2024-11-21 17:05:32.4036|DEBUG|OnDoc|
2024-11-21 17:06:03.7359|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0002008001966621
2024-11-21 17:06:05.6668|DEBUG|OnDoc|Start Updaet IL_Log: DokumentID:OFFEDK0002008001966621
2024-11-21 17:06:05.6809|DEBUG|OnDoc|Ende Updaet IL_Log: DokumentID:OFFEDK0002008001966621
2024-11-21 17:06:07.5788|DEBUG|OnDoc|
2024-11-21 17:06:07.6523|DEBUG|OnDoc|
2024-11-21 17:06:07.6553|DEBUG|OnDoc|
2024-11-21 17:06:07.6743|ERROR|OnDoc|Die Tabelle 0 kann nicht gefunden werden.
2024-11-21 17:40:19.1027|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002014002326559
2024-11-21 17:40:24.7073|DEBUG|OnDoc|
2024-11-21 17:40:24.7073|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK0002014002326559
2024-11-21 17:40:32.1301|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002014002326559
2024-11-21 17:40:32.1400|DEBUG|OnDoc|
2024-11-21 17:40:32.1400|DEBUG|OnDoc|System.Data.DataRowOFFEDK0002014002326559

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
View File

Binary file not shown.

6
Client/App.config
View File

@@ -11,13 +11,13 @@
<userSettings> <userSettings>
<OnDoc.Properties.Settings> <OnDoc.Properties.Settings>
<setting name="Connectionstring" serializeAs="String"> <setting name="Connectionstring" serializeAs="String">
<value>Data Source=shu01\shu00;Initial Catalog=edoka_dms;Persist Security Info=True;User ID=sa;Password=*shu29;</value> <value></value>
</setting> </setting>
<setting name="NativVorlagen" serializeAs="String"> <setting name="NativVorlagen" serializeAs="String">
<value>E:\Software-Projekte\OnDoc\Nativ\</value> <value>E:\Software-Projekte\OnDoc\Nativ\</value>
</setting> </setting>
<setting name="Connectionstring_Prod" serializeAs="String"> <setting name="Connectionstring_Prod" serializeAs="String">
<value>Data Source=shu01\shu00;Initial Catalog=edoka;Persist Security Info=True;User ID=sa;Password=*shu29;</value> <value></value>
</setting> </setting>
<setting name="RESTURI" serializeAs="String"> <setting name="RESTURI" serializeAs="String">
<value>https://localhost:44334/</value> <value>https://localhost:44334/</value>
@@ -26,7 +26,7 @@
<value>NO</value> <value>NO</value>
</setting> </setting>
<setting name="apikey" serializeAs="String"> <setting name="apikey" serializeAs="String">
<value>5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</value> <value></value>
</setting> </setting>
<setting name="StandardWordDruckMakro" serializeAs="String"> <setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value> <value>FilePrintDefault</value>

1
Client/Client.csproj
View File

@@ -238,6 +238,7 @@
<Compile Include="Klassen\EDKFile.cs" /> <Compile Include="Klassen\EDKFile.cs" />
<Compile Include="Klassen\EventHandler.cs" /> <Compile Include="Klassen\EventHandler.cs" />
<Compile Include="Klassen\Factory.cs" /> <Compile Include="Klassen\Factory.cs" />
<Compile Include="Klassen\StringCipher.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Start.cs"> <Compile Include="Start.cs">

29
Client/DocMgmt/DokTypSelect.Designer.cs generated
View File

@@ -42,6 +42,7 @@ namespace OnDoc.DocMgmt
this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup();
this.RibbonTextSearch = new System.Windows.Forms.RibbonTextBox(); this.RibbonTextSearch = new System.Windows.Forms.RibbonTextBox();
this.RibbonButtonSearch = new System.Windows.Forms.RibbonButton(); this.RibbonButtonSearch = new System.Windows.Forms.RibbonButton();
this.ribbonButtonClear = new System.Windows.Forms.RibbonButton();
this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonCreate = new System.Windows.Forms.RibbonButton(); this.ribbonButtonCreate = new System.Windows.Forms.RibbonButton();
this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel(); this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
@@ -68,6 +69,8 @@ namespace OnDoc.DocMgmt
this.tsbtnRename = new System.Windows.Forms.ToolStripButton(); this.tsbtnRename = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtndelete = new System.Windows.Forms.ToolStripButton(); this.tsbtndelete = new System.Windows.Forms.ToolStripButton();
this.ribbonButtonFilter = new System.Windows.Forms.RibbonPanel();
this.ribboncomboboxfachverantwortung = new System.Windows.Forms.RibbonComboBox();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.contextMenuStripVorlagen.SuspendLayout(); this.contextMenuStripVorlagen.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv2)).BeginInit();
@@ -108,6 +111,7 @@ namespace OnDoc.DocMgmt
this.ribbonTab1.Panels.Add(this.ribbonPanel3); this.ribbonTab1.Panels.Add(this.ribbonPanel3);
this.ribbonTab1.Panels.Add(this.ribbonPanel5); this.ribbonTab1.Panels.Add(this.ribbonPanel5);
this.ribbonTab1.Panels.Add(this.ribbonPanel4); this.ribbonTab1.Panels.Add(this.ribbonPanel4);
this.ribbonTab1.Panels.Add(this.ribbonButtonFilter);
this.ribbonTab1.Text = null; this.ribbonTab1.Text = null;
// //
// ribbonPanel1 // ribbonPanel1
@@ -139,6 +143,7 @@ namespace OnDoc.DocMgmt
this.ribbonItemGroup1.Image = global::OnDoc.Properties.Resources.Search_16x16_32; this.ribbonItemGroup1.Image = global::OnDoc.Properties.Resources.Search_16x16_32;
this.ribbonItemGroup1.Items.Add(this.RibbonTextSearch); this.ribbonItemGroup1.Items.Add(this.RibbonTextSearch);
this.ribbonItemGroup1.Items.Add(this.RibbonButtonSearch); this.ribbonItemGroup1.Items.Add(this.RibbonButtonSearch);
this.ribbonItemGroup1.Items.Add(this.ribbonButtonClear);
this.ribbonItemGroup1.Name = "ribbonItemGroup1"; this.ribbonItemGroup1.Name = "ribbonItemGroup1";
// //
// RibbonTextSearch // RibbonTextSearch
@@ -157,6 +162,15 @@ namespace OnDoc.DocMgmt
this.RibbonButtonSearch.SmallImage = global::OnDoc.Properties.Resources.Search_16x16_32; this.RibbonButtonSearch.SmallImage = global::OnDoc.Properties.Resources.Search_16x16_32;
this.RibbonButtonSearch.Click += new System.EventHandler(this.RibbonButtonSearch_Click); this.RibbonButtonSearch.Click += new System.EventHandler(this.RibbonButtonSearch_Click);
// //
// ribbonButtonClear
//
this.ribbonButtonClear.Image = global::OnDoc.Properties.Resources.Connect_16x16_32;
this.ribbonButtonClear.LargeImage = global::OnDoc.Properties.Resources.Connect_16x16_32;
this.ribbonButtonClear.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonButtonClear.Name = "ribbonButtonClear";
this.ribbonButtonClear.SmallImage = global::OnDoc.Properties.Resources.CloseApplication_16x16_32;
this.ribbonButtonClear.Click += new System.EventHandler(this.ribbonButtonClear_Click);
//
// ribbonPanel3 // ribbonPanel3
// //
this.ribbonPanel3.ButtonMoreVisible = false; this.ribbonPanel3.ButtonMoreVisible = false;
@@ -470,6 +484,18 @@ namespace OnDoc.DocMgmt
this.tsbtndelete.Text = "Vorlage / Ordner mit Unterlementen löschen"; this.tsbtndelete.Text = "Vorlage / Ordner mit Unterlementen löschen";
this.tsbtndelete.Click += new System.EventHandler(this.tsbtndelete_Click); this.tsbtndelete.Click += new System.EventHandler(this.tsbtndelete_Click);
// //
// ribbonButtonFilter
//
this.ribbonButtonFilter.Items.Add(this.ribboncomboboxfachverantwortung);
this.ribbonButtonFilter.Name = "ribbonButtonFilter";
this.ribbonButtonFilter.Text = "Filter Fachverantwortung";
//
// ribboncomboboxfachverantwortung
//
this.ribboncomboboxfachverantwortung.Name = "ribboncomboboxfachverantwortung";
this.ribboncomboboxfachverantwortung.SelectedIndex = -1;
this.ribboncomboboxfachverantwortung.TextBoxText = "";
//
// DokTypSelect // DokTypSelect
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -533,5 +559,8 @@ namespace OnDoc.DocMgmt
private System.Windows.Forms.ToolStripButton tsbtnNewFolder; private System.Windows.Forms.ToolStripButton tsbtnNewFolder;
private System.Windows.Forms.ToolStripButton tsbtnRename; private System.Windows.Forms.ToolStripButton tsbtnRename;
private System.Windows.Forms.ToolStripButton tsbtndelete; private System.Windows.Forms.ToolStripButton tsbtndelete;
private System.Windows.Forms.RibbonButton ribbonButtonClear;
private System.Windows.Forms.RibbonPanel ribbonButtonFilter;
private System.Windows.Forms.RibbonComboBox ribboncomboboxfachverantwortung;
} }
} }

154
Client/DocMgmt/DokTypSelect.cs
View File

@@ -18,6 +18,8 @@ using Database;
using OnDoc.Diverses; using OnDoc.Diverses;
using System.Xml.Linq; using System.Xml.Linq;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using Microsoft.SqlServer.Server;
using System.Collections;
namespace OnDoc.DocMgmt namespace OnDoc.DocMgmt
{ {
@@ -70,15 +72,21 @@ namespace OnDoc.DocMgmt
{ {
this.Style.TitleBar.BackColor = Theaming.Titelbar(); this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("select distinct dbo.get_fachverantwortung(dbo.dokument.dokumenttypnr) from dbo.dokumenttyp", false, true);
//foreach (System.Data.DataRow in db.dsdaten.Tables)
if (this.favoriten) { Load_Favoriten(""); } if (this.favoriten) { Load_Favoriten(""); }
else { load_standard(""); } else { load_standard(""); }
} }
TreeNodeAdv[] nodestoexpand = new TreeNodeAdv[50];
int nodextoexpandindex = 1;
public void load_standard(string filter) public void load_standard(string filter)
{ {
Cursor = Cursors.WaitCursor; Cursor = Cursors.WaitCursor;
if (AppParams.connectionstring == "") if (AppParams.connectionstring == "")
{ {
@@ -87,9 +95,6 @@ namespace OnDoc.DocMgmt
treeViewAdv1.Enabled = false; treeViewAdv1.Enabled = false;
treeViewAdv1.Visible = false; treeViewAdv1.Visible = false;
treeViewAdv1.BeginUpdate(); treeViewAdv1.BeginUpdate();
treeViewAdv1.EnableVirtualization=true;
treeViewAdv1.SuspendExpandRecalculate=true;
treeViewAdv1.RecalculateExpansion = false;
treeViewAdv1.Nodes.Clear(); treeViewAdv1.Nodes.Clear();
treeViewAdv1.LeftImageList = imageList1; treeViewAdv1.LeftImageList = imageList1;
@@ -101,89 +106,56 @@ namespace OnDoc.DocMgmt
if (vorlagentype == 1) if (vorlagentype == 1)
{ {
//DB db1 = new DB(AppParams.connectionstring); this.Text = "Vorlage auswählen";
//DataTable vorlagen1 = new DataTable(); //Standard Vorlagen
//DataTable Struktur1 = new DataTable(); DB db = new DB(AppParams.connectionstring);
//DataSet ds = new DataSet(); DataTable vorlagen = new DataTable();
//db1.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true); DataTable Struktur = new DataTable();
//vorlagen1 = db1.dsdaten.Tables[0].Copy(); DataSet ds = new DataSet();
//db1.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true); db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
vorlagen = db.dsdaten.Tables[0].Copy();
db.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true);
//db1.dsdaten.Tables[0].AcceptChanges(); db.dsdaten.Tables[0].AcceptChanges();
//Struktur1 = db1.dsdaten.Tables[0].Copy(); Struktur = db.dsdaten.Tables[0].Copy();
//Syncfusion.Windows.Forms.Tools.DataRelation childRelation1;
//Syncfusion.Windows.Forms.Tools.DataRelation childRelation2;
//Syncfusion.Windows.Forms.Tools.DataRelation childRelation3;
//childRelation1 = new Syncfusion.Windows.Forms.Tools.DataRelation(Struktur1, "struktur1", "bezeichnung", "ChildFolder", "SubFolderChild1", "SubFolderName1", "Checked"); ds.Tables.Add(Struktur.Copy());
ds.Tables[0].TableName = "Struktur";
ds.Tables.Add(vorlagen.Copy());
ds.Relations.Add("TreeParentChild", ds.Tables[0].Columns["ID"], ds.Tables[0].Columns["ParentID"], false);
ds.Relations.Add("VorlagenParent", ds.Tables[0].Columns["ID"], ds.Tables[1].Columns["node"], false);
nodestoexpand = null;
nodestoexpand = new TreeNodeAdv[Struktur.Rows.Count];
nodextoexpandindex = 1;
//if (where == "" && StaticValues.vorlagen.Nodes.Count>1) foreach (System.Data.DataRow dr in ds.Tables[0].Rows)
//{ {
if (dr["Parentid"].ToString() == "0")
// treeViewAdv1.Nodes.Clear();
// TreeNodeAdv copynodes = StaticValues.vorlagen.Nodes[0].Clone();
// treeViewAdv1.Nodes.Add(copynodes);
// copynodes = StaticValues.vorlagen.Nodes[1].Clone();
// treeViewAdv1.Nodes.Add(copynodes);
//}
//else
//{
this.Text = "Vorlage auswählen";
//Standard Vorlagen
DB db = new DB(AppParams.connectionstring);
DataTable vorlagen = new DataTable();
DataTable Struktur = new DataTable();
DataSet ds = new DataSet();
db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
vorlagen = db.dsdaten.Tables[0].Copy();
db.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true);
db.dsdaten.Tables[0].AcceptChanges();
Struktur = db.dsdaten.Tables[0].Copy();
ds.Tables.Add(Struktur.Copy());
ds.Tables[0].TableName = "Struktur";
ds.Tables.Add(vorlagen.Copy());
ds.Relations.Add("TreeParentChild", ds.Tables[0].Columns["ID"], ds.Tables[0].Columns["ParentID"], false);
ds.Relations.Add("VorlagenParent", ds.Tables[0].Columns["ID"], ds.Tables[1].Columns["node"], false);
foreach (System.Data.DataRow dr in ds.Tables[0].Rows)
{ {
if (dr["Parentid"].ToString() == "0") //Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
treeViewAdv1.Nodes.Add(root);
PopulateTree(dr, root);
}
}
if (filter == "")
{
try
{
for (int i = 1; i < nodextoexpandindex; i++)
{ {
//Creates a TreeNode if the parent equals 0 treeViewAdv1.SelectedNode = nodestoexpand[i];
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString()); if (treeViewAdv1.SelectedNode.Nodes[0].Nodes.Count > 0) { treeViewAdv1.SelectedNode.Expand(); }
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
treeViewAdv1.Nodes.Add(root);
//Recursively builds the tree
PopulateTree(dr, root);
} }
} }
catch { }
} else
// if (StaticValues.vorlagen.Nodes.Count==0) { treeViewAdv1.ExpandAll();
//{ }
// Logging.Logging.Debug("Save Static Value Start", "OnDoc", "");
// //StaticValues.vorlagen = treeViewAdv1;
// TreeNodeAdv copynodes = this.treeViewAdv1.Nodes[0].Clone();
// StaticValues.vorlagen.Nodes.Add(copynodes);
// copynodes = this.treeViewAdv1.Nodes[1].Clone();
// StaticValues.vorlagen.Nodes.Add(copynodes);
// Logging.Logging.Debug("Save Static Value Ende", "OnDoc", "");
// }
//}
} }
else else
{ {
@@ -229,12 +201,14 @@ namespace OnDoc.DocMgmt
//Expands all the tree nodes //Expands all the tree nodes
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
treeViewAdv1.EndUpdate(); treeViewAdv1.EndUpdate();
treeViewAdv1.Enabled = true; treeViewAdv1.Enabled = true;
treeViewAdv1.Visible = true; treeViewAdv1.Visible = true;
Logging.Logging.Debug("Tree Expand all Ende", "OnDoc", "");
if (ExternalCall.struktur != "") if (ExternalCall.struktur != "")
{ {
@@ -247,17 +221,15 @@ namespace OnDoc.DocMgmt
public void PopulateSubTree(System.Data.DataRow dr, TreeNodeAdv pNode) public void PopulateSubTree(System.Data.DataRow dr, TreeNodeAdv pNode)
{ {
//To iterate through all the rows in the DataSet
foreach (System.Data.DataRow row in dr.GetChildRows("VorlagenParent")) foreach (System.Data.DataRow row in dr.GetChildRows("VorlagenParent"))
{ {
//Creating a TreeNode for each row
TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString()); TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString());
cChild.LeftImageIndices = new int[] { 1 }; cChild.LeftImageIndices = new int[] { 1 };
cChild.Tag = Convert.ToInt32(row["id"]) * 1; cChild.Tag = Convert.ToInt32(row["id"]) * 1;
cChild.TagObject = row; cChild.TagObject = row;
//Add cChild node to the pNode
pNode.Nodes.Add(cChild); pNode.Nodes.Add(cChild);
//Recursively build the tree
PopulateSubTree(row, cChild); PopulateSubTree(row, cChild);
} }
} }
@@ -275,8 +247,11 @@ namespace OnDoc.DocMgmt
cChild.Tag = Convert.ToInt32(row["id"]) * -1; cChild.Tag = Convert.ToInt32(row["id"]) * -1;
cChild.LeftImageIndices = new int[] { 0 }; cChild.LeftImageIndices = new int[] { 0 };
cChild.TagObject = row; cChild.TagObject = row;
nodestoexpand[nodextoexpandindex] = cChild;
nodextoexpandindex = nodextoexpandindex + 1;
//Add cChild node to the pNode //Add cChild node to the pNode
pNode.Nodes.Add(cChild); pNode.Nodes.Add(cChild);
//Recursively build the tree //Recursively build the tree
PopulateTree(row, cChild); PopulateTree(row, cChild);
//PopulateSubTree(row, cChild); //PopulateSubTree(row, cChild);
@@ -328,6 +303,7 @@ namespace OnDoc.DocMgmt
//Recursively builds the tree //Recursively builds the tree
PopulateTree_Favoriten(dr, root); PopulateTree_Favoriten(dr, root);
} }
} }
treeViewAdv2.ExpandAll(); treeViewAdv2.ExpandAll();
@@ -801,5 +777,11 @@ namespace OnDoc.DocMgmt
} }
} }
} }
private void ribbonButtonClear_Click(object sender, EventArgs e)
{
RibbonTextSearch.Text = "";
load_standard("");
}
} }
} }

2
Client/DocMgmt/DokTypSelect.resx
View File

@@ -284,7 +284,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CAAAAk1TRnQBSQFMAgEBAgEAAYABAAGAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

103
Client/Klassen/StringCipher.cs Normal file
View File

@@ -0,0 +1,103 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
namespace OnDoc.Klassen
{
public static class StringCipher
{// This constant is used to determine the keysize of the encryption algorithm in bits.
// We divide this by 8 within the code below to get the equivalent number of bytes.
private const int Keysize = 256;
// This constant determines the number of iterations for the password bytes generation function.
private const int DerivationIterations = 1000;
public static string Encrypt(string plainText, string passPhrase)
{
// Salt and IV is randomly generated each time, but is preprended to encrypted cipher text
// so that the same Salt and IV values can be used when decrypting.
var saltStringBytes = Generate256BitsOfRandomEntropy();
var ivStringBytes = Generate256BitsOfRandomEntropy();
var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
using (var password = new Rfc2898DeriveBytes(passPhrase, saltStringBytes, DerivationIterations))
{
var keyBytes = password.GetBytes(Keysize / 8);
using (var symmetricKey = new RijndaelManaged())
{
symmetricKey.BlockSize = 256;
symmetricKey.Mode = CipherMode.CBC;
symmetricKey.Padding = PaddingMode.PKCS7;
using (var encryptor = symmetricKey.CreateEncryptor(keyBytes, ivStringBytes))
{
using (var memoryStream = new MemoryStream())
{
using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
{
cryptoStream.Write(plainTextBytes, 0, plainTextBytes.Length);
cryptoStream.FlushFinalBlock();
// Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
var cipherTextBytes = saltStringBytes;
cipherTextBytes = cipherTextBytes.Concat(ivStringBytes).ToArray();
cipherTextBytes = cipherTextBytes.Concat(memoryStream.ToArray()).ToArray();
memoryStream.Close();
cryptoStream.Close();
return Convert.ToBase64String(cipherTextBytes);
}
}
}
}
}
}
public static string Decrypt(string cipherText, string passPhrase)
{
// Get the complete stream of bytes that represent:
// [32 bytes of Salt] + [32 bytes of IV] + [n bytes of CipherText]
var cipherTextBytesWithSaltAndIv = Convert.FromBase64String(cipherText);
// Get the saltbytes by extracting the first 32 bytes from the supplied cipherText bytes.
var saltStringBytes = cipherTextBytesWithSaltAndIv.Take(Keysize / 8).ToArray();
// Get the IV bytes by extracting the next 32 bytes from the supplied cipherText bytes.
var ivStringBytes = cipherTextBytesWithSaltAndIv.Skip(Keysize / 8).Take(Keysize / 8).ToArray();
// Get the actual cipher text bytes by removing the first 64 bytes from the cipherText string.
var cipherTextBytes = cipherTextBytesWithSaltAndIv.Skip((Keysize / 8) * 2).Take(cipherTextBytesWithSaltAndIv.Length - ((Keysize / 8) * 2)).ToArray();
using (var password = new Rfc2898DeriveBytes(passPhrase, saltStringBytes, DerivationIterations))
{
var keyBytes = password.GetBytes(Keysize / 8);
using (var symmetricKey = new RijndaelManaged())
{
symmetricKey.BlockSize = 256;
symmetricKey.Mode = CipherMode.CBC;
symmetricKey.Padding = PaddingMode.PKCS7;
using (var decryptor = symmetricKey.CreateDecryptor(keyBytes, ivStringBytes))
{
using (var memoryStream = new MemoryStream(cipherTextBytes))
{
using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
using (var streamReader = new StreamReader(cryptoStream, Encoding.UTF8))
{
return streamReader.ReadToEnd();
}
}
}
}
}
}
private static byte[] Generate256BitsOfRandomEntropy()
{
var randomBytes = new byte[32]; // 32 Bytes will give us 256 bits.
using (var rngCsp = new RNGCryptoServiceProvider())
{
// Fill the array with cryptographically secure random bytes.
rngCsp.GetBytes(randomBytes);
}
return randomBytes;
}
}
}

8
Client/Klassen/clsAppParams.cs
View File

@@ -35,17 +35,19 @@ namespace OnDoc.Klassen
public static void init() public static void init()
{ {
string startuppath = AppDomain.CurrentDomain.BaseDirectory; string startuppath = AppDomain.CurrentDomain.BaseDirectory;
connectionstring = System.IO.File.ReadAllText(startuppath + @"\edokaconn.cfg"); connectionstring = System.IO.File.ReadAllText(startuppath + @"\ondocconn.cfg");
connectionstring = StringCipher.Decrypt(connectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm");
DB db = new DB(connectionstring); DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from applikation where applikationsnr = 1", false, true); db.Get_Tabledata("Select * from applikation where applikationsnr = 1", false, true);
tempdir = db.dsdaten.Tables[0].Rows[0]["pfad_temporaer_dokumente"].ToString(); tempdir = db.dsdaten.Tables[0].Rows[0]["pfad_temporaer_dokumente"].ToString();
db = null; db = null;
StaticValues.UserID = "Stefan Hutter"; StaticValues.UserID = "Stefan Hutter";
apikey = System.IO.File.ReadAllText(startuppath + @"\apikey.cfg");
apikey = StringCipher.Decrypt(apikey, "PBod8b%s@c9ib7Lws#na5sGM2trugrx3h!oyB^y!Bc%fHEYUT3QvTVr6sAaAr9FoQWzb");
UseAPI = Properties.Settings.Default.UseAPI; UseAPI = Properties.Settings.Default.UseAPI;
RESTURI = Properties.Settings.Default.RESTURI; RESTURI = Properties.Settings.Default.RESTURI;
apikey = Properties.Settings.Default.apikey; //apikey = Properties.Settings.Default.apikey;
wordprintmacro = Properties.Settings.Default.StandardWordDruckMakro; wordprintmacro = Properties.Settings.Default.StandardWordDruckMakro;
vbvorlagenmanagement = Properties.Settings.Default.VBVorlagenmanagement; vbvorlagenmanagement = Properties.Settings.Default.VBVorlagenmanagement;

6
Client/UIControls/DokList.resx
View File

@@ -470,19 +470,19 @@
<data name="ribbonbuttonlogin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ribbonbuttonlogin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="ribbonbuttonlogin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ribbonbuttonlogin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="ribbonbuttonlogin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ribbonbuttonlogin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

6
Client/bin/Debug/OnDoc.exe.config
View File

@@ -11,13 +11,13 @@
<userSettings> <userSettings>
<OnDoc.Properties.Settings> <OnDoc.Properties.Settings>
<setting name="Connectionstring" serializeAs="String"> <setting name="Connectionstring" serializeAs="String">
<value>Data Source=shu01\shu00;Initial Catalog=edoka_dms;Persist Security Info=True;User ID=sa;Password=*shu29;</value> <value></value>
</setting> </setting>
<setting name="NativVorlagen" serializeAs="String"> <setting name="NativVorlagen" serializeAs="String">
<value>E:\Software-Projekte\OnDoc\Nativ\</value> <value>E:\Software-Projekte\OnDoc\Nativ\</value>
</setting> </setting>
<setting name="Connectionstring_Prod" serializeAs="String"> <setting name="Connectionstring_Prod" serializeAs="String">
<value>Data Source=shu01\shu00;Initial Catalog=edoka;Persist Security Info=True;User ID=sa;Password=*shu29;</value> <value></value>
</setting> </setting>
<setting name="RESTURI" serializeAs="String"> <setting name="RESTURI" serializeAs="String">
<value>https://localhost:44334/</value> <value>https://localhost:44334/</value>
@@ -26,7 +26,7 @@
<value>NO</value> <value>NO</value>
</setting> </setting>
<setting name="apikey" serializeAs="String"> <setting name="apikey" serializeAs="String">
<value>5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</value> <value></value>
</setting> </setting>
<setting name="StandardWordDruckMakro" serializeAs="String"> <setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value> <value>FilePrintDefault</value>

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

1
Client/bin/Debug/apikey.cfg Normal file
View File

@@ -0,0 +1 @@
dFuyEhqaiQZ5vsGP66+D0BJttUtKYRCXt7XpBHLym7flLMz8gpFZgf28+9wwx30EkjOd0OVD5fgxqxFftCQ9UucI6Xf119aM48gMt3/T3tlx/QWcnuPlLhM/MpS8P8I4tuCwrj//dDGf194wJK9lWBB0LT6xFUqAZLuujmMHVPRn0QmcQQi992T00HTTiwz1SwgawjRlLt0jD40UO6vl9Wf2n5eq3000jwOno1YbyvCBqQu6wAVYtmtMAYw1IoKQ5bF6zpqAGehpFjm0EcdIJFVR6U3njEmI5xBjeY6/SNA=

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

0
Client/bin/Debug/edokaconn.cfg → Client/bin/Debug/ondicconn - Kopie.cfg
View File

1
Client/bin/Debug/ondocconn.cfg Normal file
View File

@@ -0,0 +1 @@
Q3MS5GJhakLjwhZg7WIP6Tt9p4ZmjtzTRsJyQgBdF8MuFZGjjomJyJ09DyCaAzZ4ZvgxAAAI0Ij3SybN/Y/3SWDpj68jav/xP5kd7t2p9RCa3pWRTIWjCawF026Mrndr1Z93cI+sV9MYnLB74dcqcuVqFn1l6NA2g3hLLmWVxva904e456kO1Oojn0wPIBs66XVSsRqS3MhyoKK/hTl/YCZZuzUsSV1v/JRAo+aYVxbYx6UpxK8IUegDY/CZc5NM

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
b85197c4cb2d8acde4f36cac6dd54c4797f46e1d9966a337f99196a91d00f019 d12f283318bf5001c92ba993d56640d65572c928ee53285767ebdfcf370acd1a

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.UICintrols.DokList.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

6
Client/obj/Debug/OnDoc.exe.config
View File

@@ -11,13 +11,13 @@
<userSettings> <userSettings>
<OnDoc.Properties.Settings> <OnDoc.Properties.Settings>
<setting name="Connectionstring" serializeAs="String"> <setting name="Connectionstring" serializeAs="String">
<value>Data Source=shu01\shu00;Initial Catalog=edoka_dms;Persist Security Info=True;User ID=sa;Password=*shu29;</value> <value></value>
</setting> </setting>
<setting name="NativVorlagen" serializeAs="String"> <setting name="NativVorlagen" serializeAs="String">
<value>E:\Software-Projekte\OnDoc\Nativ\</value> <value>E:\Software-Projekte\OnDoc\Nativ\</value>
</setting> </setting>
<setting name="Connectionstring_Prod" serializeAs="String"> <setting name="Connectionstring_Prod" serializeAs="String">
<value>Data Source=shu01\shu00;Initial Catalog=edoka;Persist Security Info=True;User ID=sa;Password=*shu29;</value> <value></value>
</setting> </setting>
<setting name="RESTURI" serializeAs="String"> <setting name="RESTURI" serializeAs="String">
<value>https://localhost:44334/</value> <value>https://localhost:44334/</value>
@@ -26,7 +26,7 @@
<value>NO</value> <value>NO</value>
</setting> </setting>
<setting name="apikey" serializeAs="String"> <setting name="apikey" serializeAs="String">
<value>5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</value> <value></value>
</setting> </setting>
<setting name="StandardWordDruckMakro" serializeAs="String"> <setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value> <value>FilePrintDefault</value>

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
ILMocup/bin/ILMocup.dll
View File

Binary file not shown.

BIN
ILMocup/bin/ILMocup.pdb
View File

Binary file not shown.

BIN
ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
ILMocup/obj/Debug/ILMocup.dll
View File

Binary file not shown.

BIN
ILMocup/obj/Debug/ILMocup.pdb
View File

Binary file not shown.

BIN
NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
NativVorlagen/obj/Debug/NativVorlagen.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
27bcfe09cae266b6b9e968d62d8221d5f040572d4146dbc95121164155619caf dd73945d3f1350b4bea503a54828856013d6d8b9d046025b2c6be15533ccedfd

BIN
OnDocMessage/bin/Debug/OnDocMessage.dll
View File

Binary file not shown.

BIN
OnDocMessage/bin/Debug/OnDocMessage.pdb
View File

Binary file not shown.

2
OnDocMessage/obj/Debug/OnDocMessage.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
8e32e0bcca6aede1ad934c222c298e85fb9c8349f23a31df8869a9d5da9449a6 5151f6a5cbcc4acbe00756c300f77bb96e5aecfac67fdb54fc00187fe5a95c2c

BIN
OnDocMessage/obj/Debug/OnDocMessage.dll
View File

Binary file not shown.

BIN
OnDocMessage/obj/Debug/OnDocMessage.pdb
View File

Binary file not shown.

2
OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs
View File

@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+194a97416c869b6fadc75f1422d24e09a7b860b9")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d3bf9458eba220c1124ec602cb13603d25907a21")]
[assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")]
[assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache
View File

@@ -1 +1 @@
7fc997ed381a441d80e39601fb52a4a506f0d75823f30dc042d9413f545e0167 a0eda29d7f13e46e42efa9b59adbd6e79b6cf16103067a19c11ba7cca3b6c280

BIN
OnDocWeb/bin/OnDocWeb.dll
View File

Binary file not shown.

BIN
OnDocWeb/bin/OnDocWeb.pdb
View File

Binary file not shown.

BIN
OnDocWeb/obj/Debug/OnDocWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
OnDocWeb/obj/Debug/OnDocWeb.dll
View File

Binary file not shown.

BIN
OnDocWeb/obj/Debug/OnDocWeb.pdb
View File

Binary file not shown.