[v9] backport #1130 (Add --request-id flag to connection instructions for Kubes and Databases)

packages/teleport/src/Databases/ConnectDialog/ConnectDialog.story.tsx

@@ -31,3 +31,17 @@ export const Connect = () => (
     authType="local"
   />
 );
+
+export const ConnectWithRequestId = () => {
+  return (
+    <ConnectDialog
+      username="yassine"
+      dbName="aurora"
+      dbProtocol="postgres"
+      clusterId="im-a-cluster"
+      onClose={() => null}
+      authType="local"
+      accessRequestId="e1e8072c-1eb8-5df4-a7bd-b6863b19271c"
+    />
+  );
+};

packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx

@@ -31,6 +31,7 @@ export default function ConnectDialog({
   dbName,
   onClose,
   authType,
+  accessRequestId,
 }: Props) {
   const { hostname, port } = window.document.location;
   const host = `${hostname}:${port || '443'}`;
@@ -40,6 +41,10 @@ export default function ConnectDialog({
       ? `tsh login --proxy=${host}`
       : `tsh login --proxy=${host} --auth=local --user=${username}`;
 
+  const requestIdFlag = accessRequestId
+    ? ` --request-id=${accessRequestId}`
+    : '';
+
   return (
     <Dialog
       dialogCss={() => ({
@@ -59,14 +64,17 @@ export default function ConnectDialog({
             Step 1
           </Text>
           {' - Login to Teleport'}
-          <TextSelectCopy mt="2" text={connectCmd} />
+          <TextSelectCopy mt="2" text={`${connectCmd}${requestIdFlag}`} />
         </Box>
         <Box mb={4}>
           <Text bold as="span">
             Step 2
           </Text>
           {' - Retrieve credentials for the database'}
-          <TextSelectCopy mt="2" text={`tsh db login [--db-user=<user>] [--db-name=<name>] ${dbName}`} />
+          <TextSelectCopy
+            mt="2"
+            text={`tsh db login [--db-user=<user>] [--db-name=<name>] ${dbName}`}
+          />
         </Box>
         <Box mb={4}>
           <Text bold as="span">
@@ -105,4 +113,5 @@ export type Props = {
   username: string;
   clusterId: string;
   authType: AuthType;
+  accessRequestId?: string;
 };

packages/teleport/src/Databases/DatabaseList/DatabaseList.tsx

@@ -45,6 +45,7 @@ function DatabaseList(props: Props) {
     pathname,
     replaceHistory,
     onLabelClick,
+    accessRequestId,
   } = props;
 
   const [dbConnectInfo, setDbConnectInfo] = useState<{
@@ -117,6 +118,7 @@ function DatabaseList(props: Props) {
           dbProtocol={dbConnectInfo.protocol}
           onClose={() => setDbConnectInfo(null)}
           authType={authType}
+          accessRequestId={accessRequestId}
         />
       )}
     </>
@@ -165,6 +167,7 @@ type Props = {
   pathname: string;
   replaceHistory: (path: string) => void;
   onLabelClick: (label: AgentLabel) => void;
+  accessRequestId?: string;
 };
 
 export default DatabaseList;

packages/teleport/src/Databases/Databases.story.tsx

@@ -84,4 +84,5 @@ export const props: State = {
   replaceHistory: () => null,
   isSearchEmpty: false,
   onLabelClick: () => null,
+  accessRequestId: null,
 };

packages/teleport/src/Databases/Databases.tsx

@@ -63,6 +63,7 @@ export function Databases(props: State) {
     fetchStatus,
     isSearchEmpty,
     onLabelClick,
+    accessRequestId,
   } = props;
 
   const hasNoDatabases =
@@ -111,6 +112,7 @@ export function Databases(props: State) {
             pathname={pathname}
             replaceHistory={replaceHistory}
             onLabelClick={onLabelClick}
+            accessRequestId={accessRequestId}
           />
         </>
       )}

packages/teleport/src/Databases/useDatabases.ts

@@ -38,6 +38,7 @@ export default function useDatabases(ctx: Ctx) {
   const isEnterprise = ctx.isEnterprise;
   const version = ctx.storeUser.state.cluster.authVersion;
   const authType = ctx.storeUser.state.authType;
+  const accessRequestId = ctx.storeUser.getAccessRequestId();
   const [isAddDialogVisible, setIsAddDialogVisible] = useState(false);
   const [fetchStatus, setFetchStatus] = useState<FetchStatus>('');
   const [params, setParams] = useState<ResourceUrlQueryParams>({
@@ -173,6 +174,7 @@ export default function useDatabases(ctx: Ctx) {
     fetchStatus,
     isSearchEmpty,
     onLabelClick,
+    accessRequestId,
   };
 }
 

packages/teleport/src/Kubes/ConnectDialog/ConnectDialog.story.tsx

@@ -33,6 +33,19 @@ export const Local = () => {
   );
 };
 
+export const LocalWithRequestId = () => {
+  return (
+    <Component
+      onClose={() => null}
+      username={'sam'}
+      authType={'local'}
+      kubeConnectName={'tele.logicoma.dev-prod'}
+      clusterId={'some-cluster-name'}
+      accessRequestId={'8289cdb1-385c-5b02-85f1-fa2a934b749f'}
+    />
+  );
+};
+
 export const Sso = () => {
   return (
     <Component

packages/teleport/src/Kubes/ConnectDialog/ConnectDialog.tsx

@@ -26,12 +26,23 @@ import TextSelectCopy from 'teleport/components/TextSelectCopy';
 import { AuthType } from 'teleport/services/user';
 
 function ConnectDialog(props: Props) {
-  const { onClose, username, authType, kubeConnectName, clusterId } = props;
+  const {
+    onClose,
+    username,
+    authType,
+    kubeConnectName,
+    clusterId,
+    accessRequestId,
+  } = props;
   const { hostname, port } = window.document.location;
   const host = `${hostname}:${port || '443'}`;
   const authSpec =
-    authType === 'local' ? `--auth=${authType} --user=${username} ` : '';
-  const text = `tsh login --proxy=${host} ${authSpec}${clusterId}`;
+    authType === 'local' ? ` --auth=${authType} --user=${username}` : '';
+  const text = `tsh login --proxy=${host}${authSpec}`;
+
+  const requestIdFlag = accessRequestId
+    ? ` --request-id=${accessRequestId}`
+    : '';
 
   return (
     <Dialog
@@ -49,7 +60,10 @@ function ConnectDialog(props: Props) {
             Step 1
           </Text>
           {' - Login to Teleport'}
-          <TextSelectCopy mt="2" text={text} />
+          <TextSelectCopy
+            mt="2"
+            text={`${text}${requestIdFlag} ${clusterId}`}
+          />
         </Box>
         <Box mb={4}>
           <Text bold as="span">
@@ -90,6 +104,7 @@ type Props = {
   authType: AuthType;
   kubeConnectName: string;
   clusterId: string;
+  accessRequestId?: string;
 };
 
 const dialogCss = () => `

packages/teleport/src/Kubes/KubeList/KubeList.tsx

@@ -45,6 +45,7 @@ function KubeList(props: Props) {
     pathname,
     replaceHistory,
     onLabelClick,
+    accessRequestId,
   } = props;
 
   const [kubeConnectName, setKubeConnectName] = useState('');
@@ -103,6 +104,7 @@ function KubeList(props: Props) {
           authType={authType}
           kubeConnectName={kubeConnectName}
           clusterId={clusterId}
+          accessRequestId={accessRequestId}
         />
       )}
     </>
@@ -141,6 +143,7 @@ type Props = {
   pathname: string;
   replaceHistory: (path: string) => void;
   onLabelClick: (label: AgentLabel) => void;
+  accessRequestId?: string;
 };
 
 export default KubeList;

packages/teleport/src/Kubes/Kubes.story.tsx

@@ -80,4 +80,5 @@ export const props: State = {
   replaceHistory: () => null,
   isSearchEmpty: false,
   onLabelClick: () => null,
+  accessRequestId: null,
 };

packages/teleport/src/Kubes/Kubes.tsx

@@ -60,6 +60,7 @@ export function Kubes(props: State) {
     fetchStatus,
     isSearchEmpty,
     onLabelClick,
+    accessRequestId,
   } = props;
 
   const [showAddKube, setShowAddKube] = useState(false);
@@ -110,6 +111,7 @@ export function Kubes(props: State) {
             pathname={pathname}
             replaceHistory={replaceHistory}
             onLabelClick={onLabelClick}
+            accessRequestId={accessRequestId}
           />
         </>
       )}

packages/teleport/src/Kubes/useKubes.ts

@@ -34,6 +34,7 @@ export default function useKubes(ctx: TeleportContext) {
   const { search, pathname } = useLocation();
   const [startKeys, setStartKeys] = useState<string[]>([]);
   const canCreate = ctx.storeUser.getTokenAccess().create;
+  const accessRequestId = ctx.storeUser.getAccessRequestId();
   const { attempt, setAttempt } = useAttempt('processing');
   const [fetchStatus, setFetchStatus] = useState<FetchStatus>('');
   const [params, setParams] = useState<ResourceUrlQueryParams>({
@@ -155,6 +156,7 @@ export default function useKubes(ctx: TeleportContext) {
     fetchStatus,
     isSearchEmpty,
     onLabelClick,
+    accessRequestId,
   };
 }
 

packages/teleport/src/services/user/makeUserContext.ts

@@ -22,6 +22,7 @@ export default function makeUserContext(json: any): UserContext {
   json = json || {};
   const username = json.userName;
   const authType = json.authType;
+  const accessRequestId = json.accessRequestId;
 
   const cluster = makeCluster(json.cluster);
   const acl = makeAcl(json.userAcl);
@@ -35,6 +36,7 @@ export default function makeUserContext(json: any): UserContext {
     cluster,
     accessStrategy,
     accessCapabilities,
+    accessRequestId,
   };
 }
 

packages/teleport/src/services/user/types.ts

@@ -35,6 +35,8 @@ export interface UserContext {
   cluster: Cluster;
   accessStrategy: AccessStrategy;
   accessCapabilities: AccessCapabilities;
+  // accessRequestId is the ID of the access request from which additional roles to assume were obtained for the current session.
+  accessRequestId?: string;
 }
 
 export interface Access {

packages/teleport/src/stores/storeUserContext.ts

@@ -100,4 +100,8 @@ export default class StoreUserContext extends Store<UserContext> {
   getNodeAccess() {
     return this.state.acl.nodes;
   }
+
+  getAccessRequestId() {
+    return this.state.accessRequestId;
+  }
 }