Macbox-KeePass

Author: Mark McGuill

LICENSE.md

@@ -1,6 +1,6 @@
 workspace 'StrongBox'
 
-target 'Strongbox' do
+target 'Strongbox' do'
     project 'macbox/MacBox.xcodeproj'
     platform :osx, '10.9'
     use_frameworks!
@@ -21,7 +21,7 @@ pre_install do |installer|
     end
 end
 
-abstract_target 'common-ios' do
+abstract_target 'common-ios' do'
     project 'Strongbox.xcodeproj'
     platform :ios, '9.2'
     use_frameworks!

Podfile

@@ -29,7 +29,7 @@ PODS:
   - GTMSessionFetcher/Full (1.2.0):
     - GTMSessionFetcher/Core (= 1.2.0)
   - GZIP (1.1.1)
-  - ISMessages (1.2)
+  - ISMessages (1.3.1)
   - JNKeychain (0.1.4)
   - libsodium (1.0.12)
   - ObjectiveDropboxOfficial (3.9.2)
@@ -106,7 +106,7 @@ SPEC CHECKSUMS:
   GTMOAuth2: c77fe325e4acd453837e72d91e3b5f13116857b2
   GTMSessionFetcher: 0c4baf0a73acd0041bf9f71ea018deedab5ea84e
   GZIP: f8beb59597f651e6970a45b816508a9c6d700b77
-  ISMessages: d39098b48672813d69d30f44da06260b9920fed4
+  ISMessages: 562cddc3e960359de95f934a4e5c4e1f4ea6fd7d
   JNKeychain: fb6cc9ec95959ba46cd95d0ee6f7a05e41da9f42
   libsodium: 9a8faa5ef2fa0d2d57bd7f7d79bf8fb7c1a9f0ea
   ObjectiveDropboxOfficial: aa792e0556ceb7b72955fa29a2709072f6e35fd9

Podfile.lock

@@ -3,17 +3,16 @@ A Personal Password Manager for iOS that can be found on the Apple App Store her
 
 https://itunes.apple.com/us/app/strongbox-password-safe/id897283731
 
-and you can find the home page for the app here:
-
-https://strongboxsafe.com
-
 Strongbox supports the open source Password Safe (version 3) and KeePass file formats (KeePass 1 and 2, i.e. KDB, KDBX (3.1 and 4)). Strongbox uses open source encryption algoritms likes TwoFish, Argon2d, ChaCha20, Aes, Salsa20 and various other cryptographic techniques (SHA256s, HMACs, CSPRNGs) to store groups and entries, containing various secrets, mostly designed around password storage. You can also store File Attachments in KeePass format safes.
 
 # Build Issues
 The code is provided here for reasons of security, transparency and openness. Anyone can view the code and verify that everything is above board, the algorithms are correct and there are no backdoors or other malicious features present. You will need Google Drive, OneDrive and Dropbox developer accounts (with keys/secrets) before building. Familiarity with Cocoapods and other build tools is a prerequisite. Please do not file issues about build issues, I can't guarantee what is here will build in your environment. If instead of examining the code, you simply want to use the app, please download from the App Store. Lastly, if you are attempting to bypass built-in Pro/Free limitations for your own app usage, please consider your actions, and consider supporting further development by contributing via the official application (in app purchase upgrade). It will be very much appreciated. 
 
+# Licence Notes
+This software is licensed under the GNU AGPL by default. If you are interested in using the code in some other fashion, or require an alternative licence then please contact me directly: [email protected].
+
 # Acknowledgements
-The Crypto is mostly from TomCrypt and libsodium. PasswordSafe & KeePass DB parsing/navigation/UI/Cloud interaction is my own work. 
+The crypto is mostly from TomCrypt and libsodium. PasswordSafe & KeePass DB parsing/navigation/UI/Cloud interaction is my own work. 
 
 The official PasswordSafe github repository is here:
 

README.md

@@ -65,7 +65,7 @@ - (void)showSafesListView {
 }
 
 - (BOOL)isLiveAutoFillProvider:(StorageProvider)storageProvider {
-    return storageProvider == kiCloud || storageProvider == kGoogleDrive;
+    return storageProvider == kiCloud;
 }
 
 - (BOOL)isUnsupportedAutoFillProvider:(StorageProvider)storageProvider {
@@ -114,7 +114,7 @@ void showWelcomeMessageIfAppropriate(UIViewController *vc) {
     if(!Settings.sharedInstance.hasShownAutoFillLaunchWelcome) {
         Settings.sharedInstance.hasShownAutoFillLaunchWelcome = YES;
 
-        [Alerts info:vc title:@"Welcome to Strongbox Auto Fill" message:@"It should be noted that the following cloud providers do not support live access to your safe from App Extensions:\n\n- Dropbox\n- OneDrive\n\nIn these cases, Strongbox uses a cached local copy. Thus, there is a chance that this cache will be out of date. Please take this as a caveat. Hope you enjoy the Auto Fill extension!\n-Mark"];
+        [Alerts info:vc title:@"Welcome to Strongbox Auto Fill" message:@"It should be noted that the following cloud providers do not support live access to your safe from App Extensions:\n\n- Dropbox\n- OneDrive\n- Google Drive\n\nIn these cases, Strongbox can use a cached local copy. Thus, there is a chance that this cache will be out of date. Please take this as a caveat. Hope you enjoy the Auto Fill extension!\n-Mark"];
     }
 }
 

StrongBox Auto Fill/CredentialProviderViewController.m

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.18.0</string>
+	<string>1.18.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2618</string>
+	<string>2619</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

StrongBox Auto Fill/Info.plist

@@ -69,6 +69,24 @@ - (void)viewDidLoad {
     [self smartInitializeSearch];
 }
 
+static NSString *getSearchTermFromDomain(NSString* host) {
+    const char *cStringUrl = [host UTF8String];
+    
+    void *tree = loadTldTree();
+    const char *result = getRegisteredDomainDrop(cStringUrl, tree, 1);
+    
+    NSString *domain = [NSString stringWithCString:result encoding:NSUTF8StringEncoding];
+    
+    NSLog(@"Calculated Domain: %@", domain);
+    
+    NSArray<NSString*> *parts = [domain componentsSeparatedByString:@"."];
+    
+    NSLog(@"%@", parts);
+    
+    NSString *searchTerm =  parts.count ? parts[0] : domain;
+    return searchTerm;
+}
+
 - (void)smartInitializeSearch {
     NSArray<ASCredentialServiceIdentifier *> *serviceIdentifiers = [self.rootViewController getCredentialServiceIdentifiers];
 
@@ -80,34 +98,27 @@ - (void)smartInitializeSearch {
     if(serviceId) {
         if(serviceId.type == ASCredentialServiceIdentifierTypeURL) {
             NSURL* url = [NSURL URLWithString:serviceId.identifier];
-            
+
             NSLog(@"URL: %@", url);
-            void *tree = loadTldTree();
-            
-            const char *cStringUrl = [url.host UTF8String];
-            const char *result = getRegisteredDomainDrop(cStringUrl, tree, 1);
-            
-            NSString *domain = [NSString stringWithCString:result encoding:NSUTF8StringEncoding];
-        
-            NSLog(@"Calculated Domain: %@", domain);
-            
-            NSArray<NSString*> *parts = [domain componentsSeparatedByString:@"."];
-            
-            NSLog(@"%@", parts);
-            
-            NSString *searchTerm =  parts.count ? parts[0] : domain;
+
+            NSString * searchTerm = getSearchTermFromDomain(url.host);
 
             self.searchController.searchBar.selectedScopeButtonIndex = 0; // Title
             [self.searchController.searchBar setText:searchTerm];
             return;
         }
-        else {
-            NSLog(@"Service Identifier Not URL: [%@]", serviceIdentifiers);
+        else if (serviceId.type == ASCredentialServiceIdentifierTypeDomain) {
+            NSString * searchTerm = getSearchTermFromDomain(serviceId.identifier);
+            
+            self.searchController.searchBar.selectedScopeButtonIndex = 0;
+            [self.searchController.searchBar setText:searchTerm];
+        
+            return;
         }
     }
 
-    self.searchController.searchBar.selectedScopeButtonIndex = 0; // Title
-    [self.searchController.searchBar setText:@""];
+    //self.searchController.searchBar.selectedScopeButtonIndex = 0; // Title
+    //[self.searchController.searchBar setText:@""];
 }
 
 - (void)viewWillAppear:(BOOL)animated {