version 1.0.1

ANSSI-FR · Dec 18, 2024 · 0f10420 · 0f10420
1 parent 8d05ddb
commit 0f10420
Show file tree

Hide file tree

Showing 12 changed files with 619 additions and 492 deletions.
diff --git a/Makefile b/Makefile
@@ -58,6 +58,7 @@ dev-config:
 
 .PHONY: dev-up
 dev-up:
+	$(MAKE) dev-config
 	$(COMPOSE_DEV) up -d
 
 .PHONY: dev-up-elk
@@ -70,8 +71,8 @@ dev-down:
 
 .PHONY: dev-reset
 dev-reset:
-	$(MAKE) down-dev
-	$(MAKE) up-dev
+	$(MAKE) dev-down
+	$(MAKE) dev-up
 
 ### prod
 

diff --git a/backend/Pipfile b/backend/Pipfile
@@ -15,7 +15,7 @@ humanfriendly = "==10.0"
 whitenoise = "==6.7.0"
 msgpack = "==1.1.0"
 pydantic = "==1.*"
-minio = "==7.2.3"
+minio = "*"
 django-filter = ">=24.*"
 setuptools = ">=70.*"
 

diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/backend/eurydice/common/api/docs/static/welcome.md b/backend/eurydice/common/api/docs/static/welcome.md
@@ -1,9 +1,7 @@
-# Disclaimer: this is an early access Alpha version of the software
+# Introduction
 
 This is version `{EURYDICE_VERSION}`, if you find a bug please report it to {EURYDICE_CONTACT}.
 
-# Introduction
-
 ## 👋 Welcome to Eurydice, learn here how to transfer your files through a network diode.
 
 Eurydice is a RESTful API that allows you to submit files and transfer them through a diode.

diff --git a/compose.yml b/compose.yml
@@ -167,7 +167,8 @@ services:
       - make
       - dev
     environment:
-      NODE_ENV: development
+      NODE_ENV: ${NODE_ENV:-development}
+      VUE_APP_VERSION: ${VUE_APP_VERSION:-development}
       # workaround for vue-cli container detection not working, see:
       # https://github.com/vuejs/vue-cli/issues/6726
       CODESANDBOX_SSE: "1"
@@ -196,6 +197,8 @@ services:
       CSRF_TRUSTED_ORIGINS: ""
       DJANGO_MANAGEPY_MIGRATE: "on"
       METRICS_SLIDING_WINDOW: ${METRICS_SLIDING_WINDOW:-60min}
+      UI_BADGE_CONTENT: ${UI_BADGE_CONTENT:-Guichet origine}
+      UI_BADGE_COLOR: ${UI_BADGE_COLOR:-green}
     healthcheck:
       test:
         - "CMD"
@@ -402,6 +405,8 @@ services:
       CSRF_TRUSTED_ORIGINS: ""
       DJANGO_MANAGEPY_MIGRATE: "on"
       METRICS_SLIDING_WINDOW: ${METRICS_SLIDING_WINDOW:-60min}
+      UI_BADGE_CONTENT: ${UI_BADGE_CONTENT:-Guichet destination}
+      UI_BADGE_COLOR: ${UI_BADGE_COLOR:-blue}
     healthcheck:
       test:
         - CMD
@@ -466,4 +471,4 @@ networks:
     name: eurydice
     ipam:
       config:
-        - subnet: ${EURYDICE_IPV4_SUBNET:-172.18.0.0/24}
+        - subnet: ${EURYDICE_IPV4_SUBNET:-172.42.0.0/24}
diff --git a/docs/administrators.md b/docs/administrators.md
@@ -214,6 +214,8 @@ In case you are unable to setup a reverse proxy and remote user authentication,
 
 Basic HTTP Authentication is enabled when the `REMOTE_USER_HEADER_AUTHENTICATION_ENABLED` variable is set to `false`.
 
+If `REMOTE_USER_HEADER_AUTHENTICATION_ENABLED` is set to `false` the app won't use kerberos. Kerberos and basic auth **cannot** be used simultaneously.
+
 ### Elasticsearch API key
 
 To send applicative logs into an ELK you need an API key for a user with following role restrictions:

diff --git a/frontend/npm-audit-ignore-packages.json b/frontend/npm-audit-ignore-packages.json
@@ -10,3 +10,7 @@
   "name": "vuex",
   "description": "goes with vue"
 }
+{
+  "name": "nanoid",
+  "description": "id generation"
+}