diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml index 28834a6..46bcafa 100644 --- a/.github/workflows/lint-and-test.yaml +++ b/.github/workflows/lint-and-test.yaml @@ -34,7 +34,7 @@ jobs: submodules: "recursive" - name: Scan code with Trivy - uses: aquasecurity/trivy-action@0.33.1 + uses: aquasecurity/trivy-action@0.34.1 with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/sbom.yaml b/.github/workflows/sbom.yaml index fd1cd50..aea291c 100644 --- a/.github/workflows/sbom.yaml +++ b/.github/workflows/sbom.yaml @@ -35,7 +35,7 @@ jobs: submodules: "recursive" - name: Create SBOM with Trivy - uses: aquasecurity/trivy-action@0.33.1 + uses: aquasecurity/trivy-action@0.34.1 with: scan-type: "fs" format: "spdx-json" @@ -45,7 +45,7 @@ jobs: scanners: "vuln" - name: Create security advisory file with Trivy - uses: aquasecurity/trivy-action@0.33.1 + uses: aquasecurity/trivy-action@0.34.1 with: scan-type: "fs" format: "json" diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index fec2a9d..fff8239 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -107,22 +107,22 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/wireguard_plugin/darwin" SPEC CHECKSUMS: - app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a - device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe + app_links: 585674be3c6661708e6cd794ab4f39fb9d8356f9 + device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb - flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf - flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13 - local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb - mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb + flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f + flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29 + flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 + local_auth_darwin: 63c73d6d28cc3e239be2b6aa460ea6e317cd5100 + mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e + package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f + shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6 sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b - sqlite3_flutter_libs: 52ecc4dfaae71f496da86159263dbce5d23a051a - url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b - wireguard_plugin: c2f4d5382eecd7bcd07c027642c75e0569f91ff8 + sqlite3_flutter_libs: 7bea6d85399aebaeb54e4f9845dcac6f5033cf22 + url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa + wireguard_plugin: 4d2720563b180d23101f7162ecdbf57203e82e8e PODFILE CHECKSUM: ae9e65fc23486119b8e977fd41d9213f251e537a diff --git a/client/ios/Runner.xcodeproj/project.pbxproj b/client/ios/Runner.xcodeproj/project.pbxproj index 1e87f48..d8b5fda 100644 --- a/client/ios/Runner.xcodeproj/project.pbxproj +++ b/client/ios/Runner.xcodeproj/project.pbxproj @@ -644,7 +644,7 @@ "$(PROJECT_DIR)/VPNExtension/BoringTun", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.6.1; + MARKETING_VERSION = 1.6.2; MODULEMAP_FILE = ""; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -698,7 +698,7 @@ "$(PROJECT_DIR)/VPNExtension/BoringTun", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.6.1; + MARKETING_VERSION = 1.6.2; MODULEMAP_FILE = ""; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -749,7 +749,7 @@ "$(PROJECT_DIR)/VPNExtension/BoringTun", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.6.1; + MARKETING_VERSION = 1.6.2; MODULEMAP_FILE = ""; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; diff --git a/client/ios/VPNExtension/IpAddrMask.swift b/client/ios/VPNExtension/IpAddrMask.swift index 50a5ef9..32f972d 100644 --- a/client/ios/VPNExtension/IpAddrMask.swift +++ b/client/ios/VPNExtension/IpAddrMask.swift @@ -15,17 +15,20 @@ struct IpAddrMask: Codable, Equatable { separator: "/", maxSplits: 1, ) + let default_cidr: UInt8 if let ipv4 = IPv4Address(String(parts[0])) { address = ipv4 + default_cidr = 32 } else if let ipv6 = IPv6Address(String(parts[0])) { address = ipv6 + default_cidr = 128 } else { return nil } if parts.count > 1 { cidr = UInt8(parts[1]) ?? 0 } else { - cidr = 0 + cidr = default_cidr } } diff --git a/client/ios/boringtun b/client/ios/boringtun index df20f08..b990805 160000 --- a/client/ios/boringtun +++ b/client/ios/boringtun @@ -1 +1 @@ -Subproject commit df20f088a306b449786441a911da69621b8ee2fe +Subproject commit b990805fc1637eeaa401bc156adf0dd28b2e50b8 diff --git a/client/pubspec.lock b/client/pubspec.lock index 1105e88..000de1c 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: archive - sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" + sha256: a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff url: "https://pub.dev" source: hosted - version: "4.0.7" + version: "4.0.9" args: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: built_value - sha256: "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8" + sha256: "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9" url: "https://pub.dev" source: hosted - version: "8.12.3" + version: "8.12.4" characters: dependency: transitive description: @@ -756,10 +756,10 @@ packages: dependency: transitive description: name: image - sha256: "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c" + sha256: f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce url: "https://pub.dev" source: hosted - version: "4.7.2" + version: "4.8.0" intl: dependency: transitive description: @@ -916,10 +916,10 @@ packages: dependency: "direct main" description: name: mobile_scanner - sha256: c6184bf2913dd66be244108c9c27ca04b01caf726321c44b0e7a7a1e32d41044 + sha256: c92c26bf2231695b6d3477c8dcf435f51e28f87b1745966b1fe4c47a286171ce url: "https://pub.dev" source: hosted - version: "7.1.4" + version: "7.2.0" native_toolchain_c: dependency: transitive description: @@ -1084,10 +1084,10 @@ packages: dependency: transitive description: name: petitparser - sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1" + sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" platform: dependency: transitive description: @@ -1116,10 +1116,10 @@ packages: dependency: transitive description: name: posix - sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61" + sha256: "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07" url: "https://pub.dev" source: hosted - version: "6.0.3" + version: "6.5.0" protobuf: dependency: "direct main" description: @@ -1537,10 +1537,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: b1aca26728b7cc7a3af971bb6f601554a8ae9df2e0a006de8450ba06a17ad36a + sha256: "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0" url: "https://pub.dev" source: hosted - version: "6.4.0" + version: "6.4.1" url_launcher_linux: dependency: transitive description: @@ -1585,10 +1585,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 + sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489" url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "4.5.3" vector_graphics: dependency: transitive description: @@ -1609,10 +1609,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b" + sha256: "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74" url: "https://pub.dev" source: hosted - version: "1.1.20" + version: "1.2.0" vector_math: dependency: transitive description: diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 17fc6ad..29822c8 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.6.1+1 +version: 1.6.2+1 environment: sdk: ^3.8.1