Skip to content
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

[v17] Switching web to ssh_port_forwarding instead of port_forwarding #50245

Merged
merged 1 commit into from
Dec 13, 2024
Merged

[v17] Switching web to ssh_port_forwarding instead of port_forwarding #50245

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
12 changes: 10 additions & 2 deletions web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,11 @@ spec:
enabled: true
max_session_ttl: 30h0m0s
pin_source_ip: false
port_forwarding: true
ssh_port_forwarding:
remote:
enabled: false
local:
enabled: false
record_session:
default: best_effort
desktop: true
Expand Down Expand Up @@ -374,7 +378,11 @@ spec:
enabled: true
max_session_ttl: 30h0m0s
pin_source_ip: false
port_forwarding: true
ssh_port_forwarding:
remote:
enabled: false
local:
enabled: false
record_session:
default: best_effort
desktop: true
Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleport/src/Roles/RoleEditor/standardmodel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ function optionsToModel(options: RoleOptions): {
enhanced_recording,
idp,
pin_source_ip,
port_forwarding,
ssh_port_forwarding,
ssh_file_copy,

...unsupported
Expand Down Expand Up @@ -756,7 +756,7 @@ function optionsToModel(options: RoleOptions): {
!equalsDeep(enhanced_recording, defaultOpts.enhanced_recording) ||
!equalsDeep(idp, defaultOpts.idp) ||
pin_source_ip !== defaultOpts.pin_source_ip ||
port_forwarding !== defaultOpts.port_forwarding ||
!equalsDeep(ssh_port_forwarding, defaultOpts.ssh_port_forwarding) ||
ssh_file_copy !== defaultOpts.ssh_file_copy ||
requireMFATypeOption === undefined ||
createHostUserModeOption === undefined ||
Expand Down
18 changes: 17 additions & 1 deletion web/packages/teleport/src/Roles/RoleEditor/withDefaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ export const optionsWithDefaults = (
},
},

ssh_port_forwarding: {
local: {
...defaults.ssh_port_forwarding.local,
},
remote: {
...defaults.ssh_port_forwarding.remote,
},
},

record_session: {
...defaults.record_session,
...options?.record_session,
Expand All @@ -92,7 +101,14 @@ export const defaultOptions = (): RoleOptions => ({
},
max_session_ttl: '30h0m0s',
pin_source_ip: false,
port_forwarding: true,
ssh_port_forwarding: {
local: {
enabled: false,
},
remote: {
enabled: false,
},
},
record_session: {
default: 'best_effort',
desktop: true,
Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleport/src/Roles/Roles.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ const roles = [
name: '@teleadmin',
displayName: '@teleadmin',
content:
"kind: role\nmetadata:\n labels:\n gravitational.io/system: \"true\"\n name: '@teleadmin'\nspec:\n allow:\n kubernetes_groups:\n - admin\n logins:\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - '*'\n verbs:\n - '*'\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: false\n max_session_ttl: 30h0m0s\n port_forwarding: true\nversion: v3\n",
"kind: role\nmetadata:\n labels:\n gravitational.io/system: \"true\"\n name: '@teleadmin'\nspec:\n allow:\n kubernetes_groups:\n - admin\n logins:\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - '*'\n verbs:\n - '*'\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: false\n max_session_ttl: 30h0m0s\n ssh_port_forwarding:\n remote:\n enabled: false\n local:\n enabled: false\nversion: v3\n",
},
{
id: 'role:admin',
kind: 'role' as const,
name: 'admin',
displayName: 'admin',
content:
"kind: role\nmetadata:\n name: admin\nspec:\n allow:\n kubernetes_groups:\n - '{{internal.kubernetes_groups}}'\n logins:\n - '{{internal.logins}}'\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - role\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - auth_connector\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - session\n verbs:\n - list\n - read\n - resources:\n - trusted_cluster\n verbs:\n - list\n - create\n - read\n - update\n - delete\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: true\n max_session_ttl: 30h0m0s\n port_forwarding: true\nversion: v3\n",
"kind: role\nmetadata:\n name: admin\nspec:\n allow:\n kubernetes_groups:\n - '{{internal.kubernetes_groups}}'\n logins:\n - '{{internal.logins}}'\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - role\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - auth_connector\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - session\n verbs:\n - list\n - read\n - resources:\n - trusted_cluster\n verbs:\n - list\n - create\n - read\n - update\n - delete\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: true\n max_session_ttl: 30h0m0s\n ssh_port_forwarding:\n remote:\n enabled: false\n local:\n enabled: false\nversion: v3\n",
},
];

Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleport/src/TrustedClusters/TrustedClusters.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ const trustedClusters = [
name: '@teleadmin',
displayName: '@teleadmin',
content:
"kind: role\nmetadata:\n labels:\n gravitational.io/system: \"true\"\n name: '@teleadmin'\nspec:\n allow:\n kubernetes_groups:\n - admin\n logins:\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - '*'\n verbs:\n - '*'\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: false\n max_session_ttl: 30h0m0s\n port_forwarding: true\nversion: v3\n",
"kind: role\nmetadata:\n labels:\n gravitational.io/system: \"true\"\n name: '@teleadmin'\nspec:\n allow:\n kubernetes_groups:\n - admin\n logins:\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - '*'\n verbs:\n - '*'\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: false\n max_session_ttl: 30h0m0s\n ssh_port_forwarding:\n remote:\n enabled: false\n local:\n enabled: false\nversion: v3\n",
},
{
id: 'role:admin',
kind: 'trusted_cluster' as const,
name: 'georgewashington.gravitational.io',
displayName: 'georgewashington.gravitational.io',
content:
"kind: role\nmetadata:\n name: admin\nspec:\n allow:\n kubernetes_groups:\n - '{{internal.kubernetes_groups}}'\n logins:\n - '{{internal.logins}}'\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - role\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - auth_connector\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - session\n verbs:\n - list\n - read\n - resources:\n - trusted_cluster\n verbs:\n - list\n - create\n - read\n - update\n - delete\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: true\n max_session_ttl: 30h0m0s\n port_forwarding: true\nversion: v3\n",
"kind: role\nmetadata:\n name: admin\nspec:\n allow:\n kubernetes_groups:\n - '{{internal.kubernetes_groups}}'\n logins:\n - '{{internal.logins}}'\n - root\n node_labels:\n '*': '*'\n rules:\n - resources:\n - role\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - auth_connector\n verbs:\n - list\n - create\n - read\n - update\n - delete\n - resources:\n - session\n verbs:\n - list\n - read\n - resources:\n - trusted_cluster\n verbs:\n - list\n - create\n - read\n - update\n - delete\n deny: {}\n options:\n cert_format: standard\n client_idle_timeout: 0s\n disconnect_expired_cert: false\n forward_agent: true\n max_session_ttl: 30h0m0s\n ssh_port_forwarding:\n remote:\n enabled: false\n local:\n enabled: false\nversion: v3\n",
},
];
11 changes: 10 additions & 1 deletion web/packages/teleport/src/services/resources/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ export type RoleOptions = {
};
max_session_ttl: string;
pin_source_ip: boolean;
port_forwarding: boolean;
ssh_port_forwarding: SSHPortForwarding;
record_session: {
default: SessionRecordingMode;
ssh?: SessionRecordingMode;
Expand All @@ -365,6 +365,15 @@ export type RoleOptions = {
create_db_user_mode?: CreateDBUserMode;
};

export type SSHPortForwarding = {
local: {
enabled: boolean;
};
remote: {
enabled: boolean;
};
};

export type RequireMFAType =
| boolean
| 'hardware_key'
Expand Down
Loading