EAP-GTC authentication now split into two modes: Challenge/Response and Password
This commit is contained in:
parent
e7e57abf52
commit
690a6d54d2
@ -2,7 +2,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: EAPMethods\n"
|
"Project-Id-Version: EAPMethods\n"
|
||||||
"POT-Creation-Date: 2017-02-02 18:14+0100\n"
|
"POT-Creation-Date: 2017-02-09 13:15+0100\n"
|
||||||
"PO-Revision-Date: 2016-06-02 12:27+0200\n"
|
"PO-Revision-Date: 2016-06-02 12:27+0200\n"
|
||||||
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
|
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
|
||||||
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
|
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
|
||||||
@ -481,7 +481,7 @@ msgstr ""
|
|||||||
msgid "Configuring EAP method failed (error %u)."
|
msgid "Configuring EAP method failed (error %u)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/GTC_UI/res/wxGTC_UI.cpp:16 master/lib/GTC_UI/include/GTC_UI.h:93
|
#: master/lib/GTC_UI/res/wxGTC_UI.cpp:16 master/lib/GTC_UI/include/GTC_UI.h:103
|
||||||
msgid "GTC Challenge"
|
msgid "GTC Challenge"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -497,11 +497,23 @@ msgstr ""
|
|||||||
msgid "Enter your response here"
|
msgid "Enter your response here"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/GTC_UI/src/GTC_UI.cpp:33
|
#: master/lib/GTC_UI/res/wxGTC_UI.cpp:70
|
||||||
msgid "GTC User ID"
|
msgid "EAP-GTC authentication &mode:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/GTC_UI/src/GTC_UI.cpp:69
|
#: master/lib/GTC_UI/res/wxGTC_UI.cpp:75
|
||||||
|
msgid "Select EAP-GTC authentication mode from the list"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: master/lib/GTC_UI/src/GTC_UI.cpp:39
|
||||||
|
msgid "Challenge/Response"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: master/lib/GTC_UI/src/GTC_UI.cpp:41
|
||||||
|
msgid "Password"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: master/lib/GTC_UI/src/GTC_UI.cpp:119
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "%s Challenge"
|
msgid "%s Challenge"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -713,7 +725,7 @@ msgstr ""
|
|||||||
msgid "Custom outer identity to use"
|
msgid "Custom outer identity to use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:319
|
#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
|
||||||
#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
|
#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
|
||||||
#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
|
#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
|
||||||
#: master/lib/EAPBase_UI/include/EAP_UI.h:785
|
#: master/lib/EAPBase_UI/include/EAP_UI.h:785
|
||||||
@ -723,7 +735,7 @@ msgstr ""
|
|||||||
msgid "Error writing credentials to Credential Manager: %hs (error %u)"
|
msgid "Error writing credentials to Credential Manager: %hs (error %u)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:321
|
#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
|
||||||
#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
|
#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
|
||||||
#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
|
#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
|
||||||
#: master/lib/EAPBase_UI/include/EAP_UI.h:788
|
#: master/lib/EAPBase_UI/include/EAP_UI.h:788
|
||||||
@ -732,22 +744,22 @@ msgstr ""
|
|||||||
msgid "Writing credentials failed."
|
msgid "Writing credentials failed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/TTLS_UI/src/Module.cpp:356 ver1.1/lib/TTLS_UI/src/Module.cpp:355
|
#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
|
msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/TTLS_UI/src/Module.cpp:358 ver1.1/lib/TTLS_UI/src/Module.cpp:357
|
#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Invoking EAP identity UI failed (error %u)."
|
msgid "Invoking EAP identity UI failed (error %u)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/TTLS_UI/src/Module.cpp:485
|
#: master/lib/TTLS_UI/src/Module.cpp:496
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
|
msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/lib/TTLS_UI/src/Module.cpp:488
|
#: master/lib/TTLS_UI/src/Module.cpp:499
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Invoking EAP interactive UI failed (error %u)."
|
msgid "Invoking EAP interactive UI failed (error %u)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -884,62 +896,38 @@ msgstr ""
|
|||||||
msgid "EAP Identity Provider"
|
msgid "EAP Identity Provider"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
||||||
msgid "EAP Methods"
|
msgid "EAP Methods"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
|
||||||
msgid "Modules to support individual EAP methods"
|
msgid "Modules to support individual EAP methods"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
||||||
msgid "TTLS"
|
msgid "TTLS"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
|
|
||||||
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
|
|
||||||
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
|
||||||
msgid "Tunneled Transport Layer Security"
|
msgid "Tunneled Transport Layer Security"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|||||||
@ -9,7 +9,7 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X plug-ins for enterp
|
|||||||
- PAP
|
- PAP
|
||||||
- MSCHAPv2
|
- MSCHAPv2
|
||||||
- EAP-MSCHAPv2
|
- EAP-MSCHAPv2
|
||||||
- EAP-GTC
|
- EAP-GTC: Challenge/Response and Password authentication modes
|
||||||
- System-installed EAP method chaining (experimental)
|
- System-installed EAP method chaining (experimental)
|
||||||
|
|
||||||
### Security
|
### Security
|
||||||
|
|||||||
@ -44,6 +44,15 @@ namespace eap
|
|||||||
///
|
///
|
||||||
class config_method_eapgtc : public config_method_with_cred
|
class config_method_eapgtc : public config_method_with_cred
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
|
///
|
||||||
|
/// Authentication mode
|
||||||
|
///
|
||||||
|
enum auth_mode_t {
|
||||||
|
auth_mode_response = 0, ///< Challenge/Response
|
||||||
|
auth_mode_password, ///< Password
|
||||||
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
///
|
///
|
||||||
/// Constructs configuration
|
/// Constructs configuration
|
||||||
@ -87,6 +96,19 @@ namespace eap
|
|||||||
|
|
||||||
virtual config* clone() const;
|
virtual config* clone() const;
|
||||||
|
|
||||||
|
/// \name XML management
|
||||||
|
/// @{
|
||||||
|
virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
|
||||||
|
virtual void load(_In_ IXMLDOMNode *pConfigRoot);
|
||||||
|
/// @}
|
||||||
|
|
||||||
|
/// \name BLOB management
|
||||||
|
/// @{
|
||||||
|
virtual void operator<<(_Inout_ cursor_out &cursor) const;
|
||||||
|
virtual size_t get_pk_size() const;
|
||||||
|
virtual void operator>>(_Inout_ cursor_in &cursor);
|
||||||
|
/// @}
|
||||||
|
|
||||||
///
|
///
|
||||||
/// @copydoc eap::config_method::get_method_id()
|
/// @copydoc eap::config_method::get_method_id()
|
||||||
/// \returns This implementation always returns `winstd::eap_type_gtc`
|
/// \returns This implementation always returns `winstd::eap_type_gtc`
|
||||||
@ -101,10 +123,53 @@ namespace eap
|
|||||||
|
|
||||||
///
|
///
|
||||||
/// @copydoc eap::config_method::make_credentials()
|
/// @copydoc eap::config_method::make_credentials()
|
||||||
/// \returns This implementation always returns `eap::credentials_identity` type of credentials
|
/// \returns This implementation returns `eap::credentials_identity` or `eap::credentials_pass` type of credentials, depending on authentication mode.
|
||||||
///
|
///
|
||||||
virtual credentials* make_credentials() const;
|
virtual credentials* make_credentials() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// \addtogroup EAPBaseStream
|
||||||
|
/// @{
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Packs an EAP-GTC method authentication mode
|
||||||
|
///
|
||||||
|
/// \param[inout] cursor Memory cursor
|
||||||
|
/// \param[in] val Authentication mode to pack
|
||||||
|
///
|
||||||
|
inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config_method_eapgtc::auth_mode_t &val)
|
||||||
|
{
|
||||||
|
cursor << (unsigned char)val;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Returns packed size of an EAP-GTC method authentication mode
|
||||||
|
///
|
||||||
|
/// \param[in] val Authentication mode to pack
|
||||||
|
///
|
||||||
|
/// \returns Size of data when packed (in bytes)
|
||||||
|
///
|
||||||
|
inline size_t pksizeof(_In_ const eap::config_method_eapgtc::auth_mode_t &val)
|
||||||
|
{
|
||||||
|
return pksizeof((unsigned char)val);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Unpacks an EAP-GTC method authentication mode
|
||||||
|
///
|
||||||
|
/// \param[inout] cursor Memory cursor
|
||||||
|
/// \param[out] val Authentication mode to unpack to
|
||||||
|
///
|
||||||
|
inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method_eapgtc::auth_mode_t &val)
|
||||||
|
{
|
||||||
|
val = (eap::config_method_eapgtc::auth_mode_t)0; // Reset higher bytes to zero before reading to lower byte.
|
||||||
|
cursor >> (unsigned char&)val;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @}
|
||||||
|
|||||||
@ -50,7 +50,7 @@ namespace eap
|
|||||||
/// \param[in] cfg Method configuration
|
/// \param[in] cfg Method configuration
|
||||||
/// \param[in] cred User credentials
|
/// \param[in] cred User credentials
|
||||||
///
|
///
|
||||||
method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials_identity &cred);
|
method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred);
|
||||||
|
|
||||||
///
|
///
|
||||||
/// Moves a GTC method
|
/// Moves a GTC method
|
||||||
@ -109,7 +109,7 @@ namespace eap
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
config_method_eapgtc &m_cfg; ///< Method configuration
|
config_method_eapgtc &m_cfg; ///< Method configuration
|
||||||
credentials_identity &m_cred; ///< Method user credentials
|
credentials &m_cred; ///< Method user credentials
|
||||||
winstd::sanitizing_wstring m_challenge; ///< GTC challenge
|
winstd::sanitizing_wstring m_challenge; ///< GTC challenge
|
||||||
winstd::sanitizing_wstring m_response; ///< GTC response
|
winstd::sanitizing_wstring m_response; ///< GTC response
|
||||||
};
|
};
|
||||||
|
|||||||
@ -30,6 +30,7 @@ using namespace winstd;
|
|||||||
|
|
||||||
eap::config_method_eapgtc::config_method_eapgtc(_In_ module &mod, _In_ unsigned int level) : config_method_with_cred(mod, level)
|
eap::config_method_eapgtc::config_method_eapgtc(_In_ module &mod, _In_ unsigned int level) : config_method_with_cred(mod, level)
|
||||||
{
|
{
|
||||||
|
// Default to Challenge/Response authentication mode.
|
||||||
m_cred.reset(new credentials_identity(mod));
|
m_cred.reset(new credentials_identity(mod));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +71,95 @@ eap::config* eap::config_method_eapgtc::clone() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void eap::config_method_eapgtc::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
|
||||||
|
{
|
||||||
|
assert(pDoc);
|
||||||
|
assert(pConfigRoot);
|
||||||
|
|
||||||
|
config_method_with_cred::save(pDoc, pConfigRoot);
|
||||||
|
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
|
if (dynamic_cast<credentials_identity*>(m_cred.get()))
|
||||||
|
hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"AuthMode"), namespace_eapmetadata, bstr(L"Challenge/Response"));
|
||||||
|
else if (dynamic_cast<credentials_pass*>(m_cred.get()))
|
||||||
|
hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"AuthMode"), namespace_eapmetadata, bstr(L"Password"));
|
||||||
|
else
|
||||||
|
throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
|
||||||
|
if (FAILED(hr))
|
||||||
|
throw com_runtime_error(hr, __FUNCTION__ " Error creating <AuthMode> element.");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void eap::config_method_eapgtc::load(_In_ IXMLDOMNode *pConfigRoot)
|
||||||
|
{
|
||||||
|
assert(pConfigRoot);
|
||||||
|
HRESULT hr;
|
||||||
|
wstring xpath(eapxml::get_xpath(pConfigRoot));
|
||||||
|
|
||||||
|
// Load authentication mode first, then (re)create credentials to match the authentication mode.
|
||||||
|
bstr auth_mode;
|
||||||
|
if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:AuthMode"), auth_mode)) ||
|
||||||
|
CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, auth_mode, auth_mode.length(), _L("Challenge/Response"), -1, NULL, NULL, 0) == CSTR_EQUAL)
|
||||||
|
{
|
||||||
|
m_cred.reset(new eap::credentials_identity(m_module));
|
||||||
|
} else if (CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, auth_mode, auth_mode.length(), _L("Password"), -1, NULL, NULL, 0) == CSTR_EQUAL) {
|
||||||
|
m_cred.reset(new eap::credentials_pass(m_module));
|
||||||
|
} else
|
||||||
|
throw invalid_argument(string_printf(__FUNCTION__ " Unsupported authentication mode (%ls).", (BSTR)auth_mode));
|
||||||
|
|
||||||
|
// Load method configuration.
|
||||||
|
config_method_with_cred::load(pConfigRoot);
|
||||||
|
|
||||||
|
m_module.log_config((xpath + L"/AuthMode").c_str(), auth_mode);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void eap::config_method_eapgtc::operator<<(_Inout_ cursor_out &cursor) const
|
||||||
|
{
|
||||||
|
// Save authentication mode first, as credential loading will require this information.
|
||||||
|
if (dynamic_cast<credentials_identity*>(m_cred.get()))
|
||||||
|
cursor << auth_mode_response;
|
||||||
|
else if (dynamic_cast<credentials_pass*>(m_cred.get()))
|
||||||
|
cursor << auth_mode_password;
|
||||||
|
else
|
||||||
|
throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
|
||||||
|
|
||||||
|
config_method_with_cred::operator<<(cursor);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
size_t eap::config_method_eapgtc::get_pk_size() const
|
||||||
|
{
|
||||||
|
auth_mode_t auth_mode;
|
||||||
|
if (dynamic_cast<credentials_identity*>(m_cred.get()))
|
||||||
|
auth_mode = auth_mode_response;
|
||||||
|
else if (dynamic_cast<credentials_pass*>(m_cred.get()))
|
||||||
|
auth_mode = auth_mode_password;
|
||||||
|
else
|
||||||
|
throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
|
||||||
|
|
||||||
|
return
|
||||||
|
pksizeof(auth_mode) +
|
||||||
|
config_method_with_cred::get_pk_size();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void eap::config_method_eapgtc::operator>>(_Inout_ cursor_in &cursor)
|
||||||
|
{
|
||||||
|
// (Re)create credentials to match the authentication mode.
|
||||||
|
auth_mode_t auth_mode;
|
||||||
|
cursor >> auth_mode;
|
||||||
|
switch (auth_mode) {
|
||||||
|
case auth_mode_response: m_cred.reset(new eap::credentials_identity(m_module)); break;
|
||||||
|
case auth_mode_password: m_cred.reset(new eap::credentials_pass (m_module)); break;
|
||||||
|
default : throw invalid_argument(string_printf(__FUNCTION__ " Unsupported authentication mode (%u).", auth_mode));
|
||||||
|
}
|
||||||
|
|
||||||
|
config_method_with_cred::operator>>(cursor);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
eap_type_t eap::config_method_eapgtc::get_method_id() const
|
eap_type_t eap::config_method_eapgtc::get_method_id() const
|
||||||
{
|
{
|
||||||
return eap_type_gtc;
|
return eap_type_gtc;
|
||||||
@ -84,5 +174,10 @@ const wchar_t* eap::config_method_eapgtc::get_method_str() const
|
|||||||
|
|
||||||
eap::credentials* eap::config_method_eapgtc::make_credentials() const
|
eap::credentials* eap::config_method_eapgtc::make_credentials() const
|
||||||
{
|
{
|
||||||
return new eap::credentials_identity(m_module);
|
if (dynamic_cast<credentials_identity*>(m_cred.get()))
|
||||||
|
return new eap::credentials_identity(m_module);
|
||||||
|
else if (dynamic_cast<credentials_pass*>(m_cred.get()))
|
||||||
|
return new eap::credentials_pass (m_module);
|
||||||
|
else
|
||||||
|
throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,7 +28,7 @@ using namespace winstd;
|
|||||||
// eap::method_gtc
|
// eap::method_gtc
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials_identity &cred) :
|
eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred) :
|
||||||
m_cfg(cfg),
|
m_cfg(cfg),
|
||||||
m_cred(cred),
|
m_cred(cred),
|
||||||
method(mod)
|
method(mod)
|
||||||
@ -83,13 +83,24 @@ EapPeerMethodResponseAction eap::method_gtc::process_request_packet(
|
|||||||
|
|
||||||
m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_gtc), event_data::blank);
|
m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_gtc), event_data::blank);
|
||||||
|
|
||||||
// Read authenticator challenge as UTF-8 encoded string.
|
credentials_pass *cred_pass;
|
||||||
MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pReceivedPacket, dwReceivedPacketSize, m_challenge);
|
if (dynamic_cast<credentials_identity*>(&m_cred)) {
|
||||||
|
// 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);
|
m_module.log_event(&EAPMETHOD_GTC_RESPONSE_REQ, event_data((unsigned int)eap_type_gtc), event_data::blank);
|
||||||
|
|
||||||
// User must respond to the challenge.
|
// User must respond to the challenge.
|
||||||
return EapPeerMethodResponseActionInvokeUI;
|
return EapPeerMethodResponseActionInvokeUI;
|
||||||
|
} else if ((cred_pass = dynamic_cast<credentials_pass*>(&m_cred)) != NULL) {
|
||||||
|
// Ignore authenticator challenge and save password as GTC response.
|
||||||
|
m_response = cred_pass->m_password;
|
||||||
|
|
||||||
|
// Send the response.
|
||||||
|
m_cfg.m_last_status = config_method::status_cred_invalid; // Blame "credentials" if we fail beyond this point.
|
||||||
|
return EapPeerMethodResponseActionSend;
|
||||||
|
} else
|
||||||
|
throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -98,13 +109,13 @@ void eap::method_gtc::get_response_packet(
|
|||||||
_In_opt_ DWORD size_max)
|
_In_opt_ DWORD size_max)
|
||||||
{
|
{
|
||||||
// Encode GTC response as UTF-8.
|
// Encode GTC response as UTF-8.
|
||||||
sanitizing_string reply_utf8;
|
sanitizing_string response_utf8;
|
||||||
WideCharToMultiByte(CP_UTF8, 0, m_response, reply_utf8, NULL, NULL);
|
WideCharToMultiByte(CP_UTF8, 0, m_response, response_utf8, NULL, NULL);
|
||||||
|
|
||||||
if (sizeof(sanitizing_string::value_type)*reply_utf8.length() > size_max)
|
if (sizeof(sanitizing_string::value_type)*response_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));
|
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)*response_utf8.length(), size_max));
|
||||||
|
|
||||||
packet.assign(reply_utf8.begin(), reply_utf8.end());
|
packet.assign(response_utf8.begin(), response_utf8.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -29,14 +29,24 @@ class wxGTCResponsePanel;
|
|||||||
/// @{
|
/// @{
|
||||||
|
|
||||||
///
|
///
|
||||||
/// GTC credential entry panel
|
/// GTC challenge/response credential entry panel
|
||||||
///
|
///
|
||||||
typedef wxIdentityCredentialsPanel<eap::credentials_identity, wxIdentityCredentialsPanelBase> wxGTCCredentialsPanel;
|
typedef wxIdentityCredentialsPanel<eap::credentials_identity, wxIdentityCredentialsPanelBase> wxGTCResponseCredentialsPanel;
|
||||||
|
|
||||||
///
|
///
|
||||||
/// GTC credential configuration panel
|
/// GTC challenge/response credential configuration panel
|
||||||
///
|
///
|
||||||
typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCCredentialsPanel> wxGTCCredentialsConfigPanel;
|
typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCResponseCredentialsPanel> wxGTCResponseCredentialsConfigPanel;
|
||||||
|
|
||||||
|
///
|
||||||
|
/// GTC password credential entry panel
|
||||||
|
///
|
||||||
|
typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxGTCPasswordCredentialsPanel;
|
||||||
|
|
||||||
|
///
|
||||||
|
/// GTC password credential configuration panel
|
||||||
|
///
|
||||||
|
typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxGTCPasswordCredentialsPanel> wxGTCPasswordCredentialsConfigPanel;
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
@ -44,11 +54,6 @@ typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCCredentialsP
|
|||||||
|
|
||||||
#include "../res/wxGTC_UI.h"
|
#include "../res/wxGTC_UI.h"
|
||||||
|
|
||||||
#include <wx/panel.h>
|
|
||||||
#include <wx/stattext.h>
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
|
|
||||||
|
|
||||||
@ -58,7 +63,7 @@ typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCCredentialsP
|
|||||||
///
|
///
|
||||||
/// GTC configuration panel
|
/// GTC configuration panel
|
||||||
///
|
///
|
||||||
class wxGTCConfigPanel : public wxPanel
|
class wxGTCConfigPanel : public wxGTCConfigPanelBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
///
|
///
|
||||||
@ -66,18 +71,23 @@ public:
|
|||||||
///
|
///
|
||||||
wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent);
|
wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent);
|
||||||
|
|
||||||
///
|
|
||||||
/// Destructs the configuration panel
|
|
||||||
///
|
|
||||||
virtual ~wxGTCConfigPanel();
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// \cond internal
|
/// \cond internal
|
||||||
virtual void OnInitDialog(wxInitDialogEvent& event);
|
virtual bool TransferDataToWindow();
|
||||||
|
virtual bool TransferDataFromWindow();
|
||||||
|
virtual void OnUpdateUI(wxUpdateUIEvent& event);
|
||||||
/// \endcond
|
/// \endcond
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxGTCCredentialsConfigPanel *m_credentials; ///< Credentials configuration panel
|
const eap::config_provider &m_prov; ///< EAP provider
|
||||||
|
eap::config_method_eapgtc &m_cfg; ///< EAP-GTC configuration
|
||||||
|
|
||||||
|
wxGTCResponseCredentialsConfigPanel *m_credentials_resp; ///< Challenge/response credentials configuration panel
|
||||||
|
wxGTCPasswordCredentialsConfigPanel *m_credentials_pass; ///< Password credentials configuration panel
|
||||||
|
|
||||||
|
// Temporary configurations to hold data until applied
|
||||||
|
eap::config_method_eapgtc m_cfg_resp; ///< Method configuration for challenge/response mode
|
||||||
|
eap::config_method_eapgtc m_cfg_pass; ///< Method configuration for password mode
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -61,3 +61,32 @@ wxGTCResponsePanelBase::wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id,
|
|||||||
wxGTCResponsePanelBase::~wxGTCResponsePanelBase()
|
wxGTCResponsePanelBase::~wxGTCResponsePanelBase()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxGTCConfigPanelBase::wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
|
||||||
|
{
|
||||||
|
wxBoxSizer* sb_vertical;
|
||||||
|
sb_vertical = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
m_auth_mode_label = new wxStaticText( this, wxID_ANY, _("EAP-GTC authentication &mode:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_auth_mode_label->Wrap( -1 );
|
||||||
|
sb_vertical->Add( m_auth_mode_label, 0, wxBOTTOM, 5 );
|
||||||
|
|
||||||
|
m_auth_mode = new wxChoicebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT );
|
||||||
|
m_auth_mode->SetToolTip( _("Select EAP-GTC authentication mode from the list") );
|
||||||
|
|
||||||
|
sb_vertical->Add( m_auth_mode, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
this->SetSizer( sb_vertical );
|
||||||
|
this->Layout();
|
||||||
|
|
||||||
|
// Connect Events
|
||||||
|
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
wxGTCConfigPanelBase::~wxGTCConfigPanelBase()
|
||||||
|
{
|
||||||
|
// Disconnect Events
|
||||||
|
this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) );
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@ -466,5 +466,230 @@
|
|||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="Panel" expanded="1">
|
||||||
|
<property name="aui_managed">0</property>
|
||||||
|
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="event_handler">impl_virtual</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">wxGTCConfigPanelBase</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="size">500,-1</property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style">wxTAB_TRAVERSAL</property>
|
||||||
|
<event name="OnAuiFindManager"></event>
|
||||||
|
<event name="OnAuiPaneButton"></event>
|
||||||
|
<event name="OnAuiPaneClose"></event>
|
||||||
|
<event name="OnAuiPaneMaximize"></event>
|
||||||
|
<event name="OnAuiPaneRestore"></event>
|
||||||
|
<event name="OnAuiRender"></event>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnInitDialog"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI">OnUpdateUI</event>
|
||||||
|
<object class="wxBoxSizer" expanded="1">
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">sb_vertical</property>
|
||||||
|
<property name="orient">wxVERTICAL</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxBOTTOM</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxStaticText" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">EAP-GTC authentication &mode:</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_auth_mode_label</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxEXPAND</property>
|
||||||
|
<property name="proportion">1</property>
|
||||||
|
<object class="wxChoicebook" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_auth_mode</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style">wxCHB_DEFAULT</property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip">Select EAP-GTC authentication mode from the list</property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnChoicebookPageChanged"></event>
|
||||||
|
<event name="OnChoicebookPageChanging"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</wxFormBuilder_Project>
|
</wxFormBuilder_Project>
|
||||||
|
|||||||
@ -25,6 +25,7 @@
|
|||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/statbox.h>
|
#include <wx/statbox.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
|
#include <wx/choicebk.h>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
@ -50,4 +51,26 @@ class wxGTCResponsePanelBase : public wxPanel
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxGTCConfigPanelBase
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
class wxGTCConfigPanelBase : public wxPanel
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
|
||||||
|
protected:
|
||||||
|
wxStaticText* m_auth_mode_label;
|
||||||
|
wxChoicebook* m_auth_mode;
|
||||||
|
|
||||||
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
||||||
|
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
||||||
|
~wxGTCConfigPanelBase();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
#endif //__WXGTC_UI_H__
|
#endif //__WXGTC_UI_H__
|
||||||
|
|||||||
@ -25,36 +25,86 @@
|
|||||||
// wxGTCConfigPanel
|
// wxGTCConfigPanel
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
wxGTCConfigPanel::wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent) : wxPanel(parent)
|
wxGTCConfigPanel::wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent) :
|
||||||
|
m_prov (prov ),
|
||||||
|
m_cfg (cfg ),
|
||||||
|
m_cfg_resp(cfg.m_module, cfg.m_level),
|
||||||
|
m_cfg_pass(cfg.m_module, cfg.m_level),
|
||||||
|
wxGTCConfigPanelBase(parent)
|
||||||
{
|
{
|
||||||
wxBoxSizer* sb_content;
|
// Initialize Password authentication mode properly. Challenge/Response mode does not require initialization, since it is initialized so by default.
|
||||||
sb_content = new wxBoxSizer( wxVERTICAL );
|
m_cfg_pass.m_cred.reset(new eap::credentials_pass(m_cfg.m_module));
|
||||||
|
|
||||||
m_credentials = new wxGTCCredentialsConfigPanel(prov, cfg, this, _("GTC User ID"));
|
m_credentials_resp = new wxGTCResponseCredentialsConfigPanel(m_prov, m_cfg_resp, m_auth_mode);
|
||||||
sb_content->Add(m_credentials, 0, wxEXPAND, 5);
|
m_auth_mode->AddPage(m_credentials_resp, _("Challenge/Response"));
|
||||||
|
m_credentials_pass = new wxGTCPasswordCredentialsConfigPanel(m_prov, m_cfg_pass, m_auth_mode);
|
||||||
this->SetSizer(sb_content);
|
m_auth_mode->AddPage(m_credentials_pass, _("Password"));
|
||||||
this->Layout();
|
|
||||||
|
|
||||||
// Connect Events
|
|
||||||
this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxGTCConfigPanel::OnInitDialog));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
wxGTCConfigPanel::~wxGTCConfigPanel()
|
|
||||||
{
|
|
||||||
// Disconnect Events
|
|
||||||
this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxGTCConfigPanel::OnInitDialog));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// \cond internal
|
/// \cond internal
|
||||||
void wxGTCConfigPanel::OnInitDialog(wxInitDialogEvent& event)
|
|
||||||
|
bool wxGTCConfigPanel::TransferDataToWindow()
|
||||||
{
|
{
|
||||||
// Forward the event to child panels.
|
eap::credentials_identity *cred_resp;
|
||||||
if (m_credentials)
|
eap::credentials_pass *cred_pass;
|
||||||
m_credentials->GetEventHandler()->ProcessEvent(event);
|
|
||||||
|
if ((cred_resp = dynamic_cast<eap::credentials_identity*>(m_cfg.m_cred.get())) != NULL) {
|
||||||
|
m_cfg_resp = m_cfg;
|
||||||
|
m_auth_mode->SetSelection(0); // 0=Challenge/Response
|
||||||
|
} else if ((cred_pass = dynamic_cast<eap::credentials_pass*>(m_cfg.m_cred.get())) != NULL) {
|
||||||
|
m_cfg_pass = m_cfg;
|
||||||
|
m_auth_mode->SetSelection(1); // 1=Password
|
||||||
|
} else
|
||||||
|
wxFAIL_MSG(wxT("Unsupported authentication mode."));
|
||||||
|
|
||||||
|
return wxGTCConfigPanelBase::TransferDataToWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool wxGTCConfigPanel::TransferDataFromWindow()
|
||||||
|
{
|
||||||
|
wxCHECK(wxGTCConfigPanelBase::TransferDataFromWindow(), false);
|
||||||
|
|
||||||
|
if (!m_prov.m_read_only) {
|
||||||
|
// This is not a provider-locked configuration. Save the data.
|
||||||
|
switch (m_auth_mode->GetSelection()) {
|
||||||
|
case 0: // 0=Challenge/Response
|
||||||
|
m_cfg = m_cfg_resp;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 1: // 1=Password
|
||||||
|
m_cfg = m_cfg_pass;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
wxFAIL_MSG(wxT("Unsupported authentication mode."));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void wxGTCConfigPanel::OnUpdateUI(wxUpdateUIEvent& event)
|
||||||
|
{
|
||||||
|
UNREFERENCED_PARAMETER(event);
|
||||||
|
|
||||||
|
if (m_prov.m_read_only) {
|
||||||
|
// This is provider-locked configuration. Disable controls.
|
||||||
|
m_auth_mode_label ->Enable(false);
|
||||||
|
m_auth_mode ->Enable(false);
|
||||||
|
m_credentials_resp->Enable(false);
|
||||||
|
m_credentials_pass->Enable(false);
|
||||||
|
} else {
|
||||||
|
// This is not a provider-locked configuration. Enable controls.
|
||||||
|
m_auth_mode_label ->Enable(true);
|
||||||
|
m_auth_mode ->Enable(true);
|
||||||
|
m_credentials_resp->Enable(true);
|
||||||
|
m_credentials_pass ->Enable(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// \endcond
|
/// \endcond
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -259,7 +259,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
|
|||||||
case eap_type_gtc : meth_inner.reset(
|
case eap_type_gtc : meth_inner.reset(
|
||||||
new method_eapmsg (*this, cred_inner->get_identity().c_str(),
|
new method_eapmsg (*this, cred_inner->get_identity().c_str(),
|
||||||
new method_eap (*this, eap_type_gtc,
|
new method_eap (*this, eap_type_gtc,
|
||||||
new method_gtc (*this, dynamic_cast<config_method_eapgtc&>(*cfg_inner), dynamic_cast<credentials_identity&>(*cred_inner))))); break;
|
new method_gtc (*this, dynamic_cast<config_method_eapgtc&>(*cfg_inner), dynamic_cast<credentials&>(*cred_inner))))); break;
|
||||||
default: throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method.");
|
default: throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -298,7 +298,18 @@ void eap::peer_ttls_ui::invoke_identity_ui(
|
|||||||
case eap_type_legacy_pap : panel = new wxPAPCredentialsPanel (*cfg_prov, *dynamic_cast<const eap::config_method_pap *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass *>(cred->m_inner.get()), &dlg, false); break;
|
case eap_type_legacy_pap : panel = new wxPAPCredentialsPanel (*cfg_prov, *dynamic_cast<const eap::config_method_pap *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass *>(cred->m_inner.get()), &dlg, false); break;
|
||||||
case eap_type_legacy_mschapv2: panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_mschapv2 *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass *>(cred->m_inner.get()), &dlg, false); break;
|
case eap_type_legacy_mschapv2: panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_mschapv2 *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass *>(cred->m_inner.get()), &dlg, false); break;
|
||||||
case eap_type_mschapv2 : panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapmschapv2*>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass *>(cred->m_inner.get()), &dlg, false); break;
|
case eap_type_mschapv2 : panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapmschapv2*>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass *>(cred->m_inner.get()), &dlg, false); break;
|
||||||
case eap_type_gtc : panel = new wxGTCCredentialsPanel (*cfg_prov, *dynamic_cast<const eap::config_method_eapgtc *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_identity*>(cred->m_inner.get()), &dlg, false); break;
|
case eap_type_gtc : {
|
||||||
|
// EAP-GTC credential prompt differes for "Challenge/Response" and "Password" authentication modes.
|
||||||
|
eap::credentials_identity *cred_resp;
|
||||||
|
eap::credentials_pass *cred_pass;
|
||||||
|
if ((cred_resp = dynamic_cast<eap::credentials_identity*>(cred->m_inner.get())) != NULL)
|
||||||
|
panel = new wxGTCResponseCredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapgtc*>(cfg_method->m_inner.get()), *cred_resp, &dlg, false);
|
||||||
|
else if ((cred_pass = dynamic_cast<eap::credentials_pass*>(cred->m_inner.get())) != NULL)
|
||||||
|
panel = new wxGTCPasswordCredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapgtc*>(cfg_method->m_inner.get()), *cred_pass, &dlg, false);
|
||||||
|
else
|
||||||
|
wxLogError("Unsupported authentication mode.");
|
||||||
|
break;
|
||||||
|
}
|
||||||
default : wxLogError("Unsupported inner authentication method.");
|
default : wxLogError("Unsupported inner authentication method.");
|
||||||
}
|
}
|
||||||
panel->SetRemember(src_inner == eap::credentials::source_storage);
|
panel->SetRemember(src_inner == eap::credentials::source_storage);
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit 5ffcb79306139f20197b6492924bbe12a51d0ac2
|
Subproject commit 905fd066dc326c8e020bb62ba40125236071fdda
|
||||||
Loading…
x
Reference in New Issue
Block a user