Develop

Makefile.mk

@@ -105,6 +105,8 @@ APP_USER_LIMIT_RATE=30r/s
 APP_USER_BURST=80 nodelay
 
 API_USER_SCOPE=http_x_forwarded_for
+API_USER_ID_LIMIT_RATE=3r/s
+API_USER_ID_BURST=5 delay=2
 API_USER_GET_LIMIT_RATE=5r/s
 API_USER_GET_BURST=12 delay=8
 API_USER_POST_LIMIT_RATE=2r/m

client/cypress.env.json

@@ -11,6 +11,7 @@
   "adminPass" : "Admin*78",
   "admin93Login" : "[email protected]",
   "admin75Login" : "[email protected]",
+  "delegue75And93Login" : "[email protected]",
   "admin93Pass" : "Admin*78",
   "candidat" : "CANDIDAT",
   "candidatUn": "GOOSE",

client/docker-compose.prod.front.yml

@@ -28,6 +28,8 @@ services:
       APP_USER_LIMIT_RATE: ${APP_USER_LIMIT_RATE}
       APP_USER_BURST: ${APP_USER_BURST}
       API_USER_SCOPE: ${API_USER_SCOPE}
+      API_USER_ID_LIMIT_RATE: ${API_USER_ID_LIMIT_RATE}
+      API_USER_ID_BURST: ${API_USER_ID_BURST}
       API_USER_GET_LIMIT_RATE: ${API_USER_GET_LIMIT_RATE}
       API_USER_GET_BURST: ${API_USER_GET_BURST}
       API_USER_POST_LIMIT_RATE: ${API_USER_POST_LIMIT_RATE}
@@ -72,6 +74,8 @@ services:
       APP_USER_LIMIT_RATE: ${APP_USER_LIMIT_RATE}
       APP_USER_BURST: ${APP_USER_BURST}
       API_USER_SCOPE: ${API_USER_SCOPE}
+      API_USER_ID_LIMIT_RATE: ${API_USER_ID_LIMIT_RATE}
+      API_USER_ID_BURST: ${API_USER_ID_BURST}
       API_USER_GET_LIMIT_RATE: ${API_USER_GET_LIMIT_RATE}
       API_USER_GET_BURST: ${API_USER_GET_BURST}
       API_USER_POST_LIMIT_RATE: ${API_USER_POST_LIMIT_RATE}

client/nginx/nginx-run-candidat.template

@@ -40,6 +40,7 @@ server {
   }
 
   location ~ "^<PUBLIC_PATH>/api/v2(/public|(/auth)?/candidat)" {
+    limit_req zone=api_user_id burst=<API_USER_ID_BURST>;
     limit_req zone=api_get burst=<API_USER_GET_BURST>;
     limit_req zone=api_post burst=<API_USER_POST_BURST>;
     limit_req zone=api_patch burst=<API_USER_PATCH_BURST>;

client/nginx/nginx.template

@@ -46,6 +46,12 @@ http {
       default "";
     }
 
+    map $http_x_user_id $limit_user_id {
+      "~.+" $http_x_user_id;
+      default $<API_USER_SCOPE>;
+    }
+
+    limit_req_zone $limit_user_id zone=api_user_id:5m rate=<API_USER_ID_LIMIT_RATE>;
     limit_req_zone $limit_get zone=api_get:2m rate=<API_USER_GET_LIMIT_RATE>;
     limit_req_zone $limit_post zone=api_post:2m rate=<API_USER_POST_LIMIT_RATE>;
     limit_req_zone $limit_patch zone=api_patch:2m rate=<API_USER_PATCH_LIMIT_RATE>;
@@ -77,6 +83,7 @@ http {
     }
 
     log_format main escape=json '{ "nginx": {'
+      '"http_x_user_id":"$http_x_user_id",'
       '"http_x_forwarded_for":"$http_x_forwarded_for",'
       '"http_referer":"$http_referer",'
       '"http_user_agent":"$http_user_agent",'

client/nginx/run.sh

@@ -22,6 +22,7 @@ fi
 [ -z "${APP}" -o -z "${API_HOST}" -o -z "${API_PORT}" \
   -o -z "${APP_USER_LIMIT_RATE}"  \
   -o -z "${API_USER_SCOPE}" \
+  -o -z "${API_USER_ID_LIMIT_RATE}" -o -z "${API_USER_ID_BURST}" \
   -o -z "${API_USER_GET_LIMIT_RATE}" -o -z "${API_USER_GET_BURST}" \
   -o -z "${API_USER_POST_LIMIT_RATE}" -o -z "${API_USER_POST_BURST}" \
   -o -z "${API_USER_PATCH_LIMIT_RATE}" -o -z "${API_USER_PATCH_BURST}"  \
@@ -35,6 +36,7 @@ fi
  sed "s#<APP>#${APP}#g;s#<API_HOST>#${API_HOST}#g;s#<API_PORT>#${API_PORT}#g;" |
  sed "s#<APP_USER_LIMIT_RATE>#${APP_USER_LIMIT_RATE}#g;s#<APP_USER_BURST>#${APP_USER_BURST}#g;" |
  sed "s#<API_USER_SCOPE>#${API_USER_SCOPE}#g" |
+ sed "s#<API_USER_ID_LIMIT_RATE>#${API_USER_ID_LIMIT_RATE}#g;s#<API_USER_ID_BURST>#${API_USER_ID_BURST}#g;" |
  sed "s#<API_USER_GET_LIMIT_RATE>#${API_USER_GET_LIMIT_RATE}#g;s#<API_USER_GET_BURST>#${API_USER_GET_BURST}#g;" |
  sed "s#<API_USER_POST_LIMIT_RATE>#${API_USER_POST_LIMIT_RATE}#g;s#<API_USER_POST_BURST>#${API_USER_POST_BURST}#g;" |
  sed "s#<API_USER_PATCH_LIMIT_RATE>#${API_USER_PATCH_LIMIT_RATE}#g;s#<API_USER_PATCH_BURST>#${API_USER_PATCH_BURST}#g;" |
@@ -50,6 +52,7 @@ cat /etc/nginx/nginx.template |
  sed "s#<APP>#${APP}#g;s#<API_HOST>#${API_HOST}#g;s#<API_PORT>#${API_PORT}#g;" |
  sed "s#<APP_USER_LIMIT_RATE>#${APP_USER_LIMIT_RATE}#g;s#<APP_USER_BURST>#${APP_USER_BURST}#g;" |
  sed "s#<API_USER_SCOPE>#${API_USER_SCOPE}#g" |
+ sed "s#<API_USER_ID_LIMIT_RATE>#${API_USER_ID_LIMIT_RATE}#g;s#<API_USER_ID_BURST>#${API_USER_ID_BURST}#g;" |
  sed "s#<API_USER_GET_LIMIT_RATE>#${API_USER_GET_LIMIT_RATE}#g;s#<API_USER_GET_BURST>#${API_USER_GET_BURST}#g;" |
  sed "s#<API_USER_POST_LIMIT_RATE>#${API_USER_POST_LIMIT_RATE}#g;s#<API_USER_POST_BURST>#${API_USER_POST_BURST}#g;" |
  sed "s#<API_USER_PATCH_LIMIT_RATE>#${API_USER_PATCH_LIMIT_RATE}#g;s#<API_USER_PATCH_BURST>#${API_USER_PATCH_BURST}#g;" |