gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Update Actix crates to latest versions

Browse Source 
This avoids a vulnerability in tokio (#3085). The major version updates
of both actix-web and actix-rt required some signficant changes. Chief
among those, it turns out we were relying on actix-rt to run the
HttpServer in a different thread from the rest of the test, so that we
could talk to it from sync code in the test thread. This no longer
works, so the sync code is now run in a dedicated thread with
`actix_rt::task::spawn_blocking`.
This commit is contained in:
Dustin J. Mitchell
2023-04-08 09:30:28 -04:00
committed by Dustin J. Mitchell
parent 33366e2f05
commit 52fdc6a877
10 changed files with 466 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1070
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
taskchampion/integration-tests/Cargo.toml
View File

@@ -13,8 +13,8 @@ taskchampion-sync-server = { path = "../sync-server" }
[dev-dependencies] [dev-dependencies]
anyhow = "1.0" anyhow = "1.0"
actix-web = "^3.3.2" actix-web = "^4.3.1"
actix-rt = "^1.1.1" actix-rt = "2"
tempfile = "3" tempfile = "3"
pretty_assertions = "1" pretty_assertions = "1"
log = "^0.4.17" log = "^0.4.17"

17
taskchampion/integration-tests/tests/cross-sync.rs
View File

@@ -5,20 +5,23 @@ use taskchampion_sync_server::{storage::InMemoryStorage, Server};
#[actix_rt::test] #[actix_rt::test]
async fn cross_sync() -> anyhow::Result<()> { async fn cross_sync() -> anyhow::Result<()> {
async fn server() -> anyhow::Result<u16> {
let _ = env_logger::builder() let _ = env_logger::builder()
.is_test(true) .is_test(true)
.filter_level(log::LevelFilter::Trace) .filter_level(log::LevelFilter::Trace)
.try_init(); .try_init();
let server = Server::new(Default::default(), Box::new(InMemoryStorage::new())); let server = Server::new(Default::default(), Box::new(InMemoryStorage::new()));
let httpserver = let httpserver = HttpServer::new(move || App::new().configure(|sc| server.config(sc)))
HttpServer::new(move || App::new().configure(|sc| server.config(sc))).bind("0.0.0.0:0")?; .bind("0.0.0.0:0")?;
// bind was to :0, so the kernel will have selected an unused port // bind was to :0, so the kernel will have selected an unused port
let port = httpserver.addrs()[0].port(); let port = httpserver.addrs()[0].port();
actix_rt::spawn(httpserver.run());
Ok(port)
}
httpserver.run(); fn client(port: u16) -> anyhow::Result<()> {
// set up two replicas, and demonstrate replication between them // set up two replicas, and demonstrate replication between them
let mut rep1 = Replica::new(StorageConfig::InMemory.into_storage()?); let mut rep1 = Replica::new(StorageConfig::InMemory.into_storage()?);
let mut rep2 = Replica::new(StorageConfig::InMemory.into_storage()?); let mut rep2 = Replica::new(StorageConfig::InMemory.into_storage()?);
@@ -85,6 +88,10 @@ async fn cross_sync() -> anyhow::Result<()> {
.expect("expected task 2 on rep2"); .expect("expected task 2 on rep2");
assert_eq!(t22.get_status(), Status::Completed); assert_eq!(t22.get_status(), Status::Completed);
// note that we just drop the server here.. Ok(())
}
let port = server().await?;
actix_rt::task::spawn_blocking(move || client(port)).await??;
Ok(()) Ok(())
} }

26
taskchampion/integration-tests/tests/snapshots.rs
View File

@@ -14,19 +14,22 @@ async fn sync_with_snapshots() -> anyhow::Result<()> {
.filter_level(log::LevelFilter::Trace) .filter_level(log::LevelFilter::Trace)
.try_init(); .try_init();
async fn server() -> anyhow::Result<u16> {
let sync_server_config = SyncServerConfig { let sync_server_config = SyncServerConfig {
snapshot_days: 100, snapshot_days: 100,
snapshot_versions: 3, snapshot_versions: 3,
}; };
let server = Server::new(sync_server_config, Box::new(InMemoryStorage::new())); let server = Server::new(sync_server_config, Box::new(InMemoryStorage::new()));
let httpserver = let httpserver = HttpServer::new(move || App::new().configure(|sc| server.config(sc)))
HttpServer::new(move || App::new().configure(|sc| server.config(sc))).bind("0.0.0.0:0")?; .bind("0.0.0.0:0")?;
// bind was to :0, so the kernel will have selected an unused port // bind was to :0, so the kernel will have selected an unused port
let port = httpserver.addrs()[0].port(); let port = httpserver.addrs()[0].port();
actix_rt::spawn(httpserver.run());
Ok(port)
}
httpserver.run(); fn client(port: u16) -> anyhow::Result<()> {
let client_key = Uuid::new_v4(); let client_key = Uuid::new_v4();
let encryption_secret = b"abc123".to_vec(); let encryption_secret = b"abc123".to_vec();
let make_server = || { let make_server = || {
@@ -55,10 +58,10 @@ async fn sync_with_snapshots() -> anyhow::Result<()> {
} }
// now set up a second replica and sync it; it should catch up on that history, using a // now set up a second replica and sync it; it should catch up on that history, using a
// snapshot. Note that we can't verify that it used a snapshot, because the server currently // snapshot. Note that we can't verify that it used a snapshot, because the server
// keeps all versions (so rep2 could sync from the beginning of the version history). You can // currently keeps all versions (so rep2 could sync from the beginning of the version
// manually verify that it is applying a snapshot by adding `assert!(false)` below and skimming // history). You can manually verify that it is applying a snapshot by adding
// the logs. // `assert!(false)` below and skimming the logs.
let mut rep2 = Replica::new(StorageConfig::InMemory.into_storage()?); let mut rep2 = Replica::new(StorageConfig::InMemory.into_storage()?);
let mut serv2 = make_server()?; let mut serv2 = make_server()?;
@@ -86,9 +89,10 @@ async fn sync_with_snapshots() -> anyhow::Result<()> {
assert_eq!(t11.get_description(), "sync-back"); assert_eq!(t11.get_description(), "sync-back");
// uncomment this to force a failure and see the logs Ok(())
// assert!(false); }
// note that we just drop the server here.. let port = server().await?;
actix_rt::task::spawn_blocking(move || client(port)).await??;
Ok(()) Ok(())
} }

4
taskchampion/sync-server/Cargo.toml
View File

@@ -9,7 +9,7 @@ publish = false
[dependencies] [dependencies]
uuid = { version = "^1.3.0", features = ["serde", "v4"] } uuid = { version = "^1.3.0", features = ["serde", "v4"] }
actix-web = "^3.3.2" actix-web = "^4.3.1"
anyhow = "1.0" anyhow = "1.0"
thiserror = "1.0" thiserror = "1.0"
futures = "^0.3.25" futures = "^0.3.25"
@@ -22,6 +22,6 @@ rusqlite = { version = "0.29", features = ["bundled"] }
chrono = { version = "^0.4.22", features = ["serde"] } chrono = { version = "^0.4.22", features = ["serde"] }
[dev-dependencies] [dev-dependencies]
actix-rt = "^1.1.1" actix-rt = "2"
tempfile = "3" tempfile = "3"
pretty_assertions = "1" pretty_assertions = "1"

34
taskchampion/sync-server/src/api/add_snapshot.rs
View File

@@ -19,9 +19,11 @@ const MAX_SIZE: usize = 100 * 1024 * 1024;
pub(crate) async fn service( pub(crate) async fn service(
req: HttpRequest, req: HttpRequest,
server_state: web::Data<Arc<ServerState>>, server_state: web::Data<Arc<ServerState>>,
web::Path((version_id,)): web::Path<(VersionId,)>, path: web::Path<VersionId>,
mut payload: web::Payload, mut payload: web::Payload,
) -> Result<HttpResponse> { ) -> Result<HttpResponse> {
let version_id = path.into_inner();
// check content-type // check content-type
if req.content_type() != SNAPSHOT_CONTENT_TYPE { if req.content_type() != SNAPSHOT_CONTENT_TYPE {
return Err(error::ErrorBadRequest("Bad content-type")); return Err(error::ErrorBadRequest("Bad content-type"));
@@ -100,8 +102,8 @@ mod test {
let uri = format!("/v1/client/add-snapshot/{}", version_id); let uri = format!("/v1/client/add-snapshot/{}", version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header("Content-Type", "application/vnd.taskchampion.snapshot") .insert_header(("Content-Type", "application/vnd.taskchampion.snapshot"))
.header("X-Client-Key", client_key.to_string()) .insert_header(("X-Client-Key", client_key.to_string()))
.set_payload(b"abcd".to_vec()) .set_payload(b"abcd".to_vec())
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
@@ -111,14 +113,14 @@ mod test {
let uri = "/v1/client/snapshot"; let uri = "/v1/client/snapshot";
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(uri) .uri(uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let mut resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
use futures::StreamExt; use actix_web::body::MessageBody;
let (bytes, _) = resp.take_body().into_future().await; let bytes = resp.into_body().try_into_bytes().unwrap();
assert_eq!(bytes.unwrap().unwrap().as_ref(), b"abcd"); assert_eq!(bytes.as_ref(), b"abcd");
Ok(()) Ok(())
} }
@@ -143,8 +145,8 @@ mod test {
let uri = format!("/v1/client/add-snapshot/{}", version_id); let uri = format!("/v1/client/add-snapshot/{}", version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header("Content-Type", "application/vnd.taskchampion.snapshot") .append_header(("Content-Type", "application/vnd.taskchampion.snapshot"))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.set_payload(b"abcd".to_vec()) .set_payload(b"abcd".to_vec())
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
@@ -154,7 +156,7 @@ mod test {
let uri = "/v1/client/snapshot"; let uri = "/v1/client/snapshot";
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(uri) .uri(uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::NOT_FOUND); assert_eq!(resp.status(), StatusCode::NOT_FOUND);
@@ -172,8 +174,8 @@ mod test {
let uri = format!("/v1/client/add-snapshot/{}", version_id); let uri = format!("/v1/client/add-snapshot/{}", version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header("Content-Type", "not/correct") .append_header(("Content-Type", "not/correct"))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.set_payload(b"abcd".to_vec()) .set_payload(b"abcd".to_vec())
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
@@ -192,11 +194,11 @@ mod test {
let uri = format!("/v1/client/add-snapshot/{}", version_id); let uri = format!("/v1/client/add-snapshot/{}", version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header( .append_header((
"Content-Type", "Content-Type",
"application/vnd.taskchampion.history-segment", "application/vnd.taskchampion.history-segment",
) ))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::BAD_REQUEST); assert_eq!(resp.status(), StatusCode::BAD_REQUEST);

34
taskchampion/sync-server/src/api/add_version.rs
View File

@@ -27,9 +27,11 @@ const MAX_SIZE: usize = 100 * 1024 * 1024;
pub(crate) async fn service( pub(crate) async fn service(
req: HttpRequest, req: HttpRequest,
server_state: web::Data<Arc<ServerState>>, server_state: web::Data<Arc<ServerState>>,
web::Path((parent_version_id,)): web::Path<(VersionId,)>, path: web::Path<VersionId>,
mut payload: web::Payload, mut payload: web::Payload,
) -> Result<HttpResponse> { ) -> Result<HttpResponse> {
let parent_version_id = path.into_inner();
// check content-type // check content-type
if req.content_type() != HISTORY_SEGMENT_CONTENT_TYPE { if req.content_type() != HISTORY_SEGMENT_CONTENT_TYPE {
return Err(error::ErrorBadRequest("Bad content-type")); return Err(error::ErrorBadRequest("Bad content-type"));
@@ -80,21 +82,21 @@ pub(crate) async fn service(
Ok(match result { Ok(match result {
AddVersionResult::Ok(version_id) => { AddVersionResult::Ok(version_id) => {
let mut rb = HttpResponse::Ok(); let mut rb = HttpResponse::Ok();
rb.header(VERSION_ID_HEADER, version_id.to_string()); rb.append_header((VERSION_ID_HEADER, version_id.to_string()));
match snap_urgency { match snap_urgency {
SnapshotUrgency::None => {} SnapshotUrgency::None => {}
SnapshotUrgency::Low => { SnapshotUrgency::Low => {
rb.header(SNAPSHOT_REQUEST_HEADER, "urgency=low"); rb.append_header((SNAPSHOT_REQUEST_HEADER, "urgency=low"));
} }
SnapshotUrgency::High => { SnapshotUrgency::High => {
rb.header(SNAPSHOT_REQUEST_HEADER, "urgency=high"); rb.append_header((SNAPSHOT_REQUEST_HEADER, "urgency=high"));
} }
}; };
rb.finish() rb.finish()
} }
AddVersionResult::ExpectedParentVersion(parent_version_id) => { AddVersionResult::ExpectedParentVersion(parent_version_id) => {
let mut rb = HttpResponse::Conflict(); let mut rb = HttpResponse::Conflict();
rb.header(PARENT_VERSION_ID_HEADER, parent_version_id.to_string()); rb.append_header((PARENT_VERSION_ID_HEADER, parent_version_id.to_string()));
rb.finish() rb.finish()
} }
}) })
@@ -128,11 +130,11 @@ mod test {
let uri = format!("/v1/client/add-version/{}", parent_version_id); let uri = format!("/v1/client/add-version/{}", parent_version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header( .append_header((
"Content-Type", "Content-Type",
"application/vnd.taskchampion.history-segment", "application/vnd.taskchampion.history-segment",
) ))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.set_payload(b"abcd".to_vec()) .set_payload(b"abcd".to_vec())
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
@@ -170,11 +172,11 @@ mod test {
let uri = format!("/v1/client/add-version/{}", parent_version_id); let uri = format!("/v1/client/add-version/{}", parent_version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header( .append_header((
"Content-Type", "Content-Type",
"application/vnd.taskchampion.history-segment", "application/vnd.taskchampion.history-segment",
) ))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.set_payload(b"abcd".to_vec()) .set_payload(b"abcd".to_vec())
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
@@ -198,8 +200,8 @@ mod test {
let uri = format!("/v1/client/add-version/{}", parent_version_id); let uri = format!("/v1/client/add-version/{}", parent_version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header("Content-Type", "not/correct") .append_header(("Content-Type", "not/correct"))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.set_payload(b"abcd".to_vec()) .set_payload(b"abcd".to_vec())
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
@@ -218,11 +220,11 @@ mod test {
let uri = format!("/v1/client/add-version/{}", parent_version_id); let uri = format!("/v1/client/add-version/{}", parent_version_id);
let req = test::TestRequest::post() let req = test::TestRequest::post()
.uri(&uri) .uri(&uri)
.header( .append_header((
"Content-Type", "Content-Type",
"application/vnd.taskchampion.history-segment", "application/vnd.taskchampion.history-segment",
) ))
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::BAD_REQUEST); assert_eq!(resp.status(), StatusCode::BAD_REQUEST);

24
taskchampion/sync-server/src/api/get_child_version.rs
View File

@@ -18,8 +18,10 @@ use std::sync::Arc;
pub(crate) async fn service( pub(crate) async fn service(
req: HttpRequest, req: HttpRequest,
server_state: web::Data<Arc<ServerState>>, server_state: web::Data<Arc<ServerState>>,
web::Path((parent_version_id,)): web::Path<(VersionId,)>, path: web::Path<VersionId>,
) -> Result<HttpResponse> { ) -> Result<HttpResponse> {
let parent_version_id = path.into_inner();
let mut txn = server_state.storage.txn().map_err(failure_to_ise)?; let mut txn = server_state.storage.txn().map_err(failure_to_ise)?;
let client_key = client_key_header(&req)?; let client_key = client_key_header(&req)?;
@@ -44,8 +46,8 @@ pub(crate) async fn service(
history_segment, history_segment,
} => Ok(HttpResponse::Ok() } => Ok(HttpResponse::Ok()
.content_type(HISTORY_SEGMENT_CONTENT_TYPE) .content_type(HISTORY_SEGMENT_CONTENT_TYPE)
.header(VERSION_ID_HEADER, version_id.to_string()) .append_header((VERSION_ID_HEADER, version_id.to_string()))
.header(PARENT_VERSION_ID_HEADER, parent_version_id.to_string()) .append_header((PARENT_VERSION_ID_HEADER, parent_version_id.to_string()))
.body(history_segment)), .body(history_segment)),
GetVersionResult::NotFound => Err(error::ErrorNotFound("no such version")), GetVersionResult::NotFound => Err(error::ErrorNotFound("no such version")),
GetVersionResult::Gone => Err(error::ErrorGone("version has been deleted")), GetVersionResult::Gone => Err(error::ErrorGone("version has been deleted")),
@@ -83,9 +85,9 @@ mod test {
let uri = format!("/v1/client/get-child-version/{}", parent_version_id); let uri = format!("/v1/client/get-child-version/{}", parent_version_id);
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(&uri) .uri(&uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let mut resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!( assert_eq!(
resp.headers().get("X-Version-Id").unwrap(), resp.headers().get("X-Version-Id").unwrap(),
@@ -100,9 +102,9 @@ mod test {
&"application/vnd.taskchampion.history-segment".to_string() &"application/vnd.taskchampion.history-segment".to_string()
); );
use futures::StreamExt; use actix_web::body::MessageBody;
let (bytes, _) = resp.take_body().into_future().await; let bytes = resp.into_body().try_into_bytes().unwrap();
assert_eq!(bytes.unwrap().unwrap().as_ref(), b"abcd"); assert_eq!(bytes.as_ref(), b"abcd");
} }
#[actix_rt::test] #[actix_rt::test]
@@ -117,7 +119,7 @@ mod test {
let uri = format!("/v1/client/get-child-version/{}", parent_version_id); let uri = format!("/v1/client/get-child-version/{}", parent_version_id);
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(&uri) .uri(&uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::NOT_FOUND); assert_eq!(resp.status(), StatusCode::NOT_FOUND);
@@ -144,7 +146,7 @@ mod test {
let uri = format!("/v1/client/get-child-version/{}", parent_version_id); let uri = format!("/v1/client/get-child-version/{}", parent_version_id);
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(&uri) .uri(&uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::GONE); assert_eq!(resp.status(), StatusCode::GONE);
@@ -157,7 +159,7 @@ mod test {
let uri = format!("/v1/client/get-child-version/{}", NIL_VERSION_ID); let uri = format!("/v1/client/get-child-version/{}", NIL_VERSION_ID);
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(&uri) .uri(&uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::NOT_FOUND); assert_eq!(resp.status(), StatusCode::NOT_FOUND);

14
taskchampion/sync-server/src/api/get_snapshot.rs
View File

@@ -32,7 +32,7 @@ pub(crate) async fn service(
{ {
Ok(HttpResponse::Ok() Ok(HttpResponse::Ok()
.content_type(SNAPSHOT_CONTENT_TYPE) .content_type(SNAPSHOT_CONTENT_TYPE)
.header(VERSION_ID_HEADER, version_id.to_string()) .append_header((VERSION_ID_HEADER, version_id.to_string()))
.body(data)) .body(data))
} else { } else {
Err(error::ErrorNotFound("no snapshot")) Err(error::ErrorNotFound("no snapshot"))
@@ -66,7 +66,7 @@ mod test {
let uri = "/v1/client/snapshot"; let uri = "/v1/client/snapshot";
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(uri) .uri(uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::NOT_FOUND); assert_eq!(resp.status(), StatusCode::NOT_FOUND);
@@ -102,13 +102,13 @@ mod test {
let uri = "/v1/client/snapshot"; let uri = "/v1/client/snapshot";
let req = test::TestRequest::get() let req = test::TestRequest::get()
.uri(uri) .uri(uri)
.header("X-Client-Key", client_key.to_string()) .append_header(("X-Client-Key", client_key.to_string()))
.to_request(); .to_request();
let mut resp = test::call_service(&mut app, req).await; let resp = test::call_service(&mut app, req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
use futures::StreamExt; use actix_web::body::MessageBody;
let (bytes, _) = resp.take_body().into_future().await; let bytes = resp.into_body().try_into_bytes().unwrap();
assert_eq!(bytes.unwrap().unwrap().as_ref(), snapshot_data); assert_eq!(bytes.as_ref(), snapshot_data);
} }
} }

5
taskchampion/sync-server/src/lib.rs
View File

@@ -34,10 +34,9 @@ impl Server {
pub fn config(&self, cfg: &mut web::ServiceConfig) { pub fn config(&self, cfg: &mut web::ServiceConfig) {
cfg.service( cfg.service(
web::scope("") web::scope("")
.data(self.server_state.clone()) .app_data(web::Data::new(self.server_state.clone()))
.wrap( .wrap(
middleware::DefaultHeaders::new() middleware::DefaultHeaders::new().add(("Cache-Control", "no-store, max-age=0")),
.header("Cache-Control", "no-store, max-age=0"),
) )
.service(index) .service(index)
.service(api_scope()), .service(api_scope()),