From ac85484b3c8ffcd7644d3e67ddc7e27392c2ffad Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Mon, 16 Oct 2023 08:17:44 +0100 Subject: [PATCH 01/14] - Enabled `riseupcpn` and `echcheck` - Update Experimental Suite copy - Add support for saving multiple errors --- Podfile | 4 ++-- Podfile.lock | 12 ++++++------ ooniprobe/Test/Suite/CircumventionSuite.m | 2 ++ ooniprobe/Test/Suite/ExperimentalSuite.m | 5 +++-- ooniprobe/Test/Test/AbstractTest.m | 6 +++++- ooniprobe/Utility/LocalizationUtility.m | 3 ++- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Podfile b/Podfile index 7594c228f..b9321f75d 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.18.1/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -19,7 +19,7 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.18.1/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" pod 'SharkORM', :git => 'https://github.com/sharksync/sharkorm', :tag => 'v2.3.67' pod 'OCMapper', '2.0' end diff --git a/Podfile.lock b/Podfile.lock index 5e20c6ca0..66a02228a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,7 +9,7 @@ PODS: - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.07.18-162800) + - oonimkall (2023.10.12-182759) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -30,7 +30,7 @@ DEPENDENCIES: - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.18.1/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec`) - RHMarkdownLabel - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`) - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`) @@ -53,7 +53,7 @@ SPEC REPOS: EXTERNAL SOURCES: oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.18.1/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -78,7 +78,7 @@ SPEC CHECKSUMS: MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: 7765766adbf7284e866fee5590acf55b1b76995e + oonimkall: a4df7be72eef56e7f181c3444327f8f28492301e RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -86,6 +86,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: e82378591e42a948797afaec35b1efccdb5765ac +PODFILE CHECKSUM: 117e9c446c40e033ec1fb79b9cd439723477f007 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/ooniprobe/Test/Suite/CircumventionSuite.m b/ooniprobe/Test/Suite/CircumventionSuite.m index c1081edab..b8a95b770 100644 --- a/ooniprobe/Test/Suite/CircumventionSuite.m +++ b/ooniprobe/Test/Suite/CircumventionSuite.m @@ -17,6 +17,8 @@ - (NSArray*)getTestList { [self.testList addObject:[[Psiphon alloc] init]]; if ([SettingsUtility getSettingWithName:@"test_tor"]) [self.testList addObject:[[Tor alloc] init]]; + if ([SettingsUtility getSettingWithName:@"test_riseupvpn"]) + [self.testList addObject:[[RiseupVPN alloc] init]]; } return super.getTestList; } diff --git a/ooniprobe/Test/Suite/ExperimentalSuite.m b/ooniprobe/Test/Suite/ExperimentalSuite.m index f4af054e9..bb2d594e8 100644 --- a/ooniprobe/Test/Suite/ExperimentalSuite.m +++ b/ooniprobe/Test/Suite/ExperimentalSuite.m @@ -14,12 +14,13 @@ - (id)init { - (NSArray *)getTestList { if ([self.testList count] == 0) { if ([SettingsUtility isExperimentalTestEnabled]) { + [self.testList addObject:[[Experimental alloc] initWithName:@"stunreachability"]]; + [self.testList addObject:[[Experimental alloc] initWithName:@"dnscheck"]]; + [self.testList addObject:[[Experimental alloc] initWithName:@"echcheck"]]; if ([SettingsUtility isLongRunningTestsInForegroundEnabled] || self.autoRun) { [self.testList addObject:[[Experimental alloc] initWithName:@"torsf"]]; [self.testList addObject:[[Experimental alloc] initWithName:@"vanilla_tor"]]; } - [self.testList addObject:[[Experimental alloc] initWithName:@"stunreachability"]]; - [self.testList addObject:[[Experimental alloc] initWithName:@"dnscheck"]]; } } return super.getTestList; diff --git a/ooniprobe/Test/Test/AbstractTest.m b/ooniprobe/Test/Test/AbstractTest.m index f2010ff65..5436cfb6c 100644 --- a/ooniprobe/Test/Test/AbstractTest.m +++ b/ooniprobe/Test/Test/AbstractTest.m @@ -183,7 +183,11 @@ -(void)runTest{ } else if ([event.key isEqualToString:@"failure.startup"] || [event.key isEqualToString:@"failure.resolver_lookup"]) { - [self.result setFailure_msg:event.value.failure]; + if([self.result failure_msg] == nil){ + [self.result setFailure_msg:event.value.failure]; + } else { + [self.result setFailure_msg:[NSString stringWithFormat:@"%@\n\n%@", [self.result failure_msg], event.value.failure]]; + } [self.result save]; [ThirdPartyServices recordError:@"failure" reason:event.key diff --git a/ooniprobe/Utility/LocalizationUtility.m b/ooniprobe/Utility/LocalizationUtility.m index e6ec4c099..9b797d713 100644 --- a/ooniprobe/Utility/LocalizationUtility.m +++ b/ooniprobe/Utility/LocalizationUtility.m @@ -63,7 +63,8 @@ + (NSString*)getLongDescriptionForTest:(NSString*)testName{ return NSLocalizedFormatString(@"Dashboard.Experimental.Overview.Paragraph", [NSString stringWithFormat:@"%@ %@ %@", @"\n\n- [STUN Reachability](https://github.com/ooni/spec/blob/master/nettests/ts-025-stun-reachability.md) " - "\n\n- [DNS Check](https://github.com/ooni/spec/blob/master/nettests/ts-028-dnscheck.md) ", + "\n\n- [DNS Check](https://github.com/ooni/spec/blob/master/nettests/ts-028-dnscheck.md) " + "\n\n- [ECH Check](https://github.com/ooni/spec/blob/master/nettests/ts-039-echcheck.md)", [NSString stringWithFormat:@"%@ ( %@ )", @"\n\n- [Tor Snowflake](https://ooni.org/nettest/tor-snowflake/) ",NSLocalizedFormatString(@"Settings.TestOptions.LongRunningTest",nil)], [NSString stringWithFormat:@"%@ ( %@ )", @"\n\n- [Vanilla Tor](https://github.com/ooni/spec/blob/master/nettests/ts-016-vanilla-tor.md) ",NSLocalizedFormatString(@"Settings.TestOptions.LongRunningTest",nil)] ]); From efda25317b6724f53a30fce744bd796b272d0268 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Mon, 16 Oct 2023 10:51:02 +0100 Subject: [PATCH 02/14] Updated `IPHONEOS_DEPLOYMENT_TARGET` --- Podfile | 2 +- Podfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile b/Podfile index b9321f75d..d0e8b2783 100644 --- a/Podfile +++ b/Podfile @@ -28,7 +28,7 @@ post_install do |installer| installer.generated_projects.each do |project| project.targets.each do |target| target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' end end end diff --git a/Podfile.lock b/Podfile.lock index 66a02228a..d7760c89f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -86,6 +86,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: 117e9c446c40e033ec1fb79b9cd439723477f007 +PODFILE CHECKSUM: b246998cd93204e6deffcde852999bc3c2036e56 COCOAPODS: 1.13.0 From e806a28d17ee3c7f143d4f4ab32de128811d47e6 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Mon, 16 Oct 2023 11:21:40 +0100 Subject: [PATCH 03/14] Changed cli version --- Podfile | 4 ++-- Podfile.lock | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index d0e8b2783..81f8c63a5 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -19,7 +19,7 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec" pod 'SharkORM', :git => 'https://github.com/sharksync/sharkorm', :tag => 'v2.3.67' pod 'OCMapper', '2.0' end diff --git a/Podfile.lock b/Podfile.lock index d7760c89f..aafd40e05 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,7 +9,7 @@ PODS: - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.10.12-182759) + - oonimkall (2023.10.11-211414) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -30,7 +30,7 @@ DEPENDENCIES: - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec`) - RHMarkdownLabel - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`) - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`) @@ -53,7 +53,7 @@ SPEC REPOS: EXTERNAL SOURCES: oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -78,7 +78,7 @@ SPEC CHECKSUMS: MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: a4df7be72eef56e7f181c3444327f8f28492301e + oonimkall: 64a72016740ecc1568eb8a676235723cbd27a590 RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -86,6 +86,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: b246998cd93204e6deffcde852999bc3c2036e56 +PODFILE CHECKSUM: 2463fcc20cfdc25bf677e9513bf8469ed0dcdf99 COCOAPODS: 1.13.0 From aca756b80581f9070ea2189aabb05e3f3f362db7 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Mon, 16 Oct 2023 11:37:15 +0100 Subject: [PATCH 04/14] Update gemfile to fix build error with `activesupport` --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 06ec4c471..397c28db3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" gem "cocoapods" +gem 'activesupport', '~> 7.0', '<= 7.0.8' gem "fastlane" gem "xcpretty" From 72c1d84c5a13a2010edd2992fbd599a75ab1e62b Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Tue, 17 Oct 2023 07:35:42 +0100 Subject: [PATCH 05/14] Updated podfile --- Podfile | 4 ++-- Podfile.lock | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index 81f8c63a5..d0e8b2783 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -19,7 +19,7 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" pod 'SharkORM', :git => 'https://github.com/sharksync/sharkorm', :tag => 'v2.3.67' pod 'OCMapper', '2.0' end diff --git a/Podfile.lock b/Podfile.lock index aafd40e05..d7760c89f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,7 +9,7 @@ PODS: - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.10.11-211414) + - oonimkall (2023.10.12-182759) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -30,7 +30,7 @@ DEPENDENCIES: - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec`) - RHMarkdownLabel - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`) - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`) @@ -53,7 +53,7 @@ SPEC REPOS: EXTERNAL SOURCES: oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.2/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -78,7 +78,7 @@ SPEC CHECKSUMS: MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: 64a72016740ecc1568eb8a676235723cbd27a590 + oonimkall: a4df7be72eef56e7f181c3444327f8f28492301e RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -86,6 +86,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: 2463fcc20cfdc25bf677e9513bf8469ed0dcdf99 +PODFILE CHECKSUM: b246998cd93204e6deffcde852999bc3c2036e56 COCOAPODS: 1.13.0 From 22a26c9e2362aadfceafbad8d9796cad75a7ff94 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Tue, 17 Oct 2023 07:44:55 +0100 Subject: [PATCH 06/14] Updated version of engine to `v3.19.0-alpha.4` --- Podfile | 14 ++++++++++-- Podfile.lock | 35 ++++++++++++++++++++++++----- ooniprobe.xcodeproj/project.pbxproj | 14 ++++++++++-- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/Podfile b/Podfile index d0e8b2783..69810cd0b 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,12 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" + pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec" + pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec" + pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec" + pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec" + pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -19,7 +24,12 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" + pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec" + pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec" + pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec" + pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec" + pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec" pod 'SharkORM', :git => 'https://github.com/sharksync/sharkorm', :tag => 'v2.3.67' pod 'OCMapper', '2.0' end diff --git a/Podfile.lock b/Podfile.lock index d7760c89f..ca1024f1d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,11 +5,16 @@ PODS: - DateTools (2.0.0) - DZNEmptyDataSet (1.8.1) - Harpy (4.1.14) + - libcrypto (2023.10.16-230758) + - libevent (2023.10.16-230758) + - libssl (2023.10.16-230758) + - libtor (2023.10.16-230758) + - libz (2023.10.16-230758) - lottie-ios (2.5.3) - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.10.12-182759) + - oonimkall (2023.10.16-230758) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -26,11 +31,16 @@ DEPENDENCIES: - DateTools - DZNEmptyDataSet - Harpy + - libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec`) + - libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec`) + - libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec`) + - libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec`) + - libz (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec`) - lottie-ios (= 2.5.3) - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec`) - RHMarkdownLabel - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`) - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`) @@ -52,8 +62,18 @@ SPEC REPOS: - XNGMarkdownParser EXTERNAL SOURCES: + libcrypto: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec + libevent: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec + libssl: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec + libtor: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec + libz: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -74,11 +94,16 @@ SPEC CHECKSUMS: DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7 Harpy: b2fbe6819f6a8932df32d7cd2fb20f442df86bbc + libcrypto: 31c72ba1c3163dc883401737905112116f20a503 + libevent: ed39b4c48ded7557fc25d4fa6c00742a19377824 + libssl: 26f3dd9546d4894a9a948fad8b5390345e74f774 + libtor: 5bf7771e91058a5e3d367b666bd20fa90a4c8725 + libz: 7e8bf58f5b129c7d9e534ef911a997b4e679e884 lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: a4df7be72eef56e7f181c3444327f8f28492301e + oonimkall: 3f3ad58bd13b2f7d83a8a6da38a28dd244b2d1b5 RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -86,6 +111,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: b246998cd93204e6deffcde852999bc3c2036e56 +PODFILE CHECKSUM: a3524c14cf982a44d1e5d8e55e5313d4cf8b41bd COCOAPODS: 1.13.0 diff --git a/ooniprobe.xcodeproj/project.pbxproj b/ooniprobe.xcodeproj/project.pbxproj index 2258f2f78..39579f1e7 100644 --- a/ooniprobe.xcodeproj/project.pbxproj +++ b/ooniprobe.xcodeproj/project.pbxproj @@ -224,6 +224,11 @@ 7940AA8F28117E9000C0EB5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7940AA972811840900C0EB5D /* share.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = share.entitlements; sourceTree = ""; }; 79780FCE27E9F18E002A38B1 /* Languages.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Languages.plist; sourceTree = ""; }; + 7A8CB0932ADDDAC1005AB2BC /* libcrypto.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcrypto.xcframework; path = Pods/libcrypto/libcrypto.xcframework; sourceTree = ""; }; + 7A8CB0942ADDDAC1005AB2BC /* libevent.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libevent.xcframework; path = Pods/libevent/libevent.xcframework; sourceTree = ""; }; + 7A8CB0952ADDDAC1005AB2BC /* libssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssl.xcframework; path = Pods/libssl/libssl.xcframework; sourceTree = ""; }; + 7A8CB0962ADDDAC1005AB2BC /* libtor.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libtor.xcframework; path = Pods/libtor/libtor.xcframework; sourceTree = ""; }; + 7A8CB0972ADDDAC1005AB2BC /* libz.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libz.xcframework; path = Pods/libz/libz.xcframework; sourceTree = ""; }; 7AED19802A6EC9A2003B265A /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; 7AED19822A6EC9C7003B265A /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk/usr/lib/libresolv.tbd; sourceTree = DEVELOPER_DIR; }; AC948DA31A71FB931BBB1BB3 /* Pods-OONIProbeUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OONIProbeUnitTests.debug.xcconfig"; path = "Target Support Files/Pods-OONIProbeUnitTests/Pods-OONIProbeUnitTests.debug.xcconfig"; sourceTree = ""; }; @@ -1149,6 +1154,11 @@ F4F15431D4412F561191270F /* Frameworks */ = { isa = PBXGroup; children = ( + 7A8CB0932ADDDAC1005AB2BC /* libcrypto.xcframework */, + 7A8CB0942ADDDAC1005AB2BC /* libevent.xcframework */, + 7A8CB0952ADDDAC1005AB2BC /* libssl.xcframework */, + 7A8CB0962ADDDAC1005AB2BC /* libtor.xcframework */, + 7A8CB0972ADDDAC1005AB2BC /* libz.xcframework */, 7AED19802A6EC9A2003B265A /* libresolv.tbd */, 7AED19822A6EC9C7003B265A /* libresolv.tbd */, ED3582311FE948580078CCEE /* libsqlite3.tbd */, @@ -2016,7 +2026,7 @@ IBC_WARNINGS = NO; IBSC_WARNINGS = NO; INFOPLIST_FILE = ooniprobe/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 3.8.3; @@ -2066,7 +2076,7 @@ IBC_WARNINGS = NO; IBSC_WARNINGS = NO; INFOPLIST_FILE = ooniprobe/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 3.8.3; From 219a4b8bd7c744ca4b439df9544b1a8611b75902 Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Thu, 19 Oct 2023 15:43:54 +0100 Subject: [PATCH 07/14] Feat: Add support for `http` and `https` proxies (#535) Fixes https://github.com/ooni/probe/issues/2561 ## Proposed Changes - Update support for socks proxy to use dropdown for selecting a scheme. - Update code to save and retrieve the various proxies. ![Simulator Screenshot - iPhone 15 Pro Max - 2023-10-16 at 15 28 43](https://github.com/ooni/probe-ios/assets/17911892/48a785c2-2849-4c13-aee8-14675c26dad6) --- ooniprobe/Utility/ProxySettings.h | 4 ++- ooniprobe/Utility/ProxySettings.m | 32 +++++++++++++++++-- ooniprobe/View/Settings/ProxyViewController.m | 20 +++++++++--- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/ooniprobe/Utility/ProxySettings.h b/ooniprobe/Utility/ProxySettings.h index d3bfcd59d..5f62d7d54 100644 --- a/ooniprobe/Utility/ProxySettings.h +++ b/ooniprobe/Utility/ProxySettings.h @@ -3,7 +3,9 @@ typedef NS_ENUM(NSInteger, ProxyProtocol) { NONE, PSIPHON, - SOCKS5 + SOCKS5, + HTTP, + HTTPS }; @interface ProxySettings : NSObject diff --git a/ooniprobe/Utility/ProxySettings.m b/ooniprobe/Utility/ProxySettings.m index 876732a8c..8df9f732b 100644 --- a/ooniprobe/Utility/ProxySettings.m +++ b/ooniprobe/Utility/ProxySettings.m @@ -12,6 +12,10 @@ - (id) init { self.protocol = PSIPHON; } else if ([protocol isEqualToString:[ProxySettings getProtocol:SOCKS5]]) { self.protocol = SOCKS5; + } else if ([protocol isEqualToString:[ProxySettings getProtocol:HTTP]]) { + self.protocol = HTTP; + } else if ([protocol isEqualToString:[ProxySettings getProtocol:HTTPS]]) { + self.protocol = HTTPS; } else { // This is where we will extend the code to add support for // more proxies, e.g., HTTP proxies. @@ -30,7 +34,7 @@ - (void)saveProxy{ } - (BOOL)isCustom{ - if (self.protocol == SOCKS5) + if (self.protocol == SOCKS5 || self.protocol == HTTP || self.protocol == HTTPS) return true; return false; } @@ -49,6 +53,24 @@ - (NSString*)getProxyString{ //URI url = new URI(urlStr); return urlStr; } + if (self.protocol == HTTP) { + // Alright, we now need to construct a new SOCKS5 URL. + NSString *urlStr = [NSString stringWithFormat:@"http://%@:%@/", self.hostname, self.port]; + if ([ProxySettings isIPv6:self.hostname]) { + urlStr = [NSString stringWithFormat:@"http://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs + } + //URI url = new URI(urlStr); + return urlStr; + } + if (self.protocol == HTTPS) { + // Alright, we now need to construct a new SOCKS5 URL. + NSString *urlStr = [NSString stringWithFormat:@"https://%@:%@/", self.hostname, self.port]; + if ([ProxySettings isIPv6:self.hostname]) { + urlStr = [NSString stringWithFormat:@"https://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs + } + //URI url = new URI(urlStr); + return urlStr; + } return @""; } @@ -69,7 +91,13 @@ + (NSString*)getProtocol:(ProxyProtocol) protocol { result = @"proxy_psiphon"; break; case SOCKS5: - result = @"SOCKS5"; + result = @"socks5"; + break; + case HTTP: + result = @"http"; + break; + case HTTPS: + result = @"https"; break; default: result = @"unknown"; diff --git a/ooniprobe/View/Settings/ProxyViewController.m b/ooniprobe/View/Settings/ProxyViewController.m index 4544ea5ff..0e6d7443e 100644 --- a/ooniprobe/View/Settings/ProxyViewController.m +++ b/ooniprobe/View/Settings/ProxyViewController.m @@ -33,7 +33,11 @@ - (void)reloadRows{ @[[ProxySettings getProtocol:NONE], [ProxySettings getProtocol:PSIPHON], @"proxy_custom"], - @[[ProxySettings getProtocol:SOCKS5]], + @[ + [ProxySettings getProtocol:SOCKS5], + [ProxySettings getProtocol:HTTP], + [ProxySettings getProtocol:HTTPS] + ], @[@"proxy_hostname", @"proxy_port"]]; else items = @[@[[ProxySettings getProtocol:NONE], @@ -124,15 +128,23 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath else if (indexPath.row == 1) currentProxy.protocol = PSIPHON; if (indexPath.row == 2) - [self setCustom]; + [self setCustom:SOCKS5]; + [self reloadRows]; + } else if (indexPath.section == 1){ + if (indexPath.row == 0) + [self setCustom:SOCKS5]; + else if (indexPath.row == 1) + [self setCustom:HTTP]; + else if (indexPath.row == 2) + [self setCustom:HTTPS]; [self reloadRows]; } //[self.view endEditing:YES]; [tableView deselectRowAtIndexPath:indexPath animated:YES]; } --(void)setCustom { - currentProxy.protocol = SOCKS5; +- (void)setCustom:(enum ProxyProtocol)protocol { + currentProxy.protocol = protocol; } -(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string From 8beb9a5b2ae678c599676d1b80414925fc7c563c Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Fri, 20 Oct 2023 14:08:17 +0100 Subject: [PATCH 08/14] Update engine to `v3.19.0` https://github.com/ooni/probe/issues/2571 --- Podfile | 24 ++++++++++++------------ Podfile.lock | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Podfile b/Podfile index 69810cd0b..c0986dbf3 100644 --- a/Podfile +++ b/Podfile @@ -3,12 +3,12 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec" - pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec" - pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec" - pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec" - pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec" - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec" + pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libcrypto.podspec" + pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libevent.podspec" + pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libssl.podspec" + pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libtor.podspec" + pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libz.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -24,12 +24,12 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec" - pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec" - pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec" - pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec" - pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec" - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec" + pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libcrypto.podspec" + pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libevent.podspec" + pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libssl.podspec" + pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libtor.podspec" + pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/libz.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0/oonimkall.podspec" pod 'SharkORM', :git => 'https://github.com/sharksync/sharkorm', :tag => 'v2.3.67' pod 'OCMapper', '2.0' end diff --git a/Podfile.lock b/Podfile.lock index ca1024f1d..0609eb374 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,16 +5,16 @@ PODS: - DateTools (2.0.0) - DZNEmptyDataSet (1.8.1) - Harpy (4.1.14) - - libcrypto (2023.10.16-230758) - - libevent (2023.10.16-230758) - - libssl (2023.10.16-230758) - - libtor (2023.10.16-230758) - - libz (2023.10.16-230758) + - libcrypto (2023.10.20-093053) + - libevent (2023.10.20-093053) + - libssl (2023.10.20-093053) + - libtor (2023.10.20-093053) + - libz (2023.10.20-093053) - lottie-ios (2.5.3) - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.10.16-230758) + - oonimkall (2023.10.20-093053) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -31,16 +31,16 @@ DEPENDENCIES: - DateTools - DZNEmptyDataSet - Harpy - - libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec`) - - libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec`) - - libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec`) - - libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec`) - - libz (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec`) + - libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0/libcrypto.podspec`) + - libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0/libevent.podspec`) + - libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0/libssl.podspec`) + - libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0/libtor.podspec`) + - libz (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0/libz.podspec`) - lottie-ios (= 2.5.3) - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0/oonimkall.podspec`) - RHMarkdownLabel - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`) - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`) @@ -63,17 +63,17 @@ SPEC REPOS: EXTERNAL SOURCES: libcrypto: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0/libcrypto.podspec libevent: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0/libevent.podspec libssl: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0/libssl.podspec libtor: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0/libtor.podspec libz: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0/libz.podspec oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -94,16 +94,16 @@ SPEC CHECKSUMS: DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7 Harpy: b2fbe6819f6a8932df32d7cd2fb20f442df86bbc - libcrypto: 31c72ba1c3163dc883401737905112116f20a503 - libevent: ed39b4c48ded7557fc25d4fa6c00742a19377824 - libssl: 26f3dd9546d4894a9a948fad8b5390345e74f774 - libtor: 5bf7771e91058a5e3d367b666bd20fa90a4c8725 - libz: 7e8bf58f5b129c7d9e534ef911a997b4e679e884 + libcrypto: 7ca9f969d54aac0eebf5263b2b8c3fd97908bc64 + libevent: e4bab8744d4d57090e69ac6235fdf4714909d2ad + libssl: eaba80b0e1eea4250828e71655b99ede4ac4368b + libtor: ae56e6fcc080a2c030c8b583cf06037872edd62f + libz: 057607e787b238fee3a922d3bf52ab3fd7b7c443 lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: 3f3ad58bd13b2f7d83a8a6da38a28dd244b2d1b5 + oonimkall: 63533c51420ad15121fd18800ed82639b6e813fa RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -111,6 +111,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: a3524c14cf982a44d1e5d8e55e5313d4cf8b41bd +PODFILE CHECKSUM: cee8da05f005fec950d2db112132f04f0ba3adc9 COCOAPODS: 1.13.0 From d301e4909c4fd843484fe9d6145ba6817be42ad8 Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Fri, 20 Oct 2023 14:10:15 +0100 Subject: [PATCH 09/14] Update ooniprobe/Utility/ProxySettings.m Co-authored-by: Simone Basso --- ooniprobe/Utility/ProxySettings.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooniprobe/Utility/ProxySettings.m b/ooniprobe/Utility/ProxySettings.m index 8df9f732b..e5b7840b9 100644 --- a/ooniprobe/Utility/ProxySettings.m +++ b/ooniprobe/Utility/ProxySettings.m @@ -54,7 +54,7 @@ - (NSString*)getProxyString{ return urlStr; } if (self.protocol == HTTP) { - // Alright, we now need to construct a new SOCKS5 URL. + // Alright, we now need to construct a new HTTP URL. NSString *urlStr = [NSString stringWithFormat:@"http://%@:%@/", self.hostname, self.port]; if ([ProxySettings isIPv6:self.hostname]) { urlStr = [NSString stringWithFormat:@"http://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs From 5509283cb64d31b3d05a7b27d5fe82e86db2d73e Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Fri, 20 Oct 2023 14:10:25 +0100 Subject: [PATCH 10/14] Update ooniprobe/Utility/ProxySettings.m Co-authored-by: Simone Basso --- ooniprobe/Utility/ProxySettings.m | 1 - 1 file changed, 1 deletion(-) diff --git a/ooniprobe/Utility/ProxySettings.m b/ooniprobe/Utility/ProxySettings.m index e5b7840b9..d8cea3dc1 100644 --- a/ooniprobe/Utility/ProxySettings.m +++ b/ooniprobe/Utility/ProxySettings.m @@ -59,7 +59,6 @@ - (NSString*)getProxyString{ if ([ProxySettings isIPv6:self.hostname]) { urlStr = [NSString stringWithFormat:@"http://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs } - //URI url = new URI(urlStr); return urlStr; } if (self.protocol == HTTPS) { From 3108857b30773b72e4e6153af41400096147838f Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Fri, 20 Oct 2023 14:10:33 +0100 Subject: [PATCH 11/14] Update ooniprobe/Utility/ProxySettings.m Co-authored-by: Simone Basso --- ooniprobe/Utility/ProxySettings.m | 1 - 1 file changed, 1 deletion(-) diff --git a/ooniprobe/Utility/ProxySettings.m b/ooniprobe/Utility/ProxySettings.m index d8cea3dc1..44ab2b46d 100644 --- a/ooniprobe/Utility/ProxySettings.m +++ b/ooniprobe/Utility/ProxySettings.m @@ -67,7 +67,6 @@ - (NSString*)getProxyString{ if ([ProxySettings isIPv6:self.hostname]) { urlStr = [NSString stringWithFormat:@"https://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs } - //URI url = new URI(urlStr); return urlStr; } return @""; From f58ec7d6ef4825252a1e3618fb7f2b42c96db2cd Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Fri, 20 Oct 2023 14:10:43 +0100 Subject: [PATCH 12/14] Update ooniprobe/Utility/ProxySettings.m Co-authored-by: Simone Basso --- ooniprobe/Utility/ProxySettings.m | 1 - 1 file changed, 1 deletion(-) diff --git a/ooniprobe/Utility/ProxySettings.m b/ooniprobe/Utility/ProxySettings.m index 44ab2b46d..0f87b5c71 100644 --- a/ooniprobe/Utility/ProxySettings.m +++ b/ooniprobe/Utility/ProxySettings.m @@ -50,7 +50,6 @@ - (NSString*)getProxyString{ if ([ProxySettings isIPv6:self.hostname]) { urlStr = [NSString stringWithFormat:@"socks5://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs } - //URI url = new URI(urlStr); return urlStr; } if (self.protocol == HTTP) { From d529b679f8c006a2b3cfb550869f11a3a2f45f25 Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Fri, 20 Oct 2023 14:10:50 +0100 Subject: [PATCH 13/14] Update ooniprobe/Utility/ProxySettings.m Co-authored-by: Simone Basso --- ooniprobe/Utility/ProxySettings.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooniprobe/Utility/ProxySettings.m b/ooniprobe/Utility/ProxySettings.m index 0f87b5c71..f39d97059 100644 --- a/ooniprobe/Utility/ProxySettings.m +++ b/ooniprobe/Utility/ProxySettings.m @@ -61,7 +61,7 @@ - (NSString*)getProxyString{ return urlStr; } if (self.protocol == HTTPS) { - // Alright, we now need to construct a new SOCKS5 URL. + // Alright, we now need to construct a new HTTPS URL. NSString *urlStr = [NSString stringWithFormat:@"https://%@:%@/", self.hostname, self.port]; if ([ProxySettings isIPv6:self.hostname]) { urlStr = [NSString stringWithFormat:@"https://[%@]:%@/", self.hostname, self.port]; // IPv6 must be quoted in URLs From c20b774169d685803849c79c355cf16e3e9d6249 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Fri, 20 Oct 2023 15:10:28 +0100 Subject: [PATCH 14/14] Removed `riseupvpn` from `CircumventionSuite` --- ooniprobe/Test/Suite/CircumventionSuite.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/ooniprobe/Test/Suite/CircumventionSuite.m b/ooniprobe/Test/Suite/CircumventionSuite.m index b8a95b770..c1081edab 100644 --- a/ooniprobe/Test/Suite/CircumventionSuite.m +++ b/ooniprobe/Test/Suite/CircumventionSuite.m @@ -17,8 +17,6 @@ - (NSArray*)getTestList { [self.testList addObject:[[Psiphon alloc] init]]; if ([SettingsUtility getSettingWithName:@"test_tor"]) [self.testList addObject:[[Tor alloc] init]]; - if ([SettingsUtility getSettingWithName:@"test_riseupvpn"]) - [self.testList addObject:[[RiseupVPN alloc] init]]; } return super.getTestList; }