mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-20 19:18:45 +00:00
fix(security): pass serviceId from the remaining terminal entry points
- application general 'Open Terminal' now passes serviceId (applicationId). - The docker/terminal DockerTerminalModal now forwards serviceId to its Terminal. - compose container rows thread serviceId to their terminal + logs modals. This lets a member with service access (but without the docker permission) open the terminal / read logs of their own service's containers from every service view, matching the backend service-first authorization.
This commit is contained in:
@@ -271,6 +271,7 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
|
|||||||
<DockerTerminalModal
|
<DockerTerminalModal
|
||||||
appName={data?.appName || ""}
|
appName={data?.appName || ""}
|
||||||
serverId={data?.serverId || ""}
|
serverId={data?.serverId || ""}
|
||||||
|
serviceId={applicationId}
|
||||||
>
|
>
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
|
|||||||
@@ -55,12 +55,14 @@ interface Props {
|
|||||||
appName: string;
|
appName: string;
|
||||||
serverId?: string;
|
serverId?: string;
|
||||||
appType: "stack" | "docker-compose";
|
appType: "stack" | "docker-compose";
|
||||||
|
serviceId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ShowComposeContainers = ({
|
export const ShowComposeContainers = ({
|
||||||
appName,
|
appName,
|
||||||
appType,
|
appType,
|
||||||
serverId,
|
serverId,
|
||||||
|
serviceId,
|
||||||
}: Props) => {
|
}: Props) => {
|
||||||
const { data, isPending, refetch } =
|
const { data, isPending, refetch } =
|
||||||
api.docker.getContainersByAppNameMatch.useQuery(
|
api.docker.getContainersByAppNameMatch.useQuery(
|
||||||
@@ -122,6 +124,7 @@ export const ShowComposeContainers = ({
|
|||||||
key={container.containerId}
|
key={container.containerId}
|
||||||
container={container}
|
container={container}
|
||||||
serverId={serverId}
|
serverId={serverId}
|
||||||
|
serviceId={serviceId}
|
||||||
onActionComplete={() => refetch()}
|
onActionComplete={() => refetch()}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
@@ -142,12 +145,14 @@ interface ContainerRowProps {
|
|||||||
status: string;
|
status: string;
|
||||||
};
|
};
|
||||||
serverId?: string;
|
serverId?: string;
|
||||||
|
serviceId?: string;
|
||||||
onActionComplete: () => void;
|
onActionComplete: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ContainerRow = ({
|
const ContainerRow = ({
|
||||||
container,
|
container,
|
||||||
serverId,
|
serverId,
|
||||||
|
serviceId,
|
||||||
onActionComplete,
|
onActionComplete,
|
||||||
}: ContainerRowProps) => {
|
}: ContainerRowProps) => {
|
||||||
const [logsOpen, setLogsOpen] = useState(false);
|
const [logsOpen, setLogsOpen] = useState(false);
|
||||||
@@ -236,6 +241,7 @@ const ContainerRow = ({
|
|||||||
<DockerTerminalModal
|
<DockerTerminalModal
|
||||||
containerId={container.containerId}
|
containerId={container.containerId}
|
||||||
serverId={serverId || ""}
|
serverId={serverId || ""}
|
||||||
|
serviceId={serviceId}
|
||||||
>
|
>
|
||||||
Terminal
|
Terminal
|
||||||
</DockerTerminalModal>
|
</DockerTerminalModal>
|
||||||
@@ -280,6 +286,7 @@ const ContainerRow = ({
|
|||||||
containerId={container.containerId}
|
containerId={container.containerId}
|
||||||
serverId={serverId}
|
serverId={serverId}
|
||||||
runType="native"
|
runType="native"
|
||||||
|
serviceId={serviceId}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
|
|||||||
@@ -23,12 +23,14 @@ interface Props {
|
|||||||
containerId: string;
|
containerId: string;
|
||||||
serverId?: string;
|
serverId?: string;
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
|
serviceId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DockerTerminalModal = ({
|
export const DockerTerminalModal = ({
|
||||||
children,
|
children,
|
||||||
containerId,
|
containerId,
|
||||||
serverId,
|
serverId,
|
||||||
|
serviceId,
|
||||||
}: Props) => {
|
}: Props) => {
|
||||||
const [mainDialogOpen, setMainDialogOpen] = useState(false);
|
const [mainDialogOpen, setMainDialogOpen] = useState(false);
|
||||||
const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
|
const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
|
||||||
@@ -74,6 +76,7 @@ export const DockerTerminalModal = ({
|
|||||||
id="terminal"
|
id="terminal"
|
||||||
containerId={containerId}
|
containerId={containerId}
|
||||||
serverId={serverId || ""}
|
serverId={serverId || ""}
|
||||||
|
serviceId={serviceId}
|
||||||
/>
|
/>
|
||||||
<Dialog open={confirmDialogOpen} onOpenChange={setConfirmDialogOpen}>
|
<Dialog open={confirmDialogOpen} onOpenChange={setConfirmDialogOpen}>
|
||||||
<DialogContent onEscapeKeyDown={(event) => event.preventDefault()}>
|
<DialogContent onEscapeKeyDown={(event) => event.preventDefault()}>
|
||||||
|
|||||||
+1
@@ -312,6 +312,7 @@ const Service = (
|
|||||||
serverId={data?.serverId || undefined}
|
serverId={data?.serverId || undefined}
|
||||||
appName={data?.appName || ""}
|
appName={data?.appName || ""}
|
||||||
appType={data?.composeType || "docker-compose"}
|
appType={data?.composeType || "docker-compose"}
|
||||||
|
serviceId={data?.composeId}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|||||||
Reference in New Issue
Block a user