Browse Source

Logging configured client certificate + Logging server request for a client certificate in Normal level

Source commit: fc6db53bddb66cec2a001ae3f8aa6e50bbede272
Martin Prikryl 9 years ago
parent
commit
1ab5af6ea6
2 changed files with 5 additions and 5 deletions
  1. 4 4
      source/core/SessionInfo.cpp
  2. 1 1
      source/filezilla/AsyncSslSocketLayer.cpp

+ 4 - 4
source/core/SessionInfo.cpp

@@ -1203,8 +1203,8 @@ void __fastcall TSessionLog::DoAddStartupInfo(TSessionData * Data)
         {
         {
           ADF(L"Transfer active immediately: %s", (EnumName(Data->FtpTransferActiveImmediately, AutoSwitchNames)));
           ADF(L"Transfer active immediately: %s", (EnumName(Data->FtpTransferActiveImmediately, AutoSwitchNames)));
         }
         }
-        ADF(L"FTP: FTPS: %s; Passive: %s [Force IP: %s]; MLSD: %s [List all: %s]",
-          (Ftps, BooleanToEngStr(Data->FtpPasvMode),
+        ADF(L"FTP: FTPS: %s [Client certificate: %s]; Passive: %s [Force IP: %s]; MLSD: %s [List all: %s]",
+          (Ftps, LogSensitive(Data->TlsCertificateFile), BooleanToEngStr(Data->FtpPasvMode),
            EnumName(Data->FtpForcePasvIp, AutoSwitchNames),
            EnumName(Data->FtpForcePasvIp, AutoSwitchNames),
            EnumName(Data->FtpUseMlsd, AutoSwitchNames),
            EnumName(Data->FtpUseMlsd, AutoSwitchNames),
            EnumName(Data->FtpListAll, AutoSwitchNames)));
            EnumName(Data->FtpListAll, AutoSwitchNames)));
@@ -1212,8 +1212,8 @@ void __fastcall TSessionLog::DoAddStartupInfo(TSessionData * Data)
       if (Data->FSProtocol == fsWebDAV)
       if (Data->FSProtocol == fsWebDAV)
       {
       {
         FtpsOn = (Data->Ftps != ftpsNone);
         FtpsOn = (Data->Ftps != ftpsNone);
-        ADF(L"HTTPS: %s",
-          (BooleanToEngStr(FtpsOn)));
+        ADF(L"HTTPS: %s [Client certificate: %s]",
+          (BooleanToEngStr(FtpsOn), LogSensitive(Data->TlsCertificateFile)));
       }
       }
       if (FtpsOn)
       if (FtpsOn)
       {
       {

+ 1 - 1
source/filezilla/AsyncSslSocketLayer.cpp

@@ -1753,7 +1753,7 @@ int CAsyncSslSocketLayer::ProvideClientCert(
   }
   }
   else
   else
   {
   {
-    Level = FZ_LOG_INFO;
+    Level = FZ_LOG_PROGRESS;
     *Certificate = X509_dup(Layer->FCertificate);
     *Certificate = X509_dup(Layer->FCertificate);
     CRYPTO_add(&Layer->FPrivateKey->references, 1, CRYPTO_LOCK_EVP_PKEY);
     CRYPTO_add(&Layer->FPrivateKey->references, 1, CRYPTO_LOCK_EVP_PKEY);
     *PrivateKey = Layer->FPrivateKey;
     *PrivateKey = Layer->FPrivateKey;