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
34 changes: 32 additions & 2 deletions src/components/ContainerTerminal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,15 @@ describe("ContainerTerminal", () => {
}
} as any;

// Mock localStorage
vi.spyOn(Storage.prototype, "getItem").mockReturnValue("test-token");
Object.defineProperty(window, "localStorage", {
value: {
getItem: vi.fn().mockReturnValue("test-token"),
setItem: vi.fn(),
removeItem: vi.fn(),
clear: vi.fn(),
},
configurable: true,
});
});

afterEach(() => {
Expand Down Expand Up @@ -223,6 +230,29 @@ describe("ContainerTerminal", () => {
expect(wrapper.emitted("connected")).toBeTruthy();
});

it("shows terminal disabled denial before auth success", async () => {
const wrapper = mountTerminal();
const button = wrapper.find(".terminal-overlay button");
await button.trigger("click");

mockWebSocket.onopen();
mockWebSocket.onmessage({
data: JSON.stringify({
type: "error",
code: "protected_mode",
message: "Terminal access is disabled for this deployment by protected mode settings",
}),
});
mockWebSocket.onclose();

await wrapper.vm.$nextTick();

expect(wrapper.text()).toContain("Terminal access is disabled for this deployment by protected mode settings");
expect(wrapper.emitted("error")?.[0]).toEqual([
"Terminal access is disabled for this deployment by protected mode settings",
]);
});

it("sends resize message after auth success", async () => {
const wrapper = mountTerminal();
const button = wrapper.find(".terminal-overlay button");
Expand Down
23 changes: 21 additions & 2 deletions src/components/ContainerTerminal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ let resizeObserver: ResizeObserver | null = null;
let resizeTimeout: ReturnType<typeof setTimeout> | null = null;
let lastRows = 0;
let lastCols = 0;
let explicitCloseMessage = "";

const getWebSocketUrl = () => {
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
Expand All @@ -70,6 +71,7 @@ const connect = () => {
connectionStatus.value = "connecting";
statusMessage.value = "Connecting...";
authenticated = false;
explicitCloseMessage = "";

socket = new WebSocket(getWebSocketUrl());
socket.binaryType = "arraybuffer";
Expand Down Expand Up @@ -123,10 +125,27 @@ const connect = () => {
}
return;
}
if (parsed.type === "error") {
const message = parsed.message || "Terminal connection denied";
explicitCloseMessage = message;
connectionStatus.value = "error";
statusMessage.value = message;
emit("error", message);
socket?.close();
return;
}
} catch {
// Not JSON, might be an error message before auth
}
// If we get data before auth_success, show as error
// eslint-disable-next-line no-control-regex
const text = data.replace(/\x1b\[[0-9;]*m/g, "").trim();
if (text) {
explicitCloseMessage = text;
connectionStatus.value = "error";
statusMessage.value = text;
emit("error", text);
}
if (terminal) {
terminal.write(data);
}
Expand All @@ -139,8 +158,8 @@ const connect = () => {
};

socket.onclose = () => {
connectionStatus.value = "disconnected";
statusMessage.value = "Connection closed. Click Connect to reconnect.";
connectionStatus.value = explicitCloseMessage ? "error" : "disconnected";
statusMessage.value = explicitCloseMessage || "Connection closed. Click Connect to reconnect.";
authenticated = false;
emit("disconnected");
};
Expand Down
252 changes: 252 additions & 0 deletions src/components/DeploymentAccessField.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
<template>
<div class="deployment-access-field">
<p v-if="hint" class="tab-hint">{{ hint }}</p>
<div v-if="readOnly" class="readonly-view">
<div v-if="!entries.length" class="empty-state">
<i class="pi pi-info-circle" />
<span>No deployment access</span>
</div>
<div v-else class="entries-list">
<div v-for="entry in entries" :key="entry.name" class="entry-row readonly">
<span class="entry-name">{{ entry.name }}</span>
<span class="entry-level" :class="entry.level">{{ entry.level }}</span>
</div>
</div>
</div>

<template v-else>
<div class="add-form">
<select v-model="newName" class="form-input">
<option value="">Select deployment...</option>
<option v-for="d in selectable" :key="d" :value="d">{{ d }}</option>
</select>
<select v-model="newLevel" class="form-input">
<option value="read">Read</option>
<option value="write">Write</option>
<option value="admin">Admin</option>
</select>
<button type="button" class="btn btn-primary btn-sm" :disabled="!newName" @click="addEntry">Add</button>
</div>

<div v-if="entries.length" class="entries-list">
<div v-for="entry in entries" :key="entry.name" class="entry-row">
<span class="entry-name">{{ entry.name }}</span>
<select :value="entry.level" @change="setLevel(entry.name, ($event.target as HTMLSelectElement).value)">
<option value="read">Read</option>
<option value="write">Write</option>
<option value="admin">Admin</option>
</select>
<button type="button" class="btn btn-icon btn-sm" title="Remove" @click="removeEntry(entry.name)">
<i class="pi pi-times" />
</button>
</div>
</div>
<div v-else class="empty-state">
<i class="pi pi-info-circle" />
<span>{{ emptyHint || "No deployments selected" }}</span>
</div>
</template>
</div>
</template>

<script setup lang="ts">
import { computed, ref } from "vue";
import type { DeploymentAccessLevel, DeploymentAccessMap } from "@/types";

const props = withDefaults(
defineProps<{
modelValue: DeploymentAccessMap;
available: string[];
hint?: string;
emptyHint?: string;
readOnly?: boolean;
defaultLevel?: DeploymentAccessLevel;
}>(),
{
readOnly: false,
defaultLevel: "read",
},
);

const emit = defineEmits<{
"update:modelValue": [value: DeploymentAccessMap];
}>();

const newName = ref("");
const newLevel = ref<DeploymentAccessLevel>(props.defaultLevel);

const entries = computed(() =>
Object.entries(props.modelValue || {})
.map(([name, level]) => ({ name, level: level as DeploymentAccessLevel }))
.sort((a, b) => a.name.localeCompare(b.name)),
);

const selectable = computed(() =>
props.available.filter((d) => !(d in (props.modelValue || {}))).sort((a, b) => a.localeCompare(b)),
);

const addEntry = () => {
if (!newName.value) return;
emit("update:modelValue", { ...(props.modelValue || {}), [newName.value]: newLevel.value });
newName.value = "";
newLevel.value = props.defaultLevel;
};

const setLevel = (name: string, level: string) => {
emit("update:modelValue", { ...(props.modelValue || {}), [name]: level as DeploymentAccessLevel });
};

const removeEntry = (name: string) => {
const next = { ...(props.modelValue || {}) };
delete next[name];
emit("update:modelValue", next);
};
</script>

<style scoped>
.deployment-access-field {
display: flex;
flex-direction: column;
gap: 0.625rem;
}

.tab-hint {
margin: 0;
font-size: 0.8125rem;
color: var(--color-gray-600);
line-height: 1.4;
}

.add-form {
display: grid;
grid-template-columns: 1fr auto auto;
gap: 0.5rem;
align-items: center;
}

.add-form .form-input {
width: 100%;
padding: 0.4375rem 0.625rem;
border: 1px solid var(--color-gray-300);
border-radius: 6px;
font-size: 0.875rem;
background: var(--surface-card, white);
}

.add-form select:nth-child(2) {
min-width: 100px;
}

.entries-list {
display: flex;
flex-direction: column;
gap: 0.375rem;
}

.entry-row {
display: grid;
grid-template-columns: 1fr auto auto;
align-items: center;
gap: 0.5rem;
padding: 0.4375rem 0.625rem;
background: var(--color-gray-50);
border: 1px solid var(--color-gray-200);
border-radius: 6px;
}

.entry-row.readonly {
grid-template-columns: 1fr auto;
}

.entry-row select {
padding: 0.25rem 0.5rem;
border: 1px solid var(--color-gray-300);
border-radius: 4px;
font-size: 0.8125rem;
background: var(--surface-card, white);
}

.entry-name {
font-size: 0.875rem;
color: var(--color-gray-800);
word-break: break-all;
}

.entry-level {
font-size: 0.6875rem;
padding: 0.125rem 0.5rem;
border-radius: 4px;
text-transform: uppercase;
letter-spacing: 0.04em;
font-weight: 500;
background: var(--color-gray-200);
color: var(--color-gray-700);
}

.entry-level.read {
background: var(--color-info-50, #eff6ff);
color: var(--color-info-700, #1d4ed8);
}

.entry-level.write {
background: var(--color-warning-50, #fffbeb);
color: var(--color-warning-700, #b45309);
}

.entry-level.admin {
background: var(--color-danger-50, #fef2f2);
color: var(--color-danger-700, #b91c1c);
}

.empty-state {
display: flex;
align-items: center;
gap: 0.375rem;
padding: 0.5rem 0;
font-size: 0.8125rem;
color: var(--color-gray-500);
}

.btn {
display: inline-flex;
align-items: center;
gap: 0.25rem;
padding: 0.4375rem 0.75rem;
border: 1px solid var(--color-gray-300);
border-radius: 6px;
background: var(--surface-card, white);
color: var(--color-gray-700);
cursor: pointer;
font-size: 0.8125rem;
}

.btn:disabled {
opacity: 0.5;
cursor: not-allowed;
}

.btn-sm {
padding: 0.25rem 0.5rem;
}

.btn-icon {
padding: 0.3125rem;
background: transparent;
border-color: transparent;
}

.btn-icon:hover {
background: var(--color-gray-100);
}

.btn-primary {
background: var(--color-primary-500, #3b82f6);
color: white;
border-color: var(--color-primary-500, #3b82f6);
}

.btn-primary:hover:not(:disabled) {
background: var(--color-primary-600, #2563eb);
border-color: var(--color-primary-600, #2563eb);
}
</style>
Loading
Loading