diff --git a/apps/gpservice/src/hip_approval.rs b/apps/gpservice/src/hip_approval.rs index 42ce0fc..7479c90 100644 --- a/apps/gpservice/src/hip_approval.rs +++ b/apps/gpservice/src/hip_approval.rs @@ -7,7 +7,7 @@ use std::{ use anyhow::{Context, ensure}; use base64::{Engine, engine::general_purpose::STANDARD}; -use gpapi::service::hip::HipApprovalStatus; +use gpapi::hip::HipApprovalStatus; use serde::{Deserialize, Serialize}; use tempfile::Builder; use uuid::Uuid; diff --git a/apps/gpservice/src/hip_preview.rs b/apps/gpservice/src/hip_preview.rs index c3d6965..850ebe1 100644 --- a/apps/gpservice/src/hip_preview.rs +++ b/apps/gpservice/src/hip_preview.rs @@ -1,7 +1,7 @@ use std::{os::unix::process::CommandExt, process::Stdio, sync::Arc, time::Duration}; use anyhow::{Context, bail, ensure}; -use gpapi::service::{hip::HipSource, request::PreviewHipReportRequest}; +use gpapi::{hip::HipSource, service::request::PreviewHipReportRequest}; use tokio::{io::AsyncReadExt, process::Command}; const MAX_PREVIEW_BYTES: u64 = 1024 * 1024; diff --git a/apps/gpservice/src/hip_source.rs b/apps/gpservice/src/hip_source.rs index 9a882a1..3ad351c 100644 --- a/apps/gpservice/src/hip_source.rs +++ b/apps/gpservice/src/hip_source.rs @@ -7,7 +7,7 @@ use std::{ }; use anyhow::{Context, bail, ensure}; -use gpapi::service::hip::HipSource; +use gpapi::hip::HipSource; use gpservice::hip_runner_state::{MAX_STATE_BYTES, RUNNER_NAME, RunnerReport, STATE_NAME, validate_root_owned_path}; use tempfile::{Builder, TempDir}; diff --git a/apps/gpservice/src/request_dispatcher.rs b/apps/gpservice/src/request_dispatcher.rs index 84273f0..0998981 100644 --- a/apps/gpservice/src/request_dispatcher.rs +++ b/apps/gpservice/src/request_dispatcher.rs @@ -153,7 +153,7 @@ impl RequestDispatcher { } if matches!( request.args().hip_source(), - gpapi::service::hip::HipSource::UserScript { .. } | gpapi::service::hip::HipSource::ApprovedRootScript { .. } + gpapi::hip::HipSource::UserScript { .. } | gpapi::hip::HipSource::ApprovedRootScript { .. } ) { return Err("macOS does not support custom HIP scripts"); } @@ -459,7 +459,7 @@ mod tests { let custom = ConnectRequest::new(info, "cookie".into()) .with_vpnc_script(Some("/app/Contents/Resources/Scripts/vpnc-script".to_string())) - .with_hip_source(gpapi::service::hip::HipSource::UserScript { + .with_hip_source(gpapi::hip::HipSource::UserScript { path: "/tmp/hip.sh".into(), }); assert_eq!( diff --git a/apps/gpservice/src/ws_connection.rs b/apps/gpservice/src/ws_connection.rs index e2563b3..bb2e702 100644 --- a/apps/gpservice/src/ws_connection.rs +++ b/apps/gpservice/src/ws_connection.rs @@ -6,7 +6,7 @@ use gpapi::service::transport::{ ClientMessage, ClientPrelude, CloseReason, HandshakeRejection, NoiseResponder, NoiseTransport, ServerMessage, ServerPrelude, ServiceErrorCode, ServiceResult, }; -use gpapi::service::{hip::HipSource, request::WsRequest}; +use gpapi::{hip::HipSource, service::request::WsRequest}; use log::{info, warn}; use tokio::sync::{mpsc, watch}; use tokio::time::Instant; diff --git a/crates/gpapi/src/service/hip.rs b/crates/gpapi/src/hip.rs similarity index 100% rename from crates/gpapi/src/service/hip.rs rename to crates/gpapi/src/hip.rs diff --git a/crates/gpapi/src/lib.rs b/crates/gpapi/src/lib.rs index 3df15fd..70072d8 100644 --- a/crates/gpapi/src/lib.rs +++ b/crates/gpapi/src/lib.rs @@ -5,6 +5,7 @@ pub mod device_anchor; pub mod error; pub mod gateway; pub mod gp_params; +pub mod hip; pub mod log_format; pub mod os_profile; pub mod params; diff --git a/crates/gpapi/src/service/mod.rs b/crates/gpapi/src/service/mod.rs index 7f33a4c..e5e88df 100644 --- a/crates/gpapi/src/service/mod.rs +++ b/crates/gpapi/src/service/mod.rs @@ -1,5 +1,4 @@ pub mod event; -pub mod hip; pub mod request; pub mod transport; pub mod vpn_env; diff --git a/crates/gpapi/src/service/request.rs b/crates/gpapi/src/service/request.rs index 763f35a..5573e20 100644 --- a/crates/gpapi/src/service/request.rs +++ b/crates/gpapi/src/service/request.rs @@ -6,10 +6,11 @@ use zeroize::Zeroize; use crate::{ gateway::Gateway, + hip::HipSource, os_profile::{ClientOs, OsProfile}, }; -use super::{hip::HipSource, vpn_state::ConnectInfo}; +use super::vpn_state::ConnectInfo; pub const MAX_CLIENT_IDENTITY_DATA: usize = 32 * 1024; diff --git a/crates/gpapi/src/service/transport/message.rs b/crates/gpapi/src/service/transport/message.rs index 0c1092b..713860e 100644 --- a/crates/gpapi/src/service/transport/message.rs +++ b/crates/gpapi/src/service/transport/message.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::service::hip::HipApprovalStatus; +use crate::hip::HipApprovalStatus; use crate::service::{event::WsEvent, request::WsRequest, vpn_env::VpnEnv, vpnc_script::VpncScriptMetadata}; use super::{MAX_PLAINTEXT, MAX_SERVICE_MESSAGE, ServiceErrorCode, TransportError};