Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
.direnv/

# FVM Version Cache
.fvm/
.fvm/
2 changes: 2 additions & 0 deletions client/lib/enterprise/postures.dart
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,13 @@ class PostureConnectRequest {
final int locationId;
final String pubkey;
final DevicePostureData devicePostureData;
final String token;

const PostureConnectRequest({
required this.locationId,
required this.pubkey,
required this.devicePostureData,
required this.token,
});

factory PostureConnectRequest.fromJson(Map<String, dynamic> json) =>
Expand Down
3 changes: 3 additions & 0 deletions client/lib/enterprise/postures.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions client/lib/open/screens/instance/services/tunnel_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ class TunnelService {
navigator: navigator,
proxyUrl: instance.proxyUrl,
payload: payload,
pollingToken: instance.poolingToken,
);
if (presharedKey == null) {
return;
Expand All @@ -149,13 +150,15 @@ class TunnelService {
required NavigatorState navigator,
required String proxyUrl,
required PluginConnectPayload payload,
required String pollingToken,
}) async {
final messenger = ScaffoldMessenger.of(navigator.context);
try {
return await _authorizePostureOnly(
proxyUrl,
payload.devicePublicKey,
payload.networkId,
pollingToken,
);
} on PostureCheckException catch (e) {
talker.error('Posture check failed', e);
Expand Down Expand Up @@ -351,12 +354,14 @@ class TunnelService {
String url,
String pubkey,
int networkId,
String pollingToken,
) async {
talker.debug('Starting posture check for networkId: $networkId');
final request = PostureConnectRequest(
locationId: networkId,
pubkey: pubkey,
devicePostureData: await getPosture(),
token: pollingToken,
);

final response = await proxyApi.postureConnect(Uri.parse(url), request);
Expand Down
68 changes: 38 additions & 30 deletions client/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56"
sha256: "31b24be6615ec7fcf70b3aa5a7469fe35826485e639a16dd7eb83ba30e4cc6a8"
url: "https://pub.dev"
source: hosted
version: "8.12.6"
version: "8.12.7"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -397,26 +397,26 @@ packages:
dependency: "direct main"
description:
name: dio
sha256: ea2bad3c89a27635ce2d85cce4d6b199da49a5a48ec77b03e45b65a3b90922b0
sha256: "0df44ebba85e503958eb75d07eedd3c86275a58c1d3eda2f2ce8f0a2c3abbb3c"
url: "https://pub.dev"
source: hosted
version: "5.10.0"
version: "5.11.0"
dio_cookie_manager:
dependency: "direct main"
description:
name: dio_cookie_manager
sha256: "0db1a7b997a0455e488ac35744c68eed3f2a4280d3ab531835a65641b0a08744"
sha256: "4ed4669cacb11931517c1158876a2189f19386674b9dab498abcca063dbe4c61"
url: "https://pub.dev"
source: hosted
version: "3.4.0"
version: "3.5.0"
dio_web_adapter:
dependency: transitive
description:
name: dio_web_adapter
sha256: dd58dc3861eb36edb13b217efc006a1c21e5bbc341de8c229b85634fa5e362e4
sha256: "0786d0b7295a373de356fc0af4f6f1d0ab2844ed31b19dfc5e7556b70e24212c"
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.2.1"
drift:
dependency: "direct main"
description:
Expand Down Expand Up @@ -804,18 +804,26 @@ packages:
dependency: transitive
description:
name: jni
sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f
sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3
url: "https://pub.dev"
source: hosted
version: "1.0.0"
version: "1.0.3"
jni_flutter:
dependency: transitive
description:
name: jni_flutter
sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6"
sha256: "7b717011ea40d04fd47c2731d3d1d36eb99eba3435c2753d62489e8c3c9991d5"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
version: "1.0.2"
jni_util:
dependency: transitive
description:
name: jni_util
sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
js:
dependency: transitive
description:
Expand Down Expand Up @@ -964,10 +972,10 @@ packages:
dependency: "direct main"
description:
name: native_dio_adapter
sha256: "89a84d8936a108c206e481b8da090422abb1351febac4956cd4a8113627ebb5e"
sha256: "7ca3d04c76095a02c3b0d2e6f3c90e7781373671f7aacad34b81f31074a7369b"
url: "https://pub.dev"
source: hosted
version: "1.6.0"
version: "1.8.0"
native_toolchain_c:
dependency: transitive
description:
Expand All @@ -988,10 +996,10 @@ packages:
dependency: transitive
description:
name: objective_c
sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e
url: "https://pub.dev"
source: hosted
version: "9.4.1"
version: "9.5.0"
package_config:
dependency: transitive
description:
Expand Down Expand Up @@ -1100,34 +1108,34 @@ packages:
dependency: transitive
description:
name: permission_handler_apple
sha256: "79dfa1df734798aa3cfdad166d3a3698c206d8813de13516ea1071b5d7e2f420"
sha256: f49cb15a064ea9d974fc7fbb302099353b7b170d07284e86e264561579e5bcf8
url: "https://pub.dev"
source: hosted
version: "9.4.10"
version: "9.6.1"
permission_handler_html:
dependency: transitive
description:
name: permission_handler_html
sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
sha256: "6ea98b3f17f60d3b527f2647ed2ab4dc0f6bfe25b22cb1c363f5d8f62252f6ac"
url: "https://pub.dev"
source: hosted
version: "0.1.3+5"
version: "0.1.4+1"
permission_handler_platform_interface:
dependency: transitive
description:
name: permission_handler_platform_interface
sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
sha256: a5c8a97ecf5616112a5b16d4b8e9ec0e5ae90ef63ac69c0d7b8ae240be760b23
url: "https://pub.dev"
source: hosted
version: "4.3.0"
version: "4.4.0"
permission_handler_windows:
dependency: transitive
description:
name: permission_handler_windows
sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
sha256: caeae01858a0a7d2df67a445ac98e1ad95e55a0e77c73044f4e9b1c8c2289cbd
url: "https://pub.dev"
source: hosted
version: "0.2.1"
version: "0.2.2"
petitparser:
dependency: transitive
description:
Expand Down Expand Up @@ -1164,10 +1172,10 @@ packages:
dependency: transitive
description:
name: posix
sha256: "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07"
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
url: "https://pub.dev"
source: hosted
version: "6.5.0"
version: "6.5.2"
protobuf:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1649,10 +1657,10 @@ packages:
dependency: transitive
description:
name: vector_graphics
sha256: "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d"
sha256: "9d0e3b9cb16542ad660daee871e726a10d13a93b7b5391677c3160e8f5e83935"
url: "https://pub.dev"
source: hosted
version: "1.2.2"
version: "1.2.3"
vector_graphics_codec:
dependency: transitive
description:
Expand All @@ -1665,10 +1673,10 @@ packages:
dependency: transitive
description:
name: vector_graphics_compiler
sha256: "142a9146f447d15b10bdc00e21d5f4d83e5b32bb5f8f8f5a04c75311344923a3"
sha256: "4dca4feb77dc3ec7f6e27e49c53241eb8217f55e4f9b12599a27f8903bca5682"
url: "https://pub.dev"
source: hosted
version: "1.2.6"
version: "1.3.0"
vector_math:
dependency: transitive
description:
Expand Down