fix

Author: neurolag

shell.nix

@@ -3,7 +3,7 @@
 # This file is intended to be used with `nix-shell`
 # (https://nixos.org/nix/manual/#sec-nix-shell) to setup a fully-functional
 # syncstorage-rs build environment by installing all required dependencies.
-with import <nixpkgs> {};
+with import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/dc402c1fc646b5aeb6e50bdd06e1509981ce2af0.tar.gz") {};
 stdenv.mkDerivation {
   name = "syncstorage-rs";
   buildInputs = [
@@ -14,7 +14,9 @@ stdenv.mkDerivation {
     openssl
     cmake
     protobuf
+    python313
     go
   ];
   NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
+  RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
 }

syncserver-settings/src/lib.rs

@@ -18,8 +18,11 @@ static PREFIX: &str = "sync";
 pub struct Settings {
     pub port: u16,
     pub host: String,
-    /// public facing URL of the server
+    /// The private address of the server.
+    pub server_address: ServerAddress,
     pub public_url: Option<String>,
+    /// The public facing server address.
+    pub public_address: Option<ServerAddress>,
     /// Keep-alive header value (seconds)
     pub actix_keep_alive: Option<u32>,
     /// The master secret, from which are derived
@@ -187,7 +190,13 @@ impl Default for Settings {
         Settings {
             port: 8000,
             host: "127.0.0.1".to_string(),
+            server_address: ServerAddress::Parts {
+                host: "127.0.0.1".to_string(),
+                port: 8000,
+                path: None,
+            },
             public_url: None,
+            public_address: None,
             actix_keep_alive: None,
             master_secret: Secrets::default(),
             statsd_host: Some("localhost".to_owned()),
@@ -229,6 +238,37 @@ impl Default for Settings {
     }
 }
 
+/// Represents a server address.
+#[derive(Clone, Debug, Deserialize)]
+pub enum ServerAddress {
+    /// The uri to the server.
+    Url(String),
+    /// The parts of the address.
+    Parts {
+        /// The host name of the server.
+        host: String,
+        /// The port of the server.
+        port: u16,
+        /// The path to the root of the service.
+        path: Option<String>,
+    },
+}
+
+impl ServerAddress {
+    pub fn get_path(&self) -> String {
+        match self {
+            ServerAddress::Parts {
+                path: Some(ref path),
+                ..
+            } => path.to_owned(),
+            ServerAddress::Url(ref url) => {
+                Url::parse(url).map(|url| url.path().to_owned()).unwrap()
+            }
+            _ => "".to_owned(),
+        }
+    }
+}
+
 /// Secrets used during Hawk authentication.
 #[derive(Clone, Debug)]
 pub struct Secrets {

syncserver/src/server/mod.rs

@@ -19,7 +19,7 @@ use syncserver_common::{
     Taggable,
 };
 use syncserver_db_common::{GetPoolState, PoolState};
-use syncserver_settings::Settings;
+use syncserver_settings::{Settings, ServerAddress};
 use syncstorage_db::{DbError, DbPool, DbPoolImpl};
 use syncstorage_settings::{Deadman, ServerLimits};
 use tokio::{sync::RwLock, time};
@@ -108,7 +108,7 @@ pub struct Server;
 
 #[macro_export]
 macro_rules! build_app {
-    ($reverse_proxy_state: expr, $syncstorage_state: expr, $tokenserver_state: expr, $secrets: expr, $limits: expr, $cors: expr, $metrics: expr) => {
+    ($server_address: expr, $public_address: expr, $syncstorage_state: expr, $tokenserver_state: expr, $secrets: expr, $limits: expr, $cors: expr, $metrics: expr) => {
         App::new()
             .configure(|cfg| {
                 cfg.app_data(Data::new($syncstorage_state));
@@ -119,7 +119,7 @@ macro_rules! build_app {
                 }
             })
             .app_data(Data::new($secrets))
-            .app_data(Data::new($reverse_proxy_state))
+            .app_data(Data::new($public_address))
             // Middleware is applied LIFO
             // These will wrap all outbound responses with matching status codes.
             .wrap(ErrorHandlers::new().handler(StatusCode::NOT_FOUND, ApiError::render_404))
@@ -184,7 +184,7 @@ macro_rules! build_app {
             )
             // Tokenserver
             .service(
-                web::resource("/1.0/{application}/{version}")
+                web::resource(format!("{}1.0/{}", $server_address.path(), "{application}/{version}"))
                     .route(web::get().to(tokenserver::handlers::get_tokenserver_result)),
             )
             // Dockerflow
@@ -370,6 +370,7 @@ impl Server {
 
             build_app!(
                 ReverseProxyState::from_settings(&settings_copy),
+                &settings_copy.public_address.clone(),
                 syncstorage_state,
                 tokenserver_state.clone(),
                 Arc::clone(&secrets),

syncserver/src/server/test.rs

@@ -133,7 +133,8 @@ macro_rules! init_app {
             let state = get_test_state(&$settings).await;
             let metrics = state.metrics.clone();
             test::init_service(build_app!(
-                ReverseProxyState::from_settings(&$settings),
+                &$settings.server_address,
+                &$settings.public_address,
                 state,
                 None::<tokenserver::ServerState>,
                 Arc::clone(&SECRETS),
@@ -275,7 +276,8 @@ where
     let state = get_test_state(&settings).await;
     let metrics = state.metrics.clone();
     let app = test::init_service(build_app!(
-        ReverseProxyState::from_settings(&settings),
+        &settings.server_address,
+        &settings.public_address,
         state,
         None::<tokenserver::ServerState>,
         Arc::clone(&SECRETS),
@@ -320,7 +322,8 @@ async fn test_endpoint_with_body(
     let state = get_test_state(&settings).await;
     let metrics = state.metrics.clone();
     let app = test::init_service(build_app!(
-        ReverseProxyState::from_settings(&settings),
+        &settings.server_address,
+        &settings.public_address,
         state,
         None::<tokenserver::ServerState>,
         Arc::clone(&SECRETS),