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

72
API_NetFramework/Controllers/DocumentController.cs
View File

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

10
API_NetFramework/Web.config
View File

@@ -12,9 +12,7 @@
<add key="UnterschriftPath" value="x:\docdemo\unterschriften\" />
<add key="JSONDebugPath" value="X:\\jsontemp\" />
<add key="Bearer" value="abc" />
<add key="APIKeys" value="U3AF12C/o+r8c1fhnk+NkEOduuH9uNH3aZ1AVb0dHN1fxMGLr1s0eKcvoeJ7bPY02ytHD4SjcFb78NiQQyvWtDD+S7noWCyNmaCQkXHMx4LAomlnvnwKPqVs1TQ0qFB+,
5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6,
ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4Pan5rN+bgwm2YjdPl56Et/Z5hIr+QJhPMB8lmNO1oJytu3GS" />
<add key="APIKeys" value="x:\apikeys.key"/>
<add key="APIUser" value="OnDoc,OnBase,Fivo"/>
<add key="AuthCheck" value="Yes" />
<add key="SendToOnBase" value="No" />
@@ -128,8 +126,4 @@ ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4
</system.webServer>
</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.Web;
using System.Web.Configuration;
using System.Reflection;
using System.Collections.Specialized;
namespace SecuringWebApiUsingApiKey.Middleware
{
@@ -126,12 +128,21 @@ namespace SecuringWebApiUsingApiKey.Middleware
{ return true; }
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)
{
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++)
{
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="JSONDebugPath" value="X:\\jsontemp\" />
<add key="Bearer" value="abc" />
<add key="APIKeys" value="U3AF12C/o+r8c1fhnk+NkEOduuH9uNH3aZ1AVb0dHN1fxMGLr1s0eKcvoeJ7bPY02ytHD4SjcFb78NiQQyvWtDD+S7noWCyNmaCQkXHMx4LAomlnvnwKPqVs1TQ0qFB+,
5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6,
ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4Pan5rN+bgwm2YjdPl56Et/Z5hIr+QJhPMB8lmNO1oJytu3GS" />
<add key="APIKeys" value="x:\apikeys.key"/>
<add key="APIUser" value="OnDoc,OnBase,Fivo"/>
<add key="AuthCheck" value="Yes" />
<add key="SendToOnBase" value="No" />
@@ -128,8 +126,4 @@ ecJVgQbmauycFRw5Lz6hB0dJb6GYCePckr2kw3g+xLkbS+h6oxR0iPMFkP3uXpFq7luWAdXrEWs1kmR4
</system.webServer>
</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.
done
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.