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

Tabellenbreite gefixed VERAG TEstsuite gefixed dass es nicht alles ausbremst beim loginscreen

Browse Source
This commit is contained in:
ja
2022-01-19 09:30:36 +01:00
parent c0c3859554
commit 402cad3ca0
7 changed files with 1583 additions and 1666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
App_Code/TestPerformance.vb
View File

@@ -130,7 +130,7 @@ Public Class TestPerformance
For zahl As Integer = 0 To zahlint
sw1.Start()
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 8))))
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(5, 7))
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 2), Math.Pow(2, 5)))
arrzahl.Add(zahlint)
sw1.Stop()
arrzeitp1.Add(sw1.ElapsedMilliseconds)
@@ -190,9 +190,9 @@ Public Class TestPerformance
Next
Dim pw As String
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
pw = "PasswordV" + VERAG_VARIABLES.RandomInteger(5, zahlint - 5).ToString + "!!%"
pw = "PasswordV$$$" + VERAG_VARIABLES.RandomInteger(115, 120 + (zahlint - 5)).ToString + "!!%"
Else
pw = "&WAS5$WdAG&" + VERAG_VARIABLES.RandomInteger(75, zahlint - VERAG_VARIABLES.RandomInteger(5, 7)).ToString + "#*p(=+UY"
pw = "&WAS5$WdAG&" + VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(1200, 2512), 3000 + (zahlint - VERAG_VARIABLES.RandomInteger(5, 17))).ToString + "##*p(=+UY"
End If
For zahl As Integer = 0 To zahlint
sw2.Start()

8
App_Code/VERAG_VARIABLES.vb
View File

@@ -9,7 +9,7 @@ Public Class VERAG_VARIABLES
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))
Else
Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))
Return RandomInteger(Math.Pow(2, 5), Math.Pow(2, 7))
End If
End Function
@@ -48,7 +48,7 @@ Public Class VERAG_VARIABLES
Else
Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt
Argon.DegreeOfParallelism = 30
Argon.DegreeOfParallelism = 14
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
Argon.MemorySize = (((nIterations * 7.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
Return Argon.GetBytes(nHash)
@@ -69,8 +69,8 @@ Public Class VERAG_VARIABLES
Else
Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt
Argon.DegreeOfParallelism = 38
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 7)
Argon.DegreeOfParallelism = 8
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 4)
Argon.MemorySize = (((nIterations * 9.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
Return Await Argon.GetBytesAsync(nHash)
End If

BIN
Berechnung Memorysize argon2.xlsx
View File

Binary file not shown.

87
Customers/LKWs.aspx
View File

@@ -503,13 +503,13 @@
for (let i = rowCount-1; i >= 0; i--) {
table.deleteRow(i);
}
let strheader = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
let strheader = '<tr style="background-color:#043381;color:#fff"><th style="font-weight:600; color:white; width:224.25px">SDL-Nr</th><th style="font-weight:600; color:white;width:224.25px">Bezeichnung</th><th style="font-weight:600; color:white;width:224.25px">Gueltig bis</th><th style="font-weight:600; color:white;width:224.25px">Karten-Nummer</th></tr>';
$('#<%=tablemain.ClientID%>').append(strheader);
for (var i = 0; i < result.length; i++) {
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length)
let strHTML4 = '<tr onclick="Javascript:renderdetails(' + id.split(',')[0] +')"><td>' + result[i]["0"] + '</td><td>' + result[i]["1"] + '</td><td>' + result[i]["2"] + '</td><td>' + result[i]["3"] + '</td></tr>'
let strHTML4 = '<tr><td style="width:224.25px">' + result[i]["0"] + '</td><td style="width:224.25px">' + result[i]["1"] + '</td><td style="width:224.25px">' + result[i]["2"] + '</td><td style="width:224.25px">' + result[i]["3"] + '</td></tr>'
//alert(strHTML4)
$('#<%=tablemain.ClientID%>').append(strHTML4);
}
@@ -567,7 +567,7 @@
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length)
let strHTML4 = '<tr onclick="Javascript:renderdetails_M(' + id_M.split(',')[0] +')" style="width:385.5px"><td>' + result[i]["0"] + '</td><td>' + result[i]["1"] + '</td><td>' + result[i]["2"] + '</td><td>' + result[i]["3"] + '</td></tr>'
let strHTML4 = '<tr style="width:385.5px"><td>' + result[i]["0"] + '</td><td>' + result[i]["1"] + '</td><td>' + result[i]["2"] + '</td><td>' + result[i]["3"] + '</td></tr>'
//alert(strHTML4)
$('#<%=tablemain_m.ClientID%>').append(strHTML4);
}
@@ -581,87 +581,6 @@
});
//filltable2(id.split(',')[0])
}
function renderdetails(id) {
alert(id)
let data = {};
data['Kennzeichen'] = id;
$.ajax({
type: "POST",
url: "LKWs.aspx/filltabledetails",
contentType: "application/json; charset=utf-8",
dataType: "json",
async: "true",
data: JSON.stringify(data),
success: function (data) {
// alert(data.d.AaData)
result = data.d.AaData;
// addheader();
//var rowCount = table.rows.length;
//for (let i = rowCount - 1; i >= 0; i--) {
// table_M.deleteRow(i);
//}
let strheader_M = '<tr style="background-color:#043381;color:#fff;width:385.5px"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
//$('#<%'=tablemain_m.ClientID%>').append(strheader_M);
for (var i = 0; i < result.length; i++) {
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length)
let strHTML4 = '<tr style="width:385.5px"><td>' + result[i]["0"] + '</td><td>' + result[i]["1"] + '</td><td>' + result[i]["2"] + '</td><td>' + result[i]["3"] + '</td></tr>'
alert(strHTML4)
//$('#<%'=tablemain_m.ClientID%>').append(strHTML4);
}
//renderTable(data.d);
//alert(strHTML);
//$('#<%'=tablemain.ClientID%>').append(strheaderL);
},
error: function (jqXHR, textStatus, errorThrown) {
alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);
}
});
}
function renderdetails_M(id) {
alert(id)
var data = {};
data['Kennzeichen'] = id;
$.ajax({
type: "POST",
url: "LKWs.aspx/filltabledetails",
contentType: "application/json; charset=utf-8",
dataType: "json",
async: "true",
data: JSON.stringify(data),
success: function (data) {
// alert(data.d.AaData)
result_M = data.d.AaData;
// addheader();
//var rowCount = table.rows.length;
//for (let i = rowCount - 1; i >= 0; i--) {
// table_M.deleteRow(i);
//}
let strheader_M = '<tr style="background-color:#043381;color:#fff;width:385.5px"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
//$('#<%'=tablemain_m.ClientID%>').append(strheader_M);
for (var i = 0; i < result_M.length; i++) {
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length)
let strHTML4 = '<tr style="width:385.5px"><td>' + result_M[i]["0"] + '</td><td>' + result_M[i]["1"] + '</td><td>' + result_M[i]["2"] + '</td><td>' + result_M[i]["3"] + '</td></tr>'
alert(strHTML4)
//$('#<%'=tablemain_m.ClientID%>').append(strHTML4);
}
//renderTable(data.d);
//alert(strHTML);
//$('#<%'=tablemain.ClientID%>').append(strheaderL);
},
error: function (jqXHR, textStatus, errorThrown) {
alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);
}
});
}
</script>
</asp:Content>

8
Customers/LKWs.aspx.vb
View File

@@ -19,7 +19,7 @@ Partial Class LKWS
Dim TableRows_M As List(Of TableRow) = New List(Of TableRow)
Protected Sub Page_OnInit(sender As Object, e As EventArgs)
If TableRows.Count = 0 Then
For Each tr In TableRows
For Each tr In TableRows_M
tbl_mainpage_M.Rows.Add(tr)
Next
Else
@@ -571,9 +571,9 @@ Partial Class LKWS
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))
For Each l2 In list2
Dim strtempKat As String = ""
Dim strtempKartenNr As String = ""
Dim strtempGueltigBis As String = ""
Dim strtempKat As String = String.Empty
Dim strtempKartenNr As String = String.Empty
Dim strtempGueltigBis As String = String.Empty
If IsNothing(l2.Kategorie) = False Then
strtempKat = l2.Kategorie.ToString

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

File diff suppressed because it is too large Load Diff

3
login/login_FLEX.aspx.vb
View File

@@ -26,8 +26,6 @@ Partial Class login_FLEX
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 7), Math.Pow(2, 10))
teststr = Await TestPerformance.TestHashrateServerAsync(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 7)))
Else
intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 10), Math.Pow(2, 12))
teststr = Await TestPerformance.TestHashrateServerAsync(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 7)))
@@ -40,7 +38,6 @@ Partial Class login_FLEX
intzahliterats = 0
Response.Write(VERAG_VARIABLES.geterrornumb() + "Error on Tests for login! Try again!")
VERAG_VARIABLES.seterrorcount(4232)
sendmail("ja@verag.ag", Session.IsNewSession, VERAG_VARIABLES.geterrornumb)
End Try
Page.MaintainScrollPositionOnPostBack = False