Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 James Magahern
|
eab5301c2f |
@@ -1,5 +0,0 @@
|
||||
ASC_KEY_ID=
|
||||
ASC_ISSUER_ID=
|
||||
ASC_KEY=
|
||||
MATCH_PASSWORD=
|
||||
MATCH_GIT_BASIC_AUTHORIZATION=
|
||||
@@ -1,35 +0,0 @@
|
||||
name: TestFlight
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "release/ios/v*"
|
||||
- "Attractor-*"
|
||||
|
||||
jobs:
|
||||
testflight:
|
||||
name: Build and upload
|
||||
runs-on: macos-arm64
|
||||
timeout-minutes: 90
|
||||
|
||||
steps:
|
||||
- name: Check out the release tag
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Ruby
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: "3.3.11"
|
||||
bundler-cache: true
|
||||
|
||||
- name: Build and upload to TestFlight
|
||||
env:
|
||||
ASC_KEY_ID: ${{ secrets.ASC_KEY_ID }}
|
||||
ASC_ISSUER_ID: ${{ secrets.ASC_ISSUER_ID }}
|
||||
ASC_KEY: ${{ secrets.ASC_KEY }}
|
||||
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
|
||||
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
|
||||
CI: "true"
|
||||
FASTLANE_SKIP_UPDATE_CHECK: "1"
|
||||
FASTLANE_HIDE_CHANGELOG: "1"
|
||||
run: bundle exec fastlane ios beta
|
||||
@@ -1,5 +0,0 @@
|
||||
.env
|
||||
.bundle/
|
||||
build/
|
||||
fastlane/README.md
|
||||
fastlane/report.xml
|
||||
@@ -34,8 +34,6 @@
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.utilities</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.developer.web-browser</key>
|
||||
<true/>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
|
||||
+20
-10
@@ -19,6 +19,7 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
|
||||
|
||||
public var tabInfo: TabInfo {
|
||||
get {
|
||||
updateMetadata()
|
||||
return _tabInfo
|
||||
}
|
||||
}
|
||||
@@ -38,14 +39,18 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
|
||||
}
|
||||
public var policyManager: ResourcePolicyManager
|
||||
|
||||
// Persisted snapshot of visible tab metadata; do not recompute on read.
|
||||
var _tabInfo: TabInfo = TabInfo()
|
||||
private var _tabInfo: TabInfo = TabInfo()
|
||||
|
||||
private var loadedWebView: WKWebView? = nil
|
||||
public var title: String? { get { tabInfo.title } }
|
||||
public var url: URL? {
|
||||
if let urlString = tabInfo.urlString { return URL(string: urlString) }
|
||||
return nil
|
||||
get {
|
||||
if let urlString = tabInfo.urlString {
|
||||
return URL(string: urlString)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
public var javaScriptEnabled: Bool = false {
|
||||
@@ -105,10 +110,6 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
|
||||
super.init()
|
||||
|
||||
bridge.delegate = self
|
||||
|
||||
// Initialize snapshot metadata
|
||||
_tabInfo.identifier = self.identifier
|
||||
if let url { _tabInfo.urlString = url.absoluteString }
|
||||
}
|
||||
|
||||
deinit {
|
||||
@@ -116,8 +117,6 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
|
||||
}
|
||||
|
||||
func beginLoadingURL(_ url: URL) {
|
||||
// Update snapshot immediately so UI keeps URL even if process jettisons.
|
||||
_tabInfo.urlString = url.absoluteString
|
||||
let request = URLRequest(url: url)
|
||||
webView.load(request)
|
||||
}
|
||||
@@ -151,4 +150,15 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
|
||||
.assign(to: \.favicon, on: self)
|
||||
}
|
||||
}
|
||||
|
||||
private func updateMetadata() {
|
||||
guard contentProcessTerminated == false else { return }
|
||||
|
||||
_tabInfo = TabInfo(
|
||||
title: loadedWebView?.title,
|
||||
urlString: loadedWebView?.url?.absoluteString ?? self.homeURL?.absoluteString,
|
||||
faviconData: self.favicon?.pngData(),
|
||||
identifier: self.identifier
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,28 +49,16 @@ class TabController
|
||||
tabs.append(tab)
|
||||
}
|
||||
|
||||
// Title observation: update snapshot and notify delegate.
|
||||
// Title observation
|
||||
tab.titleObservation = tab.webView.observe(\.title, changeHandler: { [weak tab, weak self] (webView, change) in
|
||||
guard let tab = tab else { return }
|
||||
if let newTitle = webView.title, !newTitle.isEmpty {
|
||||
tab._tabInfo.title = newTitle
|
||||
}
|
||||
if let self = self, let delegate = self.controllerDelegate {
|
||||
if let tab = tab, let self = self, let delegate = self.controllerDelegate {
|
||||
delegate.tabController(self, didUpdateTitle: webView.title ?? "", forTab: tab)
|
||||
}
|
||||
})
|
||||
|
||||
// URL observation: persist the latest URL in the snapshot.
|
||||
tab.urlObservation = tab.webView.observe(\.url, changeHandler: { [weak tab] (webView, change) in
|
||||
guard let tab = tab else { return }
|
||||
tab._tabInfo.urlString = webView.url?.absoluteString ?? tab._tabInfo.urlString
|
||||
})
|
||||
|
||||
// Favicon Observation
|
||||
tab.faviconObservation = tab.$favicon.receive(on: RunLoop.main).sink { [weak tab, weak self] val in
|
||||
guard let tab = tab else { return }
|
||||
tab._tabInfo.faviconData = val?.pngData()
|
||||
if let self = self, let delegate = self.controllerDelegate {
|
||||
if let tab = tab, let self = self, let delegate = self.controllerDelegate {
|
||||
delegate.tabController(self, didUpdateFavicon: val, forTab: tab)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#import "Hacks.h"
|
||||
|
||||
#import <OSLog/OSLog.h>
|
||||
#import <stdatomic.h>
|
||||
|
||||
#import <WebKit/_WKRemoteObjectInterface.h>
|
||||
#import <WebKit/_WKRemoteObjectRegistry.h>
|
||||
@@ -20,28 +19,10 @@
|
||||
#import <WebKit/WKProcessPoolPrivate.h>
|
||||
#import <WebKit/WKWebViewPrivate.h>
|
||||
#import <WebKit/WKWebViewConfigurationPrivate.h>
|
||||
#import <WebKit/WKContentRuleListStore.h>
|
||||
|
||||
#define WKUserStyleSheet id
|
||||
#define WKUserStyleSheetEncodedClassName "X1dLVXNlclN0eWxlU2hlZXQ="
|
||||
|
||||
NSArray<NSString *> *CommonCDNList(void) {
|
||||
static dispatch_once_t onceToken;
|
||||
static NSArray<NSString *> *commonCDNList = nil;
|
||||
dispatch_once(&onceToken, ^{
|
||||
commonCDNList = @[
|
||||
@"cdn.jsdelivr.net",
|
||||
@"fsdn.net",
|
||||
@"cdnjs.com",
|
||||
@"osscdn.com",
|
||||
@"code.jquery.com",
|
||||
@"bootstrapcdn.com"
|
||||
];
|
||||
});
|
||||
|
||||
return commonCDNList;
|
||||
}
|
||||
|
||||
@interface StyleSheet : NSObject <NSCopying>
|
||||
@property (nonatomic, readonly, copy) NSString *source;
|
||||
@property (nonatomic, readonly, copy) NSURL *baseURL;
|
||||
@@ -50,9 +31,6 @@ NSArray<NSString *> *CommonCDNList(void) {
|
||||
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly;
|
||||
@end
|
||||
|
||||
// Note: We no longer proxy http/https via WKURLSchemeHandler; we use
|
||||
// WebKit content blocking rules instead.
|
||||
|
||||
@interface WKUserContentController (Private)
|
||||
- (void)__addUserStyleSheet:(WKUserStyleSheet)userStyleSheet;
|
||||
- (void)__removeUserStyleSheet:(WKUserStyleSheet)userStyleSheet;
|
||||
@@ -90,13 +68,6 @@ NSArray<NSString *> *CommonCDNList(void) {
|
||||
#define LOG_DEBUG(format, ...) os_log_debug(_log, format, ##__VA_ARGS__)
|
||||
#define LOG_ERROR(format, ...) os_log_error(_log, format, ##__VA_ARGS__)
|
||||
|
||||
static os_log_t _log;
|
||||
|
||||
__attribute__((constructor))
|
||||
static void initialize_log(void) {
|
||||
_log = os_log_create("net.buzzert.attractor.webview", "bridge");
|
||||
}
|
||||
|
||||
@interface NSURLResponse (BridgeAdditions)
|
||||
@property (nonatomic, readonly) BOOL isJavascriptResponse;
|
||||
@end
|
||||
@@ -120,11 +91,13 @@ static void initialize_log(void) {
|
||||
|
||||
@end
|
||||
|
||||
@interface SBRProcessBundleBridge ()
|
||||
@interface SBRProcessBundleBridge () <WKURLSchemeHandler>
|
||||
|
||||
@end
|
||||
|
||||
@implementation SBRProcessBundleBridge {
|
||||
os_log_t _log;
|
||||
|
||||
WKWebView *_webView;
|
||||
WKWebViewConfiguration *_webViewConfiguration;
|
||||
WKProcessPool *_processPool;
|
||||
@@ -134,21 +107,17 @@ static void initialize_log(void) {
|
||||
|
||||
NSArray<WKUserScript *> *_userScripts;
|
||||
|
||||
dispatch_queue_t _dataTasksAccessQueue;
|
||||
NSMutableDictionary<NSURLRequest *, NSURLSessionDataTask *> *_dataTasks;
|
||||
|
||||
// These come from settings.
|
||||
WKUserStyleSheet _customizedUserStylesheet;
|
||||
WKUserScript *_customizedUserScript;
|
||||
|
||||
// Content blocking
|
||||
WKContentRuleList *_activeScriptRuleList;
|
||||
void *_urlKVOContext;
|
||||
}
|
||||
|
||||
- (void)tearDown
|
||||
{
|
||||
if (_webView) {
|
||||
@try { [_webView removeObserver:self forKeyPath:@"URL" context:_urlKVOContext]; }
|
||||
@catch (__unused NSException *ex) {}
|
||||
}
|
||||
// This was used to unregister the delegate with the web process.
|
||||
}
|
||||
|
||||
- (instancetype)initWithWebViewConfiguration:(WKWebViewConfiguration *)webViewConfiguration
|
||||
@@ -156,6 +125,8 @@ static void initialize_log(void) {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
if (!webViewConfiguration) {
|
||||
_log = os_log_create("net.buzzert.attractor.webview", "bridge");
|
||||
|
||||
webViewConfiguration = [[WKWebViewConfiguration alloc] init];
|
||||
|
||||
// Set up process pool
|
||||
@@ -164,7 +135,12 @@ static void initialize_log(void) {
|
||||
|
||||
webViewConfiguration._waitsForPaintAfterViewDidMoveToWindow = NO;
|
||||
webViewConfiguration._applePayEnabled = YES;
|
||||
// No http/https interception — rely on content blocking rules instead.
|
||||
|
||||
_dataTasks = [NSMutableDictionary dictionary];
|
||||
_dataTasksAccessQueue = dispatch_queue_create("net.buzzert.attractor.dataTasksAccess", DISPATCH_QUEUE_SERIAL);
|
||||
|
||||
[webViewConfiguration setURLSchemeHandler:self forURLScheme:@"http"];
|
||||
[webViewConfiguration setURLSchemeHandler:self forURLScheme:@"https"];
|
||||
}
|
||||
|
||||
_webViewConfiguration = webViewConfiguration;
|
||||
@@ -185,11 +161,6 @@ static void initialize_log(void) {
|
||||
}
|
||||
|
||||
_webView = webView;
|
||||
_urlKVOContext = &_urlKVOContext; // unique context pointer
|
||||
[_webView addObserver:self forKeyPath:@"URL" options:(NSKeyValueObservingOptionNew) context:_urlKVOContext];
|
||||
|
||||
// Initialize content blocking rules for current host
|
||||
[self rebuildContentBlockingRulesForCurrentHost];
|
||||
}
|
||||
|
||||
return self;
|
||||
@@ -252,18 +223,97 @@ static void initialize_log(void) {
|
||||
});
|
||||
}
|
||||
|
||||
#pragma mark <WKURLSchemeHandler>
|
||||
|
||||
- (void)webView:(WKWebView *)webView startURLSchemeTask:(id<WKURLSchemeTask>)urlSchemeTask
|
||||
{
|
||||
NSString *hostOrigin = [[_webView URL] host];
|
||||
NSURLRequest *request = [urlSchemeTask request];
|
||||
|
||||
LOG_DEBUG("Start URL scheme task: request: %@", request);
|
||||
|
||||
__weak __auto_type welf = self;
|
||||
NSURLSessionDataTask *dataTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error)
|
||||
{
|
||||
if (!welf) return;
|
||||
__strong __auto_type sself = welf;
|
||||
|
||||
if (error != nil) {
|
||||
[urlSchemeTask didFailWithError:error];
|
||||
} else if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
|
||||
NSURL *requestURL = [request URL];
|
||||
NSString *resourceOrigin = [requestURL host];
|
||||
const __auto_type allowResource = ^{
|
||||
os_log_debug(sself->_log, "Allowing resource: %@", requestURL.lastPathComponent);
|
||||
[urlSchemeTask didReceiveResponse:response];
|
||||
[urlSchemeTask didReceiveData:data];
|
||||
[urlSchemeTask didFinish];
|
||||
|
||||
[self webProcessDidAllowScriptWithOrigin:resourceOrigin];
|
||||
};
|
||||
|
||||
const __auto_type denyResource = ^{
|
||||
os_log_debug(sself->_log, "Blocking resource: %@", requestURL.lastPathComponent);
|
||||
NSHTTPURLResponse *altResponse = [[NSHTTPURLResponse alloc] initWithURL:requestURL
|
||||
MIMEType:@"application/javascript"
|
||||
expectedContentLength:0 textEncodingName:@"utf8"];
|
||||
[urlSchemeTask didReceiveResponse:altResponse];
|
||||
[urlSchemeTask didReceiveData:[NSData data]];
|
||||
[urlSchemeTask didFinish];
|
||||
|
||||
[self webProcessDidBlockScriptWithOrigin:resourceOrigin];
|
||||
};
|
||||
|
||||
// Check MIME type for JavaScript responses.
|
||||
if ([response isJavascriptResponse] && ![sself allowAllScripts]) {
|
||||
dispatch_async(sself->_dataTasksAccessQueue, ^{
|
||||
NSDictionary<NSString *, NSNumber *> *policyTypes = [sself->_policyDataSource scriptPolicyTypeByOrigin];
|
||||
NSNumber *policyType = [policyTypes objectForKey:hostOrigin];
|
||||
|
||||
SBRScriptPolicy *policy = [[SBRScriptPolicy alloc] initWithSecurityOrigin:hostOrigin policyType:[policyType integerValue]];
|
||||
if ([policy allowsExternalJavaScriptResourceOrigin:resourceOrigin]) {
|
||||
allowResource();
|
||||
} else {
|
||||
denyResource();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
allowResource();
|
||||
}
|
||||
} else {
|
||||
[urlSchemeTask didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:0 userInfo:nil]];
|
||||
}
|
||||
|
||||
[sself->_dataTasks removeObjectForKey:request];
|
||||
}];
|
||||
|
||||
[_dataTasks setObject:dataTask forKey:request];
|
||||
[dataTask resume];
|
||||
}
|
||||
|
||||
- (void)webView:(WKWebView *)webView stopURLSchemeTask:(id<WKURLSchemeTask>)urlSchemeTask
|
||||
{
|
||||
NSURLRequest *request = [urlSchemeTask request];
|
||||
NSURLSessionDataTask *dataTask = [_dataTasks objectForKey:request];
|
||||
if (dataTask) {
|
||||
if ([dataTask state] != NSURLSessionTaskStateCanceling) {
|
||||
[dataTask cancel];
|
||||
}
|
||||
|
||||
[_dataTasks removeObjectForKey:request];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark Actions
|
||||
|
||||
- (void)policyDataSourceDidChange
|
||||
{
|
||||
// Rebuild content blocking rules when policy changes.
|
||||
[self rebuildContentBlockingRulesForCurrentHost];
|
||||
// This was used when we had to signal the process bundle.
|
||||
}
|
||||
|
||||
- (void)setAllowAllScripts:(BOOL)allowAllScripts
|
||||
{
|
||||
_allowAllScripts = allowAllScripts;
|
||||
[self rebuildContentBlockingRulesForCurrentHost];
|
||||
}
|
||||
|
||||
- (void)setDarkModeEnabled:(BOOL)darkModeEnabled
|
||||
@@ -310,119 +360,4 @@ static void initialize_log(void) {
|
||||
}];
|
||||
}
|
||||
|
||||
// MARK: - Content Blocking Rules
|
||||
|
||||
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
|
||||
{
|
||||
if (context == _urlKVOContext && [keyPath isEqualToString:@"URL"]) {
|
||||
[self rebuildContentBlockingRulesForCurrentHost];
|
||||
return;
|
||||
}
|
||||
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
|
||||
}
|
||||
|
||||
- (void)rebuildContentBlockingRulesForCurrentHost
|
||||
{
|
||||
NSString *hostOrigin = _webView.URL.host;
|
||||
if (!hostOrigin) {
|
||||
// No page loaded yet; clear any existing rules
|
||||
[self applyContentRuleListJSON:nil withName:nil];
|
||||
return;
|
||||
}
|
||||
|
||||
// Determine policy for this host
|
||||
NSNumber *policyType = nil;
|
||||
@synchronized (_policyDataSource) {
|
||||
NSDictionary<NSString *, NSNumber *> *policyTypes = [_policyDataSource scriptPolicyTypeByOrigin];
|
||||
policyType = [policyTypes objectForKey:hostOrigin] ?: @(0);
|
||||
}
|
||||
|
||||
// Alpha=0 Bravo=1 Charlie=2 Delta=3 Echo=4
|
||||
SBRScriptOriginPolicyType type = [policyType integerValue];
|
||||
if (_allowAllScripts || type >= SBRScriptOriginPolicyTypeEcho) {
|
||||
// Echo or shields down: no blocking
|
||||
[self applyContentRuleListJSON:nil withName:nil];
|
||||
return;
|
||||
}
|
||||
|
||||
// Base trigger applies only to this page's domain
|
||||
NSMutableArray *rules = [NSMutableArray array];
|
||||
NSDictionary *baseScriptTrigger = @{
|
||||
@"resource-type" : @[ @"script" ],
|
||||
@"if-domain" : @[ hostOrigin ]
|
||||
};
|
||||
|
||||
if (type <= SBRScriptOriginPolicyTypeBravo) {
|
||||
// Alpha or Bravo: block all external script subresources (inline JS is controlled via preferences elsewhere)
|
||||
[rules addObject:@{ @"trigger": baseScriptTrigger, @"action": @{ @"type": @"block" } }];
|
||||
} else {
|
||||
// Charlie/Delta: block third-party scripts
|
||||
NSMutableDictionary *trigger = [baseScriptTrigger mutableCopy];
|
||||
trigger[@"load-type"] = @[ @"third-party" ];
|
||||
[rules addObject:@{ @"trigger": trigger, @"action": @{ @"type": @"block" } }];
|
||||
|
||||
if (type >= SBRScriptOriginPolicyTypeDelta) {
|
||||
// Delta: add allowlist for common CDNs
|
||||
for (NSString *cdn in CommonCDNList()) {
|
||||
NSString *escaped = [NSRegularExpression escapedPatternForString:cdn];
|
||||
NSString *pattern = [NSString stringWithFormat:@".*://([^.]*\\.)?%@/", escaped];
|
||||
[rules addObject:@{
|
||||
@"trigger": @{
|
||||
@"url-filter": pattern,
|
||||
@"if-domain": @[ hostOrigin ],
|
||||
@"resource-type": @[ @"script" ]
|
||||
},
|
||||
@"action": @{ @"type": @"ignore-previous-rules" }
|
||||
}];
|
||||
}
|
||||
|
||||
// Heuristic: allow cdn.<anything-with-family-name>/* where family name is the second-level label
|
||||
NSArray<NSString *> *components = [hostOrigin componentsSeparatedByString:@"."];
|
||||
if (components.count > 1) {
|
||||
NSString *family = components[components.count - 2];
|
||||
NSString *escapedFamily = [NSRegularExpression escapedPatternForString:family];
|
||||
NSString *familyPattern = [NSString stringWithFormat:@".*://cdn\\.[^/]*%@[^/]*/", escapedFamily];
|
||||
[rules addObject:@{
|
||||
@"trigger": @{
|
||||
@"url-filter": familyPattern,
|
||||
@"if-domain": @[ hostOrigin ],
|
||||
@"resource-type": @[ @"script" ]
|
||||
},
|
||||
@"action": @{ @"type": @"ignore-previous-rules" }
|
||||
}];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:rules options:0 error:nil];
|
||||
NSString *json = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
|
||||
NSString *name = [NSString stringWithFormat:@"net.buzzert.attractor.rules.%@", hostOrigin];
|
||||
[self applyContentRuleListJSON:json withName:name];
|
||||
}
|
||||
|
||||
- (void)applyContentRuleListJSON:(NSString *)json withName:(NSString *)name
|
||||
{
|
||||
WKUserContentController *controller = [_webViewConfiguration userContentController];
|
||||
if (_activeScriptRuleList) {
|
||||
[controller removeContentRuleList:_activeScriptRuleList];
|
||||
_activeScriptRuleList = nil;
|
||||
}
|
||||
|
||||
if (!json || !name) { return; }
|
||||
|
||||
WKContentRuleListStore *store = [WKContentRuleListStore defaultStore];
|
||||
[store compileContentRuleListForIdentifier:name encodedContentRuleList:json completionHandler:^(WKContentRuleList * _Nullable ruleList, NSError * _Nullable error) {
|
||||
if (error) {
|
||||
LOG_ERROR("Failed to compile content rule list: %@", error.localizedDescription);
|
||||
return;
|
||||
}
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
self->_activeScriptRuleList = ruleList;
|
||||
[controller addContentRuleList:ruleList];
|
||||
LOG_DEBUG("Applied content rule list: %@", name);
|
||||
});
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
-244
@@ -1,244 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.8)
|
||||
abbrev (0.1.2)
|
||||
addressable (2.9.0)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
artifactory (3.0.17)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.4.0)
|
||||
aws-partitions (1.1274.0)
|
||||
aws-sdk-core (3.254.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
bigdecimal
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.130.0)
|
||||
aws-sdk-core (~> 3, >= 3.254.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.228.1)
|
||||
aws-sdk-core (~> 3, >= 3.254.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.12.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.3.0)
|
||||
benchmark (0.5.0)
|
||||
bigdecimal (4.1.2)
|
||||
claide (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
csv (3.3.6)
|
||||
declarative (0.0.20)
|
||||
digest-crc (0.7.0)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
domain_name (0.6.20240107)
|
||||
dotenv (2.8.1)
|
||||
emoji_regex (3.2.3)
|
||||
excon (1.6.0)
|
||||
logger
|
||||
faraday (1.10.6)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.8)
|
||||
faraday (>= 0.8.0)
|
||||
http-cookie (>= 1.0.0)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.1)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.2.0)
|
||||
multipart-post (~> 2.0)
|
||||
faraday-net_http (1.0.2)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.4)
|
||||
faraday_middleware (1.2.1)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.4.1)
|
||||
fastlane (2.237.0)
|
||||
CFPropertyList (>= 2.3, < 5.0.0)
|
||||
abbrev (~> 0.1)
|
||||
addressable (>= 2.9.0, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
aws-sdk-s3 (~> 1.197)
|
||||
babosa (>= 1.0.3, < 2.0.0)
|
||||
base64 (~> 0.2)
|
||||
benchmark (>= 0.1.0)
|
||||
bundler (>= 2.4.0, < 5.0.0)
|
||||
colored (~> 1.2)
|
||||
commander (~> 4.6)
|
||||
csv (~> 3.3)
|
||||
dotenv (>= 2.1.1, < 3.0.0)
|
||||
emoji_regex (>= 0.1, < 4.0)
|
||||
excon (>= 0.71.0, < 2.0.0)
|
||||
faraday (~> 1.0)
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
faraday_middleware (~> 1.0)
|
||||
fastimage (>= 2.1.0, < 3.0.0)
|
||||
fastlane-sirp (>= 1.1.0)
|
||||
gh_inspector (>= 1.1.2, < 2.0.0)
|
||||
google-apis-androidpublisher_v3 (~> 0.3)
|
||||
google-apis-playcustomapp_v1 (~> 0.1)
|
||||
google-cloud-env (>= 1.6.0, < 2.3.0)
|
||||
google-cloud-storage (~> 1.31)
|
||||
highline (~> 2.0)
|
||||
http-cookie (~> 1.0.5)
|
||||
json (< 3.0.0)
|
||||
jwt (>= 2.10.3, < 4)
|
||||
logger (>= 1.6, < 2.0)
|
||||
mini_magick (>= 4.9.4, < 5.0.0)
|
||||
multi_json (~> 1.12)
|
||||
multipart-post (>= 2.0.0, < 3.0.0)
|
||||
mutex_m (~> 0.3)
|
||||
naturally (~> 2.2)
|
||||
nkf (~> 0.2)
|
||||
optparse (>= 0.1.1, < 1.0.0)
|
||||
ostruct (>= 0.1.0)
|
||||
plist (>= 3.1.0, < 4.0.0)
|
||||
rubyzip (>= 2.0.0, < 3.0.0)
|
||||
security (= 0.1.5)
|
||||
simctl (~> 1.6.3)
|
||||
terminal-notifier (>= 2.0.0, < 3.0.0)
|
||||
terminal-table (~> 3)
|
||||
tty-screen (>= 0.6.3, < 1.0.0)
|
||||
tty-spinner (>= 0.8.0, < 1.0.0)
|
||||
word_wrap (~> 1.0.0)
|
||||
xcodeproj (>= 1.13.0, < 2.0.0)
|
||||
xcpretty (~> 0.4.1)
|
||||
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
|
||||
fastlane-sirp (1.1.0)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.106.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-core (0.18.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (~> 1.9)
|
||||
httpclient (>= 2.8.3, < 3.a)
|
||||
mini_mime (~> 1.0)
|
||||
mutex_m
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.a)
|
||||
google-apis-iamcredentials_v1 (0.28.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.18.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-storage_v1 (0.65.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-cloud-core (1.9.0)
|
||||
google-cloud-env (>= 1.0, < 3.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (2.2.2)
|
||||
base64 (~> 0.2)
|
||||
faraday (>= 1.0, < 3.a)
|
||||
google-cloud-errors (1.7.0)
|
||||
google-cloud-storage (1.62.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-core (>= 0.18, < 2)
|
||||
google-apis-iamcredentials_v1 (~> 0.18)
|
||||
google-apis-storage_v1 (>= 0.42)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (~> 1.9)
|
||||
mini_mime (~> 1.0)
|
||||
google-logging-utils (0.2.0)
|
||||
googleauth (1.17.2)
|
||||
faraday (>= 1.0, < 3.a)
|
||||
google-cloud-env (~> 2.2)
|
||||
google-logging-utils (~> 0.1)
|
||||
jwt (>= 1.4, < 4.0)
|
||||
os (>= 0.9, < 2.0)
|
||||
pstore (~> 0.1)
|
||||
signet (>= 0.16, < 2.a)
|
||||
highline (2.0.3)
|
||||
http-cookie (1.0.8)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
jmespath (1.6.2)
|
||||
json (2.21.1)
|
||||
jwt (3.2.0)
|
||||
base64
|
||||
logger (1.7.0)
|
||||
mini_magick (4.13.2)
|
||||
mini_mime (1.1.5)
|
||||
multi_json (1.21.1)
|
||||
multipart-post (2.4.1)
|
||||
mutex_m (0.3.0)
|
||||
nanaimo (0.4.0)
|
||||
naturally (2.3.0)
|
||||
nkf (0.3.0)
|
||||
optparse (0.8.1)
|
||||
os (1.1.4)
|
||||
ostruct (0.6.3)
|
||||
plist (3.7.2)
|
||||
pstore (0.2.1)
|
||||
public_suffix (7.0.5)
|
||||
rake (13.4.2)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.8.0)
|
||||
rexml (3.4.4)
|
||||
rouge (3.28.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.4.1)
|
||||
security (0.1.5)
|
||||
signet (0.22.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 4.0)
|
||||
simctl (1.6.10)
|
||||
CFPropertyList
|
||||
naturally
|
||||
terminal-notifier (2.0.0)
|
||||
terminal-table (3.0.2)
|
||||
unicode-display_width (>= 1.1.1, < 3)
|
||||
trailblazer-option (0.1.2)
|
||||
tty-cursor (0.7.1)
|
||||
tty-screen (0.8.2)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
uber (0.1.0)
|
||||
unicode-display_width (2.6.0)
|
||||
word_wrap (1.0.0)
|
||||
xcodeproj (1.28.1)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
base64
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.4.0)
|
||||
nkf
|
||||
rexml (>= 3.3.6, < 4.0)
|
||||
xcpretty (0.4.1)
|
||||
rouge (~> 3.28.0)
|
||||
xcpretty-travis-formatter (1.0.1)
|
||||
xcpretty (~> 0.2, >= 0.0.7)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
fastlane (= 2.237.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.23
|
||||
@@ -26,10 +26,3 @@ Attractor operates in five "security modes":
|
||||
- Custom redirect rules
|
||||
- Catalyst and iPadOS support
|
||||
|
||||
## Deployment
|
||||
|
||||
TestFlight deployment is handled by Fastlane and the Gitea workflow at `.gitea/workflows/testflight.yml`.
|
||||
|
||||
Required Gitea secrets match the local `.env.example`: `ASC_KEY_ID`, `ASC_ISSUER_ID`, `ASC_KEY`, `MATCH_PASSWORD`, and `MATCH_GIT_BASIC_AUTHORIZATION`.
|
||||
|
||||
Push a tag like `release/ios/v4.2` or `Attractor-4.2` to build and upload to TestFlight.
|
||||
|
||||
@@ -790,7 +790,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements";
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 6;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 3SJALV9BQ7;
|
||||
INFOPLIST_FILE = "App/Supporting Files/Info.plist";
|
||||
@@ -801,7 +801,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 4.1;
|
||||
MARKETING_VERSION = 4.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.attractor;
|
||||
PRODUCT_NAME = Attractor;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@@ -823,11 +823,11 @@
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements";
|
||||
CODE_SIGN_IDENTITY = "Apple Distribution";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
CURRENT_PROJECT_VERSION = 6;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = DQQH5H6GBD;
|
||||
DEVELOPMENT_TEAM = 3SJALV9BQ7;
|
||||
INFOPLIST_FILE = "App/Supporting Files/Info.plist";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = Attractor;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
|
||||
@@ -836,10 +836,10 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 4.1;
|
||||
MARKETING_VERSION = 4.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.attractor;
|
||||
PRODUCT_NAME = Attractor;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "Attractor AppStore CI";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MACCATALYST = YES;
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
app_identifier("net.buzzert.attractor")
|
||||
team_id("DQQH5H6GBD")
|
||||
@@ -1,40 +0,0 @@
|
||||
default_platform(:ios)
|
||||
|
||||
platform :ios do
|
||||
desc "Build a release tag and upload it to TestFlight"
|
||||
lane :beta do
|
||||
setup_ci
|
||||
|
||||
match(type: "appstore")
|
||||
|
||||
tag = ENV.fetch("GITHUB_REF_NAME")
|
||||
version = tag[%r{\A(?:release/ios/v|Attractor-)(\d+(?:\.\d+){1,2})\z}, 1]
|
||||
UI.user_error!("Expected a tag like release/ios/v4.2 or Attractor-4.2; got #{tag.inspect}") unless version
|
||||
|
||||
build_number = ENV.fetch("GITHUB_RUN_NUMBER")
|
||||
UI.user_error!("GITHUB_RUN_NUMBER must be a positive integer") unless build_number.match?(/\A[1-9]\d*\z/)
|
||||
|
||||
update_info_plist(
|
||||
plist_path: "App/Supporting Files/Info.plist",
|
||||
block: proc do |plist|
|
||||
plist["CFBundleShortVersionString"] = version
|
||||
plist["CFBundleVersion"] = build_number
|
||||
end
|
||||
)
|
||||
|
||||
api_key = app_store_connect_api_key(
|
||||
key_id: ENV.fetch("ASC_KEY_ID"),
|
||||
issuer_id: ENV.fetch("ASC_ISSUER_ID"),
|
||||
key_content: ENV.fetch("ASC_KEY"),
|
||||
is_key_content_base64: true
|
||||
)
|
||||
|
||||
build_app(scheme: "Attractor")
|
||||
|
||||
upload_to_testflight(
|
||||
api_key: api_key,
|
||||
skip_waiting_for_build_processing: true,
|
||||
uses_non_exempt_encryption: false
|
||||
)
|
||||
end
|
||||
end
|
||||
@@ -1,7 +0,0 @@
|
||||
git_url("https://code.buzzert.dev/buzzert/fastlane-match.git")
|
||||
storage_mode("git")
|
||||
type("appstore")
|
||||
|
||||
app_identifier(["net.buzzert.attractor"])
|
||||
team_id("DQQH5H6GBD")
|
||||
profile_name("Attractor AppStore CI")
|
||||
@@ -1,18 +0,0 @@
|
||||
simulator := "platform=iOS Simulator,name=iPhone 17e,OS=latest"
|
||||
derived_data := "build/DerivedData"
|
||||
|
||||
default:
|
||||
@just build
|
||||
|
||||
build:
|
||||
if command -v xcbeautify >/dev/null 2>&1; then \
|
||||
xcodebuild -project SBrowser.xcodeproj -scheme Attractor -destination '{{simulator}}' | xcbeautify; \
|
||||
else \
|
||||
xcodebuild -project SBrowser.xcodeproj -scheme Attractor -destination '{{simulator}}'; \
|
||||
fi
|
||||
|
||||
beta:
|
||||
bundle exec fastlane ios beta
|
||||
|
||||
setup-signing:
|
||||
bundle exec fastlane ios setup_signing
|
||||
Reference in New Issue
Block a user