diff --git a/Client/Client.csproj b/Client/Client.csproj
index 4ade6d5..6aa0290 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -15,4 +15,6 @@
+
+
diff --git a/Client/EngineConnection.cs b/Client/EngineConnection.cs
index 965673b..4905911 100644
--- a/Client/EngineConnection.cs
+++ b/Client/EngineConnection.cs
@@ -7,20 +7,22 @@ using System.Net.Sockets;
namespace Client
{
public delegate void HandleSerial(string message);
+ public delegate void HandleNoTunnelId();
public sealed class EngineConnection
{
private static EngineConnection instance = null;
private static readonly object padlock = new object();
+ public HandleNoTunnelId OnNoTunnelId;
private static PC[] PCs = {
//new PC("DESKTOP-M2CIH87", "Fabian"),
//new PC("T470S", "Shinichi"),
//new PC("DESKTOP-DHS478C", "semme"),
- new PC("HP-ZBOOK-SEM", "Sem"),
+ new PC("HP-ZBOOK-SEM", "Sem")
//new PC("DESKTOP-TV73FKO", "Wouter"),
- new PC("DESKTOP-SINMKT1", "Ralf van Aert"),
+ //new PC("DESKTOP-SINMKT1", "Ralf van Aert"),
//new PC("NA", "Bart")
};
@@ -62,6 +64,7 @@ namespace Client
{
TcpClient client = new TcpClient("145.48.6.10", 6666);
stream = client.GetStream();
+ initReader();
CreateConnection();
}
@@ -69,9 +72,8 @@ namespace Client
/// connects to the server and creates the tunnel
///
/// the network stream to use
- private void CreateConnection()
+ public void CreateConnection()
{
- initReader();
WriteTextMessage( "{\r\n\"id\" : \"session/list\",\r\n\"serial\" : \"list\"\r\n}");
@@ -84,7 +86,10 @@ namespace Client
// wait until we have a tunnel id
while (tunnelId == string.Empty) { }
- Write("got tunnel id! " + tunnelId);
+ if (tunnelId != null)
+ {
+ Write("got tunnel id! " + tunnelId);
+ }
mainCommand = new Command(tunnelId);
}
@@ -119,6 +124,8 @@ namespace Client
if (tunnelId == null)
{
Write("could not find a valid tunnel id!");
+ OnNoTunnelId?.Invoke();
+ Connected = false;
return;
}
}
@@ -160,7 +167,7 @@ namespace Client
stream.Write(res);
- Write("sent message " + message);
+ //Write("sent message " + message);
}
public void Write(string msg)
{
diff --git a/Client/Program.cs b/Client/Program.cs
index f8dd547..89ed605 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -1,6 +1,9 @@
using System;
using Hardware;
using Hardware.Simulators;
+using RH_Engine;
+using System.Security.Cryptography;
+using System.Text;
namespace Client
{
@@ -11,7 +14,6 @@ namespace Client
Console.WriteLine("Hello World!");
//connect fiets?
-
Client client = new Client();
diff --git a/Hashing/Hasher.cs b/Hashing/Hasher.cs
new file mode 100644
index 0000000..270faa3
--- /dev/null
+++ b/Hashing/Hasher.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Hashing
+{
+ class Hasher
+ {
+ public static byte[] GetHash(string input)
+ {
+ using (HashAlgorithm algorithm = SHA256.Create())
+ {
+ return algorithm.ComputeHash(Encoding.UTF8.GetBytes(input));
+ }
+ }
+
+ public static string HashString(string input)
+ {
+ StringBuilder sb = new StringBuilder();
+ foreach (byte b in GetHash(input)) {
+ sb.Append(b.ToString("X2"));
+ }
+ return sb.ToString();
+ }
+ }
+}
diff --git a/Hashing/Hashing.projitems b/Hashing/Hashing.projitems
new file mode 100644
index 0000000..127b36a
--- /dev/null
+++ b/Hashing/Hashing.projitems
@@ -0,0 +1,14 @@
+
+
+
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ true
+ 70277749-d423-4871-b692-2efc5a6ed932
+
+
+ Hashing
+
+
+
+
+
\ No newline at end of file
diff --git a/Hashing/Hashing.shproj b/Hashing/Hashing.shproj
new file mode 100644
index 0000000..e427bd6
--- /dev/null
+++ b/Hashing/Hashing.shproj
@@ -0,0 +1,13 @@
+
+
+
+ 70277749-d423-4871-b692-2efc5a6ed932
+ 14.0
+
+
+
+
+
+
+
+
diff --git a/ProftaakRH/ProftaakRH.sln b/ProftaakRH/ProftaakRH.sln
index f2df07f..f05bff3 100644
--- a/ProftaakRH/ProftaakRH.sln
+++ b/ProftaakRH/ProftaakRH.sln
@@ -13,9 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "..\Client\Client.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Message", "..\Message\Message.csproj", "{9ED6832D-B0FB-4460-9BCD-FAA58863B0CE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DokterApp", "..\DokterApp\DokterApp.csproj", "{B150F08B-13DA-4D17-BD96-7E89F52727C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DokterApp", "..\DokterApp\DokterApp.csproj", "{B150F08B-13DA-4D17-BD96-7E89F52727C6}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Hashing", "..\Hashing\Hashing.shproj", "{70277749-D423-4871-B692-2EFC5A6ED932}"
EndProject
Global
+ GlobalSection(SharedMSBuildProjectFiles) = preSolution
+ ..\Hashing\Hashing.projitems*{5759dd20-7a4f-4d8d-b986-a70a7818c112}*SharedItemsImports = 5
+ ..\Hashing\Hashing.projitems*{70277749-d423-4871-b692-2efc5a6ed932}*SharedItemsImports = 13
+ ..\Hashing\Hashing.projitems*{b1ab6f51-a20d-4162-9a7f-b3350b7510fd}*SharedItemsImports = 5
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
diff --git a/Server/Client.cs b/Server/Client.cs
index 02abad4..6219992 100644
--- a/Server/Client.cs
+++ b/Server/Client.cs
@@ -5,6 +5,7 @@ using System.Net.Sockets;
using System.Text;
using Client;
using Newtonsoft.Json;
+using System.Security.Cryptography;
namespace Server
{
@@ -19,6 +20,7 @@ namespace Server
private SaveData saveData;
private string username = null;
private DateTime sessionStart;
+ private const string fileName = "userInfo.dat";
@@ -132,6 +134,10 @@ namespace Server
break;
}
saveData?.WriteDataJSON(Encoding.ASCII.GetString(payloadbytes));
+
+ Array.Copy(message, 5, payloadbytes, 0, message.Length - 5);
+ dynamic json = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(payloadbytes));
+
}
else if (DataParser.isRawData(message))
{
@@ -160,9 +166,58 @@ namespace Server
private bool verifyLogin(string username, string password)
{
- return username == password;
+ Console.WriteLine("got hashes " + username + "\n" + password);
+
+
+ if (!File.Exists(fileName))
+ {
+ File.Create(fileName);
+ Console.WriteLine("file doesnt exist");
+ newUsers(username, password);
+ Console.WriteLine("true");
+ return true;
+ } else
+ {
+ Console.WriteLine("file exists, located at " + Path.GetFullPath(fileName));
+ string[] usernamesPasswords = File.ReadAllLines(fileName);
+ if (usernamesPasswords.Length == 0)
+ {
+ newUsers(username, password);
+ return true;
+ }
+
+ foreach (string s in usernamesPasswords)
+ {
+ string[] combo = s.Split(" ");
+ if (combo[0] == username)
+ {
+ Console.WriteLine("correct info");
+ return combo[1] == password;
+ }
+
+ }
+ Console.WriteLine("combo was not found in file");
+
+ }
+ Console.WriteLine("false");
+ return false;
+
}
+ private void newUsers(string username, string password)
+ {
+
+ Console.WriteLine("creating new entry in file");
+ using (StreamWriter sw = File.AppendText(fileName))
+ {
+ sw.WriteLine(username + " " + password);
+ }
+ }
+
+
+
+
+
public static string ByteArrayToString(byte[] ba)
{
StringBuilder hex = new StringBuilder(ba.Length * 2);
diff --git a/Server/Server.csproj b/Server/Server.csproj
index a91c176..cd7c7da 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -13,4 +13,6 @@
+
+