diff --git a/keepassxc-browser-safari/KeePassXC-Browser/.gitignore b/keepassxc-browser-safari/KeePassXC-Browser/.gitignore new file mode 100644 index 000000000..41d162953 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/.gitignore @@ -0,0 +1,2 @@ +xcuserdata/ + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/Info.plist b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/Info.plist new file mode 100644 index 000000000..65bf6c693 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/Info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + KeePassXC-Browser Extension + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + 1 + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSExtension + + NSExtensionPointIdentifier + com.apple.Safari.web-extension + NSExtensionPrincipalClass + $(PRODUCT_MODULE_NAME).SafariWebExtensionHandler + + + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements new file mode 100644 index 000000000..5142008ce --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements @@ -0,0 +1,14 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.application-groups + + G2S7P7J672.org.keepassxc.KeePassXC + + com.apple.security.network.client + + + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift new file mode 100644 index 000000000..482aa2523 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift @@ -0,0 +1,165 @@ +/* + * Copyright (C) 2023 KeePassXC Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import SafariServices +import os.log + +let SocketFileName = "KeePassXC.BrowserServer" +let webExtensonIdentifier = "com.keepassxc.KeePassXC-Browser-Extension" +let applicationGroupIdentifier = "G2S7P7J672.org.keepassxc.KeePassXC" +var socketFD : Int32 = -1 +var socketConnected = false +var maxMessageLength: Int32 = 1024 * 1024; +var fileHandle: FileHandle? + +class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling { + private var logger = Logger( + subsystem: Bundle.main.bundleIdentifier!, + category: String(describing: SafariWebExtensionHandler.self) + ) + + var socketPath: String { + FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: applicationGroupIdentifier)!.appending(component: SocketFileName).path(percentEncoded: false) + } + + func closeSocket() { + if (socketFD != -1) { + logger.info("Closing socket") + close(socketFD) + socketFD = -1 + } + } + + func connectSocket() -> Bool { + // Reuse socket + guard socketFD == -1 else { return true } + + guard FileManager.default.fileExists(atPath: socketPath) else { + logger.error("Socket file does not exist") + return false + } + + socketFD = socket(AF_UNIX, SOCK_STREAM, 0) + guard socketFD > 0 else { + logger.error("Failed to create socket") + return false + } + + var optval: Int = 1; // Use 1 to enable the option, 0 to disable + guard setsockopt(socketFD, SOL_SOCKET, SO_REUSEADDR, &optval, socklen_t(MemoryLayout.size)) != -1 else { + logger.error("setsockopt error: \(errno)") + return false + } + + guard setsockopt(socketFD, SOL_SOCKET, SO_SNDBUF, &maxMessageLength, socklen_t(MemoryLayout.size(ofValue: maxMessageLength))) != -1 else { + logger.error("setsockopt error") + return false + } + + var address = sockaddr_un() + address.sun_family = sa_family_t(AF_UNIX) + + withUnsafeMutableBytes(of: &address.sun_path) { ptr in + socketPath.utf8CString.withUnsafeBytes { bytes in + ptr.copyBytes(from: bytes) + } + } + + let result = withUnsafePointer(to: &address) { + $0.withMemoryRebound(to: sockaddr.self, capacity: 1) { + connect(socketFD, $0, socklen_t(MemoryLayout.size)) + } + } + + if result != 0 { + logger.error("Failed to connect to socket: \(errno)") + close(socketFD) + socketFD = -1 + return false + } + + fileHandle = FileHandle(fileDescriptor: socketFD) + fileHandle?.readabilityHandler = handleSocketMessage + + return true + } + + func beginRequest(with context: NSExtensionContext) { + let request = context.inputItems.first as? NSExtensionItem + + let message: Any? + if #available(iOS 15.0, macOS 11.0, *) { + message = request?.userInfo?[SFExtensionMessageKey] + } else { + message = request?.userInfo?["message"] + } + + guard let message = message as? [String: Any], + let data = try? JSONSerialization.data(withJSONObject: message as Any) else { + return + } + + if (!socketConnected) { + if (!connectSocket()) { + closeSocket() + logger.error("Socket not connected") + return + } + + socketConnected = true + } + + guard let fileHandle else { + logger.error("No filehandle available for sending web extension message") + return + } + + do { + try fileHandle.write(contentsOf: data) + logger.debug("Sent message of \(data.count) bytes") + } catch { + logger.error("Failed to send message to socket \(error)") + } + } + + func handleSocketMessage(fileHandle: FileHandle) { + let data = fileHandle.availableData + + guard !data.isEmpty else { + logger.debug("Data from filehandle is empty") + return + } + + guard let message = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { + logger.error("Could not parse JSON from data") + return + } + + SFSafariApplication + .dispatchMessage( + withName: "proxy_message", + toExtensionWithIdentifier: webExtensonIdentifier, + userInfo: message + ) { error in + if let error { + self.logger.error("Failed to send message to web extension \(error)") + } else { + self.logger.error("Sent message of \(data.count) bytes to web extension") + } + } + } +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.pbxproj b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.pbxproj new file mode 100644 index 000000000..3be2140bb --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.pbxproj @@ -0,0 +1,542 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 632F5844280BED1100BF1247 /* options in Resources */ = {isa = PBXBuildFile; fileRef = 632F5838280BED1000BF1247 /* options */; }; + 632F5846280BED1100BF1247 /* popups in Resources */ = {isa = PBXBuildFile; fileRef = 632F583A280BED1000BF1247 /* popups */; }; + 632F5847280BED1100BF1247 /* css in Resources */ = {isa = PBXBuildFile; fileRef = 632F583B280BED1000BF1247 /* css */; }; + 632F5848280BED1100BF1247 /* content in Resources */ = {isa = PBXBuildFile; fileRef = 632F583C280BED1000BF1247 /* content */; }; + 632F5849280BED1100BF1247 /* _locales in Resources */ = {isa = PBXBuildFile; fileRef = 632F583D280BED1000BF1247 /* _locales */; }; + 632F584A280BED1100BF1247 /* bootstrap in Resources */ = {isa = PBXBuildFile; fileRef = 632F583E280BED1000BF1247 /* bootstrap */; }; + 632F584B280BED1100BF1247 /* common in Resources */ = {isa = PBXBuildFile; fileRef = 632F583F280BED1000BF1247 /* common */; }; + 632F584C280BED1100BF1247 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 632F5840280BED1100BF1247 /* fonts */; }; + 632F584D280BED1100BF1247 /* background in Resources */ = {isa = PBXBuildFile; fileRef = 632F5841280BED1100BF1247 /* background */; }; + 632F584E280BED1100BF1247 /* icons in Resources */ = {isa = PBXBuildFile; fileRef = 632F5842280BED1100BF1247 /* icons */; }; + 632F584F280BED1100BF1247 /* manifest.json in Resources */ = {isa = PBXBuildFile; fileRef = 632F5843280BED1100BF1247 /* manifest.json */; }; + 63A6D90325193F3A00BD9198 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63A6D90225193F3A00BD9198 /* Assets.xcassets */; }; + 63A6D90A25193F3B00BD9198 /* KeePassXC-Browser Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 63A6D90925193F3B00BD9198 /* KeePassXC-Browser Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 63A6D90F25193F3B00BD9198 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63A6D90E25193F3B00BD9198 /* Cocoa.framework */; }; + 63A6D91225193F3B00BD9198 /* SafariWebExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63A6D91125193F3B00BD9198 /* SafariWebExtensionHandler.swift */; }; + 96E7F63C2D48428C0072CD34 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E7F63B2D48428C0072CD34 /* ContentView.swift */; }; + 96E7F63D2D48428C0072CD34 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E7F63A2D48428C0072CD34 /* App.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 63A6D90B25193F3B00BD9198 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 63A6D8EF25193F3A00BD9198 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 63A6D90825193F3B00BD9198; + remoteInfo = "KeePassXC-Browser Extension"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 63A6D91A25193F3B00BD9198 /* Embed App Extensions */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 13; + files = ( + 63A6D90A25193F3B00BD9198 /* KeePassXC-Browser Extension.appex in Embed App Extensions */, + ); + name = "Embed App Extensions"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 632F5838280BED1000BF1247 /* options */ = {isa = PBXFileReference; lastKnownFileType = folder; name = options; path = "../../../keepassxc-browser/options"; sourceTree = ""; }; + 632F583A280BED1000BF1247 /* popups */ = {isa = PBXFileReference; lastKnownFileType = folder; name = popups; path = "../../../keepassxc-browser/popups"; sourceTree = ""; }; + 632F583B280BED1000BF1247 /* css */ = {isa = PBXFileReference; lastKnownFileType = folder; name = css; path = "../../../keepassxc-browser/css"; sourceTree = ""; }; + 632F583C280BED1000BF1247 /* content */ = {isa = PBXFileReference; lastKnownFileType = folder; name = content; path = "../../../keepassxc-browser/content"; sourceTree = ""; }; + 632F583D280BED1000BF1247 /* _locales */ = {isa = PBXFileReference; lastKnownFileType = folder; name = _locales; path = "../../../keepassxc-browser/_locales"; sourceTree = ""; }; + 632F583E280BED1000BF1247 /* bootstrap */ = {isa = PBXFileReference; lastKnownFileType = folder; name = bootstrap; path = "../../../keepassxc-browser/bootstrap"; sourceTree = ""; }; + 632F583F280BED1000BF1247 /* common */ = {isa = PBXFileReference; lastKnownFileType = folder; name = common; path = "../../../keepassxc-browser/common"; sourceTree = ""; }; + 632F5840280BED1100BF1247 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = "../../../keepassxc-browser/fonts"; sourceTree = ""; }; + 632F5841280BED1100BF1247 /* background */ = {isa = PBXFileReference; lastKnownFileType = folder; name = background; path = "../../../keepassxc-browser/background"; sourceTree = ""; }; + 632F5842280BED1100BF1247 /* icons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = icons; path = "../../../keepassxc-browser/icons"; sourceTree = ""; }; + 632F5843280BED1100BF1247 /* manifest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = manifest.json; path = "../../../keepassxc-browser/manifest.json"; sourceTree = ""; }; + 63A6D8F725193F3A00BD9198 /* KeePassXC-Browser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KeePassXC-Browser.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 63A6D8FA25193F3A00BD9198 /* KeePassXC_Browser.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KeePassXC_Browser.entitlements; sourceTree = ""; }; + 63A6D90225193F3A00BD9198 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 63A6D90425193F3A00BD9198 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 63A6D90925193F3B00BD9198 /* KeePassXC-Browser Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "KeePassXC-Browser Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; + 63A6D90E25193F3B00BD9198 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 63A6D91125193F3B00BD9198 /* SafariWebExtensionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariWebExtensionHandler.swift; sourceTree = ""; }; + 63A6D91325193F3B00BD9198 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 63A6D91425193F3B00BD9198 /* KeePassXC_Browser_Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KeePassXC_Browser_Extension.entitlements; sourceTree = ""; }; + 96E7F63A2D48428C0072CD34 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = ""; }; + 96E7F63B2D48428C0072CD34 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 63A6D8F425193F3A00BD9198 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 63A6D90625193F3B00BD9198 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 63A6D90F25193F3B00BD9198 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 63A6D8EE25193F3A00BD9198 = { + isa = PBXGroup; + children = ( + 63A6D8F925193F3A00BD9198 /* KeePassXC-Browser */, + 63A6D91025193F3B00BD9198 /* KeePassXC-Browser Extension */, + 63A6D90D25193F3B00BD9198 /* Frameworks */, + 63A6D8F825193F3A00BD9198 /* Products */, + ); + sourceTree = ""; + }; + 63A6D8F825193F3A00BD9198 /* Products */ = { + isa = PBXGroup; + children = ( + 63A6D8F725193F3A00BD9198 /* KeePassXC-Browser.app */, + 63A6D90925193F3B00BD9198 /* KeePassXC-Browser Extension.appex */, + ); + name = Products; + sourceTree = ""; + }; + 63A6D8F925193F3A00BD9198 /* KeePassXC-Browser */ = { + isa = PBXGroup; + children = ( + 63A6D8FA25193F3A00BD9198 /* KeePassXC_Browser.entitlements */, + 96E7F63A2D48428C0072CD34 /* App.swift */, + 96E7F63B2D48428C0072CD34 /* ContentView.swift */, + 63A6D90225193F3A00BD9198 /* Assets.xcassets */, + 63A6D90425193F3A00BD9198 /* Info.plist */, + ); + path = "KeePassXC-Browser"; + sourceTree = ""; + }; + 63A6D90D25193F3B00BD9198 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 63A6D90E25193F3B00BD9198 /* Cocoa.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 63A6D91025193F3B00BD9198 /* KeePassXC-Browser Extension */ = { + isa = PBXGroup; + children = ( + 63A6D91E25193F3B00BD9198 /* Resources */, + 63A6D91125193F3B00BD9198 /* SafariWebExtensionHandler.swift */, + 63A6D91325193F3B00BD9198 /* Info.plist */, + 63A6D91425193F3B00BD9198 /* KeePassXC_Browser_Extension.entitlements */, + ); + path = "KeePassXC-Browser Extension"; + sourceTree = ""; + }; + 63A6D91E25193F3B00BD9198 /* Resources */ = { + isa = PBXGroup; + children = ( + 632F583D280BED1000BF1247 /* _locales */, + 632F5841280BED1100BF1247 /* background */, + 632F583E280BED1000BF1247 /* bootstrap */, + 632F583F280BED1000BF1247 /* common */, + 632F583C280BED1000BF1247 /* content */, + 632F583B280BED1000BF1247 /* css */, + 632F5840280BED1100BF1247 /* fonts */, + 632F5842280BED1100BF1247 /* icons */, + 632F5843280BED1100BF1247 /* manifest.json */, + 632F5838280BED1000BF1247 /* options */, + 632F583A280BED1000BF1247 /* popups */, + ); + name = Resources; + path = "KeePassXC-Browser Extension"; + sourceTree = SOURCE_ROOT; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 63A6D8F625193F3A00BD9198 /* KeePassXC-Browser */ = { + isa = PBXNativeTarget; + buildConfigurationList = 63A6D91B25193F3B00BD9198 /* Build configuration list for PBXNativeTarget "KeePassXC-Browser" */; + buildPhases = ( + 63A6D8F325193F3A00BD9198 /* Sources */, + 63A6D8F425193F3A00BD9198 /* Frameworks */, + 63A6D8F525193F3A00BD9198 /* Resources */, + 63A6D91A25193F3B00BD9198 /* Embed App Extensions */, + ); + buildRules = ( + ); + dependencies = ( + 63A6D90C25193F3B00BD9198 /* PBXTargetDependency */, + ); + name = "KeePassXC-Browser"; + productName = "KeePassXC-Browser"; + productReference = 63A6D8F725193F3A00BD9198 /* KeePassXC-Browser.app */; + productType = "com.apple.product-type.application"; + }; + 63A6D90825193F3B00BD9198 /* KeePassXC-Browser Extension */ = { + isa = PBXNativeTarget; + buildConfigurationList = 63A6D91725193F3B00BD9198 /* Build configuration list for PBXNativeTarget "KeePassXC-Browser Extension" */; + buildPhases = ( + 63A6D90525193F3B00BD9198 /* Sources */, + 63A6D90625193F3B00BD9198 /* Frameworks */, + 63A6D90725193F3B00BD9198 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "KeePassXC-Browser Extension"; + productName = "KeePassXC-Browser Extension"; + productReference = 63A6D90925193F3B00BD9198 /* KeePassXC-Browser Extension.appex */; + productType = "com.apple.product-type.app-extension"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 63A6D8EF25193F3A00BD9198 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1620; + LastUpgradeCheck = 1200; + TargetAttributes = { + 63A6D8F625193F3A00BD9198 = { + CreatedOnToolsVersion = 12.0; + LastSwiftMigration = 1620; + }; + 63A6D90825193F3B00BD9198 = { + CreatedOnToolsVersion = 12.0; + }; + }; + }; + buildConfigurationList = 63A6D8F225193F3A00BD9198 /* Build configuration list for PBXProject "KeePassXC-Browser" */; + compatibilityVersion = "Xcode 12.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 63A6D8EE25193F3A00BD9198; + productRefGroup = 63A6D8F825193F3A00BD9198 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 63A6D8F625193F3A00BD9198 /* KeePassXC-Browser */, + 63A6D90825193F3B00BD9198 /* KeePassXC-Browser Extension */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 63A6D8F525193F3A00BD9198 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 63A6D90325193F3A00BD9198 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 63A6D90725193F3B00BD9198 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 632F584E280BED1100BF1247 /* icons in Resources */, + 632F5849280BED1100BF1247 /* _locales in Resources */, + 632F584A280BED1100BF1247 /* bootstrap in Resources */, + 632F5847280BED1100BF1247 /* css in Resources */, + 632F584F280BED1100BF1247 /* manifest.json in Resources */, + 632F5844280BED1100BF1247 /* options in Resources */, + 632F584D280BED1100BF1247 /* background in Resources */, + 632F5846280BED1100BF1247 /* popups in Resources */, + 632F584C280BED1100BF1247 /* fonts in Resources */, + 632F5848280BED1100BF1247 /* content in Resources */, + 632F584B280BED1100BF1247 /* common in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 63A6D8F325193F3A00BD9198 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 96E7F63C2D48428C0072CD34 /* ContentView.swift in Sources */, + 96E7F63D2D48428C0072CD34 /* App.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 63A6D90525193F3B00BD9198 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 63A6D91225193F3B00BD9198 /* SafariWebExtensionHandler.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 63A6D90C25193F3B00BD9198 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 63A6D90825193F3B00BD9198 /* KeePassXC-Browser Extension */; + targetProxy = 63A6D90B25193F3B00BD9198 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 63A6D91525193F3B00BD9198 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 63A6D91625193F3B00BD9198 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 63A6D91825193F3B00BD9198 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_ENTITLEMENTS = "KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = "KeePassXC-Browser Extension/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@executable_path/../../../../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 1.7.2; + PRODUCT_BUNDLE_IDENTIFIER = "com.keepassxc.KeePassXC-Browser-Extension"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 63A6D91925193F3B00BD9198 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_ENTITLEMENTS = "KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = "KeePassXC-Browser Extension/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@executable_path/../../../../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 1.7.2; + PRODUCT_BUNDLE_IDENTIFIER = "com.keepassxc.KeePassXC-Browser-Extension"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 63A6D91C25193F3B00BD9198 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = "KeePassXC-Browser/KeePassXC_Browser.entitlements"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = "KeePassXC-Browser/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 1.7.2; + PRODUCT_BUNDLE_IDENTIFIER = "com.keepassxc.KeePassXC-Browser"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 63A6D91D25193F3B00BD9198 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = "KeePassXC-Browser/KeePassXC_Browser.entitlements"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = "KeePassXC-Browser/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 1.7.2; + PRODUCT_BUNDLE_IDENTIFIER = "com.keepassxc.KeePassXC-Browser"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 63A6D8F225193F3A00BD9198 /* Build configuration list for PBXProject "KeePassXC-Browser" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 63A6D91525193F3B00BD9198 /* Debug */, + 63A6D91625193F3B00BD9198 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 63A6D91725193F3B00BD9198 /* Build configuration list for PBXNativeTarget "KeePassXC-Browser Extension" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 63A6D91825193F3B00BD9198 /* Debug */, + 63A6D91925193F3B00BD9198 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 63A6D91B25193F3B00BD9198 /* Build configuration list for PBXNativeTarget "KeePassXC-Browser" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 63A6D91C25193F3B00BD9198 /* Debug */, + 63A6D91D25193F3B00BD9198 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 63A6D8EF25193F3A00BD9198 /* Project object */; +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/xcshareddata/xcschemes/KeePassXC-Browser.xcscheme b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/xcshareddata/xcschemes/KeePassXC-Browser.xcscheme new file mode 100644 index 000000000..b8e4028ee --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser.xcodeproj/xcshareddata/xcschemes/KeePassXC-Browser.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/App.swift b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/App.swift new file mode 100644 index 000000000..e552a3916 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/App.swift @@ -0,0 +1,44 @@ +// +// AppDelegate.swift +// KeePassXC-Browser +// +// Created by varjolintu on 21.9.2020. +// + +import SwiftUI +import SafariServices + +@main +struct KeePassXCBrowserApp: App { + @State private var isEnabled: Bool = false + var isEnabledInterceptor: Binding { + Binding( + get: { isEnabled }, + set: { _ in + SFSafariApplication.showPreferencesForExtension(withIdentifier: "com.keepassxc.KeePassXC-Browser-Extension") + } + ) + } + + var body: some Scene { + WindowGroup { + ContentView(isEnabled: isEnabledInterceptor) + .onAppear(perform: refreshState) + .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in refreshState() } + } + } + + func refreshState() { + Task { + do { + let state = try await SFSafariExtensionManager.stateOfSafariExtension(withIdentifier: "com.keepassxc.KeePassXC-Browser-Extension") + + DispatchQueue.main.async { + isEnabled = state.isEnabled + } + } catch { + print(error) + } + } + } +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AccentColor.colorset/Contents.json b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 000000000..e66a54064 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,15 @@ +{ + "colors" : [ + { + "color" : { + "platform" : "universal", + "reference" : "systemGreenColor" + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/Contents.json b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..64dc11ee7 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "filename" : "icon_16x16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "icon_16x16@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "icon_32x32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "icon_32x32@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "icon_128x128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "icon_128x128@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "icon_256x256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "icon_256x256@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "icon_512x512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "icon_512x512@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 000000000..0b36d35d1 Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 000000000..71c955e2a Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_16x16.png new file mode 100644 index 000000000..5b2799217 Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 000000000..62c6bbb9b Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_256x256.png new file mode 100644 index 000000000..71c955e2a Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png new file mode 100644 index 000000000..e846e3090 Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_32x32.png new file mode 100644 index 000000000..62c6bbb9b Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 000000000..fd1bdb037 Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_512x512.png new file mode 100644 index 000000000..e846e3090 Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png new file mode 100644 index 000000000..56bdc6726 Binary files /dev/null and b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/Contents.json b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ContentView.swift b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ContentView.swift new file mode 100644 index 000000000..d12539c01 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ContentView.swift @@ -0,0 +1,42 @@ +// +// ContentView.swift +// KeePassXC-Browser +// +// Created by Sebastian Livoni on 27/01/2025. +// + +import SwiftUI + +struct ContentView: View { + @Binding var isEnabled: Bool + + var body: some View { + VStack { + Spacer() + + if let image = NSImage(named: "AppIcon") { + Image(nsImage: image) + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 128) + .clipShape(RoundedRectangle(cornerRadius: 8)) + } + + Form { + Section { + Toggle("KeePassXC-Browser for Safari", isOn: $isEnabled) + } footer: { + Text("KeePassXC-Browser for Safari is currently \(isEnabled ? "on" : "off").") + } + } + .formStyle(.grouped) + + Spacer() + } + } +} + +#Preview { + ContentView(isEnabled: .constant(true)) + .frame(width: 400, height: 300) +} diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Info.plist b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Info.plist new file mode 100644 index 000000000..6113b0a40 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + 1 + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + + diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements new file mode 100644 index 000000000..625af03d9 --- /dev/null +++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + com.apple.security.network.client + + + diff --git a/keepassxc-browser/background/client.js b/keepassxc-browser/background/client.js index c98b01dec..c9d3d04e9 100644 --- a/keepassxc-browser/background/client.js +++ b/keepassxc-browser/background/client.js @@ -180,6 +180,8 @@ keepassClient.sendNativeMessage = async function(request, enableTimeout = false, }; keepassClient.handleNativeMessage = async function(response) { + if (response?.name === "proxy_message") return // Ignoring KeePassXC App Broadcast Message + // Parse through the message buffer to find the corresponding Promise. await navigator.locks.request('messageBuffer', async (lock) => { const message = messageBuffer.getMessage(response); @@ -404,6 +406,11 @@ function onDisconnected() { } keepassClient.onNativeMessage = function(response) { + // Due to limitiations on SFSafariApplication.dispatchMessage this is needed + if (response?.name === 'proxy_message') { + response = response.userInfo + } + // Handle database lock/unlock status if (response.action === kpActions.DATABASE_LOCKED || response.action === kpActions.DATABASE_UNLOCKED) { keepass.updateDatabase(); diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index e4bf97938..59e3b179f 100755 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -16,6 +16,7 @@ keepass.cacheTimeout = 30 * 1000; // Milliseconds keepass.databaseHash = ''; keepass.previousDatabaseHash = ''; keepass.reconnectLoop = null; +keepass.isSafari = isSafari(); const kpActions = { SET_LOGIN: 'set-login', diff --git a/keepassxc-browser/common/global.js b/keepassxc-browser/common/global.js index d97a8a7c6..5230b4e78 100755 --- a/keepassxc-browser/common/global.js +++ b/keepassxc-browser/common/global.js @@ -34,6 +34,11 @@ const isEdge = function() { return navigator.userAgent.indexOf('Edg') !== -1; }; +const isSafari = function() { + return navigator.userAgent.indexOf('Safari') !== -1 + && (navigator.userAgent.indexOf('Chrome') === -1 || navigator.userAgent.indexOf('Chromium') === -1); +}; + const showNotification = function(message) { browser.notifications.create({ 'type': 'basic', diff --git a/keepassxc-browser/content/banner.js b/keepassxc-browser/content/banner.js index eb732a322..115d3dd5b 100644 --- a/keepassxc-browser/content/banner.js +++ b/keepassxc-browser/content/banner.js @@ -62,7 +62,7 @@ kpxcBanner.create = async function(credentials = {}) { const bannerInfo = kpxcUI.createElement('div', 'banner-info'); const bannerButtons = kpxcUI.createElement('div', 'banner-buttons'); - const className = (isFirefox() ? 'kpxc-banner-icon-moz' : 'kpxc-banner-icon'); + const className = (isSafari() ? 'kpxc-banner-icon-safari' : (isFirefox() ? 'kpxc-banner-icon-moz' : 'kpxc-banner-icon')); const icon = kpxcUI.createElement('span', className, { 'alt': 'logo' }); const infoText = kpxcUI.createElement('span', '', {}, tr('rememberInfoText')); diff --git a/keepassxc-browser/content/custom-fields-banner.js b/keepassxc-browser/content/custom-fields-banner.js index 299899c56..efa6c8350 100644 --- a/keepassxc-browser/content/custom-fields-banner.js +++ b/keepassxc-browser/content/custom-fields-banner.js @@ -90,7 +90,7 @@ kpxcCustomLoginFieldsBanner.create = async function() { const bannerInfo = kpxcUI.createElement('div', 'banner-info'); const bannerButtons = kpxcUI.createElement('div', 'banner-buttons'); - const iconClassName = isFirefox() ? 'kpxc-banner-icon-moz' : 'kpxc-banner-icon'; + const iconClassName = isSafari() ? 'kpxc-banner-icon-safari' : (isFirefox() ? 'kpxc-banner-icon-moz' : 'kpxc-banner-icon'); const icon = kpxcUI.createElement('span', iconClassName); const infoText = kpxcUI.createElement('span', '', {}, tr('defineChooseCustomLoginFieldText')); const separator = kpxcUI.createElement('div', 'kpxc-separator'); diff --git a/keepassxc-browser/content/pwgen.js b/keepassxc-browser/content/pwgen.js index 38ceb1675..20f84fc7e 100644 --- a/keepassxc-browser/content/pwgen.js +++ b/keepassxc-browser/content/pwgen.js @@ -49,7 +49,7 @@ PasswordIcon.prototype.initField = function(field) { }; PasswordIcon.prototype.createIcon = function(field) { - const className = (isFirefox() ? 'key-moz' : 'key'); + const className = isSafari() ? 'key-safari' : (isFirefox() ? 'key-moz' : 'key'); const size = (field.offsetHeight > 28) ? 24 : 16; const offset = kpxcUI.calculateIconOffset(field, size); diff --git a/keepassxc-browser/content/totp-field.js b/keepassxc-browser/content/totp-field.js index a12032bbe..5392ee453 100644 --- a/keepassxc-browser/content/totp-field.js +++ b/keepassxc-browser/content/totp-field.js @@ -130,7 +130,7 @@ TOTPFieldIcon.prototype.initField = async function(field, segmented) { }; TOTPFieldIcon.prototype.createIcon = function(field, segmented = false) { - const className = (isFirefox() ? 'moz' : 'default'); + const className = (isSafari() ? 'safari' : (isFirefox() ? 'moz' : 'default')); // Size the icon dynamically, but not greater than 24 or smaller than 14 const size = Math.max(Math.min(24, field.offsetHeight - 4), 14); diff --git a/keepassxc-browser/content/ui.js b/keepassxc-browser/content/ui.js index 49379ce8a..db67e0b08 100644 --- a/keepassxc-browser/content/ui.js +++ b/keepassxc-browser/content/ui.js @@ -353,7 +353,7 @@ kpxcUI.createNotification = function(type, message) { const notification = kpxcUI.createElement('div', 'kpxc-notification kpxc-notification-' + type, {}); type = type.charAt(0).toUpperCase() + type.slice(1) + '!'; - const className = (isFirefox() ? 'kpxc-banner-icon-moz' : 'kpxc-banner-icon'); + const className = (isSafari() ? 'kpxc-banner-icon-safari' : (isFirefox() ? 'kpxc-banner-icon-moz' : 'kpxc-banner-icon')); const icon = kpxcUI.createElement('span', className, { 'alt': 'logo' }); const label = kpxcUI.createElement('span', 'kpxc-label', {}, type); const msg = kpxcUI.createElement('span', '', {}, message); diff --git a/keepassxc-browser/content/username-field.js b/keepassxc-browser/content/username-field.js index 9fe9fb761..db0bfba5c 100644 --- a/keepassxc-browser/content/username-field.js +++ b/keepassxc-browser/content/username-field.js @@ -44,7 +44,7 @@ class UsernameFieldIcon extends Icon { this.observer.disconnect(); } - this.icon.classList.remove('lock', 'lock-moz', 'unlock', 'unlock-moz', 'disconnected', 'disconnected-moz'); + this.icon.classList.remove('lock', 'lock-moz', 'lock-safari', 'unlock', 'unlock-moz', 'unlock-safari', 'disconnected', 'disconnected-moz', 'disconnected-safari'); this.icon.classList.add(getIconClassName(state)); this.icon.title = getIconText(state); @@ -134,12 +134,12 @@ const iconClicked = async function(field, icon) { const getIconClassName = function(state = DatabaseState.UNLOCKED) { if (state === DatabaseState.LOCKED) { - return (isFirefox() ? 'lock-moz' : 'lock'); + return (isSafari() ? 'lock-safari' : isFirefox() ? 'lock-moz' : 'lock'); } else if (state === DatabaseState.DISCONNECTED) { - return (isFirefox() ? 'disconnected-moz' : 'disconnected'); + return (isSafari() ? 'disconnected-safari' : isFirefox() ? 'disconnected-moz' : 'disconnected'); } - return (isFirefox() ? 'unlock-moz' : 'unlock'); + return (isSafari() ? 'unlock-safari' : isFirefox() ? 'unlock-moz' : 'unlock'); }; const getIconText = function(state) { diff --git a/keepassxc-browser/css/banner.css b/keepassxc-browser/css/banner.css index 797952d79..bd55de2b8 100644 --- a/keepassxc-browser/css/banner.css +++ b/keepassxc-browser/css/banner.css @@ -77,6 +77,14 @@ div.kpxc-banner .kpxc-banner-icon-moz { background-size: contain; } +div.kpxc-banner .kpxc-banner-icon-safari { + width: 24px; + height: 24px; + overflow: hidden; + background: url('safari-web-extension://__MSG_@@extension_id__/icons/keepassxc.svg') right no-repeat; + background-size: contain; +} + div.kpxc-banner .kpxc-help-icon { width: 24px; height: 24px; @@ -93,6 +101,14 @@ div.kpxc-banner .kpxc-help-icon-moz { background-size: contain; } +div.kpxc-banner .kpxc-help-icon-safari { + width: 24px; + height: 24px; + overflow: hidden; + background: url('safari-web-extension://__MSG_@@extension_id__/icons/help.svg') right no-repeat; + background-size: contain; +} + .kpxc-separator { border-left: 1px solid #ccc; height: 100% !important; diff --git a/keepassxc-browser/css/notification.css b/keepassxc-browser/css/notification.css index 1bb815f33..7cebdeaf0 100644 --- a/keepassxc-browser/css/notification.css +++ b/keepassxc-browser/css/notification.css @@ -43,6 +43,16 @@ background-size: contain; } +.kpxc-notification .kpxc-banner-icon-safari { + width: 24px; + height: 24px; + padding: 10px; + margin-right: 4px; + overflow: hidden; + background: url('safari-web-extension://__MSG_@@extension_id__/icons/keepassxc.svg') right no-repeat; + background-size: contain; +} + .kpxc-notification .kpxc-label { font-weight: bold; } diff --git a/keepassxc-browser/css/pwgen.css b/keepassxc-browser/css/pwgen.css index 64b574dac..6e148849c 100644 --- a/keepassxc-browser/css/pwgen.css +++ b/keepassxc-browser/css/pwgen.css @@ -12,3 +12,8 @@ background: url('moz-extension://__MSG_@@extension_id__/icons/key.svg') right no-repeat; background-size: contain; } + +.kpxc-pwgen-icon.key-safari { + background: url('safari-web-extension://__MSG_@@extension_id__/icons/key.svg') right no-repeat; + background-size: contain; +} diff --git a/keepassxc-browser/css/totp.css b/keepassxc-browser/css/totp.css index 828113267..27c40225c 100644 --- a/keepassxc-browser/css/totp.css +++ b/keepassxc-browser/css/totp.css @@ -11,4 +11,9 @@ .kpxc-totp-icon.moz { background: url('moz-extension://__MSG_@@extension_id__/icons/otp.svg') right no-repeat; background-size: contain; -} \ No newline at end of file +} + +.kpxc-totp-icon.safari { + background: url('safari-web-extension://__MSG_@@extension_id__/icons/otp.svg') right no-repeat; + background-size: contain; +} diff --git a/keepassxc-browser/css/username.css b/keepassxc-browser/css/username.css index 6b2e32af6..02e486783 100644 --- a/keepassxc-browser/css/username.css +++ b/keepassxc-browser/css/username.css @@ -13,6 +13,11 @@ background-size: contain; } +.kpxc-username-icon.disconnected-safari { + background: url('safari-web-extension://__MSG_@@extension_id__/icons/disconnected.svg') right no-repeat; + background-size: contain; +} + .kpxc-username-icon.lock { background: url('chrome-extension://__MSG_@@extension_id__/icons/locked.svg') right no-repeat; background-size: contain; @@ -23,6 +28,11 @@ background-size: contain; } +.kpxc-username-icon.lock-safari { + background: url('safari-web-extension://__MSG_@@extension_id__/icons/locked.svg') right no-repeat; + background-size: contain; +} + .kpxc-username-icon.unlock { background: url('chrome-extension://__MSG_@@extension_id__/icons/keepassxc.svg') right no-repeat; background-size: contain; @@ -32,3 +42,8 @@ background: url('moz-extension://__MSG_@@extension_id__/icons/keepassxc.svg') right no-repeat; background-size: contain; } + +.kpxc-username-icon.unlock-safari { + background: url('safari-web-extension://__MSG_@@extension_id__/icons/keepassxc.svg') right no-repeat; + background-size: contain; +} diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js index 3009696df..0bc5818d8 100644 --- a/keepassxc-browser/options/options.js +++ b/keepassxc-browser/options/options.js @@ -718,6 +718,11 @@ const getBrowserId = function() { startPos = navigator.userAgent.indexOf('/', startPos) + 1; const version = navigator.userAgent.substring(startPos, navigator.userAgent.indexOf('Safari')); return 'Chrome/Chromium ' + version; + } else if (navigator.userAgent.indexOf('Safari') > -1) { + let startPos = navigator.userAgent.indexOf('Version'); + startPos = navigator.userAgent.indexOf('/', startPos) + 1; + const version = navigator.userAgent.substring(startPos, navigator.userAgent.indexOf('Safari')); + return 'Safari ' + version; } return 'Other/Unknown'; diff --git a/keepassxc-browser/popups/popup.css b/keepassxc-browser/popups/popup.css index 3f0929fea..8e38231a7 100644 --- a/keepassxc-browser/popups/popup.css +++ b/keepassxc-browser/popups/popup.css @@ -153,6 +153,15 @@ code { width: 2.5rem; } +#choose-custom-login-fields-button-safari { + background-image: url('safari-web-extension://__MSG_@@extension_id__/icons/custom_login_fields.svg'); + background-position: center; + background-repeat: no-repeat; + background-size: 70%; + height: 31px; + width: 2.5rem; +} + #lock-database-button { display: none; width: 2.5rem; diff --git a/keepassxc-browser/popups/popup_functions.js b/keepassxc-browser/popups/popup_functions.js index 82ad4543a..6cf135658 100644 --- a/keepassxc-browser/popups/popup_functions.js +++ b/keepassxc-browser/popups/popup_functions.js @@ -18,6 +18,8 @@ async function initSettings() { const customLoginFieldsButton = document.body.querySelector('#settings #choose-custom-login-fields-button'); if (isFirefox()) { customLoginFieldsButton.id = 'choose-custom-login-fields-button-moz'; + } else if (isSafari()) { + customLoginFieldsButton.id = 'choose-custom-login-fields-button-safari'; } customLoginFieldsButton.addEventListener('click', async () => {