Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

__DANGEROUS__LOG_CONFIDENTIAL_DATA is now 0/1 #defined

Browse Source
This commit is contained in:
Simon Rozman 2017-02-02 14:01:12 +01:00
parent decf8d0860
commit e0572524aa
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/EAPBase/include/EAP.h
View File

@ -25,6 +25,10 @@
#define EAP_ENCRYPT_BLOBS 1 #define EAP_ENCRYPT_BLOBS 1
#endif #endif
#ifndef __DANGEROUS__LOG_CONFIDENTIAL_DATA
#define __DANGEROUS__LOG_CONFIDENTIAL_DATA 0
#endif
#ifndef EAP_USE_NATIVE_CREDENTIAL_CACHE #ifndef EAP_USE_NATIVE_CREDENTIAL_CACHE
#define EAP_USE_NATIVE_CREDENTIAL_CACHE 0 #define EAP_USE_NATIVE_CREDENTIAL_CACHE 0
#endif #endif

8
lib/EAPBase/include/Module.h
View File

@ -225,8 +225,8 @@ namespace eap
/// ///
inline void log_config_discrete(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const inline void log_config_discrete(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const
{ {
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider undefining __DANGEROUS__LOG_CONFIDENTIAL_DATA.") #pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider setting __DANGEROUS__LOG_CONFIDENTIAL_DATA to 0.")
log_config(name, value); log_config(name, value);
#else #else
log_config(name, value ? value[0] ? L"********" : L"" : NULL); log_config(name, value ? value[0] ? L"********" : L"" : NULL);
@ -240,8 +240,8 @@ namespace eap
/// ///
inline void log_config_discrete(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const inline void log_config_discrete(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const
{ {
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider undefining __DANGEROUS__LOG_CONFIDENTIAL_DATA.") #pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider setting __DANGEROUS__LOG_CONFIDENTIAL_DATA to 0.")
log_config(name, data, size); log_config(name, data, size);
#else #else
log_config(name, data ? size ? L"********" : L"" : NULL); log_config(name, data ? size ? L"********" : L"" : NULL);

4
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -67,7 +67,7 @@ class wxEAPProviderLockedPanel;
/// ///
class wxEAPCredentialWarningPanel; class wxEAPCredentialWarningPanel;
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
/// ///
/// EAP credential logging enabled warning note /// EAP credential logging enabled warning note
/// ///
@ -452,7 +452,7 @@ public:
}; };
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
class wxEAPCredentialLogWarningPanel : public wxEAPNotePanel class wxEAPCredentialLogWarningPanel : public wxEAPNotePanel
{ {
public: public:

4
lib/EAPBase_UI/src/EAP_UI.cpp
View File

@ -98,7 +98,7 @@ wxEAPCredentialsDialog::wxEAPCredentialsDialog(const eap::config_provider &prov,
// Set banner title. // Set banner title.
m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name))); m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name)));
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
AddContent(new wxEAPCredentialLogWarningPanel(this)); AddContent(new wxEAPCredentialLogWarningPanel(this));
#endif #endif
} }
@ -271,7 +271,7 @@ wxEAPCredentialWarningPanel::wxEAPCredentialWarningPanel(const eap::config_provi
// wxEAPCredentialWarningPanel // wxEAPCredentialWarningPanel
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
wxEAPCredentialLogWarningPanel::wxEAPCredentialLogWarningPanel(wxWindow* parent) : wxEAPNotePanel(parent) wxEAPCredentialLogWarningPanel::wxEAPCredentialLogWarningPanel(wxWindow* parent) : wxEAPNotePanel(parent)
{ {
// Load and set icon. // Load and set icon.