Skip to content

Commit b54a229

Browse files
committed
Merge branch 'main' into dependabot/cargo/tokio-1.43.1
2 parents 59b81d7 + 8f7ef34 commit b54a229

File tree

21 files changed

+301
-137
lines changed

21 files changed

+301
-137
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ test_details = ["test", "--target", "aarch64-apple-darwin"]
55
target = "wasm32-wasip1"
66

77
[target.'cfg(all(target_arch = "wasm32"))']
8-
runner = "viceroy run -C fastly.toml -- "
8+
runner = "viceroy run -C ../../fastly.toml -- "

CHANGELOG.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
2+
# Changelog
3+
4+
All notable changes to this project will be documented in this file.
5+
6+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
7+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
8+
9+
## [Unreleased]
10+
11+
### Added
12+
- for new features
13+
14+
### Changed
15+
- for changes in existing functionality
16+
17+
### Deprecated
18+
- for soon-to-be removed features.
19+
20+
### Removed
21+
- for now removed features
22+
23+
### Fixed
24+
- for any bug fixes
25+
26+
### Security
27+
- in case of vulnerabilities
28+
29+
## [1.0.5] - 2025-05-19
30+
31+
### Changed
32+
33+
- Refactor into crates to allow to separate Fastly implementation
34+
- Remove references to POTSI
35+
- Rename `potsi.toml` to `trusted-server.toml`
36+
37+
### Added
38+
39+
- Implemented GDPR consent for creating and passing synth headers
40+
41+
42+
## [1.0.4] - 2025-04-29
43+
44+
### Added
45+
46+
- Implemented GDPR consent for creating and passing synth headers
47+
48+
## [1.0.3] - 2025-04-23
49+
50+
### Changed
51+
52+
- Upgraded to Fastly CLI v11.2.0
53+
54+
## [1.0.2] - 2025-03-28
55+
56+
### Added
57+
- Documented project gogernance in [ProjectGovernance.md]
58+
- Document FAQ for POC [FAQ_POC.md]
59+
60+
## [1.0.1] - 2025-03-27
61+
62+
### Changed
63+
64+
- Allow to templatize synthetic cookies
65+
66+
## [1.0.0] - 2025-03-26
67+
68+
### Added
69+
70+
- Initial implementation of Trusted Server
71+
72+
[Unreleased]:https://github.com/IABTechLab/trusted-server/compare/v1.0.5...HEAD
73+
[1.0.5]:https://github.com/IABTechLab/trusted-server/compare/v1.0.4...v1.0.5
74+
[1.0.4]:https://github.com/IABTechLab/trusted-server/compare/v1.0.3...v1.0.4
75+
[1.0.3]:https://github.com/IABTechLab/trusted-server/compare/v1.0.2...v1.0.3
76+
[1.0.2]:https://github.com/IABTechLab/trusted-server/compare/v1.0.1...v1.0.2
77+
[1.0.1]:https://github.com/IABTechLab/trusted-server/compare/v1.0.0...v1.0.1
78+
[1.0.0]:https://github.com/IABTechLab/trusted-server/releases/tag/v1.0.0

Cargo.lock

Lines changed: 87 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,6 @@
1-
[package]
2-
name = "potsi"
3-
version = "0.1.0"
4-
authors = []
5-
edition = "2021"
6-
# Remove this line if you want to be able to publish this crate as open source on crates.io.
7-
# Otherwise, `publish = false` prevents an accidental `cargo publish` from revealing private source.
8-
publish = false
9-
license = "Apache-2.0"
10-
11-
[profile.release]
12-
debug = 1
13-
14-
[dependencies]
15-
fastly = "0.11.2"
16-
hmac = "0.12.1"
17-
sha2 = "0.10.6"
18-
hex = "0.4.3"
19-
serde = { version = "1.0", features = ["derive"] }
20-
serde_json = "1.0.91"
21-
cookie = "0.18.1"
22-
log = "0.4.20"
23-
log-fastly = "0.10.0"
24-
futures = "0.3"
25-
tokio = { version = "1.43", features = ["sync", "macros", "io-util", "rt", "time"] }
26-
url = "2.4.1"
27-
config = "0.15.11"
28-
handlebars = "6.3.2"
29-
chrono = "0.4"
1+
[workspace]
2+
resolver = "2"
3+
members = [
4+
"crates/common",
5+
"crates/fastly",
6+
]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ git clone [email protected]:IABTechLab/trusted-server.git
9393
:information_source: Note that you’ll have to edit the following files for your setup:
9494

9595
- fastly.toml (service ID, author, description)
96-
- potsi.toml (KV store ID names)
96+
- trusted-server.toml (KV store ID names)
9797

9898
### Build
9999

crates/common/Cargo.toml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[package]
2+
name = "trusted-server-common"
3+
version = "0.1.0"
4+
authors = []
5+
edition = "2021"
6+
# Remove this line if you want to be able to publish this crate as open source on crates.io.
7+
# Otherwise, `publish = false` prevents an accidental `cargo publish` from revealing private source.
8+
publish = false
9+
license = "Apache-2.0"
10+
11+
[profile.release]
12+
debug = 1
13+
14+
[dependencies]
15+
chrono = "0.4"
16+
config = "0.15.11"
17+
cookie = "0.18.1"
18+
fastly = "0.11.2"
19+
futures = "0.3"
20+
handlebars = "6.3.2"
21+
hex = "0.4.3"
22+
hmac = "0.12.1"
23+
log = "0.4.20"
24+
log-fastly = "0.10.0"
25+
serde = { version = "1.0", features = ["derive"] }
26+
serde_json = "1.0.91"
27+
sha2 = "0.10.6"
28+
tokio = { version = "1.0", features = ["sync", "macros", "io-util", "rt", "time"] }
29+
url = "2.4.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pub const SYNTHETIC_HEADER_FRESH: &str = "X-Synthetic-Fresh";
2-
pub const SYNTHETIC_HEADER_POTSI: &str = "X-Synthetic-Potsi";
2+
pub const SYNTHETIC_HEADER_TRUSTED_SERVER: &str = "X-Synthetic-Trusted-Server";
33
pub const SYNTHETIC_HEADER_PUB_USER_ID: &str = "X-Pub-User-ID";
File renamed without changes.

crates/common/src/lib.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pub mod constants;
2+
pub mod cookies;
3+
pub mod gdpr;
4+
pub mod models;
5+
pub mod prebid;
6+
pub mod privacy;
7+
pub mod settings;
8+
pub mod synthetic;
9+
pub mod templates;
10+
pub mod why;

0 commit comments

Comments
 (0)