edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Überprüfung auf Schlüsselparameter implementiert mit Server-Client Unterstützung

Browse Source
This commit is contained in:
ja
2022-02-03 10:43:16 +01:00
parent f483d07872
commit 6aec0d8ab7
5 changed files with 3424 additions and 3374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
App_Code/VERAG_VARIABLES.vb
View File

@@ -62,9 +62,9 @@ Public Class VERAG_VARIABLES
Else Else
Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt Argon.Salt = salt
Argon.DegreeOfParallelism = 4 Argon.DegreeOfParallelism = 8
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 4) Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 4)
Argon.MemorySize = (((nIterations * 12.88 - (nIterations * 10.23) / 8.85 * 2.28) / 10.28) + 2 * 878) / 13.1 Argon.MemorySize = (((nIterations * 13.88 - (nIterations * 10.23) / 8.85 * 2.28) / 10.28) + 2 * 878) / 13.1
Return Argon.GetBytes(nHash) Return Argon.GetBytes(nHash)
End If End If
End Function End Function
@@ -83,7 +83,7 @@ Public Class VERAG_VARIABLES
Argon.Salt = salt Argon.Salt = salt
Argon.DegreeOfParallelism = 14 Argon.DegreeOfParallelism = 14
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
Argon.MemorySize = (((nIterations * 12.88 - (nIterations * 10.23) / 8.85 * 2.28) / 10.28) + 2 * 878) / 13.1 Argon.MemorySize = (((nIterations * 13.88 - (nIterations * 10.23) / 8.85 * 2.28) / 10.28) + 2 * 878) / 13.1
Return Await Argon.GetBytesAsync(nHash) Return Await Argon.GetBytesAsync(nHash)
End If End If
End Function End Function

15
Customers/LKWs.aspx
View File

@@ -527,10 +527,10 @@ iframe {overflow:hidden}
//} //}
let data = {}; let data = {};
data['Kennzeichen'] = id.split(',')[0]; data['Kennzeichen'] = id.split(',')[0];
data['CardNo'] = id.split(',')[1];
data['Kundennr'] = id.split(',')[2]; data['Kundennr'] = id.split(',')[2];
data['SDLNr'] = id.split(',')[3]; data['CardNo'] = id.split(',')[3];
data['History'] = id.split(',')[4]; data['SDLNr'] = id.split(',')[4];
data['History'] = id.split(',')[5];
$.ajax({ $.ajax({
type: "POST", type: "POST",
@@ -662,11 +662,10 @@ iframe {overflow:hidden}
//} //}
let data_m = {}; let data_m = {};
data_m['Kennzeichen'] = id.split(',')[0]; data_m['Kennzeichen'] = id.split(',')[0];
data_M['CardNo'] = id.split(',')[1]; data_m['Kundennr'] = id.split(',')[2];
data_m['CardNo'] = id.split(',')[3];
data_m['KundenNR'] = id.split(',')[2]; data_m['SDLNr'] = id.split(',')[4];
data_m['SDLNr'] = id.split(',')[3]; data_m['History'] = id.split(',')[5];
data_m['History'] = id.split(',')[4];
$.ajax({ $.ajax({
type: "POST", type: "POST",

31
Customers/LKWs.aspx.vb
View File

@@ -147,6 +147,10 @@ Partial Class LKWS
Dim tr As TableRow = New TableRow Dim tr As TableRow = New TableRow
Dim list3 As List(Of String) = New List(Of String) Dim list3 As List(Of String) = New List(Of String)
Dim strstrstrstrtemp As String = String.Empty Dim strstrstrstrtemp As String = String.Empty
Dim strstrstrstrtempCardno As String = String.Empty
Dim strstrstrstrtempKennz As String = String.Empty
Dim strstrstrstrtempKundNr As String = String.Empty
Dim strstrstrstrtempHistory As String = String.Empty
For Each l2 In list2 For Each l2 In list2
Dim String2 As String = String.Empty Dim String2 As String = String.Empty
@@ -155,7 +159,8 @@ Partial Class LKWS
Else Else
Stringtemp = l2.Kategorie.ToString Stringtemp = l2.Kategorie.ToString
End If End If
strstrstrstrtempCardno = l2.KartenNr.ToString
strstrstrstrtempKennz = l2.KfzKennzeichen.ToString
Dim tc_SDL As TableCell = New TableCell Dim tc_SDL As TableCell = New TableCell
Dim tc_Bez As TableCell = New TableCell Dim tc_Bez As TableCell = New TableCell
Dim tc_gueltigbis As TableCell = New TableCell Dim tc_gueltigbis As TableCell = New TableCell
@@ -164,7 +169,8 @@ Partial Class LKWS
tc_Bez.Text = Stringtemp tc_Bez.Text = Stringtemp
tc_gueltigbis.Text = l2.GültigBis.ToString tc_gueltigbis.Text = l2.GültigBis.ToString
tc_Karten_Nr.Text = l2.KartenNr.ToString tc_Karten_Nr.Text = l2.KartenNr.ToString
strstrstrstrtempKundNr = l2.KundenNr.ToString
strstrstrstrtempHistory = l2.History.ToString
If String.Equals(l2.KfzKennzeichen.ToString, l1.KfzKennzeichen.ToString) = True Then If String.Equals(l2.KfzKennzeichen.ToString, l1.KfzKennzeichen.ToString) = True Then
tr.Cells.Add(tc_SDL) tr.Cells.Add(tc_SDL)
tr.Cells.Add(tc_Bez) tr.Cells.Add(tc_Bez)
@@ -184,7 +190,7 @@ Partial Class LKWS
strtemp2 = l1.Nationalität strtemp2 = l1.Nationalität
End If End If
tr1.Attributes.Add("onclick", "Javascript:doPostBack('""" + tr1.Cells.Item(0).Text + """,""" + strtemp2 + """,""" + Kdnrtext + """,""" + tr1.Cells.Item(3).Text + """')") tr1.Attributes.Add("onclick", "Javascript:doPostBack('""" + tr1.Cells.Item(0).Text + """,""" + strtemp2 + """,""" + Kdnrtext + """,""" + strstrstrstrtempCardno + """,""" + strstrstrstrtempKennz + """,""" + strstrstrstrtempHistory + """')")
cnt += 1 cnt += 1
tbl_sidemenue.Rows.Add(tr1) tbl_sidemenue.Rows.Add(tr1)
Next Next
@@ -410,7 +416,7 @@ Partial Class LKWS
strtemp2 = l3.Nationalität strtemp2 = l3.Nationalität
End If End If
tbl_mainpage_M.Rows.Clear() tbl_mainpage_M.Rows.Clear()
tr1_M.Attributes.Add("onclick", "Javascript:doPostBack_M('""" & tr1_M.Cells.Item(0).Text & """,""" & strtemp2 & """,""" & Kdnrtext & """,""" & l3.KfzKennzeichen & """,""" + tr1_M.Cells.Item(3).Text + """')") tr1_M.Attributes.Add("onclick", "Javascript:doPostBack_M('""" & tr1_M.Cells.Item(0).Text & """,""" & strtemp2 & """,""" & Kdnrtext & """,""" & l3.KfzKennzeichen & """')")
cnt += 1 cnt += 1
tbl_2.Rows.Add(tr1_M) tbl_2.Rows.Add(tr1_M)
Next Next
@@ -572,6 +578,12 @@ Partial Class LKWS
Dim list As List(Of String) = New List(Of String) Dim list As List(Of String) = New List(Of String)
Dim strtemp As String = Kennzeichen.Remove(0, 1) Dim strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1) Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
Dim sdlnrstrtemp As String = SDLNr.Remove(0, 1)
Dim finalSDLNrstr As String = sdlnrstrtemp.Remove(sdlnrstrtemp.Length - 1, 1)
Dim strtempKundennr As String = Kundennr.Remove(0, 1)
Dim finalstrKundNr As String = Kundennr.Remove(strtempKundennr.Length - 1, 1)
Dim Historytemp As String = History.Remove(0, 1)
Dim finalhistory As String = Historytemp.Remove(Historytemp.Length - 1, 1)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
Dim container As New List(Of List(Of String)) Dim container As New List(Of List(Of String))
For Each l2 In list2 For Each l2 In list2
@@ -590,7 +602,7 @@ Partial Class LKWS
End If End If
Dim Entrytemp As New List(Of String) Dim Entrytemp As New List(Of String)
If SDLNr = l2.SDLNr.ToString AndAlso Kennzeichen = l2.KfzKennzeichen.ToString AndAlso Kundennr = l2.KundenNr.ToString AndAlso History = l2.History.ToString Then If String.Equals(finalSDLNrstr, l2.SDLNr.ToString) = True AndAlso String.Equals(finalstr, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(finalstrKundNr, l2.KundenNr.ToString) = True AndAlso String.Equals(finalhistory, l2.History.ToString) = True Then
Entrytemp.Add(l2.SDLNr.ToString) Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat) Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis) Entrytemp.Add(strtempGueltigBis)
@@ -613,7 +625,12 @@ Partial Class LKWS
Dim list As List(Of String) = New List(Of String) Dim list As List(Of String) = New List(Of String)
Dim strtemp As String = Kennzeichen.Remove(0, 1) Dim strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1) Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
Dim sdlnrstrtemp As String = SDLNr.Remove(0, 1)
Dim finalSDLNrstr As String = sdlnrstrtemp.Remove(sdlnrstrtemp.Length - 1, 1)
Dim strtempKundennr As String = Kundennr.Remove(0, 1)
Dim finalstrKundNr As String = Kundennr.Remove(strtempKundennr.Length - 1, 1)
Dim Historytemp As String = History.Remove(0, 1)
Dim finalhistory As String = Historytemp.Remove(Historytemp.Length - 1, 1)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
Dim container As New List(Of List(Of String)) Dim container As New List(Of List(Of String))
For Each l2 In list2 For Each l2 In list2
@@ -632,7 +649,7 @@ Partial Class LKWS
End If End If
Dim Entrytemp As New List(Of String) Dim Entrytemp As New List(Of String)
If String.Equals(SDLNr, l2.SDLNr.ToString) = True AndAlso String.Equals(Kennzeichen, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(Kundennr, l2.KundenNr.ToString) = True AndAlso String.Equals(History, l2.History.ToString) = True Then If String.Equals(finalSDLNrstr, l2.SDLNr.ToString) = True AndAlso String.Equals(finalstr, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(finalstrKundNr, l2.KundenNr.ToString) = True AndAlso String.Equals(finalhistory, l2.History.ToString) = True Then
Entrytemp.Add(l2.SDLNr.ToString) Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat) Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis) Entrytemp.Add(strtempGueltigBis)

126
Customers/SDL/Formtemplate EcoTAX.aspx.vb
View File

@@ -72,12 +72,12 @@ Partial Class Customers_Default3
<WebMethod> <WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)> <ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltabledetails(Kennzeichen As String, cardNumber As String) As FormattedList Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, SDLNr As String, History As String) As FormattedList
Dim list As List(Of String) = New List(Of String) Dim list As List(Of String) = New List(Of String)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen)
Dim listdetails As New List(Of List(Of String)) Dim listdetails As New List(Of List(Of String))
For Each l2 In list2 For Each l2 In list2
If l2.KartenNr = cardNumber Then If l2.KfzKennzeichen = Kennzeichen AndAlso l2.KundenNr = KundenNr AndAlso l2.SDLNr = SDLNr AndAlso l2.History = History Then
Dim strtempbestelltam As String = String.Empty Dim strtempbestelltam As String = String.Empty
Dim strtempLieferdatum As String = String.Empty Dim strtempLieferdatum As String = String.Empty
Dim strtempPanNr As String = String.Empty Dim strtempPanNr As String = String.Empty
@@ -149,74 +149,76 @@ Partial Class Customers_Default3
<WebMethod> <WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)> <ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltabledetails_M(Kennzeichen As String) As FormattedList Public Shared Function filltabledetails_M(Kennzeichen As String, KundenNr As String, SDLNr As String, History As String) As FormattedList
Dim list_M As List(Of String) = New List(Of String) Dim list_M As List(Of String) = New List(Of String)
Dim strtemp As String = Kennzeichen.Remove(0, 1) Dim strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1) Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
Dim list2_M As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr) Dim list2_M As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
Dim listdetails_M As New List(Of List(Of String)) Dim listdetails_M As New List(Of List(Of String))
For Each l2 In list2_M For Each l2 In list2_M
Dim strtempbestelltam As String = String.Empty If l2.KfzKennzeichen = Kennzeichen AndAlso l2.KundenNr = KundenNr AndAlso l2.SDLNr = SDLNr AndAlso l2.History = History Then
Dim strtempLieferdatum As String = String.Empty Dim strtempbestelltam As String = String.Empty
Dim strtempPanNr As String = String.Empty Dim strtempLieferdatum As String = String.Empty
Dim strtempSerieNr As String = String.Empty Dim strtempPanNr As String = String.Empty
Dim strtempVermerk As String = String.Empty Dim strtempSerieNr As String = String.Empty
Dim strtempGueltigBis As String = String.Empty Dim strtempVermerk As String = String.Empty
Dim strtempretourniert As String = String.Empty Dim strtempGueltigBis As String = String.Empty
Dim strtempVerloren As String = String.Empty Dim strtempretourniert As String = String.Empty
Dim strtempGestohlen As String = String.Empty Dim strtempVerloren As String = String.Empty
Dim strtempGesperrt As String = String.Empty Dim strtempGestohlen As String = String.Empty
Dim strtempDefekt As String = String.Empty Dim strtempGesperrt As String = String.Empty
Dim strtempArchivt As String = String.Empty Dim strtempDefekt As String = String.Empty
Dim strtempArchivt As String = String.Empty
If IsNothing(l2.Bestelldatum) = False Then If IsNothing(l2.Bestelldatum) = False Then
strtempbestelltam = l2.Bestelldatum.ToString strtempbestelltam = l2.Bestelldatum.ToString
End If End If
If IsNothing(l2.Lieferdatum) = False Then If IsNothing(l2.Lieferdatum) = False Then
strtempLieferdatum = l2.Lieferdatum.ToString strtempLieferdatum = l2.Lieferdatum.ToString
End If End If
If IsNothing(l2.PAN_Nr) = False Then If IsNothing(l2.PAN_Nr) = False Then
strtempPanNr = l2.PAN_Nr.ToString strtempPanNr = l2.PAN_Nr.ToString
End If End If
If IsNothing(l2.SERIE_Nr) = False Then If IsNothing(l2.SERIE_Nr) = False Then
strtempSerieNr = l2.SERIE_Nr.ToString strtempSerieNr = l2.SERIE_Nr.ToString
End If End If
If IsNothing(l2.Vermerk) = False Then If IsNothing(l2.Vermerk) = False Then
strtempVermerk = l2.Vermerk.ToString strtempVermerk = l2.Vermerk.ToString
End If End If
If IsNothing(l2.GültigBis) = False Then If IsNothing(l2.GültigBis) = False Then
strtempGueltigBis = l2.GültigBis.ToString strtempGueltigBis = l2.GültigBis.ToString
End If End If
If IsNothing(l2.Retourniert) = False Then If IsNothing(l2.Retourniert) = False Then
strtempretourniert = l2.Retourniert.ToString strtempretourniert = l2.Retourniert.ToString
End If End If
If IsNothing(l2.Verloren) = False Then If IsNothing(l2.Verloren) = False Then
strtempVerloren = l2.Verloren.ToString strtempVerloren = l2.Verloren.ToString
End If End If
If IsNothing(l2.Gestohlen) = False Then If IsNothing(l2.Gestohlen) = False Then
strtempGestohlen = l2.Gestohlen.ToString strtempGestohlen = l2.Gestohlen.ToString
End If End If
If IsNothing(l2.Gesperrt) = False Then If IsNothing(l2.Gesperrt) = False Then
strtempGesperrt = l2.Gesperrt.ToString strtempGesperrt = l2.Gesperrt.ToString
End If End If
If IsNothing(l2.Defekt) = False Then If IsNothing(l2.Defekt) = False Then
strtempDefekt = l2.Defekt.ToString strtempDefekt = l2.Defekt.ToString
End If End If
If IsNothing(l2.Archiviert) = False Then If IsNothing(l2.Archiviert) = False Then
strtempArchivt = l2.Archiviert.ToString strtempArchivt = l2.Archiviert.ToString
End If End If
' List_m.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr, strtempKaut, strtempArchivt, strtempBelegNr, strtempErsatzkarte, strtempDefektAm, strtempFahrer, strtempGesperrtAm, strtempHistory, strtempHasEntry, strtempFlottenPIN, strtempFREJUS_CARD_Nr, strtempGestohlenAm, strtempLKWAbgemeldet, strtempLKWAbgemeldetAM, strtempLieferdatum, strtempMasterPIN, strtempMOTORWAY_CARD_Nr, strtempMSE_Kd_Nr, strtempOBUID, strtempPAN_Nr, strtempPartner, strtempPIN, strtempRefKundenNr, strtempRetourniert, strtempRetourniertAm, strtempSachbearbeiter, strtempSERIE_Nr, strtempStatus, strtempTelepassErsatzkarte, strtempTelepassErsatzkarteAm, strtempTELEPASS_Kd_Nr, strtempTELEPASS_Nr, strtempUmstellungsdatum, strtempVerloren, strtempVertragsabschlussdatum, strtempVertragsNr, strtempVIACARD, strtempAenderungsdatum, strtempVermerk)) ' List_m.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr, strtempKaut, strtempArchivt, strtempBelegNr, strtempErsatzkarte, strtempDefektAm, strtempFahrer, strtempGesperrtAm, strtempHistory, strtempHasEntry, strtempFlottenPIN, strtempFREJUS_CARD_Nr, strtempGestohlenAm, strtempLKWAbgemeldet, strtempLKWAbgemeldetAM, strtempLieferdatum, strtempMasterPIN, strtempMOTORWAY_CARD_Nr, strtempMSE_Kd_Nr, strtempOBUID, strtempPAN_Nr, strtempPartner, strtempPIN, strtempRefKundenNr, strtempRetourniert, strtempRetourniertAm, strtempSachbearbeiter, strtempSERIE_Nr, strtempStatus, strtempTelepassErsatzkarte, strtempTelepassErsatzkarteAm, strtempTELEPASS_Kd_Nr, strtempTELEPASS_Nr, strtempUmstellungsdatum, strtempVerloren, strtempVertragsabschlussdatum, strtempVertragsNr, strtempVIACARD, strtempAenderungsdatum, strtempVermerk))
list_M.Add(strtempbestelltam) list_M.Add(strtempbestelltam)
list_M.Add(strtempLieferdatum) list_M.Add(strtempLieferdatum)
list_M.Add(strtempPanNr) list_M.Add(strtempPanNr)
list_M.Add(strtempSerieNr) list_M.Add(strtempSerieNr)
list_M.Add(strtempVermerk) list_M.Add(strtempVermerk)
list_M.Add(strtempGueltigBis) list_M.Add(strtempGueltigBis)
list_M.Add(strtempretourniert) list_M.Add(strtempretourniert)
list_M.Add(l2.KfzKennzeichen) list_M.Add(l2.KfzKennzeichen)
If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") And l2.KartenNr = CardNr Then If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") And l2.KartenNr = CardNr Then
listdetails_M.Add(list_M) listdetails_M.Add(list_M)
End If
End If End If
Next Next

6620
VERAG_Homepage/{11EF0CDA-BC19-40FB-91C4-25C81F3A27AC}/CodeAnalysisLog.xml
View File

File diff suppressed because it is too large Load Diff