Skip to content

feat(mcp): gate mcp.makeitwork.cloud behind Cloudflare Access #26

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

Merged
xnoto merged 1 commit into from
Aug 26, 2026
Merged

feat(mcp): gate mcp.makeitwork.cloud behind Cloudflare Access #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ No modules.
| [cloudflare_zero_trust_access_application.alertmanager](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.grafana_alerts](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.k3s](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.mcp_gateway](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.warp](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_group.admins](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_group) | resource |
| [cloudflare_zero_trust_access_identity_provider.github](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_identity_provider) | resource |
| [cloudflare_zero_trust_access_service_token.mcp_gateway](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_service_token) | resource |
| [cloudflare_zero_trust_organization.main](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_organization) | resource |
| [cloudflare_zero_trust_tunnel_cloudflared.warp](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_tunnel_cloudflared) | resource |
| [cloudflare_zero_trust_tunnel_cloudflared_route.private_network](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_tunnel_cloudflared_route) | resource |
Expand All @@ -61,6 +63,8 @@ No inputs.

| Name | Description |
| ---- | ----------- |
| <a name="output_mcp_gateway_service_token_client_id"></a> [mcp\_gateway\_service\_token\_client\_id](#output\_mcp\_gateway\_service\_token\_client\_id) | CF-Access-Client-Id for MCP gateway clients |
| <a name="output_mcp_gateway_service_token_client_secret"></a> [mcp\_gateway\_service\_token\_client\_secret](#output\_mcp\_gateway\_service\_token\_client\_secret) | CF-Access-Client-Secret for MCP gateway clients |
| <a name="output_tunnel_ids"></a> [tunnel\_ids](#output\_tunnel\_ids) | Cloudflare Tunnel IDs for reference in kustomize-cluster ConfigMaps |
<!-- END_TF_DOCS -->

Expand Down
44 changes: 44 additions & 0 deletions cf-access-mcp.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Gates mcp.makeitwork.cloud (ToolHive VirtualMCPServer in kustomize-cluster
# workloads/mcp-gateway). MCP clients are headless HTTP agents, so machine
# access uses a dedicated service token (CF-Access-Client-* headers) rather
# than the browser OIDC flow; the admins policy stays for interactive debug.
resource "cloudflare_zero_trust_access_service_token" "mcp_gateway" {
account_id = local.account_id
name = "mcp-gateway"
# Non-expiring; rotate deliberately by bumping client_secret_version.
duration = "forever"
}

resource "cloudflare_zero_trust_access_application" "mcp_gateway" {
account_id = local.account_id
name = "MCP Gateway"
type = "self_hosted"
domain = "mcp.makeitwork.cloud"
session_duration = "24h"

allowed_idps = [
cloudflare_zero_trust_access_identity_provider.github.id,
]

policies = [
{
name = "mcp-gateway-clients"
decision = "non_identity"
include = [{
service_token = {
token_id = cloudflare_zero_trust_access_service_token.mcp_gateway.id
}
}]
},
{
name = "makeitworkcloud-admins"
decision = "allow"
session_duration = "24h"
include = [{
group = {
id = cloudflare_zero_trust_access_group.admins.id
}
}]
}
]
}
1 change: 1 addition & 0 deletions cf-tunnels.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ locals {
"forgejo",
"grafana",
"k3s",
"mcp",
"opencode",
"status",
"alertmanager",
Expand Down
12 changes: 12 additions & 0 deletions outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,15 @@ output "tunnel_ids" {
warp = cloudflare_zero_trust_tunnel_cloudflared.warp.id
}
}

# Clients send these as CF-Access-Client-Id / CF-Access-Client-Secret headers.
output "mcp_gateway_service_token_client_id" {
description = "CF-Access-Client-Id for MCP gateway clients"
value = cloudflare_zero_trust_access_service_token.mcp_gateway.client_id
}

output "mcp_gateway_service_token_client_secret" {
description = "CF-Access-Client-Secret for MCP gateway clients"
value = cloudflare_zero_trust_access_service_token.mcp_gateway.client_secret
sensitive = true
}
Loading