Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
70 changes: 70 additions & 0 deletions proto/agynio/api/egress/v1/egress.proto
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ service EgressRulesService {
rpc ListEgressRulesByAgent(ListEgressRulesByAgentRequest) returns (ListEgressRulesByAgentResponse);
rpc ListEgressRulesByEnvironment(ListEgressRulesByEnvironmentRequest) returns (ListEgressRulesByEnvironmentResponse);
rpc CountRulesReferencingSecret(CountRulesReferencingSecretRequest) returns (CountRulesReferencingSecretResponse);
rpc CountRulesReferencingPrivateResource(CountRulesReferencingPrivateResourceRequest) returns (CountRulesReferencingPrivateResourceResponse);
rpc ListMediatedPrivateResources(ListMediatedPrivateResourcesRequest) returns (ListMediatedPrivateResourcesResponse);
rpc ListAttachedRuleDomains(ListAttachedRuleDomainsRequest) returns (ListAttachedRuleDomainsResponse);
}

// Metadata shared by egress resources.
Expand Down Expand Up @@ -57,6 +60,15 @@ message EgressRuleMatcher {
repeated string methods = 3;
// Glob over the request path. Empty means any path.
string path_pattern = 4;
string private_resource_id = 5;
}

message EgressRuleUpstreamTls {
string server_name = 1;
oneof trust {
string ca_bundle_secret_id = 2;
bool insecure_skip_verify = 3;
}
}

// Header credential injected by the egress gateway.
Expand All @@ -83,6 +95,7 @@ message EgressRule {
string description = 4;
EgressRuleMatcher matcher = 5;
EgressRuleEffect effect = 6;
optional EgressRuleUpstreamTls upstream_tls = 7;
}

// Attachment binding an egress rule to an agent or environment.
Expand All @@ -102,6 +115,7 @@ message CreateEgressRuleRequest {
string description = 3;
EgressRuleMatcher matcher = 4;
EgressRuleEffect effect = 5;
optional EgressRuleUpstreamTls upstream_tls = 6;
}

message CreateEgressRuleResponse {
Expand All @@ -116,10 +130,18 @@ message GetEgressRuleResponse {
EgressRule egress_rule = 1;
}

enum EgressRuleTargetKind {
EGRESS_RULE_TARGET_KIND_UNSPECIFIED = 0;
EGRESS_RULE_TARGET_KIND_PUBLIC = 1;
EGRESS_RULE_TARGET_KIND_PRIVATE = 2;
}

message ListEgressRulesRequest {
string organization_id = 1;
int32 page_size = 2;
string page_token = 3;
optional string private_resource_id = 4;
optional EgressRuleTargetKind target_kind = 5;
}

message ListEgressRulesResponse {
Expand All @@ -133,6 +155,7 @@ message UpdateEgressRuleRequest {
optional string description = 3;
optional EgressRuleMatcher matcher = 4;
optional EgressRuleEffect effect = 5;
optional EgressRuleUpstreamTls upstream_tls = 6;
}

message UpdateEgressRuleResponse {
Expand Down Expand Up @@ -179,12 +202,24 @@ message ListEgressRuleAttachmentsResponse {
string next_page_token = 2;
}

enum EgressPrivateResourceProtocol {
EGRESS_PRIVATE_RESOURCE_PROTOCOL_UNSPECIFIED = 0;
EGRESS_PRIVATE_RESOURCE_PROTOCOL_HTTP = 1;
EGRESS_PRIVATE_RESOURCE_PROTOCOL_HTTPS = 2;
}

message PrivateResourceInfo {
string intercept_host = 1;
EgressPrivateResourceProtocol protocol = 2;
}

message ListEgressRulesByAgentRequest {
string agent_id = 1;
}

message ListEgressRulesByAgentResponse {
repeated EgressRule egress_rules = 1;
map<string, PrivateResourceInfo> private_resources = 2;
}

message ListEgressRulesByEnvironmentRequest {
Expand All @@ -193,6 +228,7 @@ message ListEgressRulesByEnvironmentRequest {

message ListEgressRulesByEnvironmentResponse {
repeated EgressRule egress_rules = 1;
map<string, PrivateResourceInfo> private_resources = 2;
}

message CountRulesReferencingSecretRequest {
Expand All @@ -203,3 +239,37 @@ message CountRulesReferencingSecretResponse {
int32 count = 1;
repeated string egress_rule_ids = 2;
}

message CountRulesReferencingPrivateResourceRequest {
string private_resource_id = 1;
}

message CountRulesReferencingPrivateResourceResponse {
int32 count = 1;
repeated string egress_rule_ids = 2;
}

message ListMediatedPrivateResourcesRequest {
string organization_id = 1;
}

message ListMediatedPrivateResourcesResponse {
repeated string private_resource_ids = 1;
}

message AttachedRuleDomain {
string egress_rule_id = 1;
string domain_pattern = 2;
repeated int32 ports = 3;
}

message ListAttachedRuleDomainsRequest {
oneof principal {
string agent_id = 1;
string environment_id = 2;
}
}

message ListAttachedRuleDomainsResponse {
repeated AttachedRuleDomain domains = 1;
}
4 changes: 4 additions & 0 deletions proto/agynio/api/gateway/v1/networks.proto
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ service NetworksGateway {
rpc DeletePrivateResourceAccess(agynio.api.networks.v1.DeletePrivateResourceAccessRequest) returns (agynio.api.networks.v1.DeletePrivateResourceAccessResponse);
rpc ListPrivateResourceAccess(agynio.api.networks.v1.ListPrivateResourceAccessRequest) returns (agynio.api.networks.v1.ListPrivateResourceAccessResponse);
}

// SetPrivateResourceMediation and ListPrivateResourcesReachableBy are
// deliberately absent: they are internal calls from the EgressRules service,
// and the Gateway is the external surface.
43 changes: 43 additions & 0 deletions proto/agynio/api/networks/v1/networks.proto
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ service NetworksService {
rpc CreatePrivateResourceAccess(CreatePrivateResourceAccessRequest) returns (CreatePrivateResourceAccessResponse);
rpc DeletePrivateResourceAccess(DeletePrivateResourceAccessRequest) returns (DeletePrivateResourceAccessResponse);
rpc ListPrivateResourceAccess(ListPrivateResourceAccessRequest) returns (ListPrivateResourceAccessResponse);

// --- Internal ---
rpc SetPrivateResourceMediation(SetPrivateResourceMediationRequest) returns (SetPrivateResourceMediationResponse);
rpc ListPrivateResourcesReachableBy(ListPrivateResourcesReachableByRequest) returns (ListPrivateResourcesReachableByResponse);
}

// Metadata shared by network resources.
Expand Down Expand Up @@ -71,6 +75,12 @@ enum PrivateResourceProtocol {
PRIVATE_RESOURCE_PROTOCOL_HTTPS = 3;
}

enum PrivateResourceMediation {
PRIVATE_RESOURCE_MEDIATION_UNSPECIFIED = 0;
PRIVATE_RESOURCE_MEDIATION_TUNNEL = 1;
PRIVATE_RESOURCE_MEDIATION_EGRESS_GATEWAY = 2;
}

// Principal types eligible for private resource access.
enum PrivateResourceAccessPrincipalType {
PRIVATE_RESOURCE_ACCESS_PRINCIPAL_TYPE_UNSPECIFIED = 0;
Expand Down Expand Up @@ -118,6 +128,7 @@ message PrivateResource {
// Numeric intercept ports. Each value must be in the range 1..65535.
repeated int32 intercept_ports = 9;
ProvisioningState provisioning_state = 10;
PrivateResourceMediation mediation = 11;
}

// Immutable grant authorizing a principal to dial a private resource.
Expand Down Expand Up @@ -304,3 +315,35 @@ message ListPrivateResourceAccessResponse {
repeated PrivateResourceAccess private_resource_access = 1;
string next_page_token = 2;
}

message SetPrivateResourceMediationRequest {
string id = 1;
PrivateResourceMediation mediation = 2;
}

message SetPrivateResourceMediationResponse {
PrivateResource private_resource = 1;
}

message ReachablePrivateResourceGrant {
PrivateResourceAccessPrincipalType principal_type = 1;
string principal_id = 2;
}

message ReachablePrivateResource {
string id = 1;
string intercept_host = 2;
repeated int32 intercept_ports = 3;
repeated ReachablePrivateResourceGrant grants = 4;
}

message ListPrivateResourcesReachableByRequest {
oneof principal {
string agent_id = 1;
string environment_id = 2;
}
}

message ListPrivateResourcesReachableByResponse {
repeated ReachablePrivateResource private_resources = 1;
}
5 changes: 5 additions & 0 deletions proto/agynio/api/ziti_management/v1/ziti_management.proto
Original file line number Diff line number Diff line change
Expand Up @@ -594,12 +594,17 @@ message UpdateServiceRequest {
// Deprecated: use tags_update to distinguish omitted from empty.
map<string, string> tags = 4 [deprecated = true];
optional TagsUpdate tags_update = 5;
optional RoleAttributesUpdate role_attributes_update = 6;
}

message TagsUpdate {
map<string, string> tags = 1;
}

message RoleAttributesUpdate {
repeated string role_attributes = 1;
}

message UpdateServiceResponse {
OpenZitiService service = 1;
}
Loading