From 94a28b31d31c088075bc56e24ec99b6b2c9c4066 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 18:54:15 +0100 Subject: [PATCH] update shields --- .../components/dialog/shields/AddAddress.vue | 80 +++ .../components/dialog/shields/AddDomain.vue | 2 +- .../dialog/shields/DeleteAddress.vue | 56 ++ dashboard/components/shields/Addresses.vue | 40 +- dashboard/components/shields/Bots.vue | 47 ++ dashboard/components/shields/Domains.vue | 4 +- dashboard/pages/shields.vue | 15 +- dashboard/server/api/shields/bots/options.ts | 9 + .../api/shields/bots/update_options.post.ts | 14 + .../server/api/shields/countries/add.post.ts | 11 + .../api/shields/countries/delete.delete.ts | 14 + .../server/api/shields/countries/list.ts | 8 + producer/src/controller.ts | 630 +++++++++++++++++- producer/src/deprecated.ts | 10 +- producer/src/index.ts | 24 +- scripts/producer/shared.ts | 4 + .../schema/shields/BotTrafficOptionSchema.ts | 16 + .../schema/shields/CountryBlacklistSchema.ts | 18 + .../schema/shields/PageBlacklistSchema.ts | 18 + 19 files changed, 967 insertions(+), 53 deletions(-) create mode 100644 dashboard/components/dialog/shields/AddAddress.vue create mode 100644 dashboard/components/dialog/shields/DeleteAddress.vue create mode 100644 dashboard/components/shields/Bots.vue create mode 100644 dashboard/server/api/shields/bots/options.ts create mode 100644 dashboard/server/api/shields/bots/update_options.post.ts create mode 100644 dashboard/server/api/shields/countries/add.post.ts create mode 100644 dashboard/server/api/shields/countries/delete.delete.ts create mode 100644 dashboard/server/api/shields/countries/list.ts create mode 100644 shared_global/schema/shields/BotTrafficOptionSchema.ts create mode 100644 shared_global/schema/shields/CountryBlacklistSchema.ts create mode 100644 shared_global/schema/shields/PageBlacklistSchema.ts diff --git a/dashboard/components/dialog/shields/AddAddress.vue b/dashboard/components/dialog/shields/AddAddress.vue new file mode 100644 index 0000000..0a606b2 --- /dev/null +++ b/dashboard/components/dialog/shields/AddAddress.vue @@ -0,0 +1,80 @@ + + + \ No newline at end of file diff --git a/dashboard/components/dialog/shields/AddDomain.vue b/dashboard/components/dialog/shields/AddDomain.vue index 6b74c3e..02be60e 100644 --- a/dashboard/components/dialog/shields/AddDomain.vue +++ b/dashboard/components/dialog/shields/AddDomain.vue @@ -50,7 +50,7 @@ async function addDomain() { subdomains. -
NB: Once added, we will start rejecting traffic from non-matching hostnames within a few +
NB: Once added, we will start allowing traffic only from matching hostnames within a few minutes.
diff --git a/dashboard/components/dialog/shields/DeleteAddress.vue b/dashboard/components/dialog/shields/DeleteAddress.vue new file mode 100644 index 0000000..831385b --- /dev/null +++ b/dashboard/components/dialog/shields/DeleteAddress.vue @@ -0,0 +1,56 @@ + + + \ No newline at end of file diff --git a/dashboard/components/shields/Addresses.vue b/dashboard/components/shields/Addresses.vue index e36db64..3b1741d 100644 --- a/dashboard/components/shields/Addresses.vue +++ b/dashboard/components/shields/Addresses.vue @@ -1,10 +1,8 @@ + + \ No newline at end of file diff --git a/dashboard/components/shields/Domains.vue b/dashboard/components/shields/Domains.vue index d03cf76..6d1041f 100644 --- a/dashboard/components/shields/Domains.vue +++ b/dashboard/components/shields/Domains.vue @@ -3,8 +3,6 @@ import { DialogShieldsAddDomain, DialogShieldsDeleteDomain } from '#components'; definePageMeta({ layout: 'dashboard' }); -const { project } = useProject(); - const { data: allowedDomains, refresh: refreshDomains, pending: pendingDomains } = useFetch('/api/shields/domains/list', { headers: useComputedHeaders({}) }); @@ -61,7 +59,7 @@ function showDeleteDomainModal(domain: string) {
Domains allow list
- Accept incoming traffic only from familiar domains + Accept incoming traffic only from familiar domains.
diff --git a/dashboard/pages/shields.vue b/dashboard/pages/shields.vue index a3ea3fd..5a45847 100644 --- a/dashboard/pages/shields.vue +++ b/dashboard/pages/shields.vue @@ -7,8 +7,9 @@ const selfhosted = useSelfhosted(); const items = [ { label: 'Domains', slot: 'domains', tab: 'domains' }, { label: 'IP Addresses', slot: 'ipaddresses', tab: 'ipaddresses' }, - { label: 'Countries', slot: 'countries', tab: 'countries' }, - { label: 'Pages', slot: 'pages', tab: 'pages' }, + { label: 'Bot traffic', slot: 'bots', tab: 'bots' }, + // { label: 'Countries', slot: 'countries', tab: 'countries' }, + // { label: 'Pages', slot: 'pages', tab: 'pages' }, ] @@ -23,14 +24,10 @@ const items = [ - -