From 0ec0e3579eda31620f980c12fe3d5efa09815052 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 2 Feb 2017 10:22:43 +0100
Subject: [PATCH] EAP-GTC event logging and clean-up

---
 lib/Events/res/EventsETW.man | Bin 121104 -> 122246 bytes
 lib/GTC/include/Method.h     |   4 ++--
 lib/GTC/src/Method.cpp       |  42 ++++++++++++++++++++---------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/lib/Events/res/EventsETW.man b/lib/Events/res/EventsETW.man
index 4599aef93e26b9fb15acf09548106238335912e4..504eb4a9832dfe6762c31b09da1facbf0f622251 100644
GIT binary patch
delta 337
zcmbQRiM?$%d&3q+J;6!)*w}R$+!;a`oF{*Oku48qF~l<jF}N}WGXyaBGxz~%SExwf
z<i>r%%%%(mlPBJrKiTfLn>0jy5JM_MF+%}EK0_XmP6g^tWhk6{@Vuuu4)Z|fFq%#-
z{PJ8Bs|nNnjTlw8>j^S8C^8ytUvI?NITfE((*>6?N=_Hq$S5XS3U)vdg91Yl!co)h
z%^3BkA6UZ3BaFqm>Hi}brKfM$%E%@eicL32Y<l4~M&apiwlZ=}b7oWl8#R5yX-1Ll
KJ|`HD2mk=9bXg++

delta 36
scmZqM%|2lhd&3q+J;Ch-B8&}+j0W33nlg4yo$hdsQDpm}GmJ+B0Qvt7<NyEw

diff --git a/lib/GTC/include/Method.h b/lib/GTC/include/Method.h
index 32cd4f5..3208ca8 100644
--- a/lib/GTC/include/Method.h
+++ b/lib/GTC/include/Method.h
@@ -110,8 +110,8 @@ namespace eap
     protected:
         config_method_eapgtc &m_cfg;            ///< Method configuration
         credentials_identity &m_cred;           ///< Method user credentials
-        winstd::sanitizing_wstring m_message;   ///< Authenticator message
-        winstd::sanitizing_wstring m_reply;     ///< GTC reply
+        winstd::sanitizing_wstring m_challenge; ///< GTC challenge
+        winstd::sanitizing_wstring m_response;  ///< GTC response
     };
 
     /// @}
diff --git a/lib/GTC/src/Method.cpp b/lib/GTC/src/Method.cpp
index beda200..38ea975 100644
--- a/lib/GTC/src/Method.cpp
+++ b/lib/GTC/src/Method.cpp
@@ -37,11 +37,11 @@ eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _I
 
 
 eap::method_gtc::method_gtc(_Inout_ method_gtc &&other) :
-    m_cfg    (          other.m_cfg     ),
-    m_cred   (          other.m_cred    ),
-    m_message(std::move(other.m_message)),
-    m_reply  (std::move(other.m_reply  )),
-    method   (std::move(other          ))
+    m_cfg      (          other.m_cfg       ),
+    m_cred     (          other.m_cred      ),
+    m_challenge(std::move(other.m_challenge)),
+    m_response (std::move(other.m_response )),
+    method     (std::move(other            ))
 {
 }
 
@@ -51,9 +51,9 @@ eap::method_gtc& eap::method_gtc::operator=(_Inout_ method_gtc &&other)
     if (this != std::addressof(other)) {
         assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move method within same configuration only!
         assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method within same credentials only!
-        (method&)*this = std::move(other          );
-        m_message      = std::move(other.m_message);
-        m_reply        = std::move(other.m_reply  );
+        (method&)*this = std::move(other            );
+        m_challenge    = std::move(other.m_challenge);
+        m_response     = std::move(other.m_response );
     }
 
     return *this;
@@ -81,10 +81,14 @@ EapPeerMethodResponseAction eap::method_gtc::process_request_packet(
 {
     assert(pReceivedPacket || dwReceivedPacketSize == 0);
 
-    // Read authenticator message as UTF-8 encoded string.
-    MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pReceivedPacket, dwReceivedPacketSize, m_message);
+    m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_gtc), event_data::blank);
 
-    // User must reply to the message.
+    // Read authenticator challenge as UTF-8 encoded string.
+    MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pReceivedPacket, dwReceivedPacketSize, m_challenge);
+
+    m_module.log_event(&EAPMETHOD_GTC_RESPONSE_REQ, event_data((unsigned int)eap_type_gtc), event_data::blank);
+
+    // User must respond to the challenge.
     return EapPeerMethodResponseActionInvokeUI;
 }
 
@@ -93,9 +97,9 @@ void eap::method_gtc::get_response_packet(
     _Out_    sanitizing_blob &packet,
     _In_opt_ DWORD           size_max)
 {
-    // Encode GTC reply as UTF-8.
+    // Encode GTC response as UTF-8.
     sanitizing_string reply_utf8;
-    WideCharToMultiByte(CP_UTF8, 0, m_reply, reply_utf8, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, m_response, reply_utf8, NULL, NULL);
 
     if (sizeof(sanitizing_string::value_type)*reply_utf8.length() > size_max)
         throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", sizeof(sanitizing_string::value_type)*reply_utf8.length(), size_max));
@@ -126,8 +130,8 @@ void eap::method_gtc::get_ui_context(_Out_ sanitizing_blob &context_data)
 {
     // Return authenticator string.
     context_data.assign(
-        reinterpret_cast<sanitizing_blob::const_pointer>(m_message.data()                     ),
-        reinterpret_cast<sanitizing_blob::const_pointer>(m_message.data() + m_message.length()));
+        reinterpret_cast<sanitizing_blob::const_pointer>(m_challenge.data()                       ),
+        reinterpret_cast<sanitizing_blob::const_pointer>(m_challenge.data() + m_challenge.length()));
 }
 
 
@@ -135,12 +139,14 @@ EapPeerMethodResponseAction eap::method_gtc::set_ui_context(
     _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
     _In_                                  DWORD dwUIContextDataSize)
 {
-    // Save GTC reply.
-    m_reply.assign(
+    m_module.log_event(&EAPMETHOD_GTC_RESPONSE, event_data((unsigned int)eap_type_gtc), event_data::blank);
+
+    // Save GTC response.
+    m_response.assign(
         reinterpret_cast<sanitizing_wstring::const_pointer>(pUIContextData                      ),
         reinterpret_cast<sanitizing_wstring::const_pointer>(pUIContextData + dwUIContextDataSize));
 
-    // Send the reply.
+    // Send the response.
     m_cfg.m_last_status = config_method::status_cred_invalid; // Blame "credentials" if we fail beyond this point.
     return EapPeerMethodResponseActionSend;
 }