fix: prevent credentials from being logged - WPB-14251 (#2226)

wireapp · Nov 29, 2024 · b545aa4 · b545aa4
1 parent ae81f4e
commit b545aa4
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 15 deletions.
diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift
@@ -20,8 +20,6 @@ import avs
 import Combine
 import Foundation
 
-private let zmLog = ZMSLog(tag: "calling")
-
 /// WireCallCenter is used for making Wire calls and observing their state. There can only be one instance of the
 /// WireCallCenter.
 ///
@@ -942,7 +940,7 @@ extension WireCallCenterV3 {
         overMLSSelfConversation: Bool = false
     ) {
         Self.logger.info("sending call message for AVS")
-        zmLog.debug("\(self): send call message, transport = \(String(describing: transport))")
+        Self.logger.debug("\(self): send call message, transport = \(String(describing: transport))")
         transport?.send(
             data: data,
             conversationId: conversationId,
@@ -957,18 +955,18 @@ extension WireCallCenterV3 {
     /// Sends an SFT call message when requested by AVS through `wcall_sft_req_h`.
     func sendSFT(token: WireCallMessageToken, url: String, data: Data) {
         Self.logger.info("sending SFT message for AVS")
-        zmLog.debug("\(self): send SFT call message, transport = \(String(describing: transport))")
+        Self.logger.debug("\(self): send SFT call message, transport = \(String(describing: transport))")
 
         guard let endpoint = URL(string: url) else {
-            zmLog.error("SFT request failed. Invalid url: \(url)")
+            Self.logger.error("SFT request failed. Invalid url: \(url)")
             avsWrapper.handleSFTResponse(data: nil, context: token)
             return
         }
 
         transport?.sendSFT(data: data, url: endpoint) { [weak self] result in
             switch result {
             case let .failure(error):
-                zmLog.error("SFT request failed: \(error.localizedDescription)")
+                Self.logger.error("SFT request failed: \(error.localizedDescription)")
                 self?.avsWrapper.handleSFTResponse(data: nil, context: token)
 
             case let .success(data):
@@ -979,17 +977,17 @@ extension WireCallCenterV3 {
 
     /// Sends the config request when requested by AVS through `wcall_config_req_h`.
     func requestCallConfig() {
-        zmLog.debug("\(self): requestCallConfig(), transport = \(String(describing: transport))")
+        Self.logger.debug("\(self): requestCallConfig(), transport = \(String(describing: transport))")
         transport?.requestCallConfig(completionHandler: { [weak self] config, httpStatusCode in
             guard let self else { return }
-            zmLog.debug("\(self): self.avsWrapper.update with \(String(describing: config))")
+            Self.logger.debug("\(self): self.avsWrapper.update with \(String(describing: config))")
             avsWrapper.update(callConfig: config, httpStatusCode: httpStatusCode)
         })
     }
 
     /// Tags a call as missing when requested by AVS through `wcall_missed_h`.
     func missed(conversationId: AVSIdentifier, userId: AVSIdentifier, timestamp: Date, isVideoCall: Bool) {
-        zmLog.debug("missed call")
+        Self.logger.debug("missed call")
 
         if let context = uiMOC {
             WireCallCenterMissedCallNotification(

diff --git a/...-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift b/...-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift
@@ -84,7 +84,10 @@ extension RegistationCredentialVerificationStrategy: ZMSingleRequestTranscoder {
                 // We can end up here because more than one request can be sent for a single action/phase.
                 // This is an issue in some other part of SyncEngine but as a quick fix we will log and abort here.
                 let phaseString = registrationStatus.phase.map { "\($0)" } ?? "<nil>"
-                WireLogger.authentication.error("Recieved unsuccessful response for invalid phase (\(phaseString))", attributes: .safePublic)
+                WireLogger.authentication.error(
+                    "Recieved unsuccessful response for invalid phase (\(phaseString))",
+                    attributes: .safePublic
+                )
                 return assertionFailure("Error occurs for invalid phase: \(phaseString)")
             }
             registrationStatus.handleError(error)

diff --git a/wire-ios-system/Source/Logging/CocoaLumberjackLogger.swift b/wire-ios-system/Source/Logging/CocoaLumberjackLogger.swift
@@ -73,6 +73,22 @@ final class CocoaLumberjackLogger: LoggerProtocol {
         //    return
         // }
 
+        // Filter logs by level:
+        // Only continue if we're running a DEBUG build or
+        // the level is greater than or equal to error and lower than or equal to info.
+        //
+        // DDLogLevelOff     00000 0
+        // DDLogLevelError   00001 1
+        // DDLogLevelWarning 00011 3
+        // DDLogLevelInfo    00111 7
+        // DDLogLevelDebug   01111 15
+        // DDLogLevelVerbose 11111 31
+        // DDLogLevelAll  1..11111 UInt.max
+        guard
+            isDebug ||
+            (level.rawValue >= DDLogLevel.error.rawValue && level.rawValue <= DDLogLevel.info.rawValue)
+        else { return }
+
         var entry =
             "[\(formattedLevel(level))] \(message.logDescription)\(attributesDescription(from: mergedAttributes))"
 

diff --git a/...os/Wire-iOS/Sources/Authentication/Event Handlers/AuthenticationEventResponderChain.swift b/...os/Wire-iOS/Sources/Authentication/Event Handlers/AuthenticationEventResponderChain.swift
@@ -180,7 +180,11 @@ final class AuthenticationEventResponderChain {
     /// - parameter eventType: The type of event that occured, and any required context.
 
     func handleEvent(ofType eventType: EventType) {
-        log.info("Event handling manager received event: \(eventType)")
+        if case .userInput = eventType {
+            log.info("Event handling manager received event: userInput")
+        } else {
+            log.info("Event handling manager received event: \(eventType)")
+        }
 
         switch eventType {
         case let .flowStart(error, numberOfAccounts):

diff --git a/...rces/Authentication/Event Handlers/Input/AuthenticationLoginCredentialsInputHandler.swift b/...rces/Authentication/Event Handlers/Input/AuthenticationLoginCredentialsInputHandler.swift
@@ -47,7 +47,12 @@ final class AuthenticationLoginCredentialsInputHandler: AuthenticationEventHandl
 
 }
 
-struct EmailPasswordInput {
+struct EmailPasswordInput: CustomStringConvertible {
+
     var email: String
     var password: String
+
+    var description: String {
+        String(describing: Self.self)
+    }
 }
diff --git a/...-ios/Wire-iOS/Sources/UserInterface/CustomAppLock/Setup/PasscodeSetupViewController.swift b/...-ios/Wire-iOS/Sources/UserInterface/CustomAppLock/Setup/PasscodeSetupViewController.swift
@@ -97,7 +97,8 @@ final class PasscodeSetupViewController: UIViewController {
     private lazy var infoLabel: UILabel = {
         let label = DynamicFontLabel(
             fontSpec: .normalRegularFont,
-            color: ColorTheme.Backgrounds.onSurfaceVariant)
+            color: ColorTheme.Backgrounds.onSurfaceVariant
+        )
         label.textAlignment = .center
         label.configMultipleLineLabel()
         return label
@@ -222,8 +223,14 @@ final class PasscodeSetupViewController: UIViewController {
             contentView.widthAnchor.constraint(lessThanOrEqualToConstant: 375),
             contentView.topAnchor.constraint(equalTo: contentLayoutGuide.topAnchor),
             contentView.bottomAnchor.constraint(equalTo: contentLayoutGuide.bottomAnchor),
-            contentView.leadingAnchor.constraint(greaterThanOrEqualTo: contentLayoutGuide.leadingAnchor, constant: contentPadding),
-            contentView.trailingAnchor.constraint(lessThanOrEqualTo: contentLayoutGuide.trailingAnchor, constant: -contentPadding),
+            contentView.leadingAnchor.constraint(
+                greaterThanOrEqualTo: contentLayoutGuide.leadingAnchor,
+                constant: contentPadding
+            ),
+            contentView.trailingAnchor.constraint(
+                lessThanOrEqualTo: contentLayoutGuide.trailingAnchor,
+                constant: -contentPadding
+            ),
             contentView.centerXAnchor.constraint(equalTo: scrollView.centerXAnchor),
 
             // stack view