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

Änderungen

Browse Source
This commit is contained in:
ja
2021-12-06 11:56:26 +01:00
parent 7a4a2b70a1
commit 4acaa9ff71
6 changed files with 148 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
App_Code/TestPerformance.vb Normal file
View File

@@ -0,0 +1,113 @@
Imports System.Data.SqlClient
Imports Microsoft.VisualBasic
Public Class TestPerformance
Public Shared Sub createnUsers(ByRef n As Integer)
Dim ConnectionString = ""
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956"
ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
Else
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
End If
Using con As New SqlConnection(ConnectionString)
' Using cmd As New SqlCommand("Validate_User")
For nzahl As Integer = 0 To n Step 1
Dim UsrID As Integer = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(0, 15), VERAG_VARIABLES.RandomInteger(500, 45750))
Dim usrname As String = String.Empty
Dim pw As String = "Pw" + Convert.ToBase64String(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(0, nzahl + 2)))
Dim email As String = "ja@verag.ag"
Dim monthrndm As Integer = VERAG_VARIABLES.RandomInteger(1, 12)
Dim Yearrand As Integer = VERAG_VARIABLES.RandomInteger(2001, 2021)
Dim dayrand As Integer = VERAG_VARIABLES.RandomInteger(1, 30)
Dim datelastloggedin As Date = New Date(Yearrand, monthrndm, dayrand)
Dim monthrndm2 As Integer = VERAG_VARIABLES.RandomInteger(1, 12)
Dim Yearrand2 As Integer = VERAG_VARIABLES.RandomInteger(2001, 2021)
Dim dayrand2 As Integer = VERAG_VARIABLES.RandomInteger(1, 30)
Dim DateCreate As Date = New Date(Yearrand2, monthrndm2, dayrand2)
'Namen
Dim lstCapitals As New ArrayList
' Capital Names
lstCapitals.Add("Montgomery")
lstCapitals.Add("Juneau")
lstCapitals.Add("Phoenix")
lstCapitals.Add("Little Rock")
lstCapitals.Add("Sacramento")
lstCapitals.Add("Denver")
lstCapitals.Add("Hartford")
lstCapitals.Add("Dover")
lstCapitals.Add("Tallahassee")
lstCapitals.Add("Atlanta")
lstCapitals.Add("Honolulu")
lstCapitals.Add("Boise")
lstCapitals.Add("Springfield")
lstCapitals.Add("Indianapolis")
lstCapitals.Add("Des Moines")
lstCapitals.Add("Topeka")
lstCapitals.Add("Frankfort")
lstCapitals.Add("Baton Rouge")
lstCapitals.Add("Augusta")
lstCapitals.Add("Annapolis")
lstCapitals.Add("Boston")
lstCapitals.Add("Lansing")
lstCapitals.Add("St. Paul")
lstCapitals.Add("Jackson")
lstCapitals.Add("Jefferson City")
lstCapitals.Add("Helena")
lstCapitals.Add("Lincoln")
lstCapitals.Add("Carson City")
lstCapitals.Add("Concord")
lstCapitals.Add("Trenton")
lstCapitals.Add("Santa Fe")
lstCapitals.Add("Albany")
lstCapitals.Add("Raleigh")
lstCapitals.Add("Bismarck")
lstCapitals.Add("Columbus")
lstCapitals.Add("Oklahoma City")
lstCapitals.Add("Salem")
lstCapitals.Add("Harrisburg")
lstCapitals.Add("Providence")
lstCapitals.Add("Columbia")
lstCapitals.Add("Pierre")
lstCapitals.Add("Nashville")
lstCapitals.Add("Austin")
lstCapitals.Add("Salt Lake City")
lstCapitals.Add("Montpelier")
lstCapitals.Add("Richmond")
lstCapitals.Add("Olympia")
lstCapitals.Add("Charleston")
lstCapitals.Add("Madison")
lstCapitals.Add("Cheyenne")
'Pulls a name randomly from the list
Dim stringname As String = lstCapitals.Item(VERAG_VARIABLES.RandomInteger(0, lstCapitals.Count))
usrname = stringname
Using cmd As New SqlCommand("INSERT INTO [VERAG_HOMEPAGE].[dbo].[Users] VALUES (@UserId,@Username,@Password,@Email,@Date")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@UserId", UsrID)
cmd.Parameters.AddWithValue("@Username", usrname)
cmd.Parameters.AddWithValue("@Password", pw)
cmd.Parameters.AddWithValue("@Email", email)
cmd.Parameters.AddWithValue("@Date", DateCreate)
cmd.Parameters.AddWithValue("Dateloggedinlast", datelastloggedin)
cmd.Connection = con
con.Open()
' userId = Convert.ToInt32(cmd.ExecuteScalar())
cmd.ExecuteScalar()
con.Close()
End Using
Next
End Using
End Sub
Public Shared DeleteUsers()
End Class

4
App_Code/VERAG_VARIABLES.vb
View File

@@ -34,7 +34,7 @@ Public Class VERAG_VARIABLES
Argon.Salt = salt
Argon.DegreeOfParallelism = 24
Argon.Iterations = nIterations
Argon.MemorySize = ((nIterations * 1 - nIterations / 2 * 2) / 1.05) + 1 * 150
Argon.MemorySize = (((nIterations * 1 - nIterations / 4 * 2) / 1.05) + 1 * 150)
Return Await Argon.GetBytesAsync(nHash)
'Return Convert.ToBase64String(Argon.GetBytes(nHash))
'Return Argon.GetBytes(nHash)
@@ -46,7 +46,7 @@ Public Class VERAG_VARIABLES
Argon.Salt = salt
Argon.DegreeOfParallelism = 48
Argon.Iterations = nIterations
Argon.MemorySize = ((nIterations * 1 + nIterations / 2 * 2) / 0.08) + 1 * 170
Argon.MemorySize = ((((nIterations * 2 - nIterations / 1.75 * 2.08) / 0.08) + 1 * 256) / 2)
Return Await Argon.GetBytesAsync(nHash)
End If
End Function

2
login/Change_PW.aspx.vb
View File

@@ -242,7 +242,7 @@ Partial Class login_Change_PW
Dim isPasswhash As Byte() = Await gensaltPasswAsync(usrname, tempstr, salt, intzahliterats, intzahl, Email, Session.IsNewSession)
Dim isPasswDBhash As Byte() = Await gensaltPasswAsync(UsernameDB, pwDB, salt, intzahliterats, intzahl, EmailDB, Session.IsNewSession)
If regexval_txt_Pw.IsValid = True Then
If Await VERAG_VARIABLES.Verifyhash(tempstr, salt, isPasswhash, intzahliterats, intzahl) = True Then
If Await VERAG_VARIABLES.Verifyhash(txt_Pw.Text, salt, isPasswhash, intzahliterats, intzahl) = True And Await VERAG_VARIABLES.Verifyhash(txt_Pw_WH.Text, salt, Await VERAG_VARIABLES.HashPassword(txt_Pw.Text, salt, intzahliterats, intzahl), intzahliterats, intzahl) = True Then
Using con As New SqlConnection(ConnectionString)
Using cmd As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET [Password]=@Password WHERE [Username]=@Username AND [UserId]=@UserId")
' cmd.CommandType = CommandType.StoredProcedure

2
login/ForgotPW.aspx.vb
View File

@@ -850,10 +850,10 @@ Partial Class ForgotPW
tokentest = genToken(username, Passw, email, CustomerID, True, True, True, False, TheusrID)
Session.Add("TokenforEmail", tokentest)
Session.Add("SessID", VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(Session.SessionID))
hashtoken = Await VERAG_VARIABLES.HashPassword(tokentest, salt, iterationnumb, nzahl)
Else
tokentest = Session.Item("TokenforEmail")
End If
hashtoken = Await VERAG_VARIABLES.HashPassword(tokentest, salt, iterationnumb, nzahl)
If Await VERAG_VARIABLES.Verifyhash(tokentest, salt, hashtoken, iterationnumb, nzahl) = True Then
If SendEmail(username, Passw, email, tokentest, CustomerID, True, True, True, False, TheusrID) = True Then
'password = RandomString(New Random, 10)

2
login/login_FLEX.aspx
View File

@@ -494,6 +494,8 @@
</tr>
<tr style="color:#003680; height:12px">
<td align="center" style="width:295px" colspan="2">
<!-- <asp:TextBox ID="txt_numbuserstest" runat="server"></asp:TextBox>
<asp:Button ID="CreateTestusers" OnClick="CreateTestusers_Click" CausesValidation="false" runat="server" Text="Create Users"/>-->
<asp:Literal ID="FailureText_M" runat="server" EnableViewState="False"></asp:Literal>
<asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="Username" ValidationGroup="Login_M" ForeColor="Red" Font-Size="18px" runat="server" style="margin-left:132px;color:red" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$" ErrorMessage="Username does not meet the requirements." ></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="Login_M" ForeColor="Red" Font-Size="18px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>

50
login/login_FLEX.aspx.vb
View File

@@ -228,31 +228,39 @@ Partial Class login_FLEX
Dim token As Byte()
token = Await VERAG_VARIABLES.HashPassword(Convert.ToBase64String(time.Concat(Key).ToArray()), salt, intzahliterats, intzahl)
Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token))
Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token))
'Dim Msg, Style, Title As String
'Msg = "Token Generation failed" & vbCrLf & "A new E-mail has been sent to the intern e-mail given."
'Style = vbRetry + vbExclamation + vbDefaultButton1
'Title = "Error05: Token-Generierung"
'MsgBox(Msg, Style, Title)
'If MsgBox(Msg, Style, Title).Retry Then
'genToken(username, password, email)
'Dim Msg, Style, Title As String
'Msg = "Token Generation failed" & vbCrLf & "A new E-mail has been sent to the intern e-mail given."
'Style = vbRetry + vbExclamation + vbDefaultButton1
'Title = "Error05: Token-Generierung"
'MsgBox(Msg, Style, Title)
'If MsgBox(Msg, Style, Title).Retry Then
'genToken(username, password, email)
token = Await VERAG_VARIABLES.HashPassword(Convert.ToBase64String(time.Concat(Key).ToArray()), salt, intzahliterats, intzahl)
Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token))
'Else
'MsgBox("Token-Generation has not been successful." & vbCrLf & "Please try again in five seconds!")
Dim jetzt As DateTime = DateTime.UtcNow
Dim wenn As DateTime = DateTime.UtcNow.AddSeconds(-5)
If jetzt < wenn Then
Return "NotYet"
Else
token = Await VERAG_VARIABLES.HashPassword(Convert.ToBase64String(time.Concat(Key).ToArray()), salt, intzahliterats, intzahl)
Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token))
'Else
'MsgBox("Token-Generation has not been successful." & vbCrLf & "Please try again in five seconds!")
Dim jetzt As DateTime = DateTime.UtcNow
Dim wenn As DateTime = DateTime.UtcNow.AddSeconds(-5)
If jetzt < wenn Then
Return "NotYet"
Else
token = Await VERAG_VARIABLES.HashPassword(Convert.ToBase64String(time.Concat(Key).ToArray()), salt, intzahliterats, intzahl)
Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token))
'End If
End If
'End If
End If
End If
End Function
Protected Sub CreateTestusers_Click(sender As Object, e As EventArgs)
Dim str As String = String.Empty
Dim textbox As TextBox = Page.FindControl("txt_numbuserstes")
str = textbox.Text
TestPerformance.createnUsers(Integer.Parse(str))
End Sub
End Class