Made interpolated strings visible in unified logging.

ccmenu · Aug 16, 2024 · b96fccf · b96fccf
1 parent f326d27
commit b96fccf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CCMenu/Resources/Info.plist b/CCMenu/Resources/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2252.1</string>
+	<string>2252.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/CCMenu/Source/Miscellaneous/Keychain.swift b/CCMenu/Source/Miscellaneous/Keychain.swift
@@ -52,10 +52,10 @@ class Keychain {
     func getPassword(forURL url: URL) throws -> String? {
         let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "keychain")
         if let password = cache[url.absoluteString] {
-            logger.log("Using cached password for \(url)")
+            logger.log("Using cached password for \(url, privacy: .public)")
             return password
         }
-        logger.log("Retrieving password for \(url) from keychain")
+        logger.log("Retrieving password for \(url, privacy: .public) from keychain")
         let query = [
             kSecClass:        kSecClassInternetPassword,
             kSecAttrServer:   try getOrThrow(error: .missingHostErr) { url.host() },
@@ -66,7 +66,7 @@ class Keychain {
         ] as NSDictionary
         let password = try getStringForQuery(query)
         if let password {
-            logger.log("Got password (length = \(password.count))")
+            logger.log("Got password (length = \(password.count, privacy: .public))")
         } else {
             logger.log("Didn't get a password")
         }

diff --git a/CCMenu/Source/Pipeline Window/CCTray Sheets/CCTrayPipelineBuilder.swift b/CCMenu/Source/Pipeline Window/CCTray Sheets/CCTrayPipelineBuilder.swift
@@ -50,7 +50,7 @@ class CCTrayPipelineBuilder: ObservableObject {
                     try Keychain.standard.setPassword(credential.password, forURL: newUrl.absoluteString)
                 } catch {
                     let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "keychain")
-                    logger.error("Error when storing password in keychain: \(error.localizedDescription)")
+                    logger.error("Error when storing password in keychain: \(error.localizedDescription, privacy: .public)")
                 }
             }
         } else {

diff --git a/CCMenu/Source/Server Monitor/CCTrayAPI.swift b/CCMenu/Source/Server Monitor/CCTrayAPI.swift
@@ -26,9 +26,9 @@ class CCTrayAPI {
             let v = URLRequest.basicAuthValue(user: credential.user, password: credential.password)
             request.setValue(v, forHTTPHeaderField: "Authorization")
             let redacted = v.replacingOccurrences(of: "[A-Za-z0-9=]", with: "*", options: [.regularExpression])
-            logger.log("Making request for url \(url) with authorization \(redacted)")
+            logger.log("Making request for url \(url, privacy: .public) with authorization \(redacted, privacy: .public)")
         } else {
-            logger.log("Making request for url \(url)")
+            logger.log("Making request for url \(url, privacy: .public)")
         }
 
         return request