adding PortForwardConfig to RoleOptions

gravitational · Nov 18, 2024 · 28e9439 · 28e9439
1 parent 7aed1f6
commit 28e9439
Show file tree

Hide file tree

Showing 2 changed files with 2,611 additions and 2,299 deletions.
diff --git a/api/proto/teleport/legacy/types/types.proto b/api/proto/teleport/legacy/types/types.proto
@@ -2855,6 +2855,20 @@ enum CreateDatabaseUserMode {
   DB_USER_MODE_BEST_EFFORT_DROP = 3;
 }
 
+// PortForwardConfig defines which types of port forwarding are permitted, if any.
+message PortForwardConfig {
+  BoolValue Local = 1 [
+    (gogoproto.nullable) = true,
+    (gogoproto.jsontag) = "local,omitempty",
+    (gogoproto.customtype) = "BoolOption"
+  ];
+  BoolValue Remote = 2 [
+    (gogoproto.nullable) = true,
+    (gogoproto.jsontag) = "remote,omitempty",
+    (gogoproto.customtype) = "BoolOption"
+  ];
+}
+
 // RoleOptions is a set of role options
 message RoleOptions {
   // ForwardAgent is SSH agent forwarding.
@@ -2869,10 +2883,7 @@ message RoleOptions {
     (gogoproto.casttype) = "Duration"
   ];
 
-  // PortForwarding defines if the certificate will have
-  // "permit-port-forwarding"
-  // in the certificate. PortForwarding is "yes" if not set,
-  // that's why this is a pointer
+  // Deprecated: Use PortForwardMode instead
   BoolValue PortForwarding = 3 [
     (gogoproto.nullable) = true,
     (gogoproto.jsontag) = "port_forwarding,omitempty",
@@ -3040,6 +3051,12 @@ message RoleOptions {
 
   // CreateHostUserDefaultShell is used to configure the default shell for newly provisioned host users.
   string CreateHostUserDefaultShell = 31 [(gogoproto.jsontag) = "create_host_user_default_shell,omitempty"];
+
+  // PortForwardConfig
+  PortForwardConfig PortForwardConfig = 32 [
+    (gogoproto.nullable) = true,
+    (gogoproto.jsontag) = "port_forward_config,omitempty"
+  ];
 }
 
 message RecordSession {