diff --git a/App/BitBar/AppDelegate.m b/App/BitBar/AppDelegate.m index 3fa054f20..9174b72a4 100644 --- a/App/BitBar/AppDelegate.m +++ b/App/BitBar/AppDelegate.m @@ -81,26 +81,54 @@ - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppl // extract the url from the event and handle it NSString *URLString = [event paramDescriptorForKeyword:keyDirectObject].stringValue; - NSString *prefix = @"bitbar://openPlugin?src="; + URLString = [URLString stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString *prefix = @"bitbar://openPlugin?"; // skip urls that don't begin with our prefix if (![URLString hasPrefix:prefix]) return; URLString = [URLString substringFromIndex:prefix.length]; + prefix = @"title="; - NSString *plugin = nil; + NSString *title = nil; + + if ([URLString hasPrefix:prefix]) { + URLString = [URLString substringFromIndex:prefix.length]; + NSArray *components = [URLString componentsSeparatedByString:@"&"]; + + if (components.count < 2) + return; + + title = components.firstObject; + URLString = [[components subarrayWithRange:NSMakeRange(1, components.count - 1)] componentsJoinedByString:@"&"]; + } + + prefix = @"src="; + + if (![URLString hasPrefix:prefix]) + return; + + URLString = [URLString substringFromIndex:prefix.length]; + + BOOL trusted = NO; // if the plugin is at our repository, only display the filename - if ([URLString hasPrefix:@"https://github.com/matryer/bitbar-plugins/raw/master/"]) - plugin = URLString.lastPathComponent; + if ([URLString hasPrefix:@"https://github.com/matryer/bitbar-plugins/raw/master/"]) { + trusted = YES; + } NSAlert *alert = [[NSAlert alloc] init]; - [alert addButtonWithTitle:@"OK"]; + [alert addButtonWithTitle:@"Install"]; [alert addButtonWithTitle:@"Cancel"]; - alert.messageText = [NSString stringWithFormat:@"Download and install the plugin %@?", plugin ?: [NSString stringWithFormat:@"at %@", URLString]]; - alert.informativeText = @"Only install plugins from trusted sources."; - + alert.messageText = [NSString stringWithFormat:@"Download and install the plugin %@?", trusted ? (title.length > 0 ? title : URLString.lastPathComponent) : [NSString stringWithFormat:@"at %@", URLString]]; + + if (trusted) { + alert.informativeText = @"Only install plugins from trusted sources."; + } else { + alert.informativeText = @"CAUTION: This plugin is not from the official BitBar repository. We recommend that you only install plugins from trusted sources."; + } + if ([alert runModal] != NSAlertFirstButtonReturn) { // cancel clicked return; diff --git a/App/BitBar/incoming-url-tests.html b/App/BitBar/incoming-url-tests.html new file mode 100644 index 000000000..a58ae3583 --- /dev/null +++ b/App/BitBar/incoming-url-tests.html @@ -0,0 +1,60 @@ + + + + Incoming URL tests + + + +

BitBar - Incoming URL tests

+ + + + + + + + + + + + + + + + + + + + + + + + +
LinkExpectation
+ + Normal + + + Should open and install 'Cycle Text and Detail' plugin +
+ + Missing title + + + Should open and install 'Cycle Text and Detail' plugin but use cycle_text_and_detail.sh as title +
+ + Empty title + + + Should open and install 'Cycle Text and Detail' plugin but use cycle_text_and_detail.sh as title +
+ + Unofficial repo + + + Should open and install test plugin but have additional warnings - and use full URL (not title) +
+ + + \ No newline at end of file