Skip to content

Allow ESI shared-template caching behind basic auth #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prk-Jr wants to merge 2 commits into from
Open

Allow ESI shared-template caching behind basic auth #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edc80f3
Allow template caching behind edge auth
prk-Jr Aug 25, 2026
9bf200a
Merge branch 'main' into esi-edge-terminated-auth-main
prk-Jr Aug 26, 2026
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
7 changes: 5 additions & 2 deletions crates/trusted-server-adapter-axum/src/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@ impl AuthMiddleware {

#[async_trait(?Send)]
impl Middleware for AuthMiddleware {
async fn handle(&self, ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
match enforce_basic_auth(&self.settings, ctx.request()) {
async fn handle(&self, mut ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
// Takes the request mutably because `enforce_basic_auth` marks requests
// whose credential it consumed itself; the shared template cache gate
// reads that marker later.
match enforce_basic_auth(&self.settings, ctx.request_mut()) {
Ok(Some(response)) => return Ok(response),
Ok(None) => {}
Err(report) => {
Expand Down
7 changes: 5 additions & 2 deletions crates/trusted-server-adapter-cloudflare/src/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@ impl AuthMiddleware {

#[async_trait(?Send)]
impl Middleware for AuthMiddleware {
async fn handle(&self, ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
match enforce_basic_auth(&self.settings, ctx.request()) {
async fn handle(&self, mut ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
// Takes the request mutably because `enforce_basic_auth` marks requests
// whose credential it consumed itself; the shared template cache gate
// reads that marker later.
match enforce_basic_auth(&self.settings, ctx.request_mut()) {
Ok(Some(response)) => return Ok(response),
Ok(None) => {}
Err(report) => {
Expand Down
7 changes: 5 additions & 2 deletions crates/trusted-server-adapter-fastly/src/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,11 @@ impl AuthMiddleware {

#[async_trait(?Send)]
impl Middleware for AuthMiddleware {
async fn handle(&self, ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
match enforce_basic_auth(&self.settings, ctx.request()) {
async fn handle(&self, mut ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
// Takes the request mutably because `enforce_basic_auth` marks requests
// whose credential it consumed itself; the shared template cache gate
// reads that marker later.
match enforce_basic_auth(&self.settings, ctx.request_mut()) {
Comment on lines +128 to +131

@ChristianPavilonis ChristianPavilonis Aug 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⛏ Nitpick: remove the repeated middleware comment

The mutable request and call name already make this clear, while enforce_basic_auth owns the full explanation. I would remove this comment here and from the Axum, Cloudflare, and Spin copies.

Suggested change
// Takes the request mutably because `enforce_basic_auth` marks requests
// whose credential it consumed itself; the shared template cache gate
// reads that marker later.
match enforce_basic_auth(&self.settings, ctx.request_mut()) {
match enforce_basic_auth(&self.settings, ctx.request_mut()) {

Ok(Some(response)) => return Ok(response),
Ok(None) => {}
Err(report) => {
Expand Down
7 changes: 5 additions & 2 deletions crates/trusted-server-adapter-spin/src/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,11 @@ impl AuthMiddleware {

#[async_trait(?Send)]
impl Middleware for AuthMiddleware {
async fn handle(&self, ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
match enforce_basic_auth(&self.settings, ctx.request()) {
async fn handle(&self, mut ctx: RequestContext, next: Next<'_>) -> Result<Response, EdgeError> {
// Takes the request mutably because `enforce_basic_auth` marks requests
// whose credential it consumed itself; the shared template cache gate
// reads that marker later.
match enforce_basic_auth(&self.settings, ctx.request_mut()) {
Ok(Some(response)) => return Ok(response),
Ok(None) => {}
Err(report) => {
Expand Down
Loading
Loading